[dpdk-stable] patch 'net/sfc: fix a Tx queue double release possibility' has been queued to stable release 18.08.1

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/26/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From b6f3cc25414269b602e221c2486448934f71bd01 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Fri, 14 Sep 2018 08:31:36 +0100
Subject: [PATCH] net/sfc: fix a Tx queue double release possibility

[ upstream commit 5d138ef92d47b34af589e49f505fb1bf6db5f09b ]

There are two function that call sfc_tx_qfini():
sfc_tx_fini_queues() and sfc_tx_queue_release(). But only
sfc_tx_queue_release() sets tx_queues pointer of the device data to NULL.
It may lead to the scenario in which a queue is destroyed by
sfc_tx_fini_queues() and after the queue is attempted to be destroyed again
by sfc_tx_queue_release().

Move NULL assignment to sfc_tx_qfini().

Fixes: b1b7ad933b39 ("net/sfc: set up and release Tx queues")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/sfc_ethdev.c | 3 ---
 drivers/net/sfc/sfc_tx.c     | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index d35187a3a..b5ef47296 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -496,7 +496,4 @@ sfc_tx_queue_release(void *queue)
 	sfc_adapter_lock(sa);
 
-	SFC_ASSERT(sw_index < sa->eth_dev->data->nb_tx_queues);
-	sa->eth_dev->data->tx_queues[sw_index] = NULL;
-
 	sfc_tx_qfini(sa, sw_index);
 
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index 6d42a1a65..0c909b1f5 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -234,4 +234,6 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
 
 	SFC_ASSERT(sw_index < sa->txq_count);
+	sa->eth_dev->data->tx_queues[sw_index] = NULL;
+
 	txq_info = &sa->txq_info[sw_index];
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 15:59:14.112898303 +0000
+++ 0019-net-sfc-fix-a-Tx-queue-double-release-possibility.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,8 +1,10 @@
-From 5d138ef92d47b34af589e49f505fb1bf6db5f09b Mon Sep 17 00:00:00 2001
+From b6f3cc25414269b602e221c2486448934f71bd01 Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov@oktetlabs.ru>
 Date: Fri, 14 Sep 2018 08:31:36 +0100
 Subject: [PATCH] net/sfc: fix a Tx queue double release possibility
 
+[ upstream commit 5d138ef92d47b34af589e49f505fb1bf6db5f09b ]
+
 There are two function that call sfc_tx_qfini():
 sfc_tx_fini_queues() and sfc_tx_queue_release(). But only
 sfc_tx_queue_release() sets tx_queues pointer of the device data to NULL.
@@ -13,7 +15,6 @@
 Move NULL assignment to sfc_tx_qfini().
 
 Fixes: b1b7ad933b39 ("net/sfc: set up and release Tx queues")
-Cc: stable@dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
@@ -23,10 +24,10 @@
  2 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
-index 23778c9f3..93bfecc4e 100644
+index d35187a3a..b5ef47296 100644
 --- a/drivers/net/sfc/sfc_ethdev.c
 +++ b/drivers/net/sfc/sfc_ethdev.c
-@@ -499,7 +499,4 @@ sfc_tx_queue_release(void *queue)
+@@ -496,7 +496,4 @@ sfc_tx_queue_release(void *queue)
  	sfc_adapter_lock(sa);
  
 -	SFC_ASSERT(sw_index < sa->eth_dev->data->nb_tx_queues);
@@ -35,7 +36,7 @@
  	sfc_tx_qfini(sa, sw_index);
  
 diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
-index 8af08b37c..12665d813 100644
+index 6d42a1a65..0c909b1f5 100644
 --- a/drivers/net/sfc/sfc_tx.c
 +++ b/drivers/net/sfc/sfc_tx.c
 @@ -234,4 +234,6 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)