patch 'net/mlx5: fix thread workspace memory leak' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 11/14/22. 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/c31f9fd5590ddb18e282e73184beb0b02331a01c

Thanks.

Kevin

---
>From c31f9fd5590ddb18e282e73184beb0b02331a01c Mon Sep 17 00:00:00 2001
From: Dong Zhou <dongzhou at nvidia.com>
Date: Thu, 13 Oct 2022 12:34:02 +0300
Subject: [PATCH] net/mlx5: fix thread workspace memory leak

[ upstream commit 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e ]

The thread workspace push/pop should be paired. In the "flow_list_create"
routine, if error happened the workspace pop was missed. This patch shares
the workspace pop for all return paths.

Fixes: 0064bf431899 ("net/mlx5: fix nested flow creation")

Signed-off-by: Dong Zhou <dongzhou at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 42de516bfd..ef19ca0f18 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -6769,6 +6769,6 @@ error:
 	ret = rte_errno;
 	rte_errno = ret;
-	mlx5_flow_pop_thread_workspace();
 error_before_hairpin_split:
+	mlx5_flow_pop_thread_workspace();
 	rte_free(translated_actions);
 	return 0;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 10:32:17.493259419 +0000
+++ 0017-net-mlx5-fix-thread-workspace-memory-leak.patch	2022-11-11 10:32:17.044300647 +0000
@@ -1 +1 @@
-From 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e Mon Sep 17 00:00:00 2001
+From c31f9fd5590ddb18e282e73184beb0b02331a01c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4df7f801fff5e4065da5c86ad05df0e48d4d3d6e ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index e4744b0a67..6fb1d53fc5 100644
+index 42de516bfd..ef19ca0f18 100644
@@ -23 +24 @@
-@@ -7029,6 +7029,6 @@ error:
+@@ -6769,6 +6769,6 @@ error: