From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, war2jordan@live.com,
pavel.dovgaluk@ispras.ru, mst@redhat.com, jasowang@redhat.com,
zuban32s@gmail.com, kraxel@redhat.com,
thomas.dullien@googlemail.com, artem.k.pisarenko@gmail.com,
quintela@redhat.com, ciro.santilli@gmail.com,
armbru@redhat.comdovgaluk@ispras.ru, dgilbert@redhat.com,
boost.lists@gmail.com, alex.bennee@linaro.org, rth@twiddle.net,
kwolf@redhat.com, crosthwaite.peter@gmail.com, mreitz@redhat.com,
maria.klimushenkova@ispras.ru, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH v7 11/19] replay: implement replay-seek command to proceed to the desired step
Date: Wed, 10 Oct 2018 16:34:37 +0300 [thread overview]
Message-ID: <20181010133436.24538.61872.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20181010133333.24538.53169.stgit@pasha-VirtualBox>
This patch adds hmp/qmp commands replay_seek/replay-seek that proceed
the execution to the specified step.
The commands automatically loads nearest snapshot and replay the execution
to find the desired step.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
--
v2:
- renamed replay_seek qmp command into replay-seek
(suggested by Eric Blake)
v7:
- small fixes related to Markus Armbruster's review
---
hmp-commands.hx | 15 +++++++
hmp.h | 1
qapi/misc.json | 11 +++++
replay/replay-debugging.c | 91 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 118 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 615d725..1988b2b 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1917,6 +1917,21 @@ Removes replay breakpoint which was previously set with replay_break.
ETEXI
{
+ .name = "replay_seek",
+ .args_type = "step:i",
+ .params = "step",
+ .help = "rewinds replay to the specified step",
+ .cmd = hmp_replay_seek,
+ },
+
+STEXI
+@item replay_seek @var{step}
+@findex replay_seek
+Automatically proceeds to the specified step, when replaying
+the execution.
+ETEXI
+
+ {
.name = "info",
.args_type = "item:s?",
.params = "[subcommand]",
diff --git a/hmp.h b/hmp.h
index c9b9b4f..d6e1d7e 100644
--- a/hmp.h
+++ b/hmp.h
@@ -151,5 +151,6 @@ void hmp_info_sev(Monitor *mon, const QDict *qdict);
void hmp_info_replay(Monitor *mon, const QDict *qdict);
void hmp_replay_break(Monitor *mon, const QDict *qdict);
void hmp_replay_delete_break(Monitor *mon, const QDict *qdict);
+void hmp_replay_seek(Monitor *mon, const QDict *qdict);
#endif
diff --git a/qapi/misc.json b/qapi/misc.json
index e00a9b0..869c5fa 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -3171,6 +3171,17 @@
{ 'command': 'replay-delete-break' }
##
+# @replay-seek:
+#
+# Automatically proceeds to the specified step when replaying
+# the execution.
+#
+# @step: destination execution step
+# -> { "execute": "replay-seek", "data": { "step": 220414 } }
+##
+{ 'command': 'replay-seek', 'data': { 'step': 'int' } }
+
+##
# @xen-load-devices-state:
#
# Load the state of all devices from file. The RAM and the block devices
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
index 207d6e0..d744106 100644
--- a/replay/replay-debugging.c
+++ b/replay/replay-debugging.c
@@ -18,6 +18,8 @@
#include "qapi/qapi-commands-misc.h"
#include "qapi/qmp/qdict.h"
#include "qemu/timer.h"
+#include "block/snapshot.h"
+#include "migration/snapshot.h"
void hmp_info_replay(Monitor *mon, const QDict *qdict)
{
@@ -124,3 +126,92 @@ void hmp_replay_delete_break(Monitor *mon, const QDict *qdict)
return;
}
}
+
+static char *replay_find_nearest_snapshot(int64_t step, int64_t* snapshot_step)
+{
+ BlockDriverState *bs;
+ QEMUSnapshotInfo *sn_tab;
+ QEMUSnapshotInfo *nearest = NULL;
+ char *ret = NULL;
+ int nb_sns, i;
+ AioContext *aio_context;
+
+ *snapshot_step = -1;
+
+ bs = bdrv_all_find_vmstate_bs();
+ if (!bs) {
+ goto fail;
+ }
+ aio_context = bdrv_get_aio_context(bs);
+
+ aio_context_acquire(aio_context);
+ nb_sns = bdrv_snapshot_list(bs, &sn_tab);
+ aio_context_release(aio_context);
+
+ for (i = 0; i < nb_sns; i++) {
+ if (bdrv_all_find_snapshot(sn_tab[i].name, &bs) == 0) {
+ if (sn_tab[i].icount != -1ULL
+ && sn_tab[i].icount <= step
+ && (!nearest || nearest->icount < sn_tab[i].icount)) {
+ nearest = &sn_tab[i];
+ }
+ }
+ }
+ if (nearest) {
+ ret = g_strdup(nearest->name);
+ *snapshot_step = nearest->icount;
+ }
+ g_free(sn_tab);
+
+fail:
+ return ret;
+}
+
+static void replay_seek(int64_t step, QEMUTimerCB callback, Error **errp)
+{
+ char *snapshot = NULL;
+ int64_t snapshot_step;
+
+ if (replay_mode != REPLAY_MODE_PLAY) {
+ error_setg(errp, "replay must be enabled to seek");
+ return;
+ }
+ if (!replay_snapshot) {
+ error_setg(errp, "snapshotting is disabled");
+ return;
+ }
+
+ snapshot = replay_find_nearest_snapshot(step, &snapshot_step);
+ if (snapshot) {
+ if (step < replay_get_current_step()
+ || replay_get_current_step() < snapshot_step) {
+ vm_stop(RUN_STATE_RESTORE_VM);
+ load_snapshot(snapshot, errp);
+ }
+ g_free(snapshot);
+ }
+ if (replay_get_current_step() <= step) {
+ replay_break(step, callback, NULL);
+ vm_start();
+ } else {
+ error_setg(errp, "cannot seek to the specified step");
+ }
+}
+
+void qmp_replay_seek(int64_t step, Error **errp)
+{
+ replay_seek(step, replay_stop_vm, errp);
+}
+
+void hmp_replay_seek(Monitor *mon, const QDict *qdict)
+{
+ int64_t step = qdict_get_try_int(qdict, "step", -1LL);
+ Error *err = NULL;
+
+ qmp_replay_seek(step, &err);
+ if (err) {
+ error_report_err(err);
+ error_free(err);
+ return;
+ }
+}
next prev parent reply other threads:[~2018-10-10 13:31 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 13:33 [Qemu-devel] [PATCH v7 00/19] Fixing record/replay and adding reverse debugging Pavel Dovgalyuk
2018-10-10 13:33 ` [Qemu-devel] [PATCH v7 01/19] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2018-10-10 13:33 ` [Qemu-devel] [PATCH v7 02/19] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2018-10-10 13:33 ` [Qemu-devel] [PATCH v7 03/19] replay: update docs for record/replay with block devices Pavel Dovgalyuk
2018-10-10 13:33 ` [Qemu-devel] [PATCH v7 04/19] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2018-11-28 15:45 ` Kevin Wolf
2018-11-30 7:55 ` Pavel Dovgalyuk
2018-11-30 10:01 ` Kevin Wolf
2018-11-30 10:51 ` Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 05/19] replay: finish record/replay before closing the disks Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 06/19] qcow2: introduce icount field for snapshots Pavel Dovgalyuk
2018-11-28 14:33 ` Kevin Wolf
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 07/19] migration: " Pavel Dovgalyuk
2018-11-28 15:53 ` Kevin Wolf
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 08/19] replay: provide and accessor for rr filename Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 09/19] replay: introduce info hmp/qmp command Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 10/19] replay: introduce breakpoint at the specified step Pavel Dovgalyuk
2018-10-10 13:34 ` Pavel Dovgalyuk [this message]
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 12/19] replay: refine replay-time module Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 13/19] replay: flush rr queue before loading the vmstate Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 14/19] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2018-10-10 13:34 ` [Qemu-devel] [PATCH v7 15/19] gdbstub: add reverse continue " Pavel Dovgalyuk
2018-10-10 13:35 ` [Qemu-devel] [PATCH v7 16/19] replay: describe reverse debugging in docs/replay.txt Pavel Dovgalyuk
2018-10-10 13:35 ` [Qemu-devel] [PATCH v7 17/19] replay: add BH oneshot event for block layer Pavel Dovgalyuk
2018-11-28 16:01 ` Kevin Wolf
2018-11-30 8:21 ` Pavel Dovgalyuk
2018-11-30 11:18 ` Kevin Wolf
2018-11-30 11:26 ` Pavel Dovgalyuk
2018-10-10 13:35 ` [Qemu-devel] [PATCH v7 18/19] replay: init rtc after enabling the replay Pavel Dovgalyuk
2018-10-11 13:48 ` Artem Pisarenko
2018-10-10 13:35 ` [Qemu-devel] [PATCH v7 19/19] replay: document development rules Pavel Dovgalyuk
2018-10-11 15:08 ` Artem Pisarenko
2018-10-10 15:58 ` [Qemu-devel] [PATCH v7 00/19] Fixing record/replay and adding reverse debugging Aleksandr Bezzubikov
2018-10-15 8:46 ` Pavel Dovgalyuk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181010133436.24538.61872.stgit@pasha-VirtualBox \
--to=pavel.dovgaluk@ispras.ru \
--cc=armbru@redhat.comdovgaluk \
--cc=artem.k.pisarenko@gmail.com \
--cc=ciro.santilli@gmail.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=thomas.dullien@googlemail.com \
--cc=war2jordan@live.com \
--cc=zuban32s@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).