From nobody Thu Nov 6 20:31:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487735642902936.1189920706171; Tue, 21 Feb 2017 19:54:02 -0800 (PST) Received: from localhost ([::1]:49688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgO09-00061M-6j for importer@patchew.org; Tue, 21 Feb 2017 22:54:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgNpR-0004j6-0S for qemu-devel@nongnu.org; Tue, 21 Feb 2017 22:42:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgNpM-0002vj-Op for qemu-devel@nongnu.org; Tue, 21 Feb 2017 22:42:57 -0500 Received: from [45.249.212.188] (port=2935 helo=dggrg02-dlp.huawei.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1cgNpM-0002rv-4z for qemu-devel@nongnu.org; Tue, 21 Feb 2017 22:42:52 -0500 Received: from 172.30.72.55 (EHLO DGGEMM402-HUB.china.huawei.com) ([172.30.72.55]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AIU51190; Wed, 22 Feb 2017 11:42:46 +0800 (CST) Received: from DGGEML401-HUB.china.huawei.com (10.3.17.32) by DGGEMM402-HUB.china.huawei.com (10.3.20.210) with Microsoft SMTP Server (TLS) id 14.3.301.0; Wed, 22 Feb 2017 11:42:44 +0800 Received: from localhost (10.177.24.212) by DGGEML401-HUB.china.huawei.com (10.3.17.32) with Microsoft SMTP Server id 14.3.301.0; Wed, 22 Feb 2017 11:42:35 +0800 From: zhanghailiang To: , , Date: Wed, 22 Feb 2017 11:42:15 +0800 Message-ID: <1487734936-43472-15-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1487734936-43472-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1487734936-43472-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.58AD08B7.0148, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: a8fe2aad47ce1dfac14fe19574d91e14 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.188 Subject: [Qemu-devel] [PATCH 14/15] COLO: Split qemu_savevm_state_begin out of checkpoint process X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xiecl.fnst@cn.fujitsu.com, zhanghailiang , lizhijian@cn.fujitsu.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is unnecessary to call qemu_savevm_state_begin() in every checkpoint pro= cess. 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 Sgned-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- 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(MigrationSta= te *s, goto out; } =20 - /* Disable block migration */ - s->params.blk =3D 0; - s->params.shared =3D 0; - qemu_savevm_state_begin(s->to_dst_file, &s->params); - ret =3D 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 *n= otifier, void *data) colo_checkpoint_notify(data); } =20 +static int colo_prepare_before_save(MigrationState *s) +{ + int ret; + + /* Disable block migration */ + s->params.blk =3D 0; + s->params.shared =3D 0; + qemu_savevm_state_begin(s->to_dst_file, &s->params); + ret =3D 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 =3D colo_compare_notify_checkpoint; colo_compare_register_notifier(&packets_compare_notifier); =20 + ret =3D 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, } } =20 +static int colo_prepare_before_load(QEMUFile *f) +{ + int ret; + + ret =3D qemu_loadvm_state_begin(f); + if (ret < 0) { + error_report("Load VM state begin error, ret =3D %d", ret); + } + return ret; +} + void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis =3D opaque; @@ -610,6 +631,11 @@ void *colo_process_incoming_thread(void *opaque) fb =3D qemu_fopen_channel_input(QIO_CHANNEL(bioc)); object_unref(OBJECT(bioc)); =20 + ret =3D 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; } =20 - ret =3D qemu_loadvm_state_begin(mis->from_src_file); - if (ret < 0) { - error_report("Load vm state begin error, ret=3D%d", ret); - goto out; - } ret =3D qemu_loadvm_state_main(mis->from_src_file, mis); if (ret < 0) { error_report("Load VM's live state (ram) error"); --=20 1.8.3.1