From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Cleber Rosa" <crosa@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"John Snow" <jsnow@redhat.com>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH 03/11] scripts/replay-dump: update to latest format
Date: Tue, 5 Dec 2023 20:40:58 +0000 [thread overview]
Message-ID: <20231205204106.95531-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20231205204106.95531-1-alex.bennee@linaro.org>
To help debugging replay logs I've implemented decode_plain and
decode_char_write as well as put in a new table for the current format
of log.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
scripts/replay-dump.py | 70 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 64 insertions(+), 6 deletions(-)
diff --git a/scripts/replay-dump.py b/scripts/replay-dump.py
index b89dc29555..8b9f914534 100755
--- a/scripts/replay-dump.py
+++ b/scripts/replay-dump.py
@@ -115,6 +115,11 @@ def decode_unimp(eid, name, _unused_dumpfile):
print("%s not handled - will now stop" % (name))
return False
+def decode_plain(eid, name, _unused_dumpfile):
+ "Plain events without additional data"
+ print_event(eid, name, "no data")
+ return True
+
# Checkpoint decoder
def swallow_async_qword(eid, name, dumpfile):
"Swallow a qword of data without looking at it"
@@ -151,6 +156,12 @@ def decode_instruction(eid, name, dumpfile):
print_event(eid, name, "0x%x" % (ins_diff))
return True
+def decode_char_write(eid, name, dumpfile):
+ res = read_dword(dumpfile)
+ offset = read_dword(dumpfile)
+ print_event(eid, name, "%d -> %d" % (offset, res))
+ return True
+
def decode_audio_out(eid, name, dumpfile):
audio_data = read_dword(dumpfile)
print_event(eid, name, "%d" % (audio_data))
@@ -193,10 +204,10 @@ def decode_clock(eid, name, dumpfile):
# pre-MTTCG merge
v5_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction),
Decoder(1, "EVENT_INTERRUPT", decode_interrupt),
- Decoder(2, "EVENT_EXCEPTION", decode_unimp),
+ Decoder(2, "EVENT_EXCEPTION", decode_plain),
Decoder(3, "EVENT_ASYNC", decode_async),
Decoder(4, "EVENT_SHUTDOWN", decode_unimp),
- Decoder(5, "EVENT_CHAR_WRITE", decode_unimp),
+ Decoder(5, "EVENT_CHAR_WRITE", decode_char_write),
Decoder(6, "EVENT_CHAR_READ_ALL", decode_unimp),
Decoder(7, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp),
Decoder(8, "EVENT_CLOCK_HOST", decode_clock),
@@ -215,10 +226,10 @@ def decode_clock(eid, name, dumpfile):
# post-MTTCG merge, AUDIO support added
v6_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction),
Decoder(1, "EVENT_INTERRUPT", decode_interrupt),
- Decoder(2, "EVENT_EXCEPTION", decode_unimp),
+ Decoder(2, "EVENT_EXCEPTION", decode_plain),
Decoder(3, "EVENT_ASYNC", decode_async),
Decoder(4, "EVENT_SHUTDOWN", decode_unimp),
- Decoder(5, "EVENT_CHAR_WRITE", decode_unimp),
+ Decoder(5, "EVENT_CHAR_WRITE", decode_char_write),
Decoder(6, "EVENT_CHAR_READ_ALL", decode_unimp),
Decoder(7, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp),
Decoder(8, "EVENT_AUDIO_OUT", decode_audio_out),
@@ -250,7 +261,7 @@ def decode_clock(eid, name, dumpfile):
Decoder(10, "EVENT_SHUTDOWN_GUEST_RESET", decode_unimp),
Decoder(11, "EVENT_SHUTDOWN_GUEST_PANIC", decode_unimp),
Decoder(12, "EVENT_SHUTDOWN___MAX", decode_unimp),
- Decoder(13, "EVENT_CHAR_WRITE", decode_unimp),
+ Decoder(13, "EVENT_CHAR_WRITE", decode_char_write),
Decoder(14, "EVENT_CHAR_READ_ALL", decode_unimp),
Decoder(15, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp),
Decoder(16, "EVENT_AUDIO_OUT", decode_audio_out),
@@ -268,6 +279,49 @@ def decode_clock(eid, name, dumpfile):
Decoder(28, "EVENT_CP_RESET", decode_checkpoint),
]
+# Shutdown cause added
+v12_event_table = [Decoder(0, "EVENT_INSTRUCTION", decode_instruction),
+ Decoder(1, "EVENT_INTERRUPT", decode_interrupt),
+ Decoder(2, "EVENT_EXCEPTION", decode_plain),
+ Decoder(3, "EVENT_ASYNC", decode_async),
+ Decoder(4, "EVENT_ASYNC", decode_async),
+ Decoder(5, "EVENT_ASYNC", decode_async),
+ Decoder(6, "EVENT_ASYNC", decode_async),
+ Decoder(6, "EVENT_ASYNC", decode_async),
+ Decoder(8, "EVENT_ASYNC", decode_async),
+ Decoder(9, "EVENT_ASYNC", decode_async),
+ Decoder(10, "EVENT_ASYNC", decode_async),
+ Decoder(11, "EVENT_SHUTDOWN", decode_unimp),
+ Decoder(12, "EVENT_SHUTDOWN_HOST_ERR", decode_unimp),
+ Decoder(13, "EVENT_SHUTDOWN_HOST_QMP_QUIT", decode_unimp),
+ Decoder(14, "EVENT_SHUTDOWN_HOST_QMP_RESET", decode_unimp),
+ Decoder(14, "EVENT_SHUTDOWN_HOST_SIGNAL", decode_unimp),
+ Decoder(15, "EVENT_SHUTDOWN_HOST_UI", decode_unimp),
+ Decoder(16, "EVENT_SHUTDOWN_GUEST_SHUTDOWN", decode_unimp),
+ Decoder(17, "EVENT_SHUTDOWN_GUEST_RESET", decode_unimp),
+ Decoder(18, "EVENT_SHUTDOWN_GUEST_PANIC", decode_unimp),
+ Decoder(19, "EVENT_SHUTDOWN_GUEST_SUBSYSTEM_RESET", decode_unimp),
+ Decoder(20, "EVENT_SHUTDOWN_GUEST_SNAPSHOT_LOAD", decode_unimp),
+ Decoder(21, "EVENT_SHUTDOWN___MAX", decode_unimp),
+ Decoder(22, "EVENT_CHAR_WRITE", decode_char_write),
+ Decoder(23, "EVENT_CHAR_READ_ALL", decode_unimp),
+ Decoder(24, "EVENT_CHAR_READ_ALL_ERROR", decode_unimp),
+ Decoder(25, "EVENT_AUDIO_IN", decode_unimp),
+ Decoder(26, "EVENT_AUDIO_OUT", decode_audio_out),
+ Decoder(27, "EVENT_RANDOM", decode_unimp),
+ Decoder(28, "EVENT_CLOCK_HOST", decode_clock),
+ Decoder(29, "EVENT_CLOCK_VIRTUAL_RT", decode_clock),
+ Decoder(30, "EVENT_CP_CLOCK_WARP_START", decode_checkpoint),
+ Decoder(31, "EVENT_CP_CLOCK_WARP_ACCOUNT", decode_checkpoint),
+ Decoder(32, "EVENT_CP_RESET_REQUESTED", decode_checkpoint),
+ Decoder(33, "EVENT_CP_SUSPEND_REQUESTED", decode_checkpoint),
+ Decoder(34, "EVENT_CP_CLOCK_VIRTUAL", decode_checkpoint),
+ Decoder(35, "EVENT_CP_CLOCK_HOST", decode_checkpoint),
+ Decoder(36, "EVENT_CP_CLOCK_VIRTUAL_RT", decode_checkpoint),
+ Decoder(37, "EVENT_CP_INIT", decode_checkpoint_init),
+ Decoder(38, "EVENT_CP_RESET", decode_checkpoint),
+]
+
def parse_arguments():
"Grab arguments for script"
parser = argparse.ArgumentParser()
@@ -283,9 +337,13 @@ def decode_file(filename):
version = read_dword(dumpfile)
junk = read_qword(dumpfile)
+ # see REPLAY_VERSION
print("HEADER: version 0x%x" % (version))
- if version == 0xe02007:
+ if version == 0xe0200c:
+ event_decode_table = v12_event_table
+ replay_state.checkpoint_start = 30
+ elif version == 0xe02007:
event_decode_table = v7_event_table
replay_state.checkpoint_start = 12
elif version == 0xe02006:
--
2.39.2
next prev parent reply other threads:[~2023-12-05 20:43 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 20:40 [PATCH 00/11] record/replay fixes, maybe for 8.2 or for post release stable? Alex Bennée
2023-12-05 20:40 ` [PATCH 01/11] tests/avocado: add a simple i386 replay kernel test Alex Bennée
2023-12-06 16:21 ` Richard Henderson
2023-12-07 8:20 ` Pavel Dovgalyuk
2023-12-05 20:40 ` [PATCH 02/11] tests/avocado: fix typo in replay_linux Alex Bennée
2023-12-06 11:24 ` Philippe Mathieu-Daudé
2023-12-06 16:22 ` Richard Henderson
2023-12-07 8:20 ` Pavel Dovgalyuk
2023-12-05 20:40 ` Alex Bennée [this message]
2023-12-06 16:29 ` [PATCH 03/11] scripts/replay-dump: update to latest format Richard Henderson
2023-12-05 20:40 ` [PATCH 04/11] scripts/replay_dump: track total number of instructions Alex Bennée
2023-12-06 11:25 ` Philippe Mathieu-Daudé
2023-12-06 16:38 ` Richard Henderson
2023-12-07 8:26 ` Pavel Dovgalyuk
2023-12-05 20:41 ` [PATCH 05/11] replay: remove host_clock_last Alex Bennée
2023-12-06 11:33 ` Philippe Mathieu-Daudé
2023-12-06 16:39 ` Richard Henderson
2023-12-07 8:26 ` Pavel Dovgalyuk
2023-12-05 20:41 ` [PATCH 06/11] replay: add proper kdoc for ReplayState Alex Bennée
2023-12-06 11:27 ` Philippe Mathieu-Daudé
2023-12-06 11:56 ` Alex Bennée
2023-12-07 8:38 ` Pavel Dovgalyuk
2023-12-05 20:41 ` [PATCH 07/11] replay: make has_unread_data a bool Alex Bennée
2023-12-06 11:31 ` Philippe Mathieu-Daudé
2023-12-06 16:42 ` Richard Henderson
2023-12-07 8:39 ` Pavel Dovgalyuk
2023-12-05 20:41 ` [PATCH 08/11] replay: introduce a central report point for sync errors Alex Bennée
2023-12-06 11:35 ` Philippe Mathieu-Daudé
2023-12-06 16:48 ` Richard Henderson
2023-12-07 8:45 ` Pavel Dovgalyuk
2023-12-06 16:47 ` Richard Henderson
2023-12-05 20:41 ` [PATCH 09/11] replay: stop us hanging in rr_wait_io_event Alex Bennée
2023-12-06 16:51 ` Richard Henderson
2023-12-08 8:32 ` Pavel Dovgalyuk
2023-12-08 9:29 ` Alex Bennée
2023-12-05 20:41 ` [PATCH 10/11] chardev: force write all when recording replay logs Alex Bennée
2023-12-06 14:25 ` Philippe Mathieu-Daudé
2023-12-07 8:46 ` Pavel Dovgalyuk
2023-12-05 20:41 ` [PATCH 11/11] tests/avocado: remove skips from replay_kernel Alex Bennée
2023-12-07 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=20231205204106.95531-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=eduardo@habkost.net \
--cc=jsnow@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=wainersm@redhat.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).