hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: flowtable: Fix incorrect tc_setup_type type 

The indirect block setup should use TC_SETUP_FT as the type instead of
TC_SETUP_BLOCK. Adjust existing users of the indirect flow block
infrastructure.

Fixes: b5140a36da ("netfilter: flowtable: add indr block setup support")
Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
wenxu 2020-03-24 07:34:25 +08:00 committed by Pablo Neira Ayuso
parent 53c2b2899a
commit 133a2fe594
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/flow_offload.h
View File

@ -520,6 +520,7 @@ void flow_indr_block_cb_unregister(struct net_device *dev,
void flow_indr_block_call(struct net_device *dev, void flow_indr_block_call(struct net_device *dev,
struct flow_block_offload *bo, struct flow_block_offload *bo,
enum flow_block_command command); enum flow_block_command command,
enum tc_setup_type type);
#endif /* _NET_FLOW_OFFLOAD_H */ #endif /* _NET_FLOW_OFFLOAD_H */

6
net/core/flow_offload.c
View File

@ -511,7 +511,8 @@ EXPORT_SYMBOL_GPL(flow_indr_block_cb_unregister);
void flow_indr_block_call(struct net_device *dev, void flow_indr_block_call(struct net_device *dev,
struct flow_block_offload *bo, struct flow_block_offload *bo,
enum flow_block_command command) enum flow_block_command command,
enum tc_setup_type type)
{ {
struct flow_indr_block_cb *indr_block_cb; struct flow_indr_block_cb *indr_block_cb;
struct flow_indr_block_dev *indr_dev; struct flow_indr_block_dev *indr_dev;
@ -521,8 +522,7 @@ void flow_indr_block_call(struct net_device *dev,
return; return;
list_for_each_entry(indr_block_cb, &indr_dev->cb_list, list) list_for_each_entry(indr_block_cb, &indr_dev->cb_list, list)
indr_block_cb->cb(dev, indr_block_cb->cb_priv, TC_SETUP_BLOCK, indr_block_cb->cb(dev, indr_block_cb->cb_priv, type, bo);
bo);
} }
EXPORT_SYMBOL_GPL(flow_indr_block_call); EXPORT_SYMBOL_GPL(flow_indr_block_call);

2
net/netfilter/nf_flow_table_offload.c
View File

@ -938,7 +938,7 @@ static int nf_flow_table_indr_offload_cmd(struct flow_block_offload *bo,
{ {
nf_flow_table_block_offload_init(bo, dev_net(dev), cmd, flowtable, nf_flow_table_block_offload_init(bo, dev_net(dev), cmd, flowtable,
extack); extack);
flow_indr_block_call(dev, bo, cmd); flow_indr_block_call(dev, bo, cmd, TC_SETUP_FT);
if (list_empty(&bo->cb_list)) if (list_empty(&bo->cb_list))
return -EOPNOTSUPP; return -EOPNOTSUPP;

2
net/netfilter/nf_tables_offload.c
View File

@ -313,7 +313,7 @@ static int nft_indr_block_offload_cmd(struct nft_base_chain *chain,
nft_flow_block_offload_init(&bo, dev_net(dev), cmd, chain, &extack); nft_flow_block_offload_init(&bo, dev_net(dev), cmd, chain, &extack);
flow_indr_block_call(dev, &bo, cmd); flow_indr_block_call(dev, &bo, cmd, TC_SETUP_BLOCK);
if (list_empty(&bo.cb_list)) if (list_empty(&bo.cb_list))
return -EOPNOTSUPP; return -EOPNOTSUPP;

2
net/sched/cls_api.c
View File

@ -708,7 +708,7 @@ static void tc_indr_block_call(struct tcf_block *block,
}; };
INIT_LIST_HEAD(&bo.cb_list); INIT_LIST_HEAD(&bo.cb_list);
flow_indr_block_call(dev, &bo, command); flow_indr_block_call(dev, &bo, command, TC_SETUP_BLOCK);
tcf_block_setup(block, &bo); tcf_block_setup(block, &bo);
} }