patch 'net/mlx5: fix template flow rule identification' has been queued to stable release 24.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.3

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

Thanks.

Kevin

---
>From 709450b4cbdf30afd4cbe652dc7ed1901dda8b6f Mon Sep 17 00:00:00 2001
From: Junfeng Guo <junfengg at nvidia.com>
Date: Thu, 5 Jun 2025 13:07:34 +0300
Subject: [PATCH] net/mlx5: fix template flow rule identification

[ upstream commit 82e0453609e59d66b0fce9c59ce0380d7bc39e17 ]

Set the flag nt_rule to be FALSE whenever the flow rule is created
through template API. This would ensure that this flow is always
treated as template API flow after mlx5_ipool_malloc without being
zeroing via memset.

Otherwise, some tables or template actions may be still in use for
port init stage when attaching a port for template or non-template
rule, in scenarios where the uninitialized memory nt_rule happens
to contain a TRUE value.

Fixes: 2fda185a8c1c ("net/mlx5: reuse flow fields")
Fixes: 63296851fadb ("net/mlx5: support flow rule update")

Signed-off-by: Junfeng Guo <junfengg at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_hw.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index a0e7a6ba0b..f60b7b0cc0 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -3889,4 +3889,5 @@ flow_hw_async_flow_create_generic(struct rte_eth_dev *dev,
 		goto error;
 	}
+	flow->nt_rule = false;
 	rule_acts = flow_hw_get_dr_action_buffer(priv, table, action_template_index, queue);
 	/*
@@ -4095,5 +4096,5 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev,
 	aux = mlx5_flow_hw_aux(dev->data->port_id, of);
 	nf = &aux->upd_flow;
-	memset(nf, 0, sizeof(struct rte_flow_hw));
+	nf->nt_rule = false;
 	rule_acts = flow_hw_get_dr_action_buffer(priv, table, action_template_index, queue);
 	/*
-- 
2.50.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-07-18 20:29:14.397657882 +0100
+++ 0098-net-mlx5-fix-template-flow-rule-identification.patch	2025-07-18 20:29:11.011907579 +0100
@@ -1 +1 @@
-From 82e0453609e59d66b0fce9c59ce0380d7bc39e17 Mon Sep 17 00:00:00 2001
+From 709450b4cbdf30afd4cbe652dc7ed1901dda8b6f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 82e0453609e59d66b0fce9c59ce0380d7bc39e17 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index e26093522f..af2e7a84a5 100644
+index a0e7a6ba0b..f60b7b0cc0 100644
@@ -30 +31 @@
-@@ -3936,4 +3936,5 @@ flow_hw_async_flow_create_generic(struct rte_eth_dev *dev,
+@@ -3889,4 +3889,5 @@ flow_hw_async_flow_create_generic(struct rte_eth_dev *dev,
@@ -36 +37 @@
-@@ -4142,5 +4143,5 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev,
+@@ -4095,5 +4096,5 @@ flow_hw_async_flow_update(struct rte_eth_dev *dev,