[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 10/23] migration: wakeup dst ram-load-thread for
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v7 10/23] migration: wakeup dst ram-load-thread for recover |
Date: |
Fri, 9 Mar 2018 17:15:22 +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 322d5ad79b..bbeb156a39 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -429,8 +429,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
- [Qemu-devel] [PATCH v7 00/23] Migration: postcopy failure recovery, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 01/23] migration: let incoming side use thread context, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 03/23] migration: implement "postcopy-pause" src logic, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 04/23] migration: allow dst vm pause on postcopy, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 02/23] migration: new postcopy-pause state, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 05/23] migration: allow src return path to pause, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 06/23] migration: allow fault thread to pause, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 07/23] qmp: hmp: add migrate "resume" option, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 08/23] migration: rebuild channel on source, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 10/23] migration: wakeup dst ram-load-thread for recover,
Peter Xu <=
- [Qemu-devel] [PATCH v7 09/23] migration: new state "postcopy-recover", Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 11/23] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 14/23] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 12/23] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 13/23] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 15/23] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 16/23] migration: synchronize dirty bitmap for resume, Peter Xu, 2018/03/09
- [Qemu-devel] [PATCH v7 17/23] migration: setup ramstate for resume, Peter Xu, 2018/03/09