netfilter: nf_tables_offload: add nft_chain_offload_cmd()
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: nf_tables_offload: add nft_chain_offload_cmd()
This patch adds the nft_chain_offload_cmd() helper function.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_offload.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_offload.c +15 -5
@@ -316,6 +316,20 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain,#define FLOW_SETUP_BLOCK TC_SETUP_BLOCK +static int nft_chain_offload_cmd (struct nft_base_chain *basechain, +struct net_device *dev, +enum flow_block_command cmd) +{ +int err; + +if (dev->netdev_ops->ndo_setup_tc) + err =nft_block_offload_cmd (basechain, dev, cmd); +else + err =nft_indr_block_offload_cmd (basechain, dev, cmd); + +return err; +} +static int nft_flow_block_chain (struct nft_base_chain *basechain,const struct net_device *this_dev,enum flow_block_command cmd)
@@ -329,11 +343,7 @@ static int nft_flow_block_chain(struct nft_base_chain *basechain,if (this_dev && this_dev != dev)continue ; -if (dev->netdev_ops->ndo_setup_tc) - err =nft_block_offload_cmd (basechain, dev, cmd); -else - err =nft_indr_block_offload_cmd (basechain, dev, cmd); - + err =nft_chain_offload_cmd (basechain, dev, cmd);if (err <0 )return err; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: nf_tables_offload: add nft_flow_block_offload_init()
This patch adds the nft_flow_block_offload_init() helper function to initialize the flow_block_offload object.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_offload.c | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-)
net/netfilter/nf_tables_offload.c +21 -21
@@ -246,20 +246,30 @@ static int nft_block_setup(struct nft_base_chain *basechain,return err; } +static void nft_flow_block_offload_init (struct flow_block_offload *bo, +struct net *net, +enum flow_block_command cmd, +struct nft_base_chain *basechain, +struct netlink_ext_ack *extack) +{ +memset (bo,0 ,sizeof (*bo)); + bo->net = net; + bo->block = &basechain->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 nft_block_offload_cmd (struct nft_base_chain *chain,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; - bo.net =dev_net (dev); - bo.block = &chain->flow_block; - bo.command = cmd; - bo.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; - bo.extack = &extack; -INIT_LIST_HEAD (&bo.cb_list); +nft_flow_block_offload_init (&bo,dev_net (dev), cmd, chain, &extack); err = dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_BLOCK , &bo);if (err <0 )
@@ -275,17 +285,12 @@ static void nft_indr_block_ing_cmd(struct net_device *dev, enum flow_block_command cmd) {struct netlink_ext_ack extack = {}; -struct flow_block_offload bo = {}; +struct flow_block_offload bo;if (!chain)return ; - bo.net =dev_net (dev); - bo.block = &chain->flow_block; - bo.command = cmd; - bo.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; - bo.extack = &extack; -INIT_LIST_HEAD (&bo.cb_list); +nft_flow_block_offload_init (&bo,dev_net (dev), cmd, chain, &extack);cb (dev, cb_priv,TC_SETUP_BLOCK , &bo);
@@ -296,15 +301,10 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain, struct net_device *dev, enum flow_block_command cmd) { -struct flow_block_offload bo = {};struct netlink_ext_ack extack = {}; +struct flow_block_offload bo; - bo.net =dev_net (dev); - bo.block = &chain->flow_block; - bo.command = cmd; - bo.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; - bo.extack = &extack; -INIT_LIST_HEAD (&bo.cb_list); +nft_flow_block_offload_init (&bo,dev_net (dev), cmd, chain, &extack);flow_indr_block_call (dev, &bo, cmd);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nf_tables_offload: unbind if multi-device binding fails
In reply to Pablo Neira Ayusonft_flow_block_chain() needs to unbind in case of error when performing the multi-device binding.
Fixes d54725cd11a5 ("netfilter: nf_tables: support for multiple devices per netdev hook")
Reported-by wenxu <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_offload.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_offload.c +17 -2
@@ -336,7 +336,7 @@ static int nft_flow_block_chain(struct nft_base_chain *basechain, {struct net_device *dev;struct nft_hook *hook; -int err; +int err, i =0 ;list_for_each_entry (hook, &basechain->hook_list, list) { dev = hook->ops.dev;
@@ -344,11 +344,26 @@ static int nft_flow_block_chain(struct nft_base_chain *basechain,continue ; err =nft_chain_offload_cmd (basechain, dev, cmd); -if (err <0 ) +if (err <0 && cmd ==FLOW_BLOCK_BIND ) { +if (!this_dev) + goto err_flow_block; +return err; + } + i++; }return 0 ; + +err_flow_block: +list_for_each_entry (hook, &basechain->hook_list, list) { +if (i-- <=0 ) +break ; + + dev = hook->ops.dev; +nft_chain_offload_cmd (basechain, dev,FLOW_BLOCK_UNBIND ); + } +return err; } static int nft_flow_offload_chain(struct nft_chain *chain, u8 *ppolicy,
Signature · 1 line
2.11.0