[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/25] migration: Tracepoint change in postcopy-run bottom hal
From: |
Peter Xu |
Subject: |
[PATCH v2 03/25] migration: Tracepoint change in postcopy-run bottom half |
Date: |
Tue, 1 Mar 2022 16:39:03 +0800 |
Remove the old two tracepoints and they're even near each other:
trace_loadvm_postcopy_handle_run_cpu_sync()
trace_loadvm_postcopy_handle_run_vmstart()
Add trace_loadvm_postcopy_handle_run_bh() with a finer granule trace.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/savevm.c | 12 +++++++++---
migration/trace-events | 3 +--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 190cc5fc42..41e3238798 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2006,13 +2006,19 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
Error *local_err = NULL;
MigrationIncomingState *mis = opaque;
+ trace_loadvm_postcopy_handle_run_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");
+
qemu_announce_self(&mis->announce_timer, migrate_announce_params());
+ trace_loadvm_postcopy_handle_run_bh("after announce");
+
/* Make sure all file formats flush their mutable metadata.
* If we get an error here, just don't restart the VM yet. */
bdrv_invalidate_cache_all(&local_err);
@@ -2022,9 +2028,7 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
autostart = false;
}
- trace_loadvm_postcopy_handle_run_cpu_sync();
-
- trace_loadvm_postcopy_handle_run_vmstart();
+ trace_loadvm_postcopy_handle_run_bh("after invalidate cache");
dirty_bitmap_mig_before_vm_start();
@@ -2037,6 +2041,8 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)
}
qemu_bh_delete(mis->bh);
+
+ trace_loadvm_postcopy_handle_run_bh("return");
}
/* After all discards we can start running and asking for pages */
diff --git a/migration/trace-events b/migration/trace-events
index 92596c00d8..1aec580e92 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -16,8 +16,7 @@ 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_cpu_sync(void) ""
-loadvm_postcopy_handle_run_vmstart(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) ""
--
2.32.0
- [PATCH v2 00/25] migration: Postcopy Preemption, Peter Xu, 2022/03/01
- [PATCH v2 01/25] migration: Dump sub-cmd name in loadvm_process_command tp, Peter Xu, 2022/03/01
- [PATCH v2 02/25] migration: Finer grained tracepoints for POSTCOPY_LISTEN, Peter Xu, 2022/03/01
- [PATCH v2 03/25] migration: Tracepoint change in postcopy-run bottom half,
Peter Xu <=
- [PATCH v2 04/25] migration: Introduce postcopy channels on dest node, Peter Xu, 2022/03/01
- [PATCH v2 05/25] migration: Dump ramblock and offset too when non-same-page detected, Peter Xu, 2022/03/01
- [PATCH v2 06/25] migration: Add postcopy_thread_create(), Peter Xu, 2022/03/01
- [PATCH v2 07/25] migration: Move static var in ram_block_from_stream() into global, Peter Xu, 2022/03/01
- [PATCH v2 08/25] migration: Add pss.postcopy_requested status, Peter Xu, 2022/03/01
- [PATCH v2 09/25] migration: Move migrate_allow_multifd and helpers into migration.c, Peter Xu, 2022/03/01
- [PATCH v2 10/25] migration: Enlarge postcopy recovery to capture !-EIO too, Peter Xu, 2022/03/01
- [PATCH v2 11/25] migration: postcopy_pause_fault_thread() never fails, Peter Xu, 2022/03/01
- [PATCH v2 14/25] migration: Add migration_incoming_transport_cleanup(), Peter Xu, 2022/03/01
- [PATCH v2 15/25] migration: Allow migrate-recover to run multiple times, Peter Xu, 2022/03/01