[dpdk-stable] patch 'net/sfc: fix a Tx queue double release possibility' has been queued to LTS release 17.11.5
Yongseok Koh
yskoh at mellanox.com
Fri Nov 30 00:10:18 CET 2018
Hi,
FYI, your patch has been queued to LTS release 17.11.5
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/01/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.
Yongseok
---
>From 8a9fe070659b061a70b0dd21913d219cc6aaa8f2 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at 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 at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at 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 ba08d615a..94e7c7924 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -512,9 +512,6 @@ 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);
sfc_adapter_unlock(sa);
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index d1320f462..9b1e6541e 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -239,6 +239,8 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
sfc_log_init(sa, "TxQ = %u", 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];
txq = txq_info->txq;
--
2.11.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-11-29 15:01:46.334116293 -0800
+++ 0024-net-sfc-fix-a-Tx-queue-double-release-possibility.patch 2018-11-29 15:01:45.023962000 -0800
@@ -1,8 +1,10 @@
-From 5d138ef92d47b34af589e49f505fb1bf6db5f09b Mon Sep 17 00:00:00 2001
+From 8a9fe070659b061a70b0dd21913d219cc6aaa8f2 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at 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 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, 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 ba08d615a..94e7c7924 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
-@@ -498,9 +498,6 @@ sfc_tx_queue_release(void *queue)
+@@ -512,9 +512,6 @@ sfc_tx_queue_release(void *queue)
sfc_adapter_lock(sa);
@@ -37,10 +38,10 @@
sfc_adapter_unlock(sa);
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
-index 8af08b37c..12665d813 100644
+index d1320f462..9b1e6541e 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
-@@ -233,6 +233,8 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
+@@ -239,6 +239,8 @@ sfc_tx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
sfc_log_init(sa, "TxQ = %u", sw_index);
SFC_ASSERT(sw_index < sa->txq_count);
More information about the stable
mailing list