[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 21/24] replay: wake up vCPU when replaying
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [PATCH v5 21/24] replay: wake up vCPU when replaying |
Date: |
Wed, 25 Jul 2018 15:16:49 +0300 |
User-agent: |
StGit/0.17.1-dirty |
In record/replay icount mode vCPU thread and iothread synchronize
the execution using the checkpoints.
vCPU thread processes the virtual timers and iothread processes all others.
When iothread wants to wake up sleeping vCPU thread, it sends dummy queued
work. Therefore it could be the following sequence of the events in
record mode:
- IO: sending dummy work
- IO: processing timers
- CPU: wakeup
- CPU: clearing dummy work
- CPU: processing virtual timers
But due to the races in replay mode the sequence may change:
- IO: sending dummy work
- CPU: wakeup
- CPU: clearing dummy work
- CPU: sleeping again because nothing to do
- IO: Processing timers
- CPU: zzzz
In this case vCPU will not wake up, because dummy work is not to be set up
again.
This patch tries to wake up the vCPU when it sleeps and the icount warp
checkpoint isn't met. It means that vCPU has something to do, because
there are no other reasons of non-matching warp checkpoint.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
--
v5: improve checking that vCPU is still sleeping
---
cpus.c | 31 +++++++++++++++++++++----------
include/sysemu/replay.h | 3 +++
replay/replay.c | 12 ++++++++++++
3 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/cpus.c b/cpus.c
index 181ce33..38bd521 100644
--- a/cpus.c
+++ b/cpus.c
@@ -539,18 +539,29 @@ void qemu_start_warp_timer(void)
return;
}
- /* warp clock deterministically in record/replay mode */
- if (!replay_checkpoint(CHECKPOINT_CLOCK_WARP_START)) {
- return;
- }
+ if (replay_mode != REPLAY_MODE_PLAY) {
+ if (!all_cpu_threads_idle()) {
+ return;
+ }
- if (!all_cpu_threads_idle()) {
- return;
- }
+ if (qtest_enabled()) {
+ /* When testing, qtest commands advance icount. */
+ return;
+ }
- if (qtest_enabled()) {
- /* When testing, qtest commands advance icount. */
- return;
+ replay_checkpoint(CHECKPOINT_CLOCK_WARP_START);
+ } else {
+ /* warp clock deterministically in record/replay mode */
+ if (!replay_checkpoint(CHECKPOINT_CLOCK_WARP_START)) {
+ /* vCPU is sleeping and warp can't be started.
+ It is probably a race condition: notification sent
+ to vCPU was processed in advance and vCPU went to sleep.
+ Therefore we have to wake it up for doing someting. */
+ if (replay_has_checkpoint()) {
+ qemu_clock_notify(QEMU_CLOCK_VIRTUAL);
+ }
+ return;
+ }
}
/* We want to use the earliest deadline from ALL vm_clocks */
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index a3113c1..8118b00 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -136,6 +136,9 @@ void replay_shutdown_request(ShutdownCause cause);
Returns 0 in PLAY mode if checkpoint was not found.
Returns 1 in all other cases. */
bool replay_checkpoint(ReplayCheckpoint checkpoint);
+/*! Used to determine that checkpoint is pending.
+ Does not proceed to the next event in the log. */
+bool replay_has_checkpoint(void);
/* Asynchronous events queue */
diff --git a/replay/replay.c b/replay/replay.c
index dcce902..6e82764 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -240,6 +240,18 @@ out:
return res;
}
+bool replay_has_checkpoint(void)
+{
+ bool res = false;
+ if (replay_mode == REPLAY_MODE_PLAY) {
+ g_assert(replay_mutex_locked());
+ replay_account_executed_instructions();
+ res = EVENT_CHECKPOINT <= replay_state.data_kind
+ && replay_state.data_kind <= EVENT_CHECKPOINT_LAST;
+ }
+ return res;
+}
+
static void replay_enable(const char *fname, int mode)
{
const char *fmode = NULL;
- [Qemu-devel] [PATCH v5 11/24] replay: flush events when exiting, (continued)
- [Qemu-devel] [PATCH v5 11/24] replay: flush events when exiting, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 12/24] timer: remove replay clock probe in deadline calculation, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 13/24] replay: refine replay-time module, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 14/24] translator: fix breakpoint processing, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 15/24] replay: flush rr queue before loading the vmstate, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 16/24] gdbstub: add reverse step support in replay mode, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 17/24] gdbstub: add reverse continue support in replay mode, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 18/24] replay: describe reverse debugging in docs/replay.txt, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 19/24] replay: allow loading any snapshots before recording, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 20/24] ps2: prevent changing irq state on save and load, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 21/24] replay: wake up vCPU when replaying,
Pavel Dovgalyuk <=
- [Qemu-devel] [PATCH v5 22/24] replay: replay BH for IDE trim operation, Pavel Dovgalyuk, 2018/07/25
- [Qemu-devel] [PATCH v5 23/24] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2018/07/25
- Re: [Qemu-devel] [PATCH v5 23/24] replay: add BH oneshot event for block layer, Alex Bennée, 2018/07/26
- [Qemu-devel] [PATCH v5 24/24] slirp: fix ipv6 timers, Pavel Dovgalyuk, 2018/07/25