From patchwork Wed Aug 3 12:26:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9261205 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 95C9260865 for ; Wed, 3 Aug 2016 13:00:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8387F28554 for ; Wed, 3 Aug 2016 13:00:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75C8628581; Wed, 3 Aug 2016 13:00:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 43AA328554 for ; Wed, 3 Aug 2016 13:00:29 +0000 (UTC) Received: from localhost ([::1]:34338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvmd-0002eH-Pg for patchwork-qemu-devel@patchwork.kernel.org; Wed, 03 Aug 2016 09:00:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvGT-0000rl-AH for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUvGR-0006g8-Qk for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:13 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:52291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUvGR-0006fU-5L for qemu-devel@nongnu.org; Wed, 03 Aug 2016 08:27:11 -0400 Received: from 172.24.1.47 (EHLO szxeml426-hub.china.huawei.com) ([172.24.1.47]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DLE25572; Wed, 03 Aug 2016 20:26:55 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml426-hub.china.huawei.com (10.82.67.181) with Microsoft SMTP Server id 14.3.235.1; Wed, 3 Aug 2016 20:26:45 +0800 From: zhanghailiang To: Date: Wed, 3 Aug 2016 20:26:07 +0800 Message-ID: <1470227172-13704-30-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1470227172-13704-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1470227172-13704-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.0A0B0204.57A1E310.0172, 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: ffd62b5ef2b7f7f42f7ba3301c62d44f X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Subject: [Qemu-devel] [PATCH COLO-Frame v18 29/34] 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, lizhijian@cn.fujitsu.com, quintela@redhat.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, zhanghailiang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. 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 48cdf06..f618ca6 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -289,16 +289,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. @@ -373,6 +363,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) { QIOChannelBuffer *bioc; @@ -389,6 +394,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. @@ -510,6 +520,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; @@ -549,6 +570,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; + } + colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, &local_err); if (local_err) { @@ -581,11 +607,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");