[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/7] migration: Stop postcopy fault thread before not
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 3/7] migration: Stop postcopy fault thread before notifying |
Date: |
Thu, 11 Oct 2018 20:25:09 +0100 |
From: Ilya Maximets <address@hidden>
POSTCOPY_NOTIFY_INBOUND_END handlers will remove userfault fds
from the postcopy_remote_fds array which could be still in
use by the fault thread. Let's stop the thread before
notification to avoid possible accessing wrong memory.
Fixes: 46343570c06e ("vhost+postcopy: Wire up POSTCOPY_END notify")
Cc: address@hidden
Signed-off-by: Ilya Maximets <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Maxime Coquelin <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/postcopy-ram.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 853d8b32ca..e5c02a32c5 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -533,6 +533,12 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState
*mis)
if (mis->have_fault_thread) {
Error *local_err = NULL;
+ /* Let the fault thread quit */
+ atomic_set(&mis->fault_thread_quit, 1);
+ postcopy_fault_thread_notify(mis);
+ trace_postcopy_ram_incoming_cleanup_join();
+ qemu_thread_join(&mis->fault_thread);
+
if (postcopy_notify(POSTCOPY_NOTIFY_INBOUND_END, &local_err)) {
error_report_err(local_err);
return -1;
@@ -541,11 +547,6 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState
*mis)
if (qemu_ram_foreach_migratable_block(cleanup_range, mis)) {
return -1;
}
- /* Let the fault thread quit */
- atomic_set(&mis->fault_thread_quit, 1);
- postcopy_fault_thread_notify(mis);
- trace_postcopy_ram_incoming_cleanup_join();
- qemu_thread_join(&mis->fault_thread);
trace_postcopy_ram_incoming_cleanup_closeuf();
close(mis->userfault_fd);
--
2.19.0
- [Qemu-devel] [PULL 0/7] migration queue, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 3/7] migration: Stop postcopy fault thread before notifying,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 4/7] vhost-user: Fix userfaultfd leak, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 5/7] vhost-user: Don't ask for reply on postcopy mem table set, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 6/7] qmp, hmp: make subsystem/system-vendor identities optional, Dr. David Alan Gilbert (git), 2018/10/11
- [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Dr. David Alan Gilbert (git), 2018/10/11
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Emilio G. Cota, 2018/10/17
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Thomas Huth, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Thomas Huth, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Emilio G. Cota, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Wei Huang, 2018/10/18
- Re: [Qemu-devel] [PULL 2/7] tests/migration: Enable the migration test on s390x, too, Thomas Huth, 2018/10/19