[dpdk-stable] patch 'net/mlx5: fix leak on Tx queue creation failure' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/a73c3391bd85cfed48b1302239fcab88bd0a02ed

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From a73c3391bd85cfed48b1302239fcab88bd0a02ed Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at nvidia.com>
Date: Tue, 15 Dec 2020 08:48:32 +0000
Subject: [PATCH] net/mlx5: fix leak on Tx queue creation failure

[ upstream commit b689b00dd253356567c4d95f55921ce6c0e87d80 ]

In Tx queue creation, there are two validations for the Tx
configuration.

When one of them fails, the MR btree memory was not freed what caused a
memory leak.

Free it.

Fixes: f6d9ab4e769f ("net/mlx5: check Tx queue size overflow")

Signed-off-by: Michael Baum <michaelba at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_txq.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 36aa9b59f3..fd1edfff65 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -1317,6 +1317,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 	LIST_INSERT_HEAD(&priv->txqsctrl, tmpl, next);
 	return tmpl;
 error:
+	mlx5_mr_btree_free(&tmpl->txq.mr_ctrl.cache_bh);
 	rte_free(tmpl);
 	return NULL;
 }
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:33.201899402 +0100
+++ 0127-net-mlx5-fix-leak-on-Tx-queue-creation-failure.patch	2021-02-04 12:04:28.194789887 +0100
@@ -1 +1 @@
-From b689b00dd253356567c4d95f55921ce6c0e87d80 Mon Sep 17 00:00:00 2001
+From a73c3391bd85cfed48b1302239fcab88bd0a02ed Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b689b00dd253356567c4d95f55921ce6c0e87d80 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index d96abef883..b81bb4a12d 100644
+index 36aa9b59f3..fd1edfff65 100644
@@ -27 +28 @@
-@@ -1146,6 +1146,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+@@ -1317,6 +1317,7 @@ mlx5_txq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
@@ -32 +33 @@
- 	mlx5_free(tmpl);
+ 	rte_free(tmpl);