[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 03/32] migration: provide postcopy_fault_thread_n
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v4 03/32] migration: provide postcopy_fault_thread_notify() |
Date: |
Wed, 8 Nov 2017 14:01:01 +0800 |
A general helper to notify the fault thread.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/postcopy-ram.c | 35 ++++++++++++++++++++---------------
migration/postcopy-ram.h | 2 ++
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 9ad4f20f82..032abfbf1a 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -377,25 +377,15 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState
*mis)
trace_postcopy_ram_incoming_cleanup_entry();
if (mis->have_fault_thread) {
- uint64_t tmp64;
-
if (qemu_ram_foreach_block(cleanup_range, mis)) {
return -1;
}
- /*
- * Tell the fault_thread to exit, it's an eventfd that should
- * currently be at 0, we're going to increment it to 1
- */
- tmp64 = 1;
+ /* Let the fault thread quit */
atomic_set(&mis->fault_thread_quit, 1);
- if (write(mis->userfault_event_fd, &tmp64, 8) == 8) {
- trace_postcopy_ram_incoming_cleanup_join();
- qemu_thread_join(&mis->fault_thread);
- } else {
- /* Not much we can do here, but may as well report it */
- error_report("%s: incrementing userfault_event_fd: %s", __func__,
- strerror(errno));
- }
+ 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);
close(mis->userfault_event_fd);
@@ -824,6 +814,21 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis)
/* ------------------------------------------------------------------------- */
+void postcopy_fault_thread_notify(MigrationIncomingState *mis)
+{
+ uint64_t tmp64 = 1;
+
+ /*
+ * Wakeup the fault_thread. It's an eventfd that should currently
+ * be at 0, we're going to increment it to 1
+ */
+ if (write(mis->userfault_event_fd, &tmp64, 8) != 8) {
+ /* Not much we can do here, but may as well report it */
+ error_report("%s: incrementing failed: %s", __func__,
+ strerror(errno));
+ }
+}
+
/**
* postcopy_discard_send_init: Called at the start of each RAMBlock before
* asking to discard individual ranges.
diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h
index 77ea0fd264..14f6cadcbd 100644
--- a/migration/postcopy-ram.h
+++ b/migration/postcopy-ram.h
@@ -114,4 +114,6 @@ PostcopyState postcopy_state_get(void);
/* Set the state and return the old state */
PostcopyState postcopy_state_set(PostcopyState new_state);
+void postcopy_fault_thread_notify(MigrationIncomingState *mis);
+
#endif
--
2.13.6
- [Qemu-devel] [PATCH v4 00/32] Migration: postcopy failure recovery, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 02/32] migration: reuse mis->userfault_quit_fd, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 03/32] migration: provide postcopy_fault_thread_notify(),
Peter Xu <=
- [Qemu-devel] [PATCH v4 01/32] migration: better error handling with QEMUFile, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 04/32] migration: new postcopy-pause state, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 06/32] migration: allow dst vm pause on postcopy, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 08/32] migration: allow send_rq to fail, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 09/32] migration: allow fault thread to pause, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 10/32] qmp: hmp: add migrate "resume" option, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 11/32] migration: pass MigrationState to migrate_init(), Peter Xu, 2017/11/08