From patchwork Sat Feb 6 09:28:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8242271 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 309A2BEEE5 for ; Sat, 6 Feb 2016 09:49:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6290520204 for ; Sat, 6 Feb 2016 09:49:30 +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 120CB20142 for ; Sat, 6 Feb 2016 09:49:29 +0000 (UTC) Received: from localhost ([::1]:52750 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzUe-0005NC-Gi for patchwork-qemu-devel@patchwork.kernel.org; Sat, 06 Feb 2016 04:49:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzC3-0003MF-JC for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRzC0-0001cs-CM for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:15 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:26814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBz-0001bw-8d for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:12 -0500 Received: from 172.24.1.49 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DEG12961; Sat, 06 Feb 2016 17:29:57 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.235.1; Sat, 6 Feb 2016 17:29:51 +0800 From: zhanghailiang To: Date: Sat, 6 Feb 2016 17:28:51 +0800 Message-ID: <1454750932-7556-40-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1454750932-7556-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.56B5BD16.0019, 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: 9c18a34852126e2de544afe6a2ccb2ba X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 58.251.152.64 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 Subject: [Qemu-devel] [PATCH COLO-Frame v14 39/40] COLO: flush buffered packets in checkpoint process or exit COLO 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 In COLO periodic mode, the packets from VM should not be sent during the time interval of two checkpoints, we will release all these buffered packets after the checkpoint process, before VM is resumed. In this way, we can ensure not to break the network services if COLO goes into failover process. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v14: - New patch --- migration/colo.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 86a7638..afbb0e1 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -118,6 +118,19 @@ static void colo_set_filter_status(NetFilterState *nf, void *opaque, object_property_set_str(OBJECT(nf), status, "status", errp); } +static void colo_flush_filter_packets(NetFilterState *nf, void *opaque, + Error **errp) +{ + char colo_filter[128]; + char *name = object_get_canonical_path_component(OBJECT(nf)); + + snprintf(colo_filter, sizeof(colo_filter), "%scolo", nf->netdev_id); + if (strcmp(colo_filter, name)) { + return; + } + filter_buffer_flush(nf); +} + static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); @@ -154,6 +167,7 @@ static void primary_vm_do_failover(void) if (local_err) { error_report_err(local_err); } + qemu_foreach_netfilter(colo_flush_filter_packets, NULL, NULL); /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_sem); @@ -361,6 +375,8 @@ static int colo_do_checkpoint_transaction(MigrationState *s, if (local_err) { goto out; } + /* FIXME: Remove this after switch to use colo-proxy */ + qemu_foreach_netfilter(colo_flush_filter_packets, NULL, NULL); if (colo_shutdown_requested) { colo_put_cmd(s->to_dst_file, COLO_MESSAGE_GUEST_SHUTDOWN, &local_err);