From: wenxu <wenxu@ucloud.cn>
To: Pablo Neira Ayuso <pablo@netfilter.org>, netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf-next 9/9] netfilter: flowtable: add nf_flow_table_offload_cmd()
Date: Tue, 14 Jan 2020 13:45:05 +0800 [thread overview]
Message-ID: <30705b0a-11ad-cd80-ffa6-f855b2e3c174@ucloud.cn> (raw)
In-Reply-To: <20200113181554.52612-9-pablo@netfilter.org>
On 1/14/2020 2:15 AM, Pablo Neira Ayuso wrote:
> Split nf_flow_table_offload_setup() in two functions to make it more
> maintainable.
>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> net/netfilter/nf_flow_table_offload.c | 38 +++++++++++++++++++++++++----------
> 1 file changed, 27 insertions(+), 11 deletions(-)
>
> diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
> index a08756dc96e4..cb10d903cc47 100644
> --- a/net/netfilter/nf_flow_table_offload.c
> +++ b/net/netfilter/nf_flow_table_offload.c
> @@ -838,12 +838,12 @@ 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 int nf_flow_table_offload_cmd(struct flow_block_offload *bo,
> + struct nf_flowtable *flowtable,
> + struct net_device *dev,
> + enum flow_block_command cmd,
> + struct netlink_ext_ack *extack)
> {
> - struct netlink_ext_ack extack = {};
> - struct flow_block_offload bo = {};
> int err;
>
> if (!nf_flowtable_hw_offload(flowtable))
> @@ -852,17 +852,33 @@ int nf_flow_table_offload_setup(struct nf_flowtable *flowtable,
> 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);
> + memset(bo, 0, sizeof(*bo));
> + 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);
>
> err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_FT, &bo);
This callback should be :
err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_FT, bo);
> if (err < 0)
> return err;
>
> + return 0;
> +}
> +
> +int nf_flow_table_offload_setup(struct nf_flowtable *flowtable,
> + struct net_device *dev,
> + enum flow_block_command cmd)
> +{
> + struct netlink_ext_ack extack = {};
> + struct flow_block_offload bo;
> + int err;
> +
> + err = nf_flow_table_offload_cmd(&bo, flowtable, dev, cmd, &extack);
> + if (err < 0)
> + return err;
> +
> return nf_flow_table_block_setup(flowtable, &bo, cmd);
> }
> EXPORT_SYMBOL_GPL(nf_flow_table_offload_setup);
prev parent reply other threads:[~2020-01-14 5:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 18:15 [PATCH nf-next,v3 1/9] netfilter: flowtable: fetch stats only if flow is still alive Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next,v2 2/9] netfilter: flowtable: restrict flow dissector match on meta ingress device Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next,v2 3/9] netfilter: flowtable: add nf_flow_offload_work_alloc() Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next,v2 4/9] netfilter: flowtable: remove dying bit, use teardown bit instead Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next,v2 5/9] netfilter: flowtable: use atomic bitwise operations for flow flags Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next 6/9] netfilter: flowtable: add nf_flowtable_hw_offload() helper function Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next,v2 7/9] netfilter: flowtable: refresh flow if hardware offload fails Pablo Neira Ayuso
2020-01-13 18:15 ` [PATCH nf-next 8/9] netfilter: flowtable: add flow_offload_tuple() helper Pablo Neira Ayuso
2020-01-14 5:58 ` wenxu
2020-01-13 18:15 ` [PATCH nf-next 9/9] netfilter: flowtable: add nf_flow_table_offload_cmd() Pablo Neira Ayuso
2020-01-14 5:45 ` wenxu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30705b0a-11ad-cd80-ffa6-f855b2e3c174@ucloud.cn \
--to=wenxu@ucloud.cn \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).