From patchwork Mon Jul 15 14:42:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 259061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A46132C0148 for ; Tue, 16 Jul 2013 00:44:40 +1000 (EST) Received: from localhost ([::1]:60976 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk10-0000YF-MI for incoming@patchwork.ozlabs.org; Mon, 15 Jul 2013 10:44:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk0D-0000G0-LO for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:43:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uyk06-0001sc-VB for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:43:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk06-0001sU-NU for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:43:42 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6FEhgJT011915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Jul 2013 10:43:42 -0400 Received: from localhost (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r6FEhbAk018295; Mon, 15 Jul 2013 10:43:40 -0400 From: Stefan Hajnoczi To: Date: Mon, 15 Jul 2013 22:42:53 +0800 Message-Id: <1373899382-13514-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1373899382-13514-1-git-send-email-stefanha@redhat.com> References: <1373899382-13514-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Paolo Bonzini Subject: [Qemu-devel] [PATCH v2 04/13] exec: do not use qemu/tls.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Paolo Bonzini The next patch will change qemu/tls.h to support more platforms, but at some performance cost. Declare current_cpu directly instead of using the tls.h abstractions. Signed-off-by: Paolo Bonzini --- Paolo may have further improvements for these patches. This is my local version. exec.c | 10 ++++++++-- include/qemu/tls.h | 52 ---------------------------------------------------- include/qom/cpu.h | 14 +++++++++++--- 3 files changed, 19 insertions(+), 57 deletions(-) delete mode 100644 include/qemu/tls.h diff --git a/exec.c b/exec.c index 80ee2ab..b8db730 100644 --- a/exec.c +++ b/exec.c @@ -70,9 +70,15 @@ static MemoryRegion io_mem_unassigned; #endif CPUState *first_cpu; + /* current CPU in the current thread. It is only valid inside - cpu_exec() */ -DEFINE_TLS(CPUState *, current_cpu); + * cpu_exec(). See comment in include/exec/cpu-all.h. */ +#if defined CONFIG_KVM || (defined CONFIG_USER_ONLY && defined CONFIG_USE_NPTL) +__thread CPUState *current_cpu; +#else +CPUState *current_cpu; +#endif + /* 0 = Do not count executed instructions. 1 = Precise instruction counting. 2 = Adaptive rate instruction counting. */ diff --git a/include/qemu/tls.h b/include/qemu/tls.h deleted file mode 100644 index b92ea9d..0000000 --- a/include/qemu/tls.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Abstraction layer for defining and using TLS variables - * - * Copyright (c) 2011 Red Hat, Inc - * Copyright (c) 2011 Linaro Limited - * - * Authors: - * Paolo Bonzini - * Peter Maydell - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, see . - */ - -#ifndef QEMU_TLS_H -#define QEMU_TLS_H - -/* Per-thread variables. Note that we only have implementations - * which are really thread-local on Linux; the dummy implementations - * define plain global variables. - * - * This means that for the moment use should be restricted to - * per-VCPU variables, which are OK because: - * - the only -user mode supporting multiple VCPU threads is linux-user - * - TCG system mode is single-threaded regarding VCPUs - * - KVM system mode is multi-threaded but limited to Linux - * - * TODO: proper implementations via Win32 .tls sections and - * POSIX pthread_getspecific. - */ -#ifdef __linux__ -#define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x) -#define DEFINE_TLS(type, x) __thread __typeof__(type) tls__##x -#define tls_var(x) tls__##x -#else -/* Dummy implementations which define plain global variables */ -#define DECLARE_TLS(type, x) extern DEFINE_TLS(type, x) -#define DEFINE_TLS(type, x) __typeof__(type) tls__##x -#define tls_var(x) tls__##x -#endif - -#endif diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 147c256..cb26e1a 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -24,7 +24,6 @@ #include "hw/qdev-core.h" #include "exec/hwaddr.h" #include "qemu/thread.h" -#include "qemu/tls.h" #include "qemu/typedefs.h" typedef int (*WriteCoreDumpFunction)(void *buf, size_t size, void *opaque); @@ -163,8 +162,17 @@ struct CPUState { extern CPUState *first_cpu; -DECLARE_TLS(CPUState *, current_cpu); -#define current_cpu tls_var(current_cpu) +/* This is thread-local depending on __linux__ because: + * - the only -user mode supporting multiple VCPU threads is linux-user + * - TCG system mode is single-threaded regarding VCPUs + * - KVM system mode is multi-threaded but limited to Linux + */ +#if defined CONFIG_KVM || (defined CONFIG_USER_ONLY && defined CONFIG_USE_NPTL) +extern __thread CPUState *current_cpu; +#else +extern CPUState *current_cpu; +#endif + /** * cpu_paging_enabled: