Commit e0529019 authored by wenxu's avatar wenxu Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_flow_table_offload: Fix block_cb tc_setup_type as TC_SETUP_CLSFLOWER 



Add/del/stats flows through block_cb call must set the tc_setup_type as
TC_SETUP_CLSFLOWER.

Fixes: c29f74e0 ("netfilter: nf_flow_table: hardware offload support")
Signed-off-by: default avatarwenxu <wenxu@ucloud.cn>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent ee1bcfe0

net/netfilter/nf_flow_table_offload.c

+3 −3
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static int flow_offload_tuple_add(struct flow_offload_work *offload, 
	cls_flow.rule = flow_rule->rule;



	list_for_each_entry(block_cb, &flowtable->flow_block.cb_list, list) {

		err = block_cb->cb(TC_SETUP_FT, &cls_flow,

		err = block_cb->cb(TC_SETUP_CLSFLOWER, &cls_flow,

				   block_cb->cb_priv);

		if (err < 0)

			continue;
@@ -599,7 +599,7 @@ static void flow_offload_tuple_del(struct flow_offload_work *offload, 
			     &offload->flow->tuplehash[dir].tuple, &extack);



	list_for_each_entry(block_cb, &flowtable->flow_block.cb_list, list)

		block_cb->cb(TC_SETUP_FT, &cls_flow, block_cb->cb_priv);

		block_cb->cb(TC_SETUP_CLSFLOWER, &cls_flow, block_cb->cb_priv);



	offload->flow->flags |= FLOW_OFFLOAD_HW_DEAD;

}
@@ -656,7 +656,7 @@ static void flow_offload_tuple_stats(struct flow_offload_work *offload, 
			     &offload->flow->tuplehash[dir].tuple, &extack);



	list_for_each_entry(block_cb, &flowtable->flow_block.cb_list, list)

		block_cb->cb(TC_SETUP_FT, &cls_flow, block_cb->cb_priv);

		block_cb->cb(TC_SETUP_CLSFLOWER, &cls_flow, block_cb->cb_priv);

	memcpy(stats, &cls_flow.stats, sizeof(*stats));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE