From patchwork Sat Feb 6 09:28:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 579784 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 D3C99140BD3 for ; Sat, 6 Feb 2016 20:40:00 +1100 (AEDT) Received: from localhost ([::1]:52643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzLS-0004sd-Qq for incoming@patchwork.ozlabs.org; Sat, 06 Feb 2016 04:39:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBm-0002pG-KZ for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:29:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRzBk-0001SH-Is for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:29:58 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:22152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBj-0001LN-PI for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:29:56 -0500 Received: from 172.24.1.47 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.47]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BVU12158; Sat, 06 Feb 2016 17:29:48 +0800 (CST) Received: from localhost (10.177.24.212) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Sat, 6 Feb 2016 17:29:39 +0800 From: zhanghailiang To: Date: Sat, 6 Feb 2016 17:28:42 +0800 Message-ID: <1454750932-7556-31-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1454750932-7556-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.0A020206.56B5BD0C.008C, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 7b8f0619425b6723fad76cfc8d02b697 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, armbru@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, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH COLO-Frame v14 30/40] 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 --- v13: - Fix some minor issues found by Dave - Add Reviewed-by tag --- migration/colo.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index 9ac46ec..98a12fc 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -293,16 +293,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; - } - qemu_mutex_lock_iothread(); /* * Only save VM's live state, which not including device state. @@ -375,6 +365,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"); + } + return ret; +} + static void colo_process_checkpoint(MigrationState *s) { QEMUSizedBuffer *buffer = NULL; @@ -390,6 +395,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. @@ -515,6 +525,17 @@ static void 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; +} + void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis = opaque; @@ -555,6 +576,11 @@ void *colo_process_incoming_thread(void *opaque) goto out; } + ret = colo_prepare_before_load(mis->from_src_file); + if (ret < 0) { + goto out; + } + colo_put_cmd(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, &local_err); if (local_err) { @@ -587,11 +613,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");