[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 14/24] migration: new message MIG_RP_MSG_RESUME_A
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v8 14/24] migration: new message MIG_RP_MSG_RESUME_ACK |
Date: |
Wed, 2 May 2018 18:47:30 +0800 |
Creating new message to reply for MIG_CMD_POSTCOPY_RESUME. One uint32_t
is used as payload to let the source know whether destination is ready
to continue the migration.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.h | 3 +++
migration/migration.c | 37 +++++++++++++++++++++++++++++++++++++
migration/savevm.c | 3 ++-
migration/trace-events | 1 +
4 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/migration/migration.h b/migration/migration.h
index b5f89da402..e8f0afb8eb 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -24,6 +24,8 @@
struct PostcopyBlocktimeContext;
+#define MIGRATION_RESUME_ACK_VALUE (1)
+
/* State for the incoming migration */
struct MigrationIncomingState {
QEMUFile *from_src_file;
@@ -261,6 +263,7 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis,
const char* rbname,
ram_addr_t start, size_t len);
void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis,
char *block_name);
+void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
void dirty_bitmap_mig_before_vm_start(void);
void init_dirty_bitmap_incoming_migration(void);
diff --git a/migration/migration.c b/migration/migration.c
index 4276d18130..ac1780e8f0 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -96,6 +96,7 @@ enum mig_rp_message_type {
MIG_RP_MSG_REQ_PAGES_ID, /* data (start: be64, len: be32, id: string) */
MIG_RP_MSG_REQ_PAGES, /* data (start: be64, len: be32) */
MIG_RP_MSG_RECV_BITMAP, /* send recved_bitmap back to source */
+ MIG_RP_MSG_RESUME_ACK, /* tell source that we are ready to resume */
MIG_RP_MSG_MAX
};
@@ -559,6 +560,14 @@ void migrate_send_rp_recv_bitmap(MigrationIncomingState
*mis,
trace_migrate_send_rp_recv_bitmap(block_name, res);
}
+void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)
+{
+ uint32_t buf;
+
+ buf = cpu_to_be32(value);
+ migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);
+}
+
MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
{
MigrationCapabilityStatusList *head = NULL;
@@ -1838,6 +1847,7 @@ static struct rp_cmd_args {
[MIG_RP_MSG_REQ_PAGES] = { .len = 12, .name = "REQ_PAGES" },
[MIG_RP_MSG_REQ_PAGES_ID] = { .len = -1, .name = "REQ_PAGES_ID" },
[MIG_RP_MSG_RECV_BITMAP] = { .len = -1, .name = "RECV_BITMAP" },
+ [MIG_RP_MSG_RESUME_ACK] = { .len = 4, .name = "RESUME_ACK" },
[MIG_RP_MSG_MAX] = { .len = -1, .name = "MAX" },
};
@@ -1895,6 +1905,25 @@ static int migrate_handle_rp_recv_bitmap(MigrationState
*s, char *block_name)
return ram_dirty_bitmap_reload(s, block);
}
+static int migrate_handle_rp_resume_ack(MigrationState *s, uint32_t value)
+{
+ trace_source_return_path_thread_resume_ack(value);
+
+ if (value != MIGRATION_RESUME_ACK_VALUE) {
+ error_report("%s: illegal resume_ack value %"PRIu32,
+ __func__, value);
+ return -1;
+ }
+
+ /* Now both sides are active. */
+ migrate_set_state(&s->state, MIGRATION_STATUS_POSTCOPY_RECOVER,
+ MIGRATION_STATUS_POSTCOPY_ACTIVE);
+
+ /* TODO: notify send thread that time to continue send pages */
+
+ return 0;
+}
+
/*
* Handles messages sent on the return path towards the source VM
*
@@ -2014,6 +2043,14 @@ retry:
}
break;
+ case MIG_RP_MSG_RESUME_ACK:
+ tmp32 = ldl_be_p(buf);
+ if (migrate_handle_rp_resume_ack(ms, tmp32)) {
+ mark_source_rp_bad(ms);
+ goto out;
+ }
+ break;
+
default:
break;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index a7e793eef7..6a2d77cbf3 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1795,7 +1795,8 @@ static int
loadvm_postcopy_handle_resume(MigrationIncomingState *mis)
trace_loadvm_postcopy_handle_resume();
- /* TODO: Tell source that "we are ready" */
+ /* Tell source that "we are ready" */
+ migrate_send_rp_resume_ack(mis, MIGRATION_RESUME_ACK_VALUE);
return 0;
}
diff --git a/migration/trace-events b/migration/trace-events
index 29cc10f299..40a7217829 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -120,6 +120,7 @@ source_return_path_thread_entry(void) ""
source_return_path_thread_loop_top(void) ""
source_return_path_thread_pong(uint32_t val) "0x%x"
source_return_path_thread_shut(uint32_t val) "0x%x"
+source_return_path_thread_resume_ack(uint32_t v) "%"PRIu32
migrate_global_state_post_load(const char *state) "loaded state: %s"
migrate_global_state_pre_save(const char *state) "saved state: %s"
migration_thread_low_pending(uint64_t pending) "%" PRIu64
--
2.14.3
- [Qemu-devel] [PATCH v8 04/24] migration: allow dst vm pause on postcopy, (continued)
- [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, 2018/05/02
- [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 <=
- [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
- [Qemu-devel] [PATCH v8 20/24] qmp/migration: new command migrate-recover, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 21/24] hmp/migration: add migrate_recover command, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 22/24] migration: introduce lock for to_dst_file, Peter Xu, 2018/05/02