From patchwork Fri Jun 28 18:26:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 255504 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 B42542C0097 for ; Sat, 29 Jun 2013 04:28:08 +1000 (EST) Received: from localhost ([::1]:49855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsdOs-000647-Ry for incoming@patchwork.ozlabs.org; Fri, 28 Jun 2013 14:28:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsdNz-0005ZH-U2 for qemu-devel@nongnu.org; Fri, 28 Jun 2013 14:27:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsdNy-0000LB-FS for qemu-devel@nongnu.org; Fri, 28 Jun 2013 14:27:07 -0400 Received: from mail-ea0-x231.google.com ([2a00:1450:4013:c01::231]:45463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsdNy-0000Kh-5G for qemu-devel@nongnu.org; Fri, 28 Jun 2013 14:27:06 -0400 Received: by mail-ea0-f177.google.com with SMTP id j14so1200329eak.22 for ; Fri, 28 Jun 2013 11:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=fKukjr+o1rl4Ptlc4m5dSOUf1cWWF74FbgEkBBXlvSg=; b=fYbVPnDLSvliSMngUI5gdd8SWW26rc6YFOe2bTyhqZRPniQGE3gkcRy36bgenPlXqK vrdEPYs6MDJ0Skj+yAJfXyThMGv8Nz8jRi+nyqv0/jeX3jQrtcYt4FxjZUAjoq0M6qkN DEfxxMmPabN+gKHq/xZS5B6ySLWnjE6n0In5ID1XXEFT6Irza1YOqCfJ69qv2f7bou6b wkRUOGM0NFWB02xba5p+r8cqCaHNjaI8rIlpmYa2GnMfsZc/TFU+AytZtbefr4AC7UTe 79rRhm/x1/SZWhvnudPqwMb9JQMUWB5ogzi/XPTekEcV3j2TmOzxDD6VjLAHj9Xxr7MX PDig== X-Received: by 10.14.175.5 with SMTP id y5mr15042831eel.21.1372444025300; Fri, 28 Jun 2013 11:27:05 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id o5sm12035344eef.5.2013.06.28.11.27.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 28 Jun 2013 11:27:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2013 20:26:24 +0200 Message-Id: <1372444009-11544-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372444009-11544-1-git-send-email-pbonzini@redhat.com> References: <1372444009-11544-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::231 Subject: [Qemu-devel] [PATCH 05/30] 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 The next patch will change qemu/tls.h to support more platforms, but at some performance cost. Declare cpu_single_env directly instead of using the tls.h abstractions. Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori --- exec.c | 10 ++++++++-- include/exec/cpu-all.h | 14 +++++++++++--- include/qemu/tls.h | 52 -------------------------------------------------- 3 files changed, 19 insertions(+), 57 deletions(-) delete mode 100644 include/qemu/tls.h diff --git a/exec.c b/exec.c index d28403b..a788981 100644 --- a/exec.c +++ b/exec.c @@ -70,9 +70,15 @@ static MemoryRegion io_mem_unassigned; #endif CPUArchState *first_cpu; + /* current CPU in the current thread. It is only valid inside - cpu_exec() */ -DEFINE_TLS(CPUArchState *,cpu_single_env); + * cpu_exec(). See comment in include/exec/cpu-all.h. */ +#if defined CONFIG_KVM || (defined CONFIG_USER_ONLY && defined CONFIG_USE_NPTL) +__thread CPUArchState *cpu_single_env; +#else +CPUArchState *cpu_single_env; +#endif + /* 0 = Do not count executed instructions. 1 = Precise instruction counting. 2 = Adaptive rate instruction counting. */ diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e9c3717..2202ba3 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -20,7 +20,6 @@ #define CPU_ALL_H #include "qemu-common.h" -#include "qemu/tls.h" #include "exec/cpu-common.h" #include "qemu/thread.h" @@ -368,8 +367,17 @@ void cpu_dump_statistics(CPUArchState *env, FILE *f, fprintf_function cpu_fprint void QEMU_NORETURN cpu_abort(CPUArchState *env, const char *fmt, ...) GCC_FMT_ATTR(2, 3); extern CPUArchState *first_cpu; -DECLARE_TLS(CPUArchState *,cpu_single_env); -#define cpu_single_env tls_var(cpu_single_env) + +/* 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 CPUArchState *cpu_single_env; +#else +extern CPUArchState *cpu_single_env; +#endif /* Flags for use in ENV->INTERRUPT_PENDING. 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