From patchwork Tue Mar 1 11:07:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 590475 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 919A6140773 for ; Tue, 1 Mar 2016 22:11:16 +1100 (AEDT) Received: from localhost ([::1]:48651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaiCw-00027s-KD for incoming@patchwork.ozlabs.org; Tue, 01 Mar 2016 06:11:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aai9i-0005vg-6a for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:07:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aai9h-0005Pm-1R for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:07:54 -0500 Received: from mail.ispras.ru ([83.149.199.45]:58584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aai9g-0005Pb-LG for qemu-devel@nongnu.org; Tue, 01 Mar 2016 06:07:52 -0500 Received: from [10.10.150.62] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id DD22954007B; Tue, 1 Mar 2016 14:07:51 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Tue, 01 Mar 2016 14:07:52 +0300 Message-ID: <20160301110752.10104.65295.stgit@PASHA-ISP> In-Reply-To: <20160301110732.10104.2019.stgit@PASHA-ISP> References: <20160301110732.10104.2019.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, igor.rubinov@gmail.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, hines@cert.org, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, kwolf@redhat.com, stefanha@redhat.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v3 3/5] replay: introduce new checkpoint for icount warp 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 qemu_clock_warp function is called to update virtual clock when CPU is sleeping. This function includes replay checkpoint to make execution deterministic in icount mode. Record/replay module flushes async event queue at checkpoints. Some of the events (e.g., block devices operations) include interaction with hardware. E.g., APIC polled by block devices sets one of IRQ flags. Flag to be set depends on currently executed thread (CPU or iothread). Therefore in replay mode we have to process the checkpoints in the same thread as they were recorded. qemu_clock_warp function (and its checkpoint) may be called from different thread. This patch introduces new checkpoint which distinguished warp checkpoint calls from different threads. Signed-off-by: Pavel Dovgalyuk --- cpus.c | 7 ++++--- include/qemu/timer.h | 3 ++- include/sysemu/replay.h | 1 + main-loop.c | 2 +- qemu-timer.c | 2 +- stubs/clock-warp.c | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/cpus.c b/cpus.c index 01c9809..c2d9cfe 100644 --- a/cpus.c +++ b/cpus.c @@ -396,7 +396,7 @@ void qtest_clock_warp(int64_t dest) qemu_clock_notify(QEMU_CLOCK_VIRTUAL); } -void qemu_clock_warp(QEMUClockType type) +void qemu_clock_warp(QEMUClockType type, bool in_tcg) { int64_t clock; int64_t deadline; @@ -418,7 +418,8 @@ void qemu_clock_warp(QEMUClockType type) } /* warp clock deterministically in record/replay mode */ - if (!replay_checkpoint(CHECKPOINT_CLOCK_WARP)) { + if (!replay_checkpoint(in_tcg ? CHECKPOINT_CLOCK_WARP_TCG + : CHECKPOINT_CLOCK_WARP)) { return; } @@ -1496,7 +1497,7 @@ static void tcg_exec_all(void) int r; /* Account partial waits to QEMU_CLOCK_VIRTUAL. */ - qemu_clock_warp(QEMU_CLOCK_VIRTUAL); + qemu_clock_warp(QEMU_CLOCK_VIRTUAL, true); if (next_cpu == NULL) { next_cpu = first_cpu; diff --git a/include/qemu/timer.h b/include/qemu/timer.h index d0946cb..c58192c 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -212,10 +212,11 @@ void qemu_clock_enable(QEMUClockType type, bool enabled); /** * qemu_clock_warp: * @type: the clock type + * @in_tcg: true if function is called from TCG CPU thread * * Warp a clock to a new value */ -void qemu_clock_warp(QEMUClockType type); +void qemu_clock_warp(QEMUClockType type, bool in_tcg); /** * qemu_clock_register_reset_notifier: diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index 3c4a988..c879231 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -31,6 +31,7 @@ typedef enum ReplayClockKind ReplayClockKind; /* IDs of the checkpoints */ enum ReplayCheckpoint { CHECKPOINT_CLOCK_WARP, + CHECKPOINT_CLOCK_WARP_TCG, CHECKPOINT_RESET_REQUESTED, CHECKPOINT_SUSPEND_REQUESTED, CHECKPOINT_CLOCK_VIRTUAL, diff --git a/main-loop.c b/main-loop.c index 19beae7..cd8415f 100644 --- a/main-loop.c +++ b/main-loop.c @@ -509,7 +509,7 @@ int main_loop_wait(int nonblocking) /* CPU thread can infinitely wait for event after missing the warp */ - qemu_clock_warp(QEMU_CLOCK_VIRTUAL); + qemu_clock_warp(QEMU_CLOCK_VIRTUAL, false); qemu_clock_run_all_timers(); return ret; diff --git a/qemu-timer.c b/qemu-timer.c index e98ecc9..980fe7e 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -394,7 +394,7 @@ static bool timer_mod_ns_locked(QEMUTimerList *timer_list, static void timerlist_rearm(QEMUTimerList *timer_list) { /* Interrupt execution to force deadline recalculation. */ - qemu_clock_warp(timer_list->clock->type); + qemu_clock_warp(timer_list->clock->type, false); timerlist_notify(timer_list); } diff --git a/stubs/clock-warp.c b/stubs/clock-warp.c index 5ae32b9..24ae0f8 100644 --- a/stubs/clock-warp.c +++ b/stubs/clock-warp.c @@ -2,7 +2,7 @@ #include "qemu-common.h" #include "qemu/timer.h" -void qemu_clock_warp(QEMUClockType type) +void qemu_clock_warp(QEMUClockType type, bool in_tcg) { }