From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOLcE-00082R-Iy for qemu-devel@nongnu.org; Wed, 27 Jan 2016 03:38:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOLcB-0008HR-B3 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 03:38:14 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:26173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOLcA-0008HF-K0 for qemu-devel@nongnu.org; Wed, 27 Jan 2016 03:38:11 -0500 From: zhanghailiang Date: Wed, 27 Jan 2016 16:29:40 +0800 Message-ID: <1453883380-10532-6-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1453883380-10532-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1453883380-10532-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH RFC v2 5/5] net/filter: Add a default filter to each netdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jasowang@redhat.com, zhanghailiang , zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn We add each netdev a default buffer filter, and the default buffer filter is disabled, so it has no side effect for packets delivering in qemu net layer. The default buffer filter can be used by COLO or Micro-checkpoint, The reason we add the default filter is we hope to support hot add network during COLO state in future. Signed-off-by: zhanghailiang --- v2: - Add codes that generate id automatically for default filter (Jason's suggestion) - Some other minor fixes. --- include/net/filter.h | 4 ++++ net/net.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/net/filter.h b/include/net/filter.h index ee1c024..e443f9c 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -22,6 +22,10 @@ #define NETFILTER_CLASS(klass) \ OBJECT_CLASS_CHECK(NetFilterClass, (klass), TYPE_NETFILTER) +#define DEFAULT_FILTER_TYPE "nop" + +#define TYPE_FILTER_BUFFER "filter-buffer" + typedef void (FilterSetup) (NetFilterState *nf, Error **errp); typedef void (FilterCleanup) (NetFilterState *nf); /* diff --git a/net/net.c b/net/net.c index a49af48..12c13f9 100644 --- a/net/net.c +++ b/net/net.c @@ -77,6 +77,12 @@ const char *host_net_devices[] = { int default_net = 1; +/* + * TODO: Export this with an option for users to control + * this with comand line ? + */ +char default_netfilter_type[16] = TYPE_FILTER_BUFFER; + /***********************************************************/ /* network device redirectors */ @@ -1029,6 +1035,23 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp) } return -1; } + + if (is_netdev) { + const Netdev *netdev = object; + char default_name[128]; + + snprintf(default_name, sizeof(default_name), + "%s%s0", netdev->id, DEFAULT_FILTER_TYPE); + /* + * Here we add each netdev a default filter, + * it will disabled by default, Users can enable it when necessary. + */ + netdev_add_filter(netdev->id, + default_netfilter_type, + default_name, + true, + errp); + } return 0; } -- 1.8.3.1