From patchwork Fri Jun 25 14:56:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 56983 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 306FBB6EE8 for ; Sat, 26 Jun 2010 06:10:25 +1000 (EST) Received: from localhost ([127.0.0.1]:48108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSFEE-0005CQ-BK for incoming@patchwork.ozlabs.org; Fri, 25 Jun 2010 16:10:22 -0400 Received: from [140.186.70.92] (port=44249 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OSCxo-0002Fg-5B for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:45:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OSAL0-0005uw-1c for qemu-devel@nongnu.org; Fri, 25 Jun 2010 10:57:04 -0400 Received: from david.siemens.de ([192.35.17.14]:16264) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OSAKz-0005uC-JY for qemu-devel@nongnu.org; Fri, 25 Jun 2010 10:57:01 -0400 Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o5PEuvuu004928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 25 Jun 2010 16:56:57 +0200 Received: from mchn012c.mchp.siemens.de (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o5PEuvZe013168; Fri, 25 Jun 2010 16:56:57 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org, Anthony Liguori Date: Fri, 25 Jun 2010 16:56:53 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Glauber Costa , Marcelo Tosatti , Avi Kivity , Alexander Graf Subject: [Qemu-devel] [PATCH 5/8] Fix qemu_wait_io_event processing in io-thread mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When checking for I/O events in the tcg CPU loop, make sure that we call qemu_wait_io_event_common for all CPUs, not only the current one. Otherwise pause_all_vcpus may lock up or run_on_cpu requests may starve. Rename qemu_wait_io_event to qemu_tcg_wait_io_event at this chance and purge its argument list as it has no use for it. Signed-off-by: Jan Kiszka --- cpus.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index ff5e804..aef92cd 100644 --- a/cpus.c +++ b/cpus.c @@ -402,10 +402,12 @@ static void qemu_wait_io_event_common(CPUState *env) flush_queued_work(env); } -static void qemu_wait_io_event(CPUState *env) +static void qemu_tcg_wait_io_event(void) { + CPUState *env; + while (!tcg_has_work()) - qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000); + qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000); qemu_mutex_unlock(&qemu_global_mutex); @@ -418,7 +420,10 @@ static void qemu_wait_io_event(CPUState *env) qemu_mutex_unlock(&qemu_fair_mutex); qemu_mutex_lock(&qemu_global_mutex); - qemu_wait_io_event_common(env); + + for (env = first_cpu; env != NULL; env = env->next_cpu) { + qemu_wait_io_event_common(env); + } } static void qemu_kvm_eat_signal(CPUState *env, int timeout) @@ -503,7 +508,7 @@ static void *tcg_cpu_thread_fn(void *arg) while (1) { tcg_cpu_exec(); - qemu_wait_io_event(cur_cpu); + qemu_tcg_wait_io_event(); } return NULL;