77 lines
2.5 KiB
Diff
77 lines
2.5 KiB
Diff
From 117f325d4983bb7e40a50e51c2fe056938d5add4 Mon Sep 17 00:00:00 2001
|
|
From: Fabiano Rosas <farosas@suse.de>
|
|
Date: Mon, 18 Sep 2023 14:28:22 -0300
|
|
Subject: [PATCH 08/13] migration: Move return path cleanup to main migration
|
|
thread
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Peter Xu <peterx@redhat.com>
|
|
RH-MergeRequest: 203: migration: Fix race that dest preempt thread close too early
|
|
RH-Jira: RHEL-11219
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
|
RH-Commit: [8/8] 3f085c4ac6c0835d35346bf0cad778c17a248daf (peterx/qemu-kvm)
|
|
|
|
Now that the return path thread is allowed to finish during a paused
|
|
migration, we can move the cleanup of the QEMUFiles to the main
|
|
migration thread.
|
|
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Signed-off-by: Fabiano Rosas <farosas@suse.de>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-ID: <20230918172822.19052-9-farosas@suse.de>
|
|
(cherry picked from commit 36e9aab3c569d4c9ad780473596e18479838d1aa)
|
|
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
---
|
|
migration/migration.c | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/migration/migration.c b/migration/migration.c
|
|
index a0782c64a1..7a4c8beb5d 100644
|
|
--- a/migration/migration.c
|
|
+++ b/migration/migration.c
|
|
@@ -98,6 +98,7 @@ static int migration_maybe_pause(MigrationState *s,
|
|
int *current_active_state,
|
|
int new_state);
|
|
static void migrate_fd_cancel(MigrationState *s);
|
|
+static int await_return_path_close_on_source(MigrationState *s);
|
|
|
|
static bool migration_needs_multiple_sockets(void)
|
|
{
|
|
@@ -1178,6 +1179,12 @@ static void migrate_fd_cleanup(MigrationState *s)
|
|
qemu_fclose(tmp);
|
|
}
|
|
|
|
+ /*
|
|
+ * We already cleaned up to_dst_file, so errors from the return
|
|
+ * path might be due to that, ignore them.
|
|
+ */
|
|
+ await_return_path_close_on_source(s);
|
|
+
|
|
assert(!migration_is_active(s));
|
|
|
|
if (s->state == MIGRATION_STATUS_CANCELLING) {
|
|
@@ -1986,7 +1993,6 @@ out:
|
|
}
|
|
|
|
trace_source_return_path_thread_end();
|
|
- migration_release_dst_files(ms);
|
|
rcu_unregister_thread();
|
|
return NULL;
|
|
}
|
|
@@ -2040,6 +2046,9 @@ static int await_return_path_close_on_source(MigrationState *ms)
|
|
|
|
ret = ms->rp_state.error;
|
|
ms->rp_state.error = false;
|
|
+
|
|
+ migration_release_dst_files(ms);
|
|
+
|
|
trace_migration_return_path_end_after(ret);
|
|
return ret;
|
|
}
|
|
--
|
|
2.39.3
|
|
|