From patchwork Fri Apr 8 06:26:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8781271 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E409A9F659 for ; Fri, 8 Apr 2016 06:48:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B4C92024D for ; Fri, 8 Apr 2016 06:48:08 +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 0DE4820222 for ; Fri, 8 Apr 2016 06:48:07 +0000 (UTC) Received: from localhost ([::1]:54370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoQD8-0006C2-4u for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 02:48:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPvS-0004Ei-OK for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:29:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoPvP-0007MK-Fx for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:29:50 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:31489) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPvO-0007Lz-ES for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:29:47 -0400 Received: from 172.24.1.60 (EHLO szxeml426-hub.china.huawei.com) ([172.24.1.60]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DII24480; Fri, 08 Apr 2016 14:29:29 +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; Fri, 8 Apr 2016 14:29:19 +0800 From: zhanghailiang To: Date: Fri, 8 Apr 2016 14:26:36 +0800 Message-ID: <1460096797-14916-35-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1460096797-14916-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1460096797-14916-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.0A020203.57074FCA.000A, 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: f338eedf25a2ed399313920a316dfd94 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 Subject: [Qemu-devel] [PATCH COLO-Frame v16 34/35] COLO: manage the status of buffer filters for PVM 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, armbru@redhat.com, Jason Wang , 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 Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 Enable all buffer filters that added by COLO while go into COLO process, and disable them while exit COLO. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v16: - Stop buffer filter while doing checkpoint and resume it after checkpoint. v15: - Re-implement colo_set_filter_status() based on COLOBufferFilters list. - Fix the title of this patch --- migration/colo.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/migration/colo.c b/migration/colo.c index 7a60bc1..6a9caa2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -114,10 +114,22 @@ static void secondary_vm_do_failover(void) } } +static void colo_set_filter_status(const char *status, Error **errp) +{ + struct COLOListNode *e, *next; + NetFilterState *nf; + + QLIST_FOREACH_SAFE(e, &COLOBufferFilters, node, next) { + nf = e->opaque; + object_property_set_str(OBJECT(nf), status, "status", errp); + } +} + static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); int old_state; + Error *local_err = NULL; migrate_set_state(&s->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); @@ -141,6 +153,12 @@ static void primary_vm_do_failover(void) old_state); return; } + + colo_set_filter_status("off", &local_err); + if (local_err) { + error_report_err(local_err); + } + /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_sem); } @@ -299,7 +317,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s, if (failover_request_is_active()) { goto out; } - + /* Stop buffer filter and flush the buffered packets */ + colo_set_filter_status("off", &local_err); + if (local_err) { + goto out; + } colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err); if (local_err) { goto out; @@ -363,6 +385,10 @@ static int colo_do_checkpoint_transaction(MigrationState *s, qemu_thread_exit(0); } + colo_set_filter_status("on", &local_err); + if (local_err) { + goto out; + } ret = 0; /* Resume primary guest */ qemu_mutex_lock_iothread(); @@ -432,6 +458,11 @@ static void colo_process_checkpoint(MigrationState *s) failover_init_state(); + colo_set_filter_status("on", &local_err); + if (local_err) { + goto out; + } + s->rp_state.from_dst_file = qemu_file_get_return_path(s->to_dst_file); if (!s->rp_state.from_dst_file) { error_report("Open QEMUFile from_dst_file failed");