From patchwork Thu Jul 19 18:53:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 172028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 447E82C0331 for ; Fri, 20 Jul 2012 04:54:35 +1000 (EST) Received: from localhost ([::1]:58513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrt-0007mW-DZ for incoming@patchwork.ozlabs.org; Thu, 19 Jul 2012 14:54:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrh-0007mI-0w for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Srvrg-0008CM-0e for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:20 -0400 Received: from vms173017pub.verizon.net ([206.46.173.17]:23606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrf-0008CG-Rf for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:19 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173017.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M7F00M0D8HM0BB0@vms173017.mailsrvcs.net> for qemu-devel@nongnu.org; Thu, 19 Jul 2012 13:53:49 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id DB8B51F954; Thu, 19 Jul 2012 13:53:37 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 3201D80603; Thu, 19 Jul 2012 13:53:36 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2012 13:53:21 -0500 Message-id: <1342724013-1633-7-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1342724013-1633-1-git-send-email-minyard@acm.org> References: <1342724013-1633-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.17 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 06/18] qemu-char: Fix a race reporting opens and closes 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: Corey Minyard When an open event is reported, it is done through a bh. But close events are reported immediately. So if an open event is in the bh and a close occurs, an extraneous open happens, which can confuse a user. To fix this, this patch sets the "opened" flag immediately instead of in the bh handler and checks to make sure the opened flag is set before reporting an open event. This also modifies the spice code to call qemu_chr_generic_open to report an open, to keep things consistent. Signed-off-by: Corey Minyard --- qemu-char.c | 18 ++++++++++++++++-- spice-qemu-char.c | 7 +++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 43277d0..d363319 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -111,10 +111,13 @@ void qemu_chr_be_event(CharDriverState *s, int event) /* Keep track if the char device is open */ switch (event) { case CHR_EVENT_OPENED: + /* + * See the comment in qemu_chr_generic_open_bh() for why + * 's->opened = 1' is not here. + */ if (s->recon_timer) { qemu_del_timer(s->recon_timer); } - s->opened = 1; break; case CHR_EVENT_CLOSED: if (s->recon_timer) { @@ -134,13 +137,24 @@ void qemu_chr_be_event(CharDriverState *s, int event) static void qemu_chr_generic_open_bh(void *opaque) { CharDriverState *s = opaque; - qemu_chr_be_event(s, CHR_EVENT_OPENED); + /* + * Since the "close" event doesn't go through a bh, there is a + * possible race condition if a close comes in after an open, but + * the open is in the bh queue. So we double-check here, and we + * set opened in qemu_chr_generic_open() instead of + * qemu_chr_be_event(). + */ + if (s->opened) { + qemu_chr_be_event(s, CHR_EVENT_OPENED); + } qemu_bh_delete(s->bh); s->bh = NULL; } void qemu_chr_generic_open(CharDriverState *s) { + /* See the comment in qemu_chr_generic_open_bh() for why this is here */ + s->opened = 1; if (s->bh == NULL) { s->bh = qemu_bh_new(qemu_chr_generic_open_bh, s); qemu_bh_schedule(s->bh); diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 2fb8a10..d7516bd 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -93,8 +93,11 @@ static void vmc_state(SpiceCharDeviceInstance *sin, int connected) return; } - qemu_chr_be_event(scd->chr, - connected ? CHR_EVENT_OPENED : CHR_EVENT_CLOSED); + if (connected) { + qemu_chr_generic_open(scd->chr); + } else { + qemu_chr_be_event(scd->chr, CHR_EVENT_CLOSED); + } } static SpiceCharDeviceInterface vmc_interface = {