* [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx queue double release possibility
@ 2018-09-14 7:31 Andrew Rybchenko
2018-09-14 7:31 ` [dpdk-stable] [PATCH 2/2] net/sfc: fix a Tx " Andrew Rybchenko
2018-09-21 14:53 ` [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx " Ferruh Yigit
0 siblings, 2 replies; 3+ messages in thread
From: Andrew Rybchenko @ 2018-09-14 7:31 UTC (permalink / raw)
To: dev; +Cc: Igor Romanov, stable
From: Igor Romanov <igor.romanov@oktetlabs.ru>
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")
Cc: stable@dpdk.org
Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@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 435bde67f..23778c9f3 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -444,8 +444,6 @@ 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);
sfc_adapter_unlock(sa);
diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index c6321d174..5bd6bb9be 100644
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -1104,6 +1104,7 @@ sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
struct sfc_rxq *rxq;
SFC_ASSERT(sw_index < sa->rxq_count);
+ sa->eth_dev->data->rx_queues[sw_index] = NULL;
rxq_info = &sa->rxq_info[sw_index];
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dpdk-stable] [PATCH 2/2] net/sfc: fix a Tx queue double release possibility
2018-09-14 7:31 [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx queue double release possibility Andrew Rybchenko
@ 2018-09-14 7:31 ` Andrew Rybchenko
2018-09-21 14:53 ` [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx " Ferruh Yigit
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Rybchenko @ 2018-09-14 7:31 UTC (permalink / raw)
To: dev; +Cc: Igor Romanov, stable
From: Igor Romanov <igor.romanov@oktetlabs.ru>
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")
Cc: stable@dpdk.org
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 23778c9f3..93bfecc4e 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)
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 8af08b37c..12665d813 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)
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.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx queue double release possibility
2018-09-14 7:31 [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx queue double release possibility Andrew Rybchenko
2018-09-14 7:31 ` [dpdk-stable] [PATCH 2/2] net/sfc: fix a Tx " Andrew Rybchenko
@ 2018-09-21 14:53 ` Ferruh Yigit
1 sibling, 0 replies; 3+ messages in thread
From: Ferruh Yigit @ 2018-09-21 14:53 UTC (permalink / raw)
To: Andrew Rybchenko, dev; +Cc: Igor Romanov, stable
On 9/14/2018 8:31 AM, Andrew Rybchenko wrote:
> From: Igor Romanov <igor.romanov@oktetlabs.ru>
>
> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Series applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-21 14:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-14 7:31 [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx queue double release possibility Andrew Rybchenko
2018-09-14 7:31 ` [dpdk-stable] [PATCH 2/2] net/sfc: fix a Tx " Andrew Rybchenko
2018-09-21 14:53 ` [dpdk-stable] [PATCH 1/2] net/sfc: fix an Rx " Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).