From: Nicholas Piggin <npiggin@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
"Pavel Dovgalyuk" <Pavel.Dovgalyuk@ispras.ru>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"John Snow" <jsnow@redhat.com>, "Cleber Rosa" <crosa@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PATCH v3 7/9] replay: Fix migration use of clock
Date: Mon, 26 Feb 2024 18:29:43 +1000 [thread overview]
Message-ID: <20240226082945.1452499-8-npiggin@gmail.com> (raw)
In-Reply-To: <20240226082945.1452499-1-npiggin@gmail.com>
Migration reads host clocks when not holding the replay_mutex, which
asserts when recording a trace. It seems that the times should be host
times like other statistics in MigrationState, so this can easily be
converted.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
migration/migration.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index ab21de2cad..2e794db75c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3316,7 +3316,7 @@ static void *migration_thread(void *opaque)
{
MigrationState *s = opaque;
MigrationThread *thread = NULL;
- int64_t setup_start = qemu_clock_get_ms(QEMU_CLOCK_HOST);
+ int64_t setup_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
MigThrError thr_error;
bool urgent = false;
@@ -3368,7 +3368,7 @@ static void *migration_thread(void *opaque)
qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_ACTIVE);
- s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
+ s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - setup_start;
trace_migration_thread_setup_complete();
@@ -3447,7 +3447,7 @@ static void *bg_migration_thread(void *opaque)
migration_rate_set(RATE_LIMIT_DISABLED);
- setup_start = qemu_clock_get_ms(QEMU_CLOCK_HOST);
+ setup_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
/*
* We want to save vmstate for the moment when migration has been
* initiated but also we want to save RAM content while VM is running.
@@ -3480,7 +3480,7 @@ static void *bg_migration_thread(void *opaque)
qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_ACTIVE);
- s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_HOST) - setup_start;
+ s->setup_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - setup_start;
trace_migration_thread_setup_complete();
migration_downtime_start(s);
--
2.42.0
next prev parent reply other threads:[~2024-02-26 8:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 8:29 [PATCH v3 0/9] replay: fixes and new test cases Nicholas Piggin
2024-02-26 8:29 ` [PATCH v3 1/9] scripts/replay-dump.py: Update to current rr record format Nicholas Piggin
2024-02-27 15:57 ` Alex Bennée
2024-02-26 8:29 ` [PATCH v3 2/9] scripts/replay-dump.py: rejig decoders in event number order Nicholas Piggin
2024-02-27 15:57 ` Alex Bennée
2024-02-26 8:29 ` [PATCH v3 3/9] tests/avocado: excercise scripts/replay-dump.py in replay tests Nicholas Piggin
2024-02-27 19:21 ` Alex Bennée
2024-02-29 3:10 ` Nicholas Piggin
2024-02-26 8:29 ` [PATCH v3 4/9] replay: allow runstate shutdown->running when replaying trace Nicholas Piggin
2024-02-27 19:28 ` Alex Bennée
2024-02-26 8:29 ` [PATCH v3 5/9] Revert "replay: stop us hanging in rr_wait_io_event" Nicholas Piggin
2024-02-26 8:29 ` [PATCH v3 6/9] chardev: set record/replay on the base device of a muxed device Nicholas Piggin
2024-02-26 8:29 ` Nicholas Piggin [this message]
2024-02-26 8:29 ` [PATCH v3 8/9] replay: Fix migration replay_mutex locking Nicholas Piggin
2024-02-26 8:29 ` [PATCH v3 9/9] tests/avocado/reverse_debugging.py: mark aarch64 and pseries as not flaky Nicholas Piggin
2024-02-27 19:36 ` Alex Bennée
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=20240226082945.1452499-8-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=Pavel.Dovgalyuk@ispras.ru \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=jsnow@redhat.com \
--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 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.