From patchwork Fri Apr 8 06:26:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 8781251 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 DF969C0553 for ; Fri, 8 Apr 2016 06:46:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DB872026D for ; Fri, 8 Apr 2016 06:46:03 +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 1D23E2024D for ; Fri, 8 Apr 2016 06:46:02 +0000 (UTC) Received: from localhost ([::1]:54347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoQB7-0001wp-I8 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 02:46:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40145) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPvc-0004Vo-KQ for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:30:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoPvZ-0007Nr-Cl for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:30:00 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:42405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPvY-0007NK-Q8 for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:29:57 -0400 Received: from 172.24.1.50 (EHLO szxeml422-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DEV17793; Fri, 08 Apr 2016 14:29:40 +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, 8 Apr 2016 14:29:32 +0800 From: zhanghailiang To: Date: Fri, 8 Apr 2016 14:26:35 +0800 Message-ID: <1460096797-14916-34-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.0A020204.57074FD6.0041, 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: 406b650feee3e72dce53dce89433d67e X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Subject: [Qemu-devel] [PATCH COLO-Frame v16 33/35] COLO/filter: add each netdev a buffer filter 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 For COLO periodic mode, it need to buffer packets that sent by VM, and we will not release these packets until finish a checkpoint. Here, we add each netdev a buffer-filter that will be controlled by COLO. It is disabled by default, and the packets will not pass through these filters. If users don't enable COLO while configure qemu, these buffer-filters will not be added. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v16: - Remove the useless check in colo_add_buffer_filter() v15: - call object_new_with_props() directly to add filter in colo_add_buffer_filter. (Jason's suggestion) v14: - New patch --- include/migration/colo.h | 2 ++ include/net/filter.h | 2 ++ migration/colo-comm.c | 7 +++++++ migration/colo.c | 39 +++++++++++++++++++++++++++++++++++++++ net/filter-buffer.c | 2 -- stubs/migration-colo.c | 4 ++++ 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/include/migration/colo.h b/include/migration/colo.h index 919b135..87ea6d2 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -37,4 +37,6 @@ COLOMode get_colo_mode(void); void colo_do_failover(MigrationState *s); bool colo_shutdown(void); +void colo_add_buffer_filter(Notifier *notifier, void *data); + #endif diff --git a/include/net/filter.h b/include/net/filter.h index 0c4a2ea..817eaf4 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -21,6 +21,8 @@ #define NETFILTER_CLASS(klass) \ OBJECT_CLASS_CHECK(NetFilterClass, (klass), TYPE_NETFILTER) +#define TYPE_FILTER_BUFFER "filter-buffer" + typedef void (FilterSetup) (NetFilterState *nf, Error **errp); typedef void (FilterCleanup) (NetFilterState *nf); /* diff --git a/migration/colo-comm.c b/migration/colo-comm.c index 716a4f7..a90f1cb 100644 --- a/migration/colo-comm.c +++ b/migration/colo-comm.c @@ -14,12 +14,14 @@ #include "qemu/osdep.h" #include #include "trace.h" +#include typedef struct { bool colo_requested; } COLOInfo; static COLOInfo colo_info; +static Notifier netdev_init_notifier; COLOMode get_colo_mode(void) { @@ -59,6 +61,11 @@ static const VMStateDescription colo_state = { void colo_info_init(void) { vmstate_register(NULL, 0, &colo_state, &colo_info); + /* FIXME: Remove this after COLO switch to using colo-proxy */ + if (colo_supported()) { + netdev_init_notifier.notify = colo_add_buffer_filter; + netdev_init_add_notifier(&netdev_init_notifier); + } } bool migration_incoming_enable_colo(void) diff --git a/migration/colo.c b/migration/colo.c index c16a7d7..7a60bc1 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -19,12 +19,23 @@ #include "qapi/error.h" #include "migration/failover.h" #include "qapi-event.h" +#include "net/net.h" +#include "net/filter.h" +#include "net/vhost_net.h" static bool vmstate_loading; /* colo buffer */ #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) +typedef struct COLOListNode { + void *opaque; + QLIST_ENTRY(COLOListNode) node; +} COLOListNode; + +static QLIST_HEAD(, COLOListNode) COLOBufferFilters = + QLIST_HEAD_INITIALIZER(COLOBufferFilters); + bool colo_supported(void) { return true; @@ -384,6 +395,34 @@ static int colo_prepare_before_save(MigrationState *s) return ret; } +void colo_add_buffer_filter(Notifier *notifier, void *data) +{ + char *netdev_id = data; + NetFilterState *nf; + char filter_name[128]; + Object *filter; + COLOListNode *filternode; + + snprintf(filter_name, sizeof(filter_name), + "%scolo", netdev_id); + + filter = object_new_with_props(TYPE_FILTER_BUFFER, + object_get_objects_root(), + filter_name, NULL, + "netdev", netdev_id, + "status", "off", + NULL); + if (!filter) { + return; + } + nf = NETFILTER(filter); + /* Only buffer the packets that sent out by VM */ + nf->direction = NET_FILTER_DIRECTION_RX; + filternode = g_new0(COLOListNode, 1); + filternode->opaque = nf; + QLIST_INSERT_HEAD(&COLOBufferFilters, filternode, node); +} + static void colo_process_checkpoint(MigrationState *s) { QEMUSizedBuffer *buffer = NULL; diff --git a/net/filter-buffer.c b/net/filter-buffer.c index 346306a..d1cf595 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -17,8 +17,6 @@ #include "qapi-visit.h" #include "qom/object.h" -#define TYPE_FILTER_BUFFER "filter-buffer" - #define FILTER_BUFFER(obj) \ OBJECT_CHECK(FilterBufferState, (obj), TYPE_FILTER_BUFFER) diff --git a/stubs/migration-colo.c b/stubs/migration-colo.c index e507e17..65b1f49 100644 --- a/stubs/migration-colo.c +++ b/stubs/migration-colo.c @@ -49,3 +49,7 @@ bool colo_shutdown(void) { return false; } + +void colo_add_buffer_filter(Notifier *notifier, void *data) +{ +}