[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 14/32] migration: wakeup dst ram-load-thread for
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v4 14/32] migration: wakeup dst ram-load-thread for recover |
Date: |
Wed, 8 Nov 2017 14:01:12 +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 0ba0ce1baf..32c036fa82 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -423,8 +423,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.13.6
- [Qemu-devel] [PATCH v4 23/32] migration: free SocketAddress where allocated, (continued)
- [Qemu-devel] [PATCH v4 23/32] migration: free SocketAddress where allocated, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 22/32] migration: final handshake for the resume, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 26/32] migration: return incoming task tag for fd, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 27/32] migration: store listen task tag, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 29/32] migration: init dst in migration_object_init too, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 30/32] migration: delay the postcopy-active state switch, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 32/32] migration, hmp: new command "migrate_pause", Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 31/32] migration, qmp: new command "migrate-pause", Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 24/32] migration: return incoming task tag for sockets, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 25/32] migration: return incoming task tag for exec, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 14/32] migration: wakeup dst ram-load-thread for recover,
Peter Xu <=
- [Qemu-devel] [PATCH v4 05/32] migration: implement "postcopy-pause" src logic, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 07/32] migration: allow src return path to pause, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 12/32] migration: rebuild channel on source, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 13/32] migration: new state "postcopy-recover", Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 16/32] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 28/32] migration: allow migrate_incoming for paused VM, Peter Xu, 2017/11/08