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

[Kevin Traynor]

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 0a43a68d47396224b28dd3a10c5088c755cc4b69 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Fri, 14 Sep 2018 08:31:35 +0100
Subject: [PATCH] net/sfc: fix an Rx queue double release possibility

[ upstream commit 7eb7588c99ab5fd0f31032b29cac74b57e1de2ff ]

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

Move NULL assignment to sfc_rx_qfini().

Fixes: ce35b05c635e ("net/sfc: implement Rx queue setup release operations")

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

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 9decbf5af..d35187a3a 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -442,6 +442,4 @@ sfc_rx_queue_release(void *queue)
 	sfc_log_init(sa, "RxQ=%u", sw_index);
 
-	sa->eth_dev->data->rx_queues[sw_index] = NULL;
-
 	sfc_rx_qfini(sa, sw_index);
 
diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index d8503e201..311b8d9df 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -1104,4 +1104,5 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
 
 	SFC_ASSERT(sw_index < sa->rxq_count);
+	sa->eth_dev->data->rx_queues[sw_index] = NULL;
 
 	rxq_info = &sa->rxq_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.086953252 +0000
+++ 0018-net-sfc-fix-an-Rx-queue-double-release-possibility.patch	2018-11-21 15:59:13.000000000 +0000
@@ -1,8 +1,10 @@
-From 7eb7588c99ab5fd0f31032b29cac74b57e1de2ff Mon Sep 17 00:00:00 2001
+From 0a43a68d47396224b28dd3a10c5088c755cc4b69 Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov at oktetlabs.ru>
 Date: Fri, 14 Sep 2018 08:31:35 +0100
 Subject: [PATCH] net/sfc: fix an Rx queue double release possibility
 
+[ upstream commit 7eb7588c99ab5fd0f31032b29cac74b57e1de2ff ]
+
 There are two function that call sfc_rx_qfini():
 sfc_rx_fini_queues() and sfc_rx_queue_release(). But only
 sfc_rx_queue_release() sets rx_queues pointer of the device data to NULL.
@@ -13,7 +15,6 @@
 Move NULL assignment to sfc_rx_qfini().
 
 Fixes: ce35b05c635e ("net/sfc: implement Rx queue setup release operations")
-Cc: stable at dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -23,10 +24,10 @@
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
-index 435bde67f..23778c9f3 100644
+index 9decbf5af..d35187a3a 100644
 --- a/drivers/net/sfc/sfc_ethdev.c
 +++ b/drivers/net/sfc/sfc_ethdev.c
-@@ -445,6 +445,4 @@ sfc_rx_queue_release(void *queue)
+@@ -442,6 +442,4 @@ sfc_rx_queue_release(void *queue)
  	sfc_log_init(sa, "RxQ=%u", sw_index);
  
 -	sa->eth_dev->data->rx_queues[sw_index] = NULL;
@@ -34,7 +35,7 @@
  	sfc_rx_qfini(sa, sw_index);
  
 diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
-index 338184dda..58c57acfe 100644
+index d8503e201..311b8d9df 100644
 --- a/drivers/net/sfc/sfc_rx.c
 +++ b/drivers/net/sfc/sfc_rx.c
 @@ -1104,4 +1104,5 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)