From patchwork Mon Feb 22 02:40:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8370971 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 23099C0553 for ; Mon, 22 Feb 2016 02:56:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 719DA203B4 for ; Mon, 22 Feb 2016 02:56:28 +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 ACC162039E for ; Mon, 22 Feb 2016 02:56:27 +0000 (UTC) Received: from localhost ([::1]:46206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgfj-0007pz-5C for patchwork-qemu-devel@patchwork.kernel.org; Sun, 21 Feb 2016 21:56:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgS4-0002qd-Lf for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXgS3-0007e5-Ot for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:20 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:9828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXgS2-0007dB-OV for qemu-devel@nongnu.org; Sun, 21 Feb 2016 21:42:19 -0500 Received: from 172.24.1.48 (EHLO szxeml426-hub.china.huawei.com) ([172.24.1.48]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DBU14508; Mon, 22 Feb 2016 10:41:55 +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; Mon, 22 Feb 2016 10:41:45 +0800 From: zhanghailiang To: Date: Mon, 22 Feb 2016 10:40:31 +0800 Message-ID: <1456108832-24212-38-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.56CA7577.004C, 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: 3482e3925289d62933b451ec0f3b72e9 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, 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 v15 37/38] 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 --- v15: - Re-implement colo_flush_filter_packets() based on COLOBufferFilters list --- migration/colo.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 4c39204..a2d489b 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -124,6 +124,17 @@ static void colo_set_filter_status(const char *status, Error **errp) } } +static void colo_flush_filter_packets(Error **errp) +{ + struct COLOListNode *e, *next; + NetFilterState *nf; + + QLIST_FOREACH_SAFE(e, &COLOBufferFilters, node, next) { + nf = e->opaque; + filter_buffer_flush(nf); + } +} + static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); @@ -157,6 +168,7 @@ static void primary_vm_do_failover(void) if (local_err) { error_report_err(local_err); } + colo_flush_filter_packets(NULL); /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_sem); @@ -364,6 +376,8 @@ static int colo_do_checkpoint_transaction(MigrationState *s, if (local_err) { goto out; } + /* FIXME: Remove this after switch to use colo-proxy */ + colo_flush_filter_packets(NULL); if (colo_shutdown_requested) { colo_put_cmd(s->to_dst_file, COLO_MESSAGE_GUEST_SHUTDOWN, &local_err);