All of lore.kernel.org
 help / color / mirror / Atom feed
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,
	quintela@redhat.com, ciro.santilli@gmail.com,
	jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com,
	armbru@redhat.com, maria.klimushenkova@ispras.ru,
	dovgaluk@ispras.ru, kraxel@redhat.com, pavel.dovgaluk@ispras.ru,
	thomas.dullien@googlemail.com, pbonzini@redhat.com,
	mreitz@redhat.com, alex.bennee@linaro.org, dgilbert@redhat.com,
	rth@twiddle.net
Subject: [Qemu-devel] [PATCH v6 11/25] replay: implement replay-seek command to proceed to the desired step
Date: Wed, 12 Sep 2018 11:18:53 +0300	[thread overview]
Message-ID: <20180912081853.3228.63503.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20180912081747.3228.21861.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)
---
 hmp-commands.hx           |   15 ++++++++
 hmp.h                     |    1 +
 qapi/misc.json            |   16 ++++++++
 replay/replay-debugging.c |   89 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index aa0794e..8d4065b 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1903,6 +1903,21 @@ Execution stops when the specified step is reached.
 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 ad94abe..a7d3bce 100644
--- a/hmp.h
+++ b/hmp.h
@@ -150,5 +150,6 @@ void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict);
 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_seek(Monitor *mon, const QDict *qdict);
 
 #endif
diff --git a/qapi/misc.json b/qapi/misc.json
index 4fcd211..7389cc6 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -3152,6 +3152,22 @@
 { 'command': 'replay-break', 'data': { 'step': 'int' } }
 
 ##
+# @replay-seek:
+#
+# Automatically proceeds to the specified step, when replaying
+# the execution.
+#
+# @step: destination execution step
+#
+# Since: 3.1
+#
+# Example:
+#
+# -> { "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 c6b80c0..e605ee0 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)
 {
@@ -94,3 +96,90 @@ void hmp_replay_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, Error **errp, QEMUTimerCB callback)
+{
+    char *snapshot = NULL;
+    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;
+    }
+    int64_t snapshot_step = -1;
+    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, errp, replay_stop_vm);
+}
+
+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) {
+        monitor_printf(mon, "replay_seek error: %s\n", error_get_pretty(err));
+        error_free(err);
+        return;
+    }
+}

  parent reply	other threads:[~2018-09-12  8:19 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-12  8:17 [Qemu-devel] [PATCH v6 00/25] Fixing record/replay and adding reverse debugging Pavel Dovgalyuk
2018-09-12  8:17 ` [Qemu-devel] [PATCH v6 01/25] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 02/25] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 03/25] replay: update docs for record/replay with block devices Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 04/25] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 05/25] replay: finish record/replay before closing the disks Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 06/25] qcow2: introduce icount field for snapshots Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 07/25] migration: " Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 08/25] replay: provide and accessor for rr filename Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 09/25] replay: introduce info hmp/qmp command Pavel Dovgalyuk
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 10/25] replay: introduce breakpoint at the specified step Pavel Dovgalyuk
2018-09-12  8:18 ` Pavel Dovgalyuk [this message]
2018-09-12  8:18 ` [Qemu-devel] [PATCH v6 12/25] replay: flush events when exiting Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 13/25] replay: refine replay-time module Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 14/25] translator: fix breakpoint processing Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 15/25] replay: flush rr queue before loading the vmstate Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 16/25] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 17/25] gdbstub: add reverse continue " Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 18/25] replay: describe reverse debugging in docs/replay.txt Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 19/25] replay: allow loading any snapshots before recording Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 20/25] replay: wake up vCPU when replaying Pavel Dovgalyuk
2018-09-13 10:12   ` Paolo Bonzini
2018-09-13 11:06     ` Pavel Dovgalyuk
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 21/25] replay: replay BH for IDE trim operation Pavel Dovgalyuk
2018-09-13 17:05   ` John Snow
2018-09-14  5:48     ` Pavel Dovgalyuk
2018-09-14  7:27       ` Pavel Dovgalyuk
2018-09-14 14:17         ` John Snow
2018-09-14 14:00       ` John Snow
2018-09-14 15:19         ` Paolo Bonzini
2018-09-14 15:59           ` Peter Maydell
2018-09-12  8:19 ` [Qemu-devel] [PATCH v6 22/25] replay: add BH oneshot event for block layer Pavel Dovgalyuk
2018-09-13 10:22   ` Paolo Bonzini
2018-09-13 11:13     ` Pavel Dovgalyuk
2018-09-13 13:45       ` Paolo Bonzini
2018-09-14  6:17         ` Pavel Dovgalyuk
2018-09-12  8:20 ` [Qemu-devel] [PATCH v6 23/25] timer: introduce new virtual clock Pavel Dovgalyuk
2018-09-12  8:20 ` [Qemu-devel] [PATCH v6 24/25] slirp: fix ipv6 timers Pavel Dovgalyuk
2018-09-12  8:45   ` Samuel Thibault
2018-09-12  8:20 ` [Qemu-devel] [PATCH v6 25/25] ui: fix virtual timers Pavel Dovgalyuk
2018-09-13 10:27 ` [Qemu-devel] [PATCH v6 00/25] Fixing record/replay and adding reverse debugging Paolo Bonzini
2018-09-13 13:40   ` Pavel Dovgalyuk
2018-09-13 13:46     ` Paolo Bonzini

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=20180912081853.3228.63503.stgit@pasha-VirtualBox \
    --to=pavel.dovgaluk@ispras.ru \
    --cc=alex.bennee@linaro.org \
    --cc=armbru@redhat.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 \
    --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 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.