From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58724 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOGi2-0007eH-DY for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOGi1-0007m7-9I for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:56:42 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:56474) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOGi1-0007ly-5r for qemu-devel@nongnu.org; Mon, 14 Jun 2010 16:56:41 -0400 Received: by iwn10 with SMTP id 10so4582648iwn.4 for ; Mon, 14 Jun 2010 13:56:40 -0700 (PDT) Message-ID: <4C169787.5070706@codemonkey.ws> Date: Mon, 14 Jun 2010 15:56:39 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] make qemu_thread_create block all signals References: <1275571232-26486-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1275571232-26486-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, ego@in.ibm.com On 06/03/2010 08:20 AM, Paolo Bonzini wrote: > All signals will thus be routed through the IO thread. > > Signed-off-by: Paolo Bonzini > Applied. Thanks. Regards, Anthony Liguori > --- > cpus.c | 38 +++++++++++--------------------------- > qemu-thread.c | 7 +++++++ > 2 files changed, 18 insertions(+), 27 deletions(-) > > diff --git a/cpus.c b/cpus.c > index 8341f6c..fcd0f09 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -318,8 +318,8 @@ static QemuCond qemu_system_cond; > static QemuCond qemu_pause_cond; > static QemuCond qemu_work_cond; > > -static void tcg_block_io_signals(void); > -static void kvm_block_io_signals(CPUState *env); > +static void tcg_init_ipi(void); > +static void kvm_init_ipi(CPUState *env); > static void unblock_io_signals(void); > > int qemu_init_main_loop(void) > @@ -464,7 +464,7 @@ static void *kvm_cpu_thread_fn(void *arg) > if (kvm_enabled()) > kvm_init_vcpu(env); > > - kvm_block_io_signals(env); > + kvm_init_ipi(env); > > /* signal CPU creation */ > env->created = 1; > @@ -487,7 +487,7 @@ static void *tcg_cpu_thread_fn(void *arg) > { > CPUState *env = arg; > > - tcg_block_io_signals(); > + tcg_init_ipi(); > qemu_thread_self(env->thread); > > /* signal CPU creation */ > @@ -532,52 +532,36 @@ static void cpu_signal(int sig) > exit_request = 1; > } > > -static void tcg_block_io_signals(void) > +static void tcg_init_ipi(void) > { > sigset_t set; > struct sigaction sigact; > > - sigemptyset(&set); > - sigaddset(&set, SIGUSR2); > - sigaddset(&set, SIGIO); > - sigaddset(&set, SIGALRM); > - sigaddset(&set, SIGCHLD); > - pthread_sigmask(SIG_BLOCK,&set, NULL); > + memset(&sigact, 0, sizeof(sigact)); > + sigact.sa_handler = cpu_signal; > + sigaction(SIG_IPI,&sigact, NULL); > > sigemptyset(&set); > sigaddset(&set, SIG_IPI); > pthread_sigmask(SIG_UNBLOCK,&set, NULL); > - > - memset(&sigact, 0, sizeof(sigact)); > - sigact.sa_handler = cpu_signal; > - sigaction(SIG_IPI,&sigact, NULL); > } > > static void dummy_signal(int sig) > { > } > > -static void kvm_block_io_signals(CPUState *env) > +static void kvm_init_ipi(CPUState *env) > { > int r; > sigset_t set; > struct sigaction sigact; > > - sigemptyset(&set); > - sigaddset(&set, SIGUSR2); > - sigaddset(&set, SIGIO); > - sigaddset(&set, SIGALRM); > - sigaddset(&set, SIGCHLD); > - sigaddset(&set, SIG_IPI); > - pthread_sigmask(SIG_BLOCK,&set, NULL); > - > - pthread_sigmask(SIG_BLOCK, NULL,&set); > - sigdelset(&set, SIG_IPI); > - > memset(&sigact, 0, sizeof(sigact)); > sigact.sa_handler = dummy_signal; > sigaction(SIG_IPI,&sigact, NULL); > > + pthread_sigmask(SIG_BLOCK, NULL,&set); > + sigdelset(&set, SIG_IPI); > r = kvm_set_signal_mask(env,&set); > if (r) { > fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(r)); > diff --git a/qemu-thread.c b/qemu-thread.c > index 3923db7..faf4061 100644 > --- a/qemu-thread.c > +++ b/qemu-thread.c > @@ -137,9 +137,16 @@ void qemu_thread_create(QemuThread *thread, > { > int err; > > + /* Leave signal handling to the iothread. */ > + sigset_t set, oldset; > + > + sigfillset(&set); > + pthread_sigmask(SIG_SETMASK,&set,&oldset); > err = pthread_create(&thread->thread, NULL, start_routine, arg); > if (err) > error_exit(err, __func__); > + > + pthread_sigmask(SIG_SETMASK,&oldset, NULL); > } > > void qemu_thread_signal(QemuThread *thread, int sig) >