patch 'net/mlx5: fix non-template RSS expansion' has been queued to stable release 24.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.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 11/05/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://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/e07bd381439a464938bd6f4c3b508f277aeffac9

Thanks.

Kevin

---
>From e07bd381439a464938bd6f4c3b508f277aeffac9 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Tue, 12 Aug 2025 13:07:16 +0300
Subject: [PATCH] net/mlx5: fix non-template RSS expansion

[ upstream commit ee60f50fbbf57e8173282c5cdd7d66cd9090103e ]

The PMD checked flow pointer for NULL value after a call to
flow_hw_create_flow(). The function API does not define flow pointer
value if the function call has failed.

The patch fixes error verification after flow_hw_create_flow()
returned - a calling function must check flow_hw_create_flow() return
value.

Fixes: f74914c9956e ("net/mlx5: fix non-template IPv6 flow RSS hash")

Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 drivers/net/mlx5/mlx5_nta_rss.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_nta_rss.c b/drivers/net/mlx5/mlx5_nta_rss.c
index 781eaf5e99..ee38f233e1 100644
--- a/drivers/net/mlx5/mlx5_nta_rss.c
+++ b/drivers/net/mlx5/mlx5_nta_rss.c
@@ -68,5 +68,5 @@ mlx5_nta_ptype_rss_flow_create(struct mlx5_nta_rss_ctx *ctx,
 				  MLX5_FLOW_ITEM_PTYPE, MLX5_FLOW_ACTION_RSS,
 				  ctx->external, &flow, ctx->error);
-	if (flow) {
+	if (ret == 0) {
 		SLIST_INSERT_HEAD(ctx->head, flow, nt2hws->next);
 		if (dbg_log) {
@@ -276,4 +276,5 @@ mlx5_hw_rss_ptype_create_miss_flow(struct rte_eth_dev *dev,
 				   struct rte_flow_error *error)
 {
+	int ret;
 	struct rte_flow_hw *flow = NULL;
 	const struct rte_flow_attr miss_attr = {
@@ -300,8 +301,8 @@ mlx5_hw_rss_ptype_create_miss_flow(struct rte_eth_dev *dev,
 	};
 
-	flow_hw_create_flow(dev, MLX5_FLOW_TYPE_GEN, &miss_attr,
-			    miss_pattern, miss_actions, 0, MLX5_FLOW_ACTION_RSS,
-			    external, &flow, error);
-	return flow;
+	ret = flow_hw_create_flow(dev, MLX5_FLOW_TYPE_GEN, &miss_attr,
+				  miss_pattern, miss_actions, 0,
+				  MLX5_FLOW_ACTION_RSS, external, &flow, error);
+	return ret == 0 ? flow : NULL;
 }
 
@@ -316,5 +317,5 @@ mlx5_hw_rss_ptype_create_base_flow(struct rte_eth_dev *dev,
 				   struct rte_flow_error *error)
 {
-	int i = 0;
+	int ret, i = 0;
 	struct rte_flow_hw *flow = NULL;
 	struct rte_flow_action actions[MLX5_HW_MAX_ACTS];
@@ -346,7 +347,7 @@ mlx5_hw_rss_ptype_create_base_flow(struct rte_eth_dev *dev,
 	action_flags &= ~MLX5_FLOW_ACTION_RSS;
 	action_flags |= MLX5_FLOW_ACTION_JUMP;
-	flow_hw_create_flow(dev, flow_type, attr, pattern, actions,
-			    item_flags, action_flags, external, &flow, error);
-	return flow;
+	ret = flow_hw_create_flow(dev, flow_type, attr, pattern, actions,
+				  item_flags, action_flags, external, &flow, error);
+	return ret == 0 ? flow : NULL;
 }
 
@@ -426,4 +427,5 @@ flow_nta_create_single(struct rte_eth_dev *dev,
 		       struct rte_flow_error *error)
 {
+	int ret;
 	struct rte_flow_hw *flow = NULL;
 	struct rte_flow_action copy[MLX5_HW_MAX_ACTS];
@@ -457,8 +459,7 @@ flow_nta_create_single(struct rte_eth_dev *dev,
 	}
 end:
-	flow_hw_create_flow(dev, flow_type, attr, items,
-			    _actions, item_flags, action_flags,
-			    external, &flow, error);
-	return flow;
+	ret = flow_hw_create_flow(dev, flow_type, attr, items, _actions,
+				  item_flags, action_flags, external, &flow, error);
+	return ret == 0 ? flow : NULL;
 }
 
-- 
2.51.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-10-31 13:53:53.438408377 +0000
+++ 0038-net-mlx5-fix-non-template-RSS-expansion.patch	2025-10-31 13:53:52.098083857 +0000
@@ -1 +1 @@
-From ee60f50fbbf57e8173282c5cdd7d66cd9090103e Mon Sep 17 00:00:00 2001
+From e07bd381439a464938bd6f4c3b508f277aeffac9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ee60f50fbbf57e8173282c5cdd7d66cd9090103e ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 1d2940a370..1785425bb5 100644
+index 781eaf5e99..ee38f233e1 100644
@@ -34 +35 @@
-@@ -277,4 +277,5 @@ mlx5_hw_rss_ptype_create_miss_flow(struct rte_eth_dev *dev,
+@@ -276,4 +276,5 @@ mlx5_hw_rss_ptype_create_miss_flow(struct rte_eth_dev *dev,
@@ -40 +41 @@
-@@ -301,8 +302,8 @@ mlx5_hw_rss_ptype_create_miss_flow(struct rte_eth_dev *dev,
+@@ -300,8 +301,8 @@ mlx5_hw_rss_ptype_create_miss_flow(struct rte_eth_dev *dev,
@@ -53 +54 @@
-@@ -317,5 +318,5 @@ mlx5_hw_rss_ptype_create_base_flow(struct rte_eth_dev *dev,
+@@ -316,5 +317,5 @@ mlx5_hw_rss_ptype_create_base_flow(struct rte_eth_dev *dev,
@@ -60 +61 @@
-@@ -347,7 +348,7 @@ mlx5_hw_rss_ptype_create_base_flow(struct rte_eth_dev *dev,
+@@ -346,7 +347,7 @@ mlx5_hw_rss_ptype_create_base_flow(struct rte_eth_dev *dev,
@@ -71 +72 @@
-@@ -427,4 +428,5 @@ flow_nta_create_single(struct rte_eth_dev *dev,
+@@ -426,4 +427,5 @@ flow_nta_create_single(struct rte_eth_dev *dev,
@@ -77 +78 @@
-@@ -458,8 +460,7 @@ flow_nta_create_single(struct rte_eth_dev *dev,
+@@ -457,8 +459,7 @@ flow_nta_create_single(struct rte_eth_dev *dev,