From patchwork Fri Jun 3 07:52:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9152209 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 3B2B160221 for ; Fri, 3 Jun 2016 08:33:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A7012654B for ; Fri, 3 Jun 2016 08:33:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EE4F28309; Fri, 3 Jun 2016 08:33:06 +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 BF60D2654B for ; Fri, 3 Jun 2016 08:33:01 +0000 (UTC) Received: from localhost ([::1]:53258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8kXN-00006d-14 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Jun 2016 04:33:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jwD-0007e9-2R for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8jw9-00050m-Dg for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:37 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:24939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jw8-0004zV-P2 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:54:33 -0400 Received: from 172.24.1.36 (EHLO szxeml422-hub.china.huawei.com) ([172.24.1.36]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CCR25164; Fri, 03 Jun 2016 15:53:30 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml422-hub.china.huawei.com (10.82.67.152) with Microsoft SMTP Server id 14.3.235.1; Fri, 3 Jun 2016 15:53:20 +0800 From: zhanghailiang To: , , , Date: Fri, 3 Jun 2016 15:52:45 +0800 Message-ID: <1464940366-9880-34-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1464940366-9880-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1464940366-9880-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.0A090206.575137A1.0003, 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: 8ad5fcc54f38aa749fbd6b7802e6b9f5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH COLO-Frame v17 33/34] COLO: Control 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, Jason Wang , yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, zhanghailiang , arei.gonglei@huawei.com, stefanha@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-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 f9bd62c..de7174f 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_exit_sem); } @@ -294,7 +312,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; @@ -360,6 +382,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; qemu_mutex_lock_iothread(); @@ -427,6 +453,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");