From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A1BEC432C0 for ; Thu, 21 Nov 2019 12:37:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D564B2075E for ; Thu, 21 Nov 2019 12:37:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726546AbfKUMhN (ORCPT ); Thu, 21 Nov 2019 07:37:13 -0500 Received: from m9784.mail.qiye.163.com ([220.181.97.84]:3001 "EHLO m9784.mail.qiye.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726358AbfKUMhN (ORCPT ); Thu, 21 Nov 2019 07:37:13 -0500 Received: from [192.168.1.4] (unknown [116.237.146.20]) by m9784.mail.qiye.163.com (Hmail) with ESMTPA id 98D2741D40; Thu, 21 Nov 2019 20:37:09 +0800 (CST) Subject: Re: [PATCH nf-next v2 1/4] netfilter: nf_flow_table_offload: refactor nf_flow_table_offload_setup to support indir setup From: wenxu To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Paul Blakey References: <1574330056-5377-1-git-send-email-wenxu@ucloud.cn> <1574330056-5377-2-git-send-email-wenxu@ucloud.cn> Message-ID: Date: Thu, 21 Nov 2019 20:36:49 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 In-Reply-To: <1574330056-5377-2-git-send-email-wenxu@ucloud.cn> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgYFAkeWUFZVkpVS09CQkJCQk5JSEpNSUNZV1koWU FJQjdXWS1ZQUlXWQkOFx4IWUFZNTQpNjo3JCkuNz5ZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6PCI6Agw5Njg8MQ8*IjAUTRBW EDIKCUtVSlVKTkxPSEhCQ0hLSk5KVTMWGhIXVQweFQMOOw4YFxQOH1UYFUVZV1kSC1lBWUpKTVVJ SExVSk9NVUlLWVdZCAFZQU9KTUM3Bg++ X-HM-Tid: 0a6e8df75fda2086kuqy98d2741d40 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 在 2019/11/21 17:54, wenxu@ucloud.cn 写道: > From: wenxu > > Refactor nf_flow_table_offload_setup to support indir setup in > the next patch > > Signed-off-by: wenxu > --- > v2: no change > > net/netfilter/nf_flow_table_offload.c | 54 ++++++++++++++++++++++++----------- > 1 file changed, 38 insertions(+), 16 deletions(-) > > diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c > index c00bb76..2d92043 100644 > --- a/net/netfilter/nf_flow_table_offload.c > +++ b/net/netfilter/nf_flow_table_offload.c > @@ -801,26 +801,31 @@ static int nf_flow_table_block_setup(struct nf_flowtable *flowtable, > return err; > } > > -int nf_flow_table_offload_setup(struct nf_flowtable *flowtable, > - struct net_device *dev, > - enum flow_block_command cmd) > +static void nf_flow_table_block_offload_init(struct flow_block_offload *bo, > + struct net *net, > + enum flow_block_command cmd, > + struct nf_flowtable *flowtable, > + struct netlink_ext_ack *extack) > +{ > + memset(bo, 0, sizeof(*bo)); > + bo->net = net; > + bo->block = &flowtable->flow_block; > + bo->command = cmd; > + bo->binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS; > + bo->extack = extack; > + INIT_LIST_HEAD(&bo->cb_list); > +} > + > +static int nf_flow_table_offload_cmd(struct nf_flowtable *flowtable, > + struct net_device *dev, > + enum flow_block_command cmd) > { > struct netlink_ext_ack extack = {}; > - struct flow_block_offload bo = {}; > + struct flow_block_offload bo; > int err; > > - if (!(flowtable->flags & NF_FLOWTABLE_HW_OFFLOAD)) > - return 0; > - > - if (!dev->netdev_ops->ndo_setup_tc) > - return -EOPNOTSUPP; > - > - bo.net = dev_net(dev); > - bo.block = &flowtable->flow_block; > - bo.command = cmd; > - bo.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS; > - bo.extack = &extack; > - INIT_LIST_HEAD(&bo.cb_list); > + nf_flow_table_block_offload_init(&bo, dev_net(dev), cmd, flowtable, > + &extack); > > err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_BLOCK, &bo); > if (err < 0) > @@ -828,6 +833,23 @@ int nf_flow_table_offload_setup(struct nf_flowtable *flowtable, > > return nf_flow_table_block_setup(flowtable, &bo, cmd); > } > + > +int nf_flow_table_offload_setup(struct nf_flowtable *flowtable, > + struct net_device *dev, > + enum flow_block_command cmd) > +{ > + int err; > + > + if (!(flowtable->flags & NF_FLOWTABLE_HW_OFFLOAD)) > + return 0; > + > + if (dev->netdev_ops->ndo_setup_tc) > + err = nf_flow_table_offload_cmd(flowtable, dev, cmd); > + else > + err = -EOPNOTSUPP; > + > + return err; > +} > EXPORT_SYMBOL_GPL(nf_flow_table_offload_setup); > > int nf_flow_table_offload_init(void)