From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com,
crosthwaite.peter@gmail.com, boost.lists@gmail.com,
artem.k.pisarenko@gmail.com, quintela@redhat.com,
ciro.santilli@gmail.com, jasowang@redhat.com, mst@redhat.com,
armbru@redhat.com, mreitz@redhat.com,
maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru,
kraxel@redhat.com, pavel.dovgaluk@ispras.ru,
thomas.dullien@googlemail.com, pbonzini@redhat.com,
alex.bennee@linaro.org, dgilbert@redhat.com, rth@twiddle.net
Subject: [Qemu-devel] [PATCH v11 13/25] replay: implement replay-seek command
Date: Thu, 31 Jan 2019 16:16:36 +0300 [thread overview]
Message-ID: <20190131131635.23264.96446.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20190131131520.23264.75724.stgit@pasha-VirtualBox>
This patch adds hmp/qmp commands replay_seek/replay-seek that proceed
the execution to the specified instruction count.
The command automatically loads nearest snapshot and replays the execution
to find the desired instruction count.
Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Acked-by: Markus Armbruster <armbru@redhat.com>
--
v2:
- renamed replay_seek qmp command into replay-seek
(suggested by Eric Blake)
v7:
- small fixes related to Markus Armbruster's review
v9:
- changed 'step' parameter name to 'icount'
- moved json stuff to replay.json and updated the description
(suggested by Markus Armbruster)
v10:
- updated the descriptions
---
hmp-commands.hx | 19 +++++++++
hmp.h | 1
qapi/replay.json | 20 ++++++++++
replay/replay-debugging.c | 92 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 132 insertions(+)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 2ec8cb8..3c077a5 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1924,6 +1924,25 @@ The command is ignored when there are no replay breakpoints.
ETEXI
{
+ .name = "replay_seek",
+ .args_type = "icount:i",
+ .params = "icount",
+ .help = "replay execution to the specified instruction count",
+ .cmd = hmp_replay_seek,
+ },
+
+STEXI
+@item replay_seek @var{icount}
+@findex replay_seek
+Automatically proceed to the instruction count @var{icount}, when
+replaying the execution. The command automatically loads nearest
+snapshot and replays the execution to find the desired instruction.
+When there is no preceding snapshot or the execution is not replayed,
+then the command fails.
+icount for the reference may be observed with 'info replay' command.
+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/replay.json b/qapi/replay.json
index 84c148c..550fb2e 100644
--- a/qapi/replay.json
+++ b/qapi/replay.json
@@ -99,3 +99,23 @@
#
##
{ 'command': 'replay-delete-break' }
+
+##
+# @replay-seek:
+#
+# Automatically proceed to the instruction count @icount, when
+# replaying the execution. The command automatically loads nearest
+# snapshot and replays the execution to find the desired instruction.
+# When there is no preceding snapshot or the execution is not replayed,
+# then the command fails.
+# icount for the reference may be obtained with @query-replay command.
+#
+# @icount: target instruction count
+#
+# Since: 4.0
+#
+# Example:
+#
+# -> { "execute": "replay-seek", "data": { "icount": 220414 } }
+##
+{ 'command': 'replay-seek', 'data': { 'icount': 'int' } }
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
index a94685e..d99a9c1 100644
--- a/replay/replay-debugging.c
+++ b/replay/replay-debugging.c
@@ -18,6 +18,8 @@
#include "qapi/qapi-commands-replay.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)
{
@@ -127,3 +129,93 @@ void hmp_replay_delete_break(Monitor *mon, const QDict *qdict)
return;
}
}
+
+static char *replay_find_nearest_snapshot(int64_t icount,
+ int64_t* snapshot_icount)
+{
+ BlockDriverState *bs;
+ QEMUSnapshotInfo *sn_tab;
+ QEMUSnapshotInfo *nearest = NULL;
+ char *ret = NULL;
+ int nb_sns, i;
+ AioContext *aio_context;
+
+ *snapshot_icount = -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 <= icount
+ && (!nearest || nearest->icount < sn_tab[i].icount)) {
+ nearest = &sn_tab[i];
+ }
+ }
+ }
+ if (nearest) {
+ ret = g_strdup(nearest->name);
+ *snapshot_icount = nearest->icount;
+ }
+ g_free(sn_tab);
+
+fail:
+ return ret;
+}
+
+static void replay_seek(int64_t icount, QEMUTimerCB callback, Error **errp)
+{
+ char *snapshot = NULL;
+ int64_t snapshot_icount;
+
+ 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(icount, &snapshot_icount);
+ if (snapshot) {
+ if (icount < replay_get_current_step()
+ || replay_get_current_step() < snapshot_icount) {
+ vm_stop(RUN_STATE_RESTORE_VM);
+ load_snapshot(snapshot, errp);
+ }
+ g_free(snapshot);
+ }
+ if (replay_get_current_step() <= icount) {
+ replay_break(icount, callback, NULL);
+ vm_start();
+ } else {
+ error_setg(errp, "cannot seek to the specified instruction count");
+ }
+}
+
+void qmp_replay_seek(int64_t icount, Error **errp)
+{
+ replay_seek(icount, replay_stop_vm, errp);
+}
+
+void hmp_replay_seek(Monitor *mon, const QDict *qdict)
+{
+ int64_t icount = qdict_get_try_int(qdict, "icount", -1LL);
+ Error *err = NULL;
+
+ qmp_replay_seek(icount, &err);
+ if (err) {
+ error_report_err(err);
+ error_free(err);
+ return;
+ }
+}
next prev parent reply other threads:[~2019-01-31 13:16 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-31 13:15 [Qemu-devel] [PATCH v11 00/25] Fixing record/replay and adding reverse debugging Pavel Dovgalyuk
2019-01-31 13:15 ` [Qemu-devel] [PATCH v11 01/25] replay: add missing fix for internal function Pavel Dovgalyuk
2019-01-31 13:15 ` [Qemu-devel] [PATCH v11 02/25] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2019-01-31 13:15 ` [Qemu-devel] [PATCH v11 03/25] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2019-01-31 13:15 ` [Qemu-devel] [PATCH v11 04/25] replay: update docs for record/replay with block devices Pavel Dovgalyuk
2019-01-31 13:15 ` [Qemu-devel] [PATCH v11 05/25] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2019-01-31 13:15 ` [Qemu-devel] [PATCH v11 06/25] replay: finish record/replay before closing the disks Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 07/25] qcow2: introduce icount field for snapshots Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 08/25] migration: " Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 09/25] replay: provide an accessor for rr filename Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 10/25] qapi: introduce replay.json for record/replay-related stuff Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 11/25] replay: introduce info hmp/qmp command Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 12/25] replay: introduce breakpoint at the specified step Pavel Dovgalyuk
2019-01-31 13:16 ` Pavel Dovgalyuk [this message]
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 14/25] replay: refine replay-time module Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 15/25] replay: flush rr queue before loading the vmstate Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 16/25] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2019-01-31 13:16 ` [Qemu-devel] [PATCH v11 17/25] gdbstub: add reverse continue " Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 18/25] replay: describe reverse debugging in docs/replay.txt Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 19/25] replay: add BH oneshot event for block layer Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 20/25] replay: init rtc after enabling the replay Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 21/25] replay: document development rules Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 22/25] util/qemu-timer: refactor deadline calculation for external timers Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 23/25] replay: fix replay shutdown Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 24/25] replay: rename step-related variables and functions Pavel Dovgalyuk
2019-01-31 13:17 ` [Qemu-devel] [PATCH v11 25/25] icount: clean up cpu_can_io before jumping to the next block Pavel Dovgalyuk
2019-01-31 17:54 ` [Qemu-devel] [PATCH v11 00/25] Fixing record/replay and adding reverse debugging no-reply
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=20190131131635.23264.96446.stgit@pasha-VirtualBox \
--to=pavel.dovgaluk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=artem.k.pisarenko@gmail.com \
--cc=boost.lists@gmail.com \
--cc=ciro.santilli@gmail.com \
--cc=crosthwaite.peter@gmail.com \
--cc=dgilbert@redhat.com \
--cc=dovgaluk@ispras.ru \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=maria.klimushenkova@ispras.ru \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=rth@twiddle.net \
--cc=thomas.dullien@googlemail.com \
--cc=war2jordan@live.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.