[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/7] The rest of write tracking migration code.
From: |
Andrey Gruzdev |
Subject: |
[PATCH 6/7] The rest of write tracking migration code. |
Date: |
Wed, 18 Nov 2020 14:22:32 +0300 |
Signed-off-by: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
---
migration/migration.c | 72 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 70 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 381da4a4d3..92bcb9105d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3212,6 +3212,48 @@ fail:
MIGRATION_STATUS_FAILED);
}
+/**
+ * wt_migration_completion: Used by wt_migration_thread when after all the RAM
has been saved.
+ * The caller 'breaks' the loop when this returns.
+ *
+ * @s: Current migration state
+ */
+static void wt_migration_completion(MigrationState *s)
+{
+ int current_active_state = s->state;
+
+ /* Stop tracking RAM writes - un-protect memory, un-register UFFD memory
ranges,
+ * flush kernel wait queues and wake up threads waiting for write fault to
be
+ * resolved. All of this is essentially done by closing UFFD file
descriptor */
+ ram_write_tracking_stop();
+
+ if (s->state == MIGRATION_STATUS_ACTIVE) {
+ /*
+ * By this moment we have RAM content saved into the migration stream.
+ * The next step is to flush the non-RAM content (device state)
+ * right after the ram content. The device state has been stored into
+ * the temporary buffer before RAM saving started.
+ */
+ qemu_put_buffer(s->to_dst_file, s->bioc->data, s->bioc->usage);
+ qemu_fflush(s->to_dst_file);
+ } else if (s->state == MIGRATION_STATUS_CANCELLING) {
+ goto fail;
+ }
+
+ if (qemu_file_get_error(s->to_dst_file)) {
+ trace_migration_completion_file_err();
+ goto fail;
+ }
+
+ migrate_set_state(&s->state, current_active_state,
+ MIGRATION_STATUS_COMPLETED);
+ return;
+
+fail:
+ migrate_set_state(&s->state, current_active_state,
+ MIGRATION_STATUS_FAILED);
+}
+
bool migrate_colo_enabled(void)
{
MigrationState *s = migrate_get_current();
@@ -3554,7 +3596,26 @@ static void migration_iteration_finish(MigrationState *s)
static void wt_migration_iteration_finish(MigrationState *s)
{
- /* TODO: implement */
+ qemu_mutex_lock_iothread();
+ switch (s->state) {
+ case MIGRATION_STATUS_COMPLETED:
+ migration_calculate_complete(s);
+ break;
+
+ case MIGRATION_STATUS_ACTIVE:
+ case MIGRATION_STATUS_FAILED:
+ case MIGRATION_STATUS_CANCELLED:
+ case MIGRATION_STATUS_CANCELLING:
+ break;
+
+ default:
+ /* Should not reach here, but if so, forgive the VM. */
+ error_report("%s: Unknown ending state %d", __func__, s->state);
+ break;
+ }
+
+ migrate_fd_cleanup_schedule(s);
+ qemu_mutex_unlock_iothread();
}
/*
@@ -3563,7 +3624,14 @@ static void wt_migration_iteration_finish(MigrationState
*s)
*/
static MigIterateState wt_migration_iteration_run(MigrationState *s)
{
- /* TODO: implement */
+ int res;
+
+ res = qemu_savevm_state_iterate(s->to_dst_file, false);
+ if (res) {
+ wt_migration_completion(s);
+ return MIG_ITERATE_BREAK;
+ }
+
return MIG_ITERATE_RESUME;
}
--
2.25.1
- [PATCH 0/7] UFFD write-tracking migration/snapshots, Andrey Gruzdev, 2020/11/18
- [PATCH 7/7] Introduced simple linear scan rate limiting mechanism for write tracking migration., Andrey Gruzdev, 2020/11/18
- [PATCH 6/7] The rest of write tracking migration code.,
Andrey Gruzdev <=
- [PATCH 2/7] Introduced UFFD-WP low-level interface helpers. Implemented support for the whole RAM block memory protection/un-protection. Higher level ram_write_tracking_start() and ram_write_tracking_stop() to start/stop tracking memory writes on the whole VM memory., Andrey Gruzdev, 2020/11/18
- [PATCH 4/7] Implementation of write-tracking migration thread., Andrey Gruzdev, 2020/11/18
- [PATCH 3/7] Support UFFD write fault processing in ram_save_iterate()., Andrey Gruzdev, 2020/11/18
- [PATCH 1/7] Introduce 'track-writes-ram' migration capability., Andrey Gruzdev, 2020/11/18
- [PATCH 5/7] Implementation of vm_start() BH., Andrey Gruzdev, 2020/11/18
- Re: [PATCH 0/7] UFFD write-tracking migration/snapshots, no-reply, 2020/11/18