[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [for-4.2 PATCH 4/6] replay: don't drain/flush bdrv queue wh
From: |
Pavel Dovgalyuk |
Subject: |
[Qemu-devel] [for-4.2 PATCH 4/6] replay: don't drain/flush bdrv queue while RR is working |
Date: |
Mon, 29 Jul 2019 09:29:48 +0300 |
User-agent: |
StGit/0.17.1-dirty |
From: Pavel Dovgalyuk <address@hidden>
In record/replay mode bdrv queue is controlled by replay mechanism.
It does not allow saving or loading the snapshots
when bdrv queue is not empty. Stopping the VM is not blocked by nonempty
queue, but flushing the queue is still impossible there,
because it may cause deadlocks in replay mode.
This patch disables bdrv_drain_all and bdrv_flush_all in
record/replay mode.
Stopping the machine when the IO requests are not finished is needed
for the debugging. E.g., breakpoint may be set at the specified step,
and forcing the IO requests to finish may break the determinism
of the execution.
Signed-off-by: Pavel Dovgalyuk <address@hidden>
Acked-by: Kevin Wolf <address@hidden>
---
block/io.c | 28 ++++++++++++++++++++++++++++
cpus.c | 2 --
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/block/io.c b/block/io.c
index 06305c6ea6..2e71bcb8d6 100644
--- a/block/io.c
+++ b/block/io.c
@@ -32,6 +32,7 @@
#include "qemu/cutils.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
+#include "sysemu/replay.h"
#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress
*/
@@ -598,6 +599,15 @@ void bdrv_drain_all_begin(void)
return;
}
+ /*
+ * bdrv queue is managed by record/replay,
+ * waiting for finishing the I/O requests may
+ * be infinite
+ */
+ if (replay_events_enabled()) {
+ return;
+ }
+
/* AIO_WAIT_WHILE() with a NULL context can only be called from the main
* loop AioContext, so make sure we're in the main context. */
assert(qemu_get_current_aio_context() == qemu_get_aio_context());
@@ -627,6 +637,15 @@ void bdrv_drain_all_end(void)
BlockDriverState *bs = NULL;
int drained_end_counter = 0;
+ /*
+ * bdrv queue is managed by record/replay,
+ * waiting for finishing the I/O requests may
+ * be endless
+ */
+ if (replay_events_enabled()) {
+ return;
+ }
+
while ((bs = bdrv_next_all_states(bs))) {
AioContext *aio_context = bdrv_get_aio_context(bs);
@@ -1997,6 +2016,15 @@ int bdrv_flush_all(void)
BlockDriverState *bs = NULL;
int result = 0;
+ /*
+ * bdrv queue is managed by record/replay,
+ * creating new flush request for stopping
+ * the VM may break the determinism
+ */
+ if (replay_events_enabled()) {
+ return result;
+ }
+
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
AioContext *aio_context = bdrv_get_aio_context(bs);
int ret;
diff --git a/cpus.c b/cpus.c
index a7120ffbd5..f6b7252fdb 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1083,7 +1083,6 @@ static int do_vm_stop(RunState state, bool send_stop)
}
bdrv_drain_all();
- replay_disable_events();
ret = bdrv_flush_all();
return ret;
@@ -2169,7 +2168,6 @@ int vm_prepare_start(void)
/* We are sending this now, but the CPUs will be resumed shortly later */
qapi_event_send_resume();
- replay_enable_events();
cpu_enable_ticks();
runstate_set(RUN_STATE_RUNNING);
vm_state_notify(1, RUN_STATE_RUNNING);
- [Qemu-devel] [for-4.2 PATCH 0/6] Block-related record/replay fixes, Pavel Dovgalyuk, 2019/07/29
- [Qemu-devel] [for-4.2 PATCH 1/6] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2019/07/29
- [Qemu-devel] [for-4.2 PATCH 2/6] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2019/07/29
- [Qemu-devel] [for-4.2 PATCH 3/6] replay: update docs for record/replay with block devices, Pavel Dovgalyuk, 2019/07/29
- [Qemu-devel] [for-4.2 PATCH 4/6] replay: don't drain/flush bdrv queue while RR is working,
Pavel Dovgalyuk <=
- [Qemu-devel] [for-4.2 PATCH 5/6] replay: finish record/replay before closing the disks, Pavel Dovgalyuk, 2019/07/29
- [Qemu-devel] [for-4.2 PATCH 6/6] replay: add BH oneshot event for block layer, Pavel Dovgalyuk, 2019/07/29
- Re: [Qemu-devel] [for-4.2 PATCH 0/6] Block-related record/replay fixes, no-reply, 2019/07/29
- Re: [Qemu-devel] [for-4.2 PATCH 0/6] Block-related record/replay fixes, no-reply, 2019/07/29