Allow modules to report data that can only be migrated after VM is stopped.
When this concept is introduced, we will need to account stopcopy size to
be part of pending_size as before.
One thing to mention is, when there can be stopcopy size, it means the old
"pending_size" may not always be able to reach low enough to kickoff an
slow version of query sync. While it used to be almost guaranteed to
happen because if we keep iterating, normally pending_size can go to zero
for precopy-only because we assume everything reported can be migrated in
precopy phase.
So we need to make sure QEMU will kickoff a synchronized version of query
pending when all precopy data is migrated too. This might be important to
VFIO to keep making progress even if the downtime cannot yet be satisfied.
So far, this patch should introduce no functional change, as no module yet
report stopcopy size.
This will pave way for VFIO to properly report its pending data sizes,
which was actually buggy today. Will be done in follow up patches.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
include/migration/register.h | 12 +++++++++
migration/migration.c | 52 ++++++++++++++++++++++++++++++------
migration/savevm.c | 7 +++--
migration/trace-events | 2 +-
4 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/include/migration/register.h b/include/migration/register.h
index 2320c3a981..3824958ba5 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -17,12 +17,24 @@
#include "hw/core/vmstate-if.h"
typedef struct MigPendingData {
+ /*
+ * Modules can only update these fields in a query request via its
+ * save_query_pending() API.
+ */
/* How many bytes are pending for precopy / stopcopy? */
uint64_t precopy_bytes;
/* How many bytes are pending that can be transferred in postcopy? */
uint64_t postcopy_bytes;
+ /* How many bytes that can only be transferred when VM stopped? */
+ uint64_t stopcopy_bytes;
+
+ /*
+ * Modules should never update these fields.
+ */
/* Is this a fastpath query (which can be inaccurate)? */
bool fastpath;
+ /* Total pending data */
+ uint64_t total_bytes;
} MigPendingData ;
/**
diff --git a/migration/migration.c b/migration/migration.c
index 99c4d09000..42facb16d1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3198,6 +3198,44 @@ typedef enum {
MIG_ITERATE_BREAK, /* Break the loop */
} MigIterateState;
+/* Are we ready to move to the next iteration phase? */
+static bool migration_iteration_next_ready(MigrationState *s,
+ MigPendingData *pending)
+{
+ /*
+ * If the estimated values already suggest us to switchover, mark this
+ * iteration finished, time to do a slow sync.
+ */
+ if (pending->total_bytes <= s->threshold_size) {
+ return true;
+ }
+
+ /*
+ * Since we may have modules reporting stop-only data, we also want to
+ * re-query with slow mode if all precopy data is moved over. This
+ * will also mark the current iteration done.
+ *
+ * This could happen when e.g. a module (like, VFIO) reports stopcopy
+ * size too large so it will never yet satisfy the downtime with the
+ * current setup (above check). Here, slow version of re-query helps
+ * because we keep trying the best to move whatever we have.
+ */
+ if (pending->precopy_bytes == 0) {
+ return true;
+ }
+
+ return false;
+}
+
+static void migration_iteration_go_next(MigPendingData *pending)
+{
+ /*
+ * Do a slow sync will achieve this. TODO: move RAM iteration code
+ * into the core layer.
+ */
+ qemu_savevm_query_pending(pending, false);
+}
+
/*
* Return true if continue to the next iteration directly, false
* otherwise.
@@ -3209,12 +3247,10 @@ static MigIterateState migration_iteration_run(MigrationState *s)
s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
bool can_switchover = migration_can_switchover(s);
MigPendingData pending = { };
- uint64_t pending_size;
bool complete_ready;
/* Fast path - get the estimated amount of pending data */
qemu_savevm_query_pending(&pending, true);
- pending_size = pending.precopy_bytes + pending.postcopy_bytes;
if (in_postcopy) {
/*
@@ -3222,7 +3258,7 @@ static MigIterateState migration_iteration_run(MigrationState *s)
* postcopy completion doesn't rely on can_switchover, because when
* POSTCOPY_ACTIVE it means switchover already happened.
*/
- complete_ready = !pending_size;
+ complete_ready = !pending.total_bytes;
if (s->state == MIGRATION_STATUS_POSTCOPY_DEVICE &&
(s->postcopy_package_loaded || complete_ready)) {
/*
@@ -3242,9 +3278,8 @@ static MigIterateState migration_iteration_run(MigrationState *s)
* postcopy started, so ESTIMATE should always match with EXACT
* during postcopy phase.
*/
- if (pending_size <= s->threshold_size) {
- qemu_savevm_query_pending(&pending, false);
- pending_size = pending.precopy_bytes + pending.postcopy_bytes;
+ if (migration_iteration_next_ready(s, &pending)) {
+ migration_iteration_go_next(&pending);
}
/* Should we switch to postcopy now? */
@@ -3264,11 +3299,12 @@ static MigIterateState migration_iteration_run(MigrationState *s)
* (2) Pending size is no more than the threshold specified
* (which was calculated from expected downtime)
*/
- complete_ready = can_switchover && (pending_size <= s->threshold_size);
+ complete_ready = can_switchover &&
+ (pending.total_bytes <= s->threshold_size);
}
if (complete_ready) {
- trace_migration_thread_low_pending(pending_size);
+ trace_migration_thread_low_pending(pending.total_bytes);
migration_completion(s);
return MIG_ITERATE_BREAK;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index b3285d480f..812c72b3e5 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1766,8 +1766,7 @@ void qemu_savevm_query_pending(MigPendingData *pending, bool fastpath)
{
SaveStateEntry *se;
- pending->precopy_bytes = 0;
- pending->postcopy_bytes = 0;
+ memset(pending, 0, sizeof(*pending));
pending->fastpath = fastpath;
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
@@ -1780,7 +1779,11 @@ void qemu_savevm_query_pending(MigPendingData *pending, bool fastpath)
se->ops->save_query_pending(se->opaque, pending);
}
+ pending->total_bytes = pending->precopy_bytes +
+ pending->stopcopy_bytes + pending->postcopy_bytes;
+
trace_qemu_savevm_query_pending(fastpath, pending->precopy_bytes,
+ pending->stopcopy_bytes,
pending->postcopy_bytes);
}
diff --git a/migration/trace-events b/migration/trace-events
index 5f836a8652..175f09f8ad 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -7,7 +7,7 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u"
qemu_loadvm_state_post_main(int ret) "%d"
qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u"
qemu_savevm_send_packaged(void) ""
-qemu_savevm_query_pending(bool fast, uint64_t precopy, uint64_t postcopy) "fast=%d, precopy=%"PRIu64", postcopy=%"PRIu64
+qemu_savevm_query_pending(bool fast, uint64_t precopy, uint64_t stopcopy, uint64_t postcopy) "fast=%d, precopy=%"PRIu64", stopcopy=%"PRIu64", postcopy=%"PRIu64
loadvm_state_switchover_ack_needed(unsigned int switchover_ack_pending_num) "Switchover ack pending num=%u"
loadvm_state_setup(void) ""
loadvm_state_cleanup(void) ""
--
2.50.1