From patchwork Tue Dec 15 08:22:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 556864 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 16C74140311 for ; Tue, 15 Dec 2015 19:46:12 +1100 (AEDT) Received: from localhost ([::1]:35778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8lFJ-0006Ha-VF for incoming@patchwork.ozlabs.org; Tue, 15 Dec 2015 03:46:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8l25-0007yy-1K for qemu-devel@nongnu.org; Tue, 15 Dec 2015 03:32:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8l21-0002ca-Oo for qemu-devel@nongnu.org; Tue, 15 Dec 2015 03:32:28 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:59600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8l21-0002bU-1I for qemu-devel@nongnu.org; Tue, 15 Dec 2015 03:32:25 -0500 Received: from 172.24.1.50 (EHLO szxeml430-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CYB21108; Tue, 15 Dec 2015 16:24:42 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.235.1; Tue, 15 Dec 2015 16:24:30 +0800 From: zhanghailiang To: Date: Tue, 15 Dec 2015 16:22:53 +0800 Message-ID: <1450167779-9960-33-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1450167779-9960-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1450167779-9960-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.0A020205.566FCE4A.0057, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: df29c21c3f7a7a81f05c7633aec05030 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH COLO-Frame v12 32/38] COLO: Split qemu_savevm_state_begin out of checkpoint process X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org It is unnecessary to call qemu_savevm_state_begin() in every checkponit 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 later checkpoint. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- migration/colo.c | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index d253d64..4571359 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -276,15 +276,6 @@ static int colo_do_checkpoint_transaction(MigrationState *s, if (ret < 0) { 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\n"); - goto out; - } qemu_mutex_lock_iothread(); /* Note: device state is saved into buffer */ @@ -348,6 +339,21 @@ out: return ret; } +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\n"); + return ret; + } + return 0; +} + static void colo_process_checkpoint(MigrationState *s) { QEMUSizedBuffer *buffer = NULL; @@ -363,6 +369,11 @@ static void colo_process_checkpoint(MigrationState *s) goto out; } + ret = colo_prepare_before_save(s); + if (ret < 0) { + goto out; + } + /* * Wait for Secondary finish loading vm states and enter COLO * restore. @@ -484,6 +495,18 @@ static int colo_wait_handle_cmd(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; + } + return 0; +} + void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis = opaque; @@ -522,6 +545,11 @@ void *colo_process_incoming_thread(void *opaque) goto out; } + ret = colo_prepare_before_load(mis->from_src_file); + if (ret < 0) { + goto out; + } + ret = colo_put_cmd(mis->to_src_file, COLO_COMMAND_CHECKPOINT_READY); if (ret < 0) { goto out; @@ -556,11 +584,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_load_ram_state(mis->from_src_file); if (ret < 0) { error_report("load ram state error");