From patchwork Sat Apr 22 08:35:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9694295 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 0C030601E9 for ; Sat, 22 Apr 2017 08:43:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 035CF2860E for ; Sat, 22 Apr 2017 08:43:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC1B928621; Sat, 22 Apr 2017 08:43:05 +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 7E5772860E for ; Sat, 22 Apr 2017 08:43:05 +0000 (UTC) Received: from localhost ([::1]:34754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1qdE-000663-Kb for patchwork-qemu-devel@patchwork.kernel.org; Sat, 22 Apr 2017 04:43:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d1qXF-00013f-Nl for qemu-devel@nongnu.org; Sat, 22 Apr 2017 04:36:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d1qXE-0003uo-Ha for qemu-devel@nongnu.org; Sat, 22 Apr 2017 04:36:53 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:3513 helo=dggrg01-dlp.huawei.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1d1qXD-0003sx-VY for qemu-devel@nongnu.org; Sat, 22 Apr 2017 04:36:52 -0400 Received: from 172.30.72.53 (EHLO DGGEML401-HUB.china.huawei.com) ([172.30.72.53]) by dggrg01-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id ANE70250; Sat, 22 Apr 2017 16:36:41 +0800 (CST) 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; Sat, 22 Apr 2017 16:36:35 +0800 From: zhanghailiang To: , Date: Sat, 22 Apr 2017 16:35:24 +0800 Message-ID: <1492850128-17472-15-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1492850128-17472-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1492850128-17472-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.0A020202.58FB161A.005A, 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: d5b04a541e0b1f79d031b6261fbfe648 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.187 Subject: [Qemu-devel] [PATCH RESEND v2 14/18] 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: Li Zhijian , zhanghailiang , zhangchen.fnst@cn.fujitsu.com, quintela@redhat.com 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. Cc: Juan Quintela Sgned-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- migration/colo.c | 51 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index 8e27a4c..66bb5b2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -362,16 +362,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); @@ -459,6 +449,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; @@ -478,6 +483,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. @@ -628,6 +638,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; @@ -662,6 +683,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(); replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); if (local_err) { @@ -709,11 +735,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");