From patchwork Sun Sep 22 08:11:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pingfan liu X-Patchwork-Id: 276947 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 BF96A2C00B6 for ; Sun, 22 Sep 2013 18:12:48 +1000 (EST) Received: from localhost ([::1]:34317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNemc-0001g3-I1 for incoming@patchwork.ozlabs.org; Sun, 22 Sep 2013 04:12:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNely-0001Mu-7f for qemu-devel@nongnu.org; Sun, 22 Sep 2013 04:12:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VNelp-00075u-P4 for qemu-devel@nongnu.org; Sun, 22 Sep 2013 04:12:06 -0400 Received: from mail-ie0-x230.google.com ([2607:f8b0:4001:c03::230]:38754) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VNelp-000752-Jp for qemu-devel@nongnu.org; Sun, 22 Sep 2013 04:11:57 -0400 Received: by mail-ie0-f176.google.com with SMTP id as1so4184804iec.21 for ; Sun, 22 Sep 2013 01:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=juejJhyiBev3XRojRXBkp9qhsV8fZXxzQ+55eNza1fA=; b=t+nLawtG+g2WJCVahyGzIPitwozs2r6xrysTRzEW0twSbdzgInIl6QQl8JZJdfDkgS crxdO3XhnI/bOol89mJcToIGNUgA1Ktt3MS1ACOTzk84jZE80v88ZDpACBPwL0ASgydu +43MiucaS+27FWAuzbB2CDiugJcOt+d1H97zIjyXzXw8RwIoj+9FzJThk6qq0XBOhPIt cw8UpNKy35sW4M6uHIX2I2d7SbKQflgJo6SrZJvwG0mEYXGd8re5/mvzarC7BLuzDgew yCaGyZ0THDmhwAhPB9oigcw52ueUlYc7G3vxTeTYzQ4b0m4v+UcB3ODkBKSDJGe5IYBT AxVg== X-Received: by 10.50.61.205 with SMTP id s13mr8088961igr.29.1379837517094; Sun, 22 Sep 2013 01:11:57 -0700 (PDT) Received: from localhost ([202.108.130.138]) by mx.google.com with ESMTPSA id o8sm7260296igj.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 22 Sep 2013 01:11:56 -0700 (PDT) From: Liu Ping Fan To: qemu-devel@nongnu.org Date: Sun, 22 Sep 2013 16:11:19 +0800 Message-Id: <1379837479-8419-6-git-send-email-pingfank@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1379837479-8419-1-git-send-email-pingfank@linux.vnet.ibm.com> References: <1379837479-8419-1-git-send-email-pingfank@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::230 Cc: Kevin Wolf , Paolo Bonzini , Alex Bligh , Stefan Hajnoczi , Jan Kiszka Subject: [Qemu-devel] [PATCH v4 4/4] timer: make qemu_clock_enable sync between disable and timer's cb 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 After disabling the QemuClock, we should make sure that no QemuTimers are still in flight. To implement that with light overhead, we resort to QemuEvent. The caller of disabling will wait on QemuEvent of each timerlist. Note, qemu_clock_enable(foo,false) can _not_ be called from timer's cb. And the callers of qemu_clock_enable() should be sync by themselves, not protected by this patch. Signed-off-by: Liu Ping Fan --- include/qemu/timer.h | 4 ++++ qemu-timer.c | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index e4934dd..b26909a 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -185,6 +185,10 @@ void qemu_clock_notify(QEMUClockType type); * @enabled: true to enable, false to disable * * Enable or disable a clock + * Disabling the clock will wait for related timerlists to stop + * executing qemu_run_timers. Thus, this functions should not + * be used from the callback of a timer that is based on @clock. + * Doing so would cause a deadlock. */ void qemu_clock_enable(QEMUClockType type, bool enabled); diff --git a/qemu-timer.c b/qemu-timer.c index 95ff47f..c500a76 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -45,6 +45,7 @@ /* timers */ typedef struct QEMUClock { + /* We rely on BQL to protect the timerlists */ QLIST_HEAD(, QEMUTimerList) timerlists; NotifierList reset_notifiers; @@ -70,6 +71,8 @@ struct QEMUTimerList { QLIST_ENTRY(QEMUTimerList) list; QEMUTimerListNotifyCB *notify_cb; void *notify_opaque; + /* light weight method to mark the end of timerlist's running */ + QemuEvent ev; }; /** @@ -98,6 +101,7 @@ QEMUTimerList *timerlist_new(QEMUClockType type, QEMUClock *clock = qemu_clock_ptr(type); timer_list = g_malloc0(sizeof(QEMUTimerList)); + qemu_event_init(&timer_list->ev, false); timer_list->clock = clock; timer_list->notify_cb = cb; timer_list->notify_opaque = opaque; @@ -140,13 +144,24 @@ void qemu_clock_notify(QEMUClockType type) } } +/* Disabling the clock will wait for related timerlists to stop + * executing qemu_run_timers. Thus, this functions should not + * be used from the callback of a timer that is based on @clock. + * Doing so would cause a deadlock. + */ void qemu_clock_enable(QEMUClockType type, bool enabled) { QEMUClock *clock = qemu_clock_ptr(type); + QEMUTimerList *tl; bool old = clock->enabled; clock->enabled = enabled; if (enabled && !old) { qemu_clock_notify(type); + } else if (!enabled && old) { + /* We rely on BQL to protect the timerlists */ + QLIST_FOREACH(tl, &clock->timerlists, list) { + qemu_event_wait(&tl->ev); + } } } @@ -373,8 +388,10 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) QEMUTimer *ts; int64_t current_time; bool progress = false; - + + qemu_event_reset(&timer_list->ev); if (!timer_list->clock->enabled) { + qemu_event_set(&timer_list->ev); return progress; } @@ -392,6 +409,7 @@ bool timerlist_run_timers(QEMUTimerList *timer_list) ts->cb(ts->opaque); progress = true; } + qemu_event_set(&timer_list->ev); return progress; }