From 7f89f41860d64a4880197d35a47df05e7d56a6b1 Mon Sep 17 00:00:00 2001 From: Yuying Zhang Date: Tue, 2 Nov 2021 10:45:05 +0000 Subject: [PATCH] net/ice: fix order of flow filter parser list The order of flow filter parser list was not definite and linked to the register order of parsers. It caused ACL filter covered by switch filter in some cases. This patch fixed order of parser list to guarantee the usage of each filter. Below lists the order. ACL filter > Switch filter > FDIR > Hash filter. Fixes: e4a0a7599d97 ("net/ice: fix flow priority support in non-pipeline mode") Cc: stable@dpdk.org Signed-off-by: Yuying Zhang Acked-by: Qi Zhang --- drivers/net/ice/ice_generic_flow.c | 33 +++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c index d3391c86c0..c673feb7a6 100644 --- a/drivers/net/ice/ice_generic_flow.c +++ b/drivers/net/ice/ice_generic_flow.c @@ -1912,6 +1912,8 @@ ice_register_parser(struct ice_flow_parser *parser, { struct ice_parser_list *list; struct ice_flow_parser_node *parser_node; + struct ice_flow_parser_node *existing_node; + void *temp; parser_node = rte_zmalloc("ice_parser", sizeof(*parser_node), 0); if (parser_node == NULL) { @@ -1927,16 +1929,37 @@ ice_register_parser(struct ice_flow_parser *parser, if (ad->devargs.pipe_mode_support) { TAILQ_INSERT_TAIL(list, parser_node, node); } else { - if (parser->engine->type == ICE_FLOW_ENGINE_SWITCH || - parser->engine->type == ICE_FLOW_ENGINE_HASH) + if (parser->engine->type == ICE_FLOW_ENGINE_SWITCH) { + RTE_TAILQ_FOREACH_SAFE(existing_node, list, + node, temp) { + if (existing_node->parser->engine->type == + ICE_FLOW_ENGINE_ACL) { + TAILQ_INSERT_AFTER(list, existing_node, + parser_node, node); + goto DONE; + } + } + TAILQ_INSERT_HEAD(list, parser_node, node); + } else if (parser->engine->type == ICE_FLOW_ENGINE_FDIR) { + RTE_TAILQ_FOREACH_SAFE(existing_node, list, + node, temp) { + if (existing_node->parser->engine->type == + ICE_FLOW_ENGINE_SWITCH) { + TAILQ_INSERT_AFTER(list, existing_node, + parser_node, node); + goto DONE; + } + } TAILQ_INSERT_HEAD(list, parser_node, node); - else if (parser->engine->type == ICE_FLOW_ENGINE_FDIR) + } else if (parser->engine->type == ICE_FLOW_ENGINE_HASH) { TAILQ_INSERT_TAIL(list, parser_node, node); - else if (parser->engine->type == ICE_FLOW_ENGINE_ACL) + } else if (parser->engine->type == ICE_FLOW_ENGINE_ACL) { TAILQ_INSERT_HEAD(list, parser_node, node); - else + } else { return -EINVAL; + } } +DONE: return 0; } -- 2.39.5