qemu-devel.nongnu.org archive mirror
 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] [RFC PATCH 09/17] replay: introduce breakpoint at the specified step
Date: Wed, 25 Apr 2018 15:46:26 +0300	[thread overview]
Message-ID: <20180425124626.17182.89580.stgit@pasha-VirtualBox> (raw)
In-Reply-To: <20180425124533.17182.53165.stgit@pasha-VirtualBox>

This patch introduces replay_break qmp and hmp commands.
These commands allow stopping at the specified instruction.
It may be useful for debugging when there are some known
events that should be investigated.
The commands have one argument - number of instructions
executed since the start of the replay.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
---
 hmp-commands.hx           |   15 ++++++++++++
 hmp.h                     |    1 +
 include/sysemu/replay.h   |    3 ++
 qapi/misc.json            |   17 ++++++++++++++
 replay/replay-debugging.c |   55 +++++++++++++++++++++++++++++++++++++++++++++
 replay/replay-internal.h  |    4 +++
 replay/replay.c           |   17 ++++++++++++++
 7 files changed, 112 insertions(+)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 35d862a..f162f5e 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1820,6 +1820,21 @@ Set QOM property @var{property} of object at location @var{path} to value @var{v
 ETEXI
 
     {
+        .name       = "replay_break",
+        .args_type  = "step:i",
+        .params     = "step",
+        .help       = "sets breakpoint on the specified step of the replay",
+        .cmd        = hmp_replay_break,
+    },
+
+STEXI
+@item replay_break @var{step}
+@findex replay_break
+Set breakpoint on the specified step of the replay.
+Execution stops when the specified step is reached.
+ETEXI
+
+    {
         .name       = "info",
         .args_type  = "item:s?",
         .params     = "[subcommand]",
diff --git a/hmp.h b/hmp.h
index 084fb62..5ef8f56 100644
--- a/hmp.h
+++ b/hmp.h
@@ -145,5 +145,6 @@ void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict);
 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);
 
 #endif
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 3ced6bc..98d709c 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -71,6 +71,9 @@ void replay_start(void);
 void replay_finish(void);
 /*! Adds replay blocker with the specified error description */
 void replay_add_blocker(Error *reason);
+/*! Sets breakpoint at the specified step.
+    If step = -1LL the existing breakpoint is removed. */
+void replay_break(int64_t step, QEMUTimerCB callback, void *opaque);
 
 /* Processing the instructions */
 
diff --git a/qapi/misc.json b/qapi/misc.json
index 2ded924..920099c 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -3485,3 +3485,20 @@
 ##
 { 'command': 'info_replay',
   'returns': 'ReplayInfo' }
+
+##
+# @replay_break:
+#
+# Set breakpoint on the specified step of the replay.
+# Execution stops when the specified step is reached.
+#
+# @step: execution step to stop at
+#
+# Since: 2.13
+#
+# Example:
+#
+# -> { "execute": "replay_break", "data": { "step": 220414 } }
+#
+##
+{ 'command': 'replay_break', 'data': { 'step': 'int' } }
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
index 2777e57..330bd91 100644
--- a/replay/replay-debugging.c
+++ b/replay/replay-debugging.c
@@ -16,6 +16,8 @@
 #include "hmp.h"
 #include "monitor/monitor.h"
 #include "qapi/qapi-commands-misc.h"
+#include "qapi/qmp/qdict.h"
+#include "qemu/timer.h"
 
 void hmp_info_replay(Monitor *mon, const QDict *qdict)
 {
@@ -39,3 +41,56 @@ ReplayInfo *qmp_info_replay(Error **errp)
     retval->step = replay_get_current_step();
     return retval;
 }
+
+void replay_break(int64_t step, QEMUTimerCB callback, void *opaque)
+{
+    assert(replay_mode == REPLAY_MODE_PLAY);
+    assert(replay_mutex_locked());
+
+    replay_break_step = step;
+    if (replay_break_timer) {
+        timer_del(replay_break_timer);
+        timer_free(replay_break_timer);
+        replay_break_timer = NULL;
+    }
+
+    if (replay_break_step == -1LL) {
+        return;
+    }
+    assert(replay_break_step >= replay_get_current_step());
+    assert(callback);
+
+    replay_break_timer = timer_new_ns(QEMU_CLOCK_REALTIME, callback, opaque);
+}
+
+static void replay_stop_vm(void *opaque)
+{
+    vm_stop(RUN_STATE_PAUSED);
+    replay_break(-1LL, NULL, NULL);
+}
+
+void qmp_replay_break(int64_t step, Error **errp)
+{
+    if (replay_mode ==  REPLAY_MODE_PLAY) {
+        if (step >= replay_get_current_step()) {
+            replay_break(step, replay_stop_vm, NULL);
+        } else {
+            error_setg(errp, "cannot set break at the step in the past");
+        }
+    } else {
+        error_setg(errp, "setting the break is allowed only in play mode");
+    }
+}
+
+void hmp_replay_break(Monitor *mon, const QDict *qdict)
+{
+    int64_t step = qdict_get_try_int(qdict, "step", -1LL);
+    Error *err = NULL;
+
+    qmp_replay_break(step, &err);
+    if (err) {
+        monitor_printf(mon, "replay_break error: %s\n", error_get_pretty(err));
+        error_free(err);
+        return;
+    }
+}
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index ef82b5e..34d19eb 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -93,6 +93,10 @@ extern ReplayState replay_state;
 extern FILE *replay_file;
 /*! Name of replay file  */
 extern char *replay_filename;
+/*! Step of the replay breakpoint */
+extern int64_t replay_break_step;
+/*! Timer for the replay breakpoint callback */
+extern QEMUTimer *replay_break_timer;
 
 void replay_put_byte(uint8_t byte);
 void replay_put_event(uint8_t event);
diff --git a/replay/replay.c b/replay/replay.c
index 8b70d7d..dcce902 100644
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -33,6 +33,10 @@ char *replay_filename;
 ReplayState replay_state;
 static GSList *replay_blockers;
 
+/* Replay breakpoints */
+int64_t replay_break_step = -1LL;
+QEMUTimer *replay_break_timer;
+
 bool replay_next_event_is(int event)
 {
     bool res = false;
@@ -72,6 +76,13 @@ int replay_get_instructions(void)
     replay_mutex_lock();
     if (replay_next_event_is(EVENT_INSTRUCTION)) {
         res = replay_state.instructions_count;
+        if (replay_break_step != -1LL) {
+            uint64_t current = replay_get_current_step();
+            assert(replay_break_step >= current);
+            if (current + res > replay_break_step) {
+                res = replay_break_step - current;
+            }
+        }
     }
     replay_mutex_unlock();
     return res;
@@ -98,6 +109,12 @@ void replay_account_executed_instructions(void)
                    will be read from the log. */
                 qemu_notify_event();
             }
+            /* Execution reached the break step */
+            if (replay_break_step == replay_state.current_step) {
+                /* Cannot make callback directly from the vCPU thread */
+                timer_mod_ns(replay_break_timer,
+                    qemu_clock_get_ns(QEMU_CLOCK_REALTIME));
+            }
         }
     }
 }

  parent reply	other threads:[~2018-04-25 12:46 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-25 12:45 [Qemu-devel] [RFC PATCH 00/17] reverse debugging Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 01/17] block: implement bdrv_snapshot_goto for blkreplay Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 02/17] replay: disable default snapshot for record/replay Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 03/17] replay: update docs for record/replay with block devices Pavel Dovgalyuk
2018-04-25 12:45 ` [Qemu-devel] [RFC PATCH 04/17] replay: don't drain/flush bdrv queue while RR is working Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 05/17] replay: finish record/replay before closing the disks Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 06/17] migration: introduce icount field for snapshots Pavel Dovgalyuk
2018-04-25 18:59   ` Eric Blake
2018-04-26  9:40     ` Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 07/17] qcow2: " Pavel Dovgalyuk
2018-04-25 19:01   ` Eric Blake
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 08/17] replay: introduce info hmp/qmp command Pavel Dovgalyuk
2018-04-25 19:06   ` Eric Blake
2018-04-25 12:46 ` Pavel Dovgalyuk [this message]
2018-04-25 19:07   ` [Qemu-devel] [RFC PATCH 09/17] replay: introduce breakpoint at the specified step Eric Blake
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 10/17] replay: implement replay_seek command to proceed to the desired step Pavel Dovgalyuk
2018-04-25 19:07   ` Eric Blake
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 11/17] replay: flush events when exitting Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 12/17] timer: remove replay clock probe in deadline calculation Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 13/17] replay: refine replay-time module Pavel Dovgalyuk
2018-04-25 12:46 ` [Qemu-devel] [RFC PATCH 14/17] translator: fix breakpoint processing Pavel Dovgalyuk
2018-04-25 12:47 ` [Qemu-devel] [RFC PATCH 15/17] replay: flush rr queue before loading the vmstate Pavel Dovgalyuk
2018-04-25 12:47 ` [Qemu-devel] [RFC PATCH 16/17] gdbstub: add reverse step support in replay mode Pavel Dovgalyuk
2018-04-25 12:47 ` [Qemu-devel] [RFC PATCH 17/17] gdbstub: add reverse continue " Pavel Dovgalyuk
2018-04-25 12:48 ` [Qemu-devel] [RFC PATCH 00/17] reverse debugging Pavel Dovgalyuk
2018-04-26 12:21 ` Ciro Santilli
2018-04-26 12:34   ` Pavel Dovgalyuk
     [not found]     ` <CAFXrp_ddY34M8J+BwaRhPJrzxk=0XaQSBss1WnnZ8fNzAX+BjQ@mail.gmail.com>
     [not found]       ` <000401d3dec8$9c02c8d0$d4085a70$@ru>
2018-04-28  8:17         ` Ciro Santilli
2018-08-10 15:41     ` Ciro Santilli
     [not found] ` <CAFXrp_dOLnuoBEhL0eUJtobRWq7gjgAR8X48Xb3JeNx1J4eHEw@mail.gmail.com>
2018-04-28  8:14   ` [Qemu-devel] Fwd: " Ciro Santilli
     [not found]   ` <000e01d3ded3$127660d0$37632270$@ru>
2018-04-28  9:38     ` [Qemu-devel] " Ciro Santilli

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=20180425124626.17182.89580.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 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).