[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 18/33] migration: wakeup dst ram-load-thread for re
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v2 18/33] migration: wakeup dst ram-load-thread for recover |
Date: |
Wed, 30 Aug 2017 16:32:15 +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 | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 30dd566..1370c70 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -389,10 +389,37 @@ static void process_incoming_migration_co(void *opaque)
void migration_fd_process_incoming(QEMUFile *f)
{
- Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f);
+ MigrationIncomingState *mis = migration_incoming_get_current();
+ Coroutine *co;
+
+ mis->from_src_file = f;
+
+ if (mis->state == MIGRATION_STATUS_POSTCOPY_PAUSED) {
+ /* Resumed from a paused postcopy migration */
+
+ /* 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);
- qemu_file_set_blocking(f, false);
- qemu_coroutine_enter(co);
+ 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 */
+ qemu_file_set_blocking(f, false);
+ co = qemu_coroutine_create(process_incoming_migration_co, f);
+ qemu_coroutine_enter(co);
+ }
}
/*
--
2.7.4
- [Qemu-devel] [RFC v2 09/33] migration: implement "postcopy-pause" src logic, (continued)
- [Qemu-devel] [RFC v2 09/33] migration: implement "postcopy-pause" src logic, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 08/33] migration: new postcopy-pause state, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 10/33] migration: allow dst vm pause on postcopy, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 11/33] migration: allow src return path to pause, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 12/33] migration: allow send_rq to fail, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 13/33] migration: allow fault thread to pause, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 14/33] qmp: hmp: add migrate "resume" option, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 15/33] migration: pass MigrationState to migrate_init(), Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 16/33] migration: rebuild channel on source, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 17/33] migration: new state "postcopy-recover", Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 18/33] migration: wakeup dst ram-load-thread for recover,
Peter Xu <=
- [Qemu-devel] [RFC v2 19/33] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 20/33] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 21/33] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 22/33] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 23/33] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 24/33] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 25/33] migration: setup ramstate for resume, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 26/33] migration: final handshake for the resume, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 27/33] migration: free SocketAddress where allocated, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 28/33] migration: return incoming task tag for sockets, Peter Xu, 2017/08/30