patch 'net/ice: fix flow engines order' has been queued to stable release 23.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/10/25. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e42c10138ea18f856bc57d8822c65a68575090af

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From e42c10138ea18f856bc57d8822c65a68575090af Mon Sep 17 00:00:00 2001
From: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
Date: Mon, 10 Mar 2025 17:40:28 +0000
Subject: [PATCH] net/ice: fix flow engines order
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit b309503d63159680d4ff8ca9e968fcb12ac609a0 ]

Currently, the driver evaluates rules with the engines in the order they
are executed in the hardware. However, in this situation, some
wildcarded flows that are also supported by the ACL engine are installed
as switch engine rules, which scales poorly with each distinct wildcard
mask configuration. Reorder flow engine evaluation for RTE flow rule
installation to fix this problem.

Fixes: fabc9e1322e2 ("net/ice: fix flows handling")

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/ice/ice_generic_flow.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
index 5c34e0385f..4049157eab 100644
--- a/drivers/net/ice/ice_generic_flow.c
+++ b/drivers/net/ice/ice_generic_flow.c
@@ -2239,9 +2239,9 @@ static struct ice_flow_parser *get_flow_parser(uint32_t group)
 {
 	switch (group) {
 	case 0:
-		return &ice_switch_parser;
-	case 1:
 		return &ice_acl_parser;
+	case 1:
+		return &ice_switch_parser;
 	case 2:
 		return &ice_fdir_parser;
 	default:
@@ -2298,6 +2298,13 @@ ice_flow_process_filter(struct rte_eth_dev *dev,
 	}
 
 	for (int i = 0; i < ICE_FLOW_ENGINE_NB; i++) {
+		/**
+		 * Evaluate parsers in the following order:
+		 * ACL - for some subset of wildcard matching rules
+		 * Switch - This engine is placed after ACL because
+		 * it scales worse than ACL for different wildcard masks.
+		 * FDIR - for exact match rules
+		 **/
 		parser = get_flow_parser(i);
 		if (parser == NULL) {
 			rte_flow_error_set(error, EINVAL,
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-04-08 15:39:06.913016462 +0800
+++ 0033-net-ice-fix-flow-engines-order.patch	2025-04-08 15:39:05.976436565 +0800
@@ -1 +1 @@
-From b309503d63159680d4ff8ca9e968fcb12ac609a0 Mon Sep 17 00:00:00 2001
+From e42c10138ea18f856bc57d8822c65a68575090af Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit b309503d63159680d4ff8ca9e968fcb12ac609a0 ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
- drivers/net/intel/ice/ice_generic_flow.c | 11 +++++++++--
+ drivers/net/ice/ice_generic_flow.c | 11 +++++++++--
@@ -22 +24 @@
-diff --git a/drivers/net/intel/ice/ice_generic_flow.c b/drivers/net/intel/ice/ice_generic_flow.c
+diff --git a/drivers/net/ice/ice_generic_flow.c b/drivers/net/ice/ice_generic_flow.c
@@ -24,2 +26,2 @@
---- a/drivers/net/intel/ice/ice_generic_flow.c
-+++ b/drivers/net/intel/ice/ice_generic_flow.c
+--- a/drivers/net/ice/ice_generic_flow.c
++++ b/drivers/net/ice/ice_generic_flow.c