[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 10/24] migration: wakeup dst ram-load-thread for
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v8 10/24] migration: wakeup dst ram-load-thread for recover |
Date: |
Wed, 2 May 2018 18:47:26 +0800 |
On the destination side, we cannot wake up all the threads when we got
reconnected. The first thing to do is to wake up the main load thread,
so that we can continue to receive valid messages from source again and
reply when needed.
At this point, we switch the destination VM state from postcopy-paused
back to postcopy-recover.
Now we are finally ready to do the resume logic.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 304e8bf2af..32f6d686b7 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -440,8 +440,34 @@ static void migration_incoming_process(void)
void migration_fd_process_incoming(QEMUFile *f)
{
- migration_incoming_setup(f);
- migration_incoming_process();
+ MigrationIncomingState *mis = migration_incoming_get_current();
+
+ if (mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
+ /* Resumed from a paused postcopy migration */
+
+ mis->from_src_file = f;
+ /* Postcopy has standalone thread to do vm load */
+ qemu_file_set_blocking(f, true);
+
+ /* Re-configure the return path */
+ mis->to_src_file = qemu_file_get_return_path(f);
+
+ migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_PAUSED,
+ MIGRATION_STATUS_POSTCOPY_RECOVER);
+
+ /*
+ * Here, we only wake up the main loading thread (while the
+ * fault thread will still be waiting), so that we can receive
+ * commands from source now, and answer it if needed. The
+ * fault thread will be woken up afterwards until we are sure
+ * that source is ready to reply to page requests.
+ */
+ qemu_sem_post(&mis->postcopy_pause_sem_dst);
+ } else {
+ /* New incoming migration */
+ migration_incoming_setup(f);
+ migration_incoming_process();
+ }
}
void migration_ioc_process_incoming(QIOChannel *ioc)
--
2.14.3
- Re: [Qemu-devel] [PATCH v8 02/24] migration: new postcopy-pause state, (continued)
[Qemu-devel] [PATCH v8 03/24] migration: implement "postcopy-pause" src logic, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 04/24] migration: allow dst vm pause on postcopy, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 05/24] migration: allow src return path to pause, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 06/24] migration: allow fault thread to pause, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 08/24] migration: rebuild channel on source, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 07/24] qmp: hmp: add migrate "resume" option, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 09/24] migration: new state "postcopy-recover", Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 10/24] migration: wakeup dst ram-load-thread for recover,
Peter Xu <=
[Qemu-devel] [PATCH v8 11/24] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 12/24] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 13/24] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 14/24] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 15/24] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 16/24] migration: synchronize dirty bitmap for resume, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 17/24] migration: setup ramstate for resume, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 18/24] migration: final handshake for the resume, Peter Xu, 2018/05/02
[Qemu-devel] [PATCH v8 19/24] migration: init dst in migration_object_init too, Peter Xu, 2018/05/02