From patchwork Mon Feb 22 02:40:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8371051 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2C01AC0553 for ; Mon, 22 Feb 2016 02:59:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 715AF20265 for ; Mon, 22 Feb 2016 02:59:47 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 8588720222 for ; Mon, 22 Feb 2016 02:59:46 +0000 (UTC) Received: from localhost ([::1]:46243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgiw-0006g3-16 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 21 Feb 2016 21:59:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgRq-0002FO-72 for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXgRm-0007ZE-Vv for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:06 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:9191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgRl-0007YY-31 for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:02 -0500 Received: from 172.24.1.48 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.48]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DBU14359; Mon, 22 Feb 2016 10:41:19 +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; Mon, 22 Feb 2016 10:41:04 +0800 From: zhanghailiang To: Date: Mon, 22 Feb 2016 10:40:07 +0800 Message-ID: <1456108832-24212-14-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1456108832-24212-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1456108832-24212-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.0A090202.56CA7550.0046, 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: 44038d14133346198704d21bb5596def 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: 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 v15 13/38] COLO: Load VMState into qsb before restore it 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We should not destroy the state of SVM (Secondary VM) until we receive the whole state from the PVM (Primary VM), in case the primary fails in the middle of sending the state, so, here we cache the device state in Secondary before restore it. Besides, we should call qemu_system_reset() before load VM state, which can ensure the data is intact. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Signed-off-by: Gonglei Reviewed-by: Dr. David Alan Gilbert Cc: Dr. David Alan Gilbert --- v13: - Fix the define of colo_get_cmd_value() to use 'Error **errp' instead of return value. v12: - Use the new helper colo_get_cmd_value() instead of colo_ctl_get() --- migration/colo.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index 57a1132..b9f60c7 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -114,6 +114,28 @@ static void colo_get_check_cmd(QEMUFile *f, COLOMessage expect_cmd, } } +static uint64_t colo_get_cmd_value(QEMUFile *f, uint32_t expect_cmd, + Error **errp) +{ + Error *local_err = NULL; + uint64_t value; + int ret; + + colo_get_check_cmd(f, expect_cmd, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return 0; + } + + value = qemu_get_be64(f); + ret = qemu_file_get_error(f); + if (ret < 0) { + error_setg_errno(errp, -ret, "Failed to get value for COLO commnd: %s", + COLOMessage_lookup[expect_cmd]); + } + return value; +} + static int colo_do_checkpoint_transaction(MigrationState *s, QEMUSizedBuffer *buffer) { @@ -297,6 +319,10 @@ static void colo_wait_handle_cmd(QEMUFile *f, int *checkpoint_request, void *colo_process_incoming_thread(void *opaque) { MigrationIncomingState *mis = opaque; + QEMUFile *fb = NULL; + QEMUSizedBuffer *buffer = NULL; /* Cache incoming device state */ + uint64_t total_size; + uint64_t value; Error *local_err = NULL; int ret; @@ -320,6 +346,12 @@ void *colo_process_incoming_thread(void *opaque) goto out; } + buffer = qsb_create(NULL, COLO_BUFFER_BASE_SIZE); + if (buffer == NULL) { + error_report("Failed to allocate colo buffer!"); + goto out; + } + colo_put_cmd(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, &local_err); if (local_err) { @@ -347,7 +379,21 @@ void *colo_process_incoming_thread(void *opaque) goto out; } - /* TODO: read migration data into colo buffer */ + /* read the VM state total size first */ + value = colo_get_cmd_value(mis->from_src_file, + COLO_MESSAGE_VMSTATE_SIZE, &local_err); + if (local_err) { + goto out; + } + + /* read vm device state into colo buffer */ + total_size = qsb_fill_buffer(buffer, mis->from_src_file, value); + if (total_size != value) { + error_report("Got %lu VMState data, less than expected %lu", + total_size, value); + ret = -EINVAL; + goto out; + } colo_put_cmd(mis->to_src_file, COLO_MESSAGE_VMSTATE_RECEIVED, &local_err); @@ -355,13 +401,32 @@ void *colo_process_incoming_thread(void *opaque) goto out; } - /* TODO: load vm state */ + /* open colo buffer for read */ + fb = qemu_bufopen("r", buffer); + if (!fb) { + error_report("Can't open colo buffer for read"); + goto out; + } + + qemu_mutex_lock_iothread(); + qemu_system_reset(VMRESET_SILENT); + if (qemu_loadvm_state(fb) < 0) { + error_report("COLO: loadvm failed"); + qemu_mutex_unlock_iothread(); + goto out; + } + qemu_mutex_unlock_iothread(); + + /* TODO: flush vm state */ colo_put_cmd(mis->to_src_file, COLO_MESSAGE_VMSTATE_LOADED, &local_err); if (local_err) { goto out; } + + qemu_fclose(fb); + fb = NULL; } out: @@ -370,6 +435,11 @@ out: error_report_err(local_err); } + if (fb) { + qemu_fclose(fb); + } + qsb_free(buffer); + qemu_mutex_lock_iothread(); colo_release_ram_cache(); qemu_mutex_unlock_iothread();