patch 'net/mlx5: fix suffix groups without default FDB rule' has been queued to stable release 24.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/07/26. 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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/80f694224c32d2f2d9ad71fd586335070be2f306

Thanks.

Luca Boccassi

---
>From 80f694224c32d2f2d9ad71fd586335070be2f306 Mon Sep 17 00:00:00 2001
From: Rongwei Liu <rongweil at nvidia.com>
Date: Fri, 16 Oct 2026 10:48:06 +0300
Subject: [PATCH] net/mlx5: fix suffix groups without default FDB rule

[ upstream commit 5108a6f229ffa1b4f79166315bdb94fc8fcb8a0b ]

With fdb_def_rule_en=0, mlx5 SWS still decrements meter and sampler
suffix groups, causing continuation rules to be installed in the
wrong tables.

Decrement these groups only when the default FDB rule is active,
keeping suffix placement consistent with group-to-table translation.

Fixes: 1939eb6f660c ("net/mlx5: support flow port action with HWS")

Signed-off-by: Rongwei Liu <rongweil at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9735c664ad6..66fa89750eb 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -7054,7 +7054,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
 			goto exit;
 		}
 		/* Setting the sfx group atrr. */
-		sfx_attr.group = sfx_attr.transfer ?
+		sfx_attr.group = (sfx_attr.transfer && priv->fdb_def_rule) ?
 				(MLX5_FLOW_TABLE_LEVEL_METER - 1) :
 				 MLX5_FLOW_TABLE_LEVEL_METER;
 		flow_split_info->prefix_layers =
@@ -7235,7 +7235,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
 			sfx_tbl_data = container_of(sfx_tbl,
 						struct mlx5_flow_tbl_data_entry,
 						tbl);
-			sfx_attr.group = sfx_attr.transfer ?
+			sfx_attr.group = (sfx_attr.transfer && priv->fdb_def_rule) ?
 			(sfx_tbl_data->level - 1) : sfx_tbl_data->level;
 		} else {
 			MLX5_ASSERT(attr->transfer);
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-11-05 16:42:45.837694923 +0000
+++ 0021-net-mlx5-fix-suffix-groups-without-default-FDB-rule.patch	2026-11-05 16:42:44.913060547 +0000
@@ -1 +1 @@
-From 5108a6f229ffa1b4f79166315bdb94fc8fcb8a0b Mon Sep 17 00:00:00 2001
+From 80f694224c32d2f2d9ad71fd586335070be2f306 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5108a6f229ffa1b4f79166315bdb94fc8fcb8a0b ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index b0eac185b5..37654918b5 100644
+index 9735c664ad6..66fa89750eb 100644
@@ -26 +27 @@
-@@ -7048,7 +7048,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
+@@ -7054,7 +7054,7 @@ flow_create_split_meter(struct rte_eth_dev *dev,
@@ -35 +36 @@
-@@ -7229,7 +7229,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,
+@@ -7235,7 +7235,7 @@ flow_create_split_sample(struct rte_eth_dev *dev,