patch 'eventdev/eth_tx: fix queue delete' has been queued to stable release 20.11.6

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.6

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/22/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/377b5aac80c8b3dce8d5eb01c2c0de05fd8672be

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 377b5aac80c8b3dce8d5eb01c2c0de05fd8672be Mon Sep 17 00:00:00 2001
From: Naga Harish K S V <s.v.naga.harish.k at intel.com>
Date: Thu, 23 Jun 2022 15:35:11 +0530
Subject: [PATCH] eventdev/eth_tx: fix queue delete
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 881d4b4d8587419197815db57b94fc58ee487445 ]

Add spinlock protection in queue delete function.
This protects the data path while the queue delete operation
is in progress.

Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")

Signed-off-by: Naga Harish K S V <s.v.naga.harish.k at intel.com>
Acked-by: Jay Jayatheerthan <jay.jayatheerthan at intel.com>
---
 lib/librte_eventdev/rte_event_eth_tx_adapter.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
index 6474056c90..f2b7d36657 100644
--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
@@ -845,9 +845,10 @@ txa_service_queue_del(uint8_t id,
 
 	txa = txa_service_id_to_data(id);
 
+	rte_spinlock_lock(&txa->tx_lock);
 	tqi = txa_service_queue(txa, port_id, tx_queue_id);
 	if (tqi == NULL || !tqi->added)
-		return 0;
+		goto ret_unlock;
 
 	tb = tqi->tx_buf;
 	tqi->added = 0;
@@ -857,6 +858,9 @@ txa_service_queue_del(uint8_t id,
 	txa->txa_ethdev[port_id].nb_queues--;
 
 	txa_service_queue_array_free(txa, port_id);
+
+ret_unlock:
+	rte_spinlock_unlock(&txa->tx_lock);
 	return 0;
 }
 
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-20 15:01:01.303003670 +0800
+++ 0054-eventdev-eth_tx-fix-queue-delete.patch	2022-07-20 15:00:58.794333695 +0800
@@ -1 +1 @@
-From 881d4b4d8587419197815db57b94fc58ee487445 Mon Sep 17 00:00:00 2001
+From 377b5aac80c8b3dce8d5eb01c2c0de05fd8672be Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 881d4b4d8587419197815db57b94fc58ee487445 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -16 +18 @@
- lib/eventdev/rte_event_eth_tx_adapter.c | 6 +++++-
+ lib/librte_eventdev/rte_event_eth_tx_adapter.c | 6 +++++-
@@ -19,5 +21,5 @@
-diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
-index c700fb7b1f..b4b37f1cae 100644
---- a/lib/eventdev/rte_event_eth_tx_adapter.c
-+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
-@@ -891,9 +891,10 @@ txa_service_queue_del(uint8_t id,
+diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.c b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
+index 6474056c90..f2b7d36657 100644
+--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.c
++++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.c
+@@ -845,9 +845,10 @@ txa_service_queue_del(uint8_t id,
@@ -35 +37 @@
-@@ -903,6 +904,9 @@ txa_service_queue_del(uint8_t id,
+@@ -857,6 +858,9 @@ txa_service_queue_del(uint8_t id,