net/sfc: fix an Rx queue double release possibility
PATCH 1/2 net/sfc: fix an Rx queue double release possibility
From: Igor Romanov <[email protected]>
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().
--- drivers/net/sfc/sfc_ethdev.c | 2 -- drivers/net/sfc/sfc_rx.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/sfc/sfc_ethdev.c +0 -2
@@ -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);
drivers/net/sfc/sfc_rx.c +1 -0
@@ -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];
Signature · 1 line
2.17.1
PATCH 2/2 net/sfc: fix a Tx queue double release possibility
From: Igor Romanov <[email protected]>
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().
--- drivers/net/sfc/sfc_ethdev.c | 3 --- drivers/net/sfc/sfc_tx.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/sfc/sfc_ethdev.c +0 -3
@@ -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);
drivers/net/sfc/sfc_tx.c +2 -0
@@ -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;
Signature · 1 line
2.17.1
Quoted 9 lines · Andrew Rybchenko
From: Igor Romanov <[email protected]>
There are two function that call
sfc_rx_qfini():sfc_rx_fini_queues()andsfc_rx_queue_release(). But onlysfc_rx_queue_release()setsrx_queuespointer of the device data to NULL. It may lead to the scenario in which a queue is destroyed bysfc_rx_fini_queues()and after the queue is attempted to be destroyed again bysfc_rx_queue_release().
Quoted 7 lines
Move NULL assignment to
sfc_rx_qfini().Fixes ce35b05c635e ("net/sfc: implement Rx queue setup release operations")Signed-off-by Igor Romanov <[email protected]>Signed-off-by Andrew Rybchenko <[email protected]>
Series applied to dpdk-next-net/master, thanks.