[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/15] COLO: Split qemu_savevm_state_begin out of ch
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [PATCH 14/15] COLO: Split qemu_savevm_state_begin out of checkpoint process |
Date: |
Wed, 22 Feb 2017 11:42:15 +0800 |
It is unnecessary to call qemu_savevm_state_begin() in every checkpoint process.
It mainly sets up devices and does the first device state pass. These data will
not change during the later checkpoint process. So, we split it out of
colo_do_checkpoint_transaction(), in this way, we can reduce these data
transferring in the subsequent checkpoint.
Cc: Juan Quintela <address@hidden>
Sgned-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/colo.c | 52 ++++++++++++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/migration/colo.c b/migration/colo.c
index b17e8e3..ab2d700 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -313,16 +313,6 @@ static int colo_do_checkpoint_transaction(MigrationState
*s,
goto out;
}
- /* Disable block migration */
- s->params.blk = 0;
- s->params.shared = 0;
- qemu_savevm_state_begin(s->to_dst_file, &s->params);
- ret = qemu_file_get_error(s->to_dst_file);
- if (ret < 0) {
- error_report("Save VM state begin error");
- goto out;
- }
-
/* We call this API although this may do nothing on primary side. */
qemu_mutex_lock_iothread();
replication_do_checkpoint_all(&local_err);
@@ -410,6 +400,21 @@ static void colo_compare_notify_checkpoint(Notifier
*notifier, void *data)
colo_checkpoint_notify(data);
}
+static int colo_prepare_before_save(MigrationState *s)
+{
+ int ret;
+
+ /* Disable block migration */
+ s->params.blk = 0;
+ s->params.shared = 0;
+ qemu_savevm_state_begin(s->to_dst_file, &s->params);
+ ret = qemu_file_get_error(s->to_dst_file);
+ if (ret < 0) {
+ error_report("Save VM state begin error");
+ }
+ return ret;
+}
+
static void colo_process_checkpoint(MigrationState *s)
{
QIOChannelBuffer *bioc;
@@ -429,6 +434,11 @@ static void colo_process_checkpoint(MigrationState *s)
packets_compare_notifier.notify = colo_compare_notify_checkpoint;
colo_compare_register_notifier(&packets_compare_notifier);
+ ret = colo_prepare_before_save(s);
+ if (ret < 0) {
+ goto out;
+ }
+
/*
* Wait for Secondary finish loading VM states and enter COLO
* restore.
@@ -570,6 +580,17 @@ static void colo_wait_handle_message(QEMUFile *f, int
*checkpoint_request,
}
}
+static int colo_prepare_before_load(QEMUFile *f)
+{
+ int ret;
+
+ ret = qemu_loadvm_state_begin(f);
+ if (ret < 0) {
+ error_report("Load VM state begin error, ret = %d", ret);
+ }
+ return ret;
+}
+
void *colo_process_incoming_thread(void *opaque)
{
MigrationIncomingState *mis = opaque;
@@ -610,6 +631,11 @@ void *colo_process_incoming_thread(void *opaque)
fb = qemu_fopen_channel_input(QIO_CHANNEL(bioc));
object_unref(OBJECT(bioc));
+ ret = colo_prepare_before_load(mis->from_src_file);
+ if (ret < 0) {
+ goto out;
+ }
+
qemu_mutex_lock_iothread();
bdrv_invalidate_cache_all(&local_err);
if (local_err) {
@@ -621,7 +647,6 @@ void *colo_process_incoming_thread(void *opaque)
if (local_err) {
goto out;
}
-
colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY,
&local_err);
if (local_err) {
@@ -659,11 +684,6 @@ void *colo_process_incoming_thread(void *opaque)
goto out;
}
- ret = qemu_loadvm_state_begin(mis->from_src_file);
- if (ret < 0) {
- error_report("Load vm state begin error, ret=%d", ret);
- goto out;
- }
ret = qemu_loadvm_state_main(mis->from_src_file, mis);
if (ret < 0) {
error_report("Load VM's live state (ram) error");
--
1.8.3.1
- [Qemu-devel] [PATCH 00/15] COLO: integrate colo frame with block replication and net compare, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 09/15] COLO: Flush PVM's cached RAM into SVM's memory, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 08/15] ram/COLO: Record the dirty pages that SVM received, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 04/15] COLO: integrate colo compare with colo frame, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 01/15] net/colo: Add notifier/callback related helpers for filter, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 07/15] COLO: Load PVM's dirty pages into SVM's RAM cache temporarily, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 02/15] colo-compare: implement the process of checkpoint, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 05/15] COLO: Handle shutdown command for VM in COLO state, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 06/15] COLO: Add block replication into colo process, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 14/15] COLO: Split qemu_savevm_state_begin out of checkpoint process,
zhanghailiang <=
- [Qemu-devel] [PATCH 12/15] savevm: split the process of different stages for loadvm/savevm, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 15/15] COLO: flush host dirty ram from cache, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 13/15] COLO: Separate the process of saving/loading ram and device state, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 11/15] savevm: split save/find loadvm_handlers entry into two helper functions, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 03/15] colo-compare: use notifier to notify packets comparing result, zhanghailiang, 2017/02/21
- [Qemu-devel] [PATCH 10/15] qmp event: Add COLO_EXIT event to notify users while exited from COLO, zhanghailiang, 2017/02/21