patch 'net/hns3: fix double free for Rx/Tx queue' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/24. 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/46ac5a94babb0f2b546b2cb18eeca1fcb7da7f4f

Thanks.

Kevin

---
>From 46ac5a94babb0f2b546b2cb18eeca1fcb7da7f4f Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui at huawei.com>
Date: Wed, 3 Apr 2024 18:16:21 +0800
Subject: [PATCH] net/hns3: fix double free for Rx/Tx queue

[ upstream commit bbf6fcc0cc62031a26517608a471873339423d8c ]

The Pointers to some resources on the Rx/Tx queue need to be set to NULL
after free inside the hns3_rx/tx_queue_release(), as this function is
called from multiple threads (reset thread, device config thread, etc),
leading to double memory free error.

Fixes: bba636698316 ("net/hns3: support Rx/Tx and related operations")

Signed-off-by: Dengdui Huang <huangdengdui at huawei.com>
Signed-off-by: Jie Hai <haijie1 at huawei.com>
---
 drivers/net/hns3/hns3_rxtx.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index deda150a5b..cbd09e69d0 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -87,8 +87,12 @@ hns3_rx_queue_release(void *queue)
 	if (rxq) {
 		hns3_rx_queue_release_mbufs(rxq);
-		if (rxq->mz)
+		if (rxq->mz) {
 			rte_memzone_free(rxq->mz);
-		if (rxq->sw_ring)
+			rxq->mz = NULL;
+		}
+		if (rxq->sw_ring) {
 			rte_free(rxq->sw_ring);
+			rxq->sw_ring = NULL;
+		}
 		rte_free(rxq);
 	}
@@ -101,10 +105,16 @@ hns3_tx_queue_release(void *queue)
 	if (txq) {
 		hns3_tx_queue_release_mbufs(txq);
-		if (txq->mz)
+		if (txq->mz) {
 			rte_memzone_free(txq->mz);
-		if (txq->sw_ring)
+			txq->mz = NULL;
+		}
+		if (txq->sw_ring) {
 			rte_free(txq->sw_ring);
-		if (txq->free)
+			txq->sw_ring = NULL;
+		}
+		if (txq->free) {
 			rte_free(txq->free);
+			txq->free = NULL;
+		}
 		rte_free(txq);
 	}
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:10.303464061 +0100
+++ 0009-net-hns3-fix-double-free-for-Rx-Tx-queue.patch	2024-08-23 17:18:09.622429763 +0100
@@ -1 +1 @@
-From bbf6fcc0cc62031a26517608a471873339423d8c Mon Sep 17 00:00:00 2001
+From 46ac5a94babb0f2b546b2cb18eeca1fcb7da7f4f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bbf6fcc0cc62031a26517608a471873339423d8c ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/hns3/hns3_rxtx.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
+ drivers/net/hns3/hns3_rxtx.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
@@ -21 +22 @@
-index 55311402fe..bf10da1928 100644
+index deda150a5b..cbd09e69d0 100644
@@ -24 +25 @@
-@@ -87,7 +87,12 @@ hns3_rx_queue_release(void *queue)
+@@ -87,8 +87,12 @@ hns3_rx_queue_release(void *queue)
@@ -30 +31 @@
--		rte_free(rxq->sw_ring);
+-		if (rxq->sw_ring)
@@ -34 +35 @@
-+			rte_free(rxq->sw_ring);
+ 			rte_free(rxq->sw_ring);
@@ -39 +40 @@
-@@ -100,8 +105,16 @@ hns3_tx_queue_release(void *queue)
+@@ -101,10 +105,16 @@ hns3_tx_queue_release(void *queue)
@@ -45,2 +46 @@
--		rte_free(txq->sw_ring);
--		rte_free(txq->free);
+-		if (txq->sw_ring)
@@ -50 +50,2 @@
-+			rte_free(txq->sw_ring);
+ 			rte_free(txq->sw_ring);
+-		if (txq->free)
@@ -54 +55 @@
-+			rte_free(txq->free);
+ 			rte_free(txq->free);