From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRWFJ-000151-8U for qemu-devel@nongnu.org; Thu, 04 Feb 2016 21:35:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRWFG-0000Uw-1O for qemu-devel@nongnu.org; Thu, 04 Feb 2016 21:35:41 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:16623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRWFF-0000Ug-3g for qemu-devel@nongnu.org; Thu, 04 Feb 2016 21:35:37 -0500 References: <1454328077-18820-1-git-send-email-zhang.zhanghailiang@huawei.com> <1454328077-18820-5-git-send-email-zhang.zhanghailiang@huawei.com> <56B01FA0.8030509@easystack.cn> From: Hailiang Zhang Message-ID: <56B40A64.8040705@huawei.com> Date: Fri, 5 Feb 2016 10:35:16 +0800 MIME-Version: 1.0 In-Reply-To: <56B01FA0.8030509@easystack.cn> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 4/4] net/filter: Add a default filter to each netdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yang Hongyang , qemu-devel@nongnu.org Cc: jasowang@redhat.com, peter.huangpeng@huawei.com, zhangchen.fnst@cn.fujitsu.com, dgilbert@redhat.com On 2016/2/2 11:16, Yang Hongyang wrote: > > > On 02/01/2016 08:01 PM, zhanghailiang wrote: >> 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 661abef..8f5fa31 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..998e90a 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) { > > If as I said earlier add a 'defult-filter' property to netdev, we > can use that property here to init default filter. > >> + const Netdev *netdev = object; >> + char default_name[128]; >> + >> + snprintf(default_name, sizeof(default_name), >> + "%s%s", netdev->id, DEFAULT_FILTER_TYPE); > > name is "nop" > No, we shouldn't use the same name for all default filters, we need to generate the name automatically, Or there will be an error: " attempt to add duplicate property 'nop' to object". Here, i rename DEFAULT_FILTER_TYPE to DEFAULT_FILTER_ID, it is only an identification for default filter. Thanks, Hailiang >> + /* >> + * 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, > > type is filter-buffer, but name is "nop"? > >> + true, >> + errp); >> + } >> return 0; >> } >> >> >