在 2019/11/21 17:54, wenxu@xxxxxxxxx 写道:
> From: wenxu <wenxu@xxxxxxxxx>
>
> Refactor nf_flow_table_offload_setup to support indir setup in
> the next patch
>
> Signed-off-by: wenxu <wenxu@xxxxxxxxx>
> ---
> 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)
