From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45720) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsfVm-0005n0-Ta for qemu-devel@nongnu.org; Fri, 28 Jun 2013 16:43:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsfVl-0007Vq-ML for qemu-devel@nongnu.org; Fri, 28 Jun 2013 16:43:18 -0400 Received: from mail-yh0-f51.google.com ([209.85.213.51]:61812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsfVl-0007Vk-G1 for qemu-devel@nongnu.org; Fri, 28 Jun 2013 16:43:17 -0400 Received: by mail-yh0-f51.google.com with SMTP id l109so1362631yhq.10 for ; Fri, 28 Jun 2013 13:43:17 -0700 (PDT) From: Anthony Liguori In-Reply-To: <1372444009-11544-6-git-send-email-pbonzini@redhat.com> References: <1372444009-11544-1-git-send-email-pbonzini@redhat.com> <1372444009-11544-6-git-send-email-pbonzini@redhat.com> Date: Fri, 28 Jun 2013 15:43:15 -0500 Message-ID: <8738s29db0.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 05/30] exec: do not use qemu/tls.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Paolo Bonzini writes: > 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 Regards, 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 > -- > 1.8.1.4