From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Farman" <farman@linux.ibm.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
qemu-block@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
qemu-s390x@nongnu.org,
"Richard Henderson" <richard.henderson@linaro.org>,
"Leonardo Bras" <leobras@redhat.com>,
"Corey Minyard" <cminyard@mvista.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-ppc@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Li Zhijian" <lizhijian@fujitsu.com>,
"Eric Blake" <eblake@redhat.com>,
"Denis V. Lunev" <den@openvz.org>,
"Hanna Reitz" <hreitz@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
qemu-arm@nongnu.org,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Corey Minyard" <minyard@acm.org>, "John Snow" <jsnow@redhat.com>,
"Jeff Cody" <codyprime@gmail.com>, "Peter Xu" <peterx@redhat.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Juan Quintela" <quintela@redhat.com>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Jason Wang" <jasowang@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Stefan Weil" <sw@weilnetz.de>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Fam Zheng" <fam@euphon.net>,
"Joao Martins" <joao.m.martins@oracle.com>
Subject: [PULL 19/40] migration: Add tracepoints for downtime checkpoints
Date: Thu, 2 Nov 2023 12:40:33 +0100 [thread overview]
Message-ID: <20231102114054.44360-20-quintela@redhat.com> (raw)
In-Reply-To: <20231102114054.44360-1-quintela@redhat.com>
From: Peter Xu <peterx@redhat.com>
This patch is inspired by Joao Martin's patch here:
https://lore.kernel.org/r/20230926161841.98464-1-joao.m.martins@oracle.com
Add tracepoints for major downtime checkpoints on both src and dst. They
share the same tracepoint with a string showing its stage.
Besides the checkpoints in the previous patch, this patch also added
destination checkpoints.
On src, we have these checkpoints added:
- src-downtime-start: right before vm stops on src
- src-vm-stopped: after vm is fully stopped
- src-iterable-saved: after all iterables saved (END sections)
- src-non-iterable-saved: after all non-iterable saved (FULL sections)
- src-downtime-stop: migration fully completed
On dst, we have these checkpoints added:
- dst-precopy-loadvm-completes: after loadvm all done for precopy
- dst-precopy-bh-*: record BH steps to resume VM for precopy
- dst-postcopy-bh-*: record BH steps to resume VM for postcopy
On dst side, we don't have a good way to trace total time consumed by
iterable or non-iterable for now. We can mark it by 1st time receiving a
FULL / END section, but rather than that let's just rely on the other
tracepoints added for vmstates to back up the information.
With this patch, one can enable "vmstate_downtime*" tracepoints and it'll
enable all tracepoints for downtime measurements necessary.
Drop loadvm_postcopy_handle_run_bh() tracepoint alongside, because they
service the same purpose, which was only for postcopy. We then have
unified prefix for all downtime relevant tracepoints.
Co-developed-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231030163346.765724-6-peterx@redhat.com>
---
migration/migration.c | 16 +++++++++++++++-
migration/savevm.c | 14 +++++++++-----
migration/trace-events | 2 +-
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 3e38294485..c334b9effd 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -103,6 +103,7 @@ static int close_return_path_on_source(MigrationState *s);
static void migration_downtime_start(MigrationState *s)
{
+ trace_vmstate_downtime_checkpoint("src-downtime-start");
s->downtime_start = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
}
@@ -117,6 +118,8 @@ static void migration_downtime_end(MigrationState *s)
if (!s->downtime) {
s->downtime = now - s->downtime_start;
}
+
+ trace_vmstate_downtime_checkpoint("src-downtime-end");
}
static bool migration_needs_multiple_sockets(void)
@@ -151,7 +154,11 @@ static gint page_request_addr_cmp(gconstpointer ap, gconstpointer bp)
int migration_stop_vm(RunState state)
{
- return vm_stop_force_state(state);
+ int ret = vm_stop_force_state(state);
+
+ trace_vmstate_downtime_checkpoint("src-vm-stopped");
+
+ return ret;
}
void migration_object_init(void)
@@ -495,6 +502,8 @@ static void process_incoming_migration_bh(void *opaque)
Error *local_err = NULL;
MigrationIncomingState *mis = opaque;
+ trace_vmstate_downtime_checkpoint("dst-precopy-bh-enter");
+
/* If capability late_block_activate is set:
* Only fire up the block code now if we're going to restart the
* VM, else 'cont' will do it.
@@ -520,6 +529,8 @@ static void process_incoming_migration_bh(void *opaque)
*/
qemu_announce_self(&mis->announce_timer, migrate_announce_params());
+ trace_vmstate_downtime_checkpoint("dst-precopy-bh-announced");
+
multifd_load_shutdown();
dirty_bitmap_mig_before_vm_start();
@@ -537,6 +548,7 @@ static void process_incoming_migration_bh(void *opaque)
} else {
runstate_set(global_state_get_runstate());
}
+ trace_vmstate_downtime_checkpoint("dst-precopy-bh-vm-started");
/*
* This must happen after any state changes since as soon as an external
* observer sees this event they might start to prod at the VM assuming
@@ -571,6 +583,8 @@ process_incoming_migration_co(void *opaque)
ret = qemu_loadvm_state(mis->from_src_file);
mis->loadvm_co = NULL;
+ trace_vmstate_downtime_checkpoint("dst-precopy-loadvm-completed");
+
ps = postcopy_state_get();
trace_process_incoming_migration_co_end(ret, ps);
if (ps != POSTCOPY_INCOMING_NONE) {
diff --git a/migration/savevm.c b/migration/savevm.c
index 99ce42b6f3..bc98c2ea6f 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1526,6 +1526,8 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUFile *f, bool in_postcopy)
end_ts_each - start_ts_each);
}
+ trace_vmstate_downtime_checkpoint("src-iterable-saved");
+
return 0;
}
@@ -1592,6 +1594,8 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
json_writer_free(vmdesc);
ms->vmdesc = NULL;
+ trace_vmstate_downtime_checkpoint("src-non-iterable-saved");
+
return 0;
}
@@ -2133,18 +2137,18 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
Error *local_err = NULL;
MigrationIncomingState *mis = opaque;
- trace_loadvm_postcopy_handle_run_bh("enter");
+ trace_vmstate_downtime_checkpoint("dst-postcopy-bh-enter");
/* TODO we should move all of this lot into postcopy_ram.c or a shared code
* in migration.c
*/
cpu_synchronize_all_post_init();
- trace_loadvm_postcopy_handle_run_bh("after cpu sync");
+ trace_vmstate_downtime_checkpoint("dst-postcopy-bh-cpu-synced");
qemu_announce_self(&mis->announce_timer, migrate_announce_params());
- trace_loadvm_postcopy_handle_run_bh("after announce");
+ trace_vmstate_downtime_checkpoint("dst-postcopy-bh-announced");
/* Make sure all file formats throw away their mutable metadata.
* If we get an error here, just don't restart the VM yet. */
@@ -2155,7 +2159,7 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
autostart = false;
}
- trace_loadvm_postcopy_handle_run_bh("after invalidate cache");
+ trace_vmstate_downtime_checkpoint("dst-postcopy-bh-cache-invalidated");
dirty_bitmap_mig_before_vm_start();
@@ -2169,7 +2173,7 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
qemu_bh_delete(mis->bh);
- trace_loadvm_postcopy_handle_run_bh("return");
+ trace_vmstate_downtime_checkpoint("dst-postcopy-bh-vm-started");
}
/* After all discards we can start running and asking for pages */
diff --git a/migration/trace-events b/migration/trace-events
index 5820add1f3..e54f317e3b 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -17,7 +17,6 @@ loadvm_handle_recv_bitmap(char *s) "%s"
loadvm_postcopy_handle_advise(void) ""
loadvm_postcopy_handle_listen(const char *str) "%s"
loadvm_postcopy_handle_run(void) ""
-loadvm_postcopy_handle_run_bh(const char *str) "%s"
loadvm_postcopy_handle_resume(void) ""
loadvm_postcopy_ram_handle_discard(void) ""
loadvm_postcopy_ram_handle_discard_end(void) ""
@@ -50,6 +49,7 @@ vmstate_save(const char *idstr, const char *vmsd_name) "%s, %s"
vmstate_load(const char *idstr, const char *vmsd_name) "%s, %s"
vmstate_downtime_save(const char *type, const char *idstr, uint32_t instance_id, int64_t downtime) "type=%s idstr=%s instance_id=%d downtime=%"PRIi64
vmstate_downtime_load(const char *type, const char *idstr, uint32_t instance_id, int64_t downtime) "type=%s idstr=%s instance_id=%d downtime=%"PRIi64
+vmstate_downtime_checkpoint(const char *checkpoint) "%s"
postcopy_pause_incoming(void) ""
postcopy_pause_incoming_continued(void) ""
postcopy_page_req_sync(void *host_addr) "sync page req %p"
--
2.41.0
next prev parent reply other threads:[~2023-11-02 11:49 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 11:40 [PULL 00/40] Migration 20231102 patches Juan Quintela
2023-11-02 11:40 ` [PULL 01/40] hw/ipmi: Don't call vmstate_register() from instance_init() functions Juan Quintela
2023-11-02 11:40 ` [PULL 02/40] hw/s390x/s390-skeys: Don't call register_savevm_live() during instance_init() Juan Quintela
2023-11-02 11:40 ` [PULL 03/40] hw/s390x/s390-stattrib: Simplify handling of the "migration-enabled" property Juan Quintela
2023-11-02 11:40 ` [PULL 04/40] hw/s390x/s390-stattrib: Don't call register_savevm_live() during instance_init() Juan Quintela
2023-11-02 11:40 ` [PULL 05/40] migration: Create vmstate_register_any() Juan Quintela
2023-11-02 11:40 ` [PULL 06/40] migration: Use vmstate_register_any() Juan Quintela
2023-11-02 11:40 ` [PULL 07/40] migration: Use vmstate_register_any() for isa-ide Juan Quintela
2023-11-02 11:40 ` [PULL 08/40] migration: Use VMSTATE_INSTANCE_ID_ANY for slirp Juan Quintela
2023-11-02 11:40 ` [PULL 09/40] migration: Hack to maintain backwards compatibility for ppc Juan Quintela
2023-11-02 11:40 ` [PULL 10/40] migration: Check in savevm_state_handler_insert for dups Juan Quintela
2023-11-02 11:40 ` [PULL 11/40] migration: Improve example and documentation of vmstate_register() Juan Quintela
2023-11-02 11:40 ` [PULL 12/40] migration: Use vmstate_register_any() for audio Juan Quintela
2023-11-02 11:40 ` [PULL 13/40] migration: Use vmstate_register_any() for eeprom93xx Juan Quintela
2023-11-02 11:40 ` [PULL 14/40] migration: Use vmstate_register_any() for vmware_vga Juan Quintela
2023-11-02 11:40 ` [PULL 15/40] migration: Set downtime_start even for postcopy Juan Quintela
2023-11-02 11:40 ` [PULL 16/40] migration: Add migration_downtime_start|end() helpers Juan Quintela
2023-11-02 11:40 ` [PULL 17/40] migration: Add per vmstate downtime tracepoints Juan Quintela
2023-11-02 11:40 ` [PULL 18/40] migration: migration_stop_vm() helper Juan Quintela
2023-11-02 11:40 ` Juan Quintela [this message]
2023-11-02 11:40 ` [PULL 20/40] migration: mode parameter Juan Quintela
2023-11-02 11:40 ` [PULL 21/40] migration: per-mode blockers Juan Quintela
2023-11-09 17:10 ` Peter Maydell
2023-11-09 17:24 ` Steven Sistare
2023-11-09 17:27 ` Peter Maydell
2023-11-02 11:40 ` [PULL 22/40] cpr: relax blockdev migration blockers Juan Quintela
2023-11-02 11:40 ` [PULL 23/40] cpr: relax vhost " Juan Quintela
2023-11-02 11:40 ` [PULL 24/40] cpr: reboot mode Juan Quintela
2023-11-02 11:40 ` [PULL 25/40] tests/qtest: migration: add reboot mode test Juan Quintela
2023-11-15 19:32 ` Steven Sistare
2023-11-02 11:40 ` [PULL 26/40] migration: Refactor error handling in source return path Juan Quintela
2023-11-02 11:40 ` [PULL 27/40] migration: Allow network to fail even during recovery Juan Quintela
2023-11-02 11:40 ` [PULL 28/40] tests/migration-test: Add a test for postcopy hangs during RECOVER Juan Quintela
2023-11-02 11:40 ` [PULL 29/40] migration: Change ram_dirty_bitmap_reload() retval to bool Juan Quintela
2023-11-02 11:40 ` [PULL 30/40] migration: New QAPI type 'MigrateAddress' Juan Quintela
2023-11-02 11:40 ` [PULL 31/40] migration: convert migration 'uri' into 'MigrateAddress' Juan Quintela
2023-11-02 11:40 ` [PULL 32/40] migration: convert socket backend to accept MigrateAddress Juan Quintela
2023-11-02 11:40 ` [PULL 33/40] migration: convert rdma " Juan Quintela
2023-11-02 11:40 ` [PULL 34/40] migration: convert exec " Juan Quintela
2023-11-02 11:40 ` [PULL 35/40] migration: Convert the file backend to the new QAPI syntax Juan Quintela
2023-11-02 11:40 ` [PULL 36/40] migration: New migrate and migrate-incoming argument 'channels' Juan Quintela
2023-11-02 11:40 ` [PULL 37/40] migration: modify migration_channels_and_uri_compatible() for new QAPI syntax Juan Quintela
2023-11-02 11:40 ` [PULL 38/40] migration: Implement MigrateChannelList to qmp migration flow Juan Quintela
2023-11-06 13:57 ` Peter Maydell
2023-11-06 14:27 ` Juan Quintela
2023-11-02 11:40 ` [PULL 39/40] migration: Implement MigrateChannelList to hmp " Juan Quintela
2023-11-02 11:40 ` [PULL 40/40] migration: modify test_multifd_tcp_none() to use new QAPI syntax Juan Quintela
2023-11-03 3:23 ` [PULL 00/40] Migration 20231102 patches Stefan Hajnoczi
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=20231102114054.44360-20-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=clg@kaod.org \
--cc=cminyard@mvista.com \
--cc=codyprime@gmail.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=fam@euphon.net \
--cc=farman@linux.ibm.com \
--cc=farosas@suse.de \
--cc=harshpb@linux.ibm.com \
--cc=hreitz@redhat.com \
--cc=iii@linux.ibm.com \
--cc=jasowang@redhat.com \
--cc=joao.m.martins@oracle.com \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=lizhijian@fujitsu.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=minyard@acm.org \
--cc=mst@redhat.com \
--cc=npiggin@gmail.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=samuel.thibault@ens-lyon.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
--cc=sw@weilnetz.de \
--cc=thuth@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).