net/i40e: fix queue related exception handling
PATCH 1/1 net/i40e: fix queue related exception handling
There should have different behavior in queue start fail and stop fail case. When queue start fail, all the next actions should be terminated and then started queues should be cleared. But for queue stop stage, one queue stop fail should not end other queues stop. This patch fixed that issue in PF and VF.
--- drivers/net/i40e/i40e_ethdev.c | 116 ++++++++------------------------------ drivers/net/i40e/i40e_ethdev_vf.c | 2 - drivers/net/i40e/i40e_rxtx.c | 28 +++++++++ 3 files changed, 53 insertions(+), 93 deletions(-)
drivers/net/i40e/i40e_ethdev.c +25 -91
@@ -2276,6 +2276,7 @@ i40e_dev_start(struct rte_eth_dev *dev)struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;uint32_t intr_vector =0 ;struct i40e_vsi *vsi; +uint16_t nb_rxq, nb_txq; hw->adapter_stopped =0 ;
@@ -2307,7 +2308,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_dev_rxtx_init (pf);if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"Failed to init rx/tx queues" ); - goto err_up; +return ret; }/* Map queues with MSIX interrupt */
@@ -2332,10 +2333,16 @@ i40e_dev_start(struct rte_eth_dev *dev) }/* Enable all queues which have been configured */ - ret =i40e_dev_switch_queues (pf, TRUE); -if (ret !=I40E_SUCCESS ) { -PMD_DRV_LOG (ERR ,"Failed to enable VSI" ); - goto err_up; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + ret =i40e_dev_rx_queue_start (dev, nb_rxq); +if (ret) + goto rx_err; + } + +for (nb_txq =0 ; nb_txq < dev->data->nb_tx_queues; nb_txq++) { + ret =i40e_dev_tx_queue_start (dev, nb_txq); +if (ret) + goto tx_err; }/* Enable receiving broadcast packets */
@@ -2365,7 +2372,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_aq_set_lb_modes (hw, dev->data->dev_conf.lpbk_mode,NULL );if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"fail to set loopback link" ); - goto err_up; + goto tx_err; } }
@@ -2373,7 +2380,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_apply_link_speed (dev);if (I40E_SUCCESS != ret) {PMD_DRV_LOG (ERR ,"Fail to apply link setting" ); - goto err_up; + goto tx_err; }if (!rte_intr_allow_others (intr_handle)) {
@@ -2416,9 +2423,12 @@ i40e_dev_start(struct rte_eth_dev *dev)return I40E_SUCCESS ; -err_up: -i40e_dev_switch_queues (pf, FALSE); -i40e_dev_clear_queues (dev); +tx_err: +for (i =0 ; i < nb_txq; i++) +i40e_dev_tx_queue_stop (dev, i); +rx_err: +for (i =0 ; i < nb_rxq; i++) +i40e_dev_rx_queue_stop (dev, i);return ret; }
@@ -2442,7 +2452,11 @@ i40e_dev_stop(struct rte_eth_dev *dev) }/* Disable all queues */ -i40e_dev_switch_queues (pf, FALSE); +for (i =0 ; i < dev->data->nb_tx_queues; i++) +i40e_dev_tx_queue_stop (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +i40e_dev_rx_queue_stop (dev, i);/* un-map queues with interrupt registers */ i40e_vsi_disable_queues_intr (main_vsi);
@@ -6278,33 +6292,6 @@ i40e_switch_tx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)return I40E_SUCCESS ; } -/* Swith on or off the tx queues */ -static int -i40e_dev_switch_tx_queues (struct i40e_pf *pf,bool on) -{ -struct rte_eth_dev_data *dev_data = pf->dev_data; -struct i40e_tx_queue *txq; -struct rte_eth_dev *dev = pf->adapter->eth_dev; -uint16_t i; -int ret; - -for (i =0 ; i < dev_data->nb_tx_queues; i++) { - txq = dev_data->tx_queues[i]; -/* Don't operate the queue if not configured or -* if starting only per queue */ -if (!txq || !txq->q_set || (on && txq->tx_deferred_start)) -continue ; -if (on) - ret =i40e_dev_tx_queue_start (dev, i); -else - ret =i40e_dev_tx_queue_stop (dev, i); -if ( ret !=I40E_SUCCESS ) -return ret; - } - -return I40E_SUCCESS ; -} -int i40e_switch_rx_queue (struct i40e_hw *hw,uint16_t q_idx,bool on) {
@@ -6356,59 +6343,6 @@ i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)return I40E_SUCCESS ; } -/* Switch on or off the rx queues */ -static int -i40e_dev_switch_rx_queues (struct i40e_pf *pf,bool on) -{ -struct rte_eth_dev_data *dev_data = pf->dev_data; -struct i40e_rx_queue *rxq; -struct rte_eth_dev *dev = pf->adapter->eth_dev; -uint16_t i; -int ret; - -for (i =0 ; i < dev_data->nb_rx_queues; i++) { - rxq = dev_data->rx_queues[i]; -/* Don't operate the queue if not configured or -* if starting only per queue */ -if (!rxq || !rxq->q_set || (on && rxq->rx_deferred_start)) -continue ; -if (on) - ret =i40e_dev_rx_queue_start (dev, i); -else - ret =i40e_dev_rx_queue_stop (dev, i); -if (ret !=I40E_SUCCESS ) -return ret; - } - -return I40E_SUCCESS ; -} - -/* Switch on or off all the rx/tx queues */ -int -i40e_dev_switch_queues (struct i40e_pf *pf,bool on) -{ -int ret; - -if (on) { -/* enable rx queues before enabling tx queues */ - ret =i40e_dev_switch_rx_queues (pf, on); -if (ret) { -PMD_DRV_LOG (ERR ,"Failed to switch rx queues" ); -return ret; - } - ret =i40e_dev_switch_tx_queues (pf, on); - }else { -/* Stop tx queues before stopping rx queues */ - ret =i40e_dev_switch_tx_queues (pf, on); -if (ret) { -PMD_DRV_LOG (ERR ,"Failed to switch tx queues" ); -return ret; - } - ret =i40e_dev_switch_rx_queues (pf, on); - } - -return ret; -}/* Initialize VSI for TX */ static int
drivers/net/i40e/i40e_ethdev_vf.c +0 -2
@@ -789,7 +789,6 @@ i40evf_stop_queues(struct rte_eth_dev *dev)for (i =0 ; i < dev->data->nb_tx_queues; i++) {if (i40evf_dev_tx_queue_stop (dev, i) !=0 ) {PMD_DRV_LOG (ERR ,"Fail to stop queue %u" , i); -return -1 ; } }
@@ -797,7 +796,6 @@ i40evf_stop_queues(struct rte_eth_dev *dev)for (i =0 ; i < dev->data->nb_rx_queues; i++) {if (i40evf_dev_rx_queue_stop (dev, i) !=0 ) {PMD_DRV_LOG (ERR ,"Fail to stop queue %u" , i); -return -1 ; } }
drivers/net/i40e/i40e_rxtx.c +28 -0
@@ -1570,6 +1570,15 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)PMD_INIT_FUNC_TRACE (); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + } + +if (rxq->rx_deferred_start) +PMD_DRV_LOG (ERR ,"RX queue %u is deferrd start" , + rx_queue_id); err =i40e_alloc_rx_queue_mbufs (rxq);if (err) {
@@ -1602,6 +1611,11 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + }/* * rx_queue_id is queue id application refers to, while
@@ -1630,6 +1644,15 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)PMD_INIT_FUNC_TRACE (); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + } + +if (txq->tx_deferred_start) +PMD_DRV_LOG (ERR ,"TX queue %u is deferrd start" , + tx_queue_id);/* * tx_queue_id is queue id application refers to, while
@@ -1654,6 +1677,11 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + }/* * tx_queue_id is queue id application refers to, while
Signature · 1 line
2.9.5
Quoted 79 lines · Qiming Yang
There should have different behavior in queue start fail and stop fail case. When queue start fail, all the next actions should be terminated and then started queues should be cleared. But for queue stop stage, one queue stop fail should not end other queues stop. This patch fixed that issue in PF and VF.
Fixes b6583ee40265 ("i40e: full VMDQ pools support")Fixes 3f6a696f1054 ("i40evf: queue start and stop")Signed-off-by Qiming Yang <[email protected]>---
drivers/net/i40e/i40e_ethdev.c | 116 ++++++++------------------------------ drivers/net/i40e/i40e_ethdev_vf.c | 2 - drivers/net/i40e/i40e_rxtx.c | 28 +++++++++ 3 files changed, 53 insertions(+), 93 deletions(-)drivers/net/i40e/i40e_ethdev.c +14
-7@@ -2276,6 +2276,7 @@ i40e_dev_start(struct rte_eth_dev *dev)struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;uint32_t intr_vector =0 ;struct i40e_vsi *vsi; +uint16_t nb_rxq, nb_txq; hw->adapter_stopped =0 ;@@ -2307,7 +2308,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_dev_rxtx_init (pf);if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"Failed to init rx/tx queues" ); - goto err_up; +return ret; }/* Map queues with MSIX interrupt */ @@ -2332,10 +2333,16 @@ i40e_dev_start(struct rte_eth_dev *dev) }/* Enable all queues which have been configured */ - ret =i40e_dev_switch_queues (pf, TRUE); -if (ret !=I40E_SUCCESS ) { -PMD_DRV_LOG (ERR ,"Failed to enable VSI" ); - goto err_up; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + ret =i40e_dev_rx_queue_start (dev, nb_rxq); +if (ret) + goto rx_err; + } + +for (nb_txq =0 ; nb_txq < dev->data->nb_tx_queues; nb_txq++) { + ret =i40e_dev_tx_queue_start (dev, nb_txq); +if (ret) + goto tx_err; }/* Enable receiving broadcast packets */ @@ -2365,7 +2372,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_aq_set_lb_modes (hw, dev->data->dev_conf.lpbk_mode,NULL );if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"fail to set loopback link" ); - goto err_up; + goto tx_err; } }@@ -2373,7 +2380,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_apply_link_speed (dev);if (I40E_SUCCESS != ret) {PMD_DRV_LOG (ERR ,"Fail to apply link setting" ); - goto err_up; + goto tx_err; }if (!rte_intr_allow_others (intr_handle)) {@@ -2416,9 +2423,12 @@ i40e_dev_start(struct rte_eth_dev *dev)return I40E_SUCCESS ;
drivers/net/i40e/i40e_ethdev.c i40e_dev_start(struct rte_eth_dev *dev) · line 2431
Quoted 10 lines
drivers/net/i40e/i40e_ethdev.c +6
-3-err_up: -i40e_dev_switch_queues (pf, FALSE); -i40e_dev_clear_queues (dev); +tx_err: +for (i =0 ; i < nb_txq; i++) +i40e_dev_tx_queue_stop (dev, i); +rx_err: +for (i =0 ; i < nb_rxq; i++) +i40e_dev_rx_queue_stop (dev, i);
I think we still need to clear queues in the error handling.
Quoted 16 lines
drivers/net/i40e/i40e_ethdev.c +5
-1return ret; }@@ -2442,7 +2452,11 @@ i40e_dev_stop(struct rte_eth_dev *dev) }/* Disable all queues */ -i40e_dev_switch_queues (pf, FALSE); +for (i =0 ; i < dev->data->nb_tx_queues; i++) +i40e_dev_tx_queue_stop (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +i40e_dev_rx_queue_stop (dev, i);/* un-map queues with interrupt registers */ i40e_vsi_disable_queues_intr (main_vsi);
[snip]
Quoted 7 lines
drivers/net/i40e/i40e_rxtx.c +0
-0@@ -1570,6 +1570,15 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)PMD_INIT_FUNC_TRACE ();
drivers/net/i40e/i40e_rxtx.c i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) · line 1581
Quoted 10 lines
drivers/net/i40e/i40e_rxtx.c +9
-0rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + } + +if (rxq->rx_deferred_start) +PMD_DRV_LOG (ERR ,"RX queue %u is deferrd start" , + rx_queue_id);
Do we need to take any action if rx_deferred_start is set? Just print an ERR log doesn't make sense to me.
Quoted 18 lines
drivers/net/i40e/i40e_rxtx.c +5
-0err =i40e_alloc_rx_queue_mbufs (rxq);if (err) {@@ -1602,6 +1611,11 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + }/* * rx_queue_id is queue id application refers to, while @@ -1630,6 +1644,15 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)PMD_INIT_FUNC_TRACE ();
drivers/net/i40e/i40e_rxtx.c i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id) · line 1655
Quoted 10 lines
drivers/net/i40e/i40e_rxtx.c +9
-0txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + } + +if (txq->tx_deferred_start) +PMD_DRV_LOG (ERR ,"TX queue %u is deferrd start" , + tx_queue_id);
Ditto.
Thanks,
Xiaolong
Quoted 18 lines
drivers/net/i40e/i40e_rxtx.c +5
-0/* * tx_queue_id is queue id application refers to, while @@ -1654,6 +1677,11 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + }/* * tx_queue_id is queue id application refers to, while Signature · 1 line
2.9.5
Hi, Xiaolong
Quoted 25 lines
-----Original Message-----
From: Ye, Xiaolong <[email protected]>
Sent: Thursday, May 14, 2020 15:44
To: Yang, Qiming <[email protected]>
Cc: [email protected]; Xing, Beilei <[email protected]>; [email protected]
Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix queue related exception handlingQuoted 16 lines · Qiming Yang
There should have different behavior in queue start fail and stop fail case. When queue start fail, all the next actions should be terminated and then started queues should be cleared. But for queue stop stage, one queue stop fail should not end other queues stop. This patch fixed that issue in PF and VF.
Fixes b6583ee40265 ("i40e: full VMDQ pools support")Fixes 3f6a696f1054 ("i40evf: queue start and stop")Signed-off-by Qiming Yang <[email protected]>---
drivers/net/i40e/i40e_ethdev.c | 116 ++++++++------------------------------ drivers/net/i40e/i40e_ethdev_vf.c | 2 - drivers/net/i40e/i40e_rxtx.c | 28 +++++++++ 3 files changed, 53 insertions(+), 93 deletions(-)
Snip ...
Quoted 13 lines
drivers/net/i40e/i40e_ethdev.c i40e_dev_start(struct rte_eth_dev *dev) · line 2431
Quoted 11 lines
return I40E_SUCCESS;drivers/net/i40e/i40e_ethdev.c +6
-3-err_up: -i40e_dev_switch_queues (pf, FALSE); -i40e_dev_clear_queues (dev); +tx_err: +for (i =0 ; i < nb_txq; i++) +i40e_dev_tx_queue_stop (dev, i); +rx_err: +for (i =0 ; i < nb_rxq; i++) +i40e_dev_rx_queue_stop (dev, i);I think we still need to clear queues in the error handling.
I delete clear function doesn't means clear queue action be deleted.
In i40e_dev_clear_queues, it calls these four functions
i40e_tx_queue_release_mbufs(dev->data->tx_queues[i]); i40e_reset_tx_queue(dev->data->tx_queues[i]); i40e_rx_queue_release_mbufs(dev->data->rx_queues[i]); i40e_reset_rx_queue(dev->data->rx_queues[i]);
it covered by queue_stop function.
Quoted 28 lines
Quoted 17 lines
return ret; }drivers/net/i40e/i40e_ethdev.c +5
-1@@ -2442,7 +2452,11 @@ i40e_dev_stop(struct rte_eth_dev *dev) }/* Disable all queues */ -i40e_dev_switch_queues (pf, FALSE); +for (i =0 ; i < dev->data->nb_tx_queues; i++) +i40e_dev_tx_queue_stop (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +i40e_dev_rx_queue_stop (dev, i);/* un-map queues with interrupt registers */ i40e_vsi_disable_queues_intr (main_vsi);[snip]
drivers/net/i40e/i40e_rxtx.c i40e_dev_rx_queue_start(struct rte_eth_dev
Quoted 5 lines
(quoted diff) +0
-0
b/drivers/net/i40e/i40e_rxtx.cindex f6d23c9..d0bada9 100644drivers/net/i40e/i40e_rxtx.c +0
-0@@ -1570,6 +1570,15 @@ i40e_dev_rx_queue_start(struct rte_eth_dev*dev,
uint16_trx_queue_id)Quoted 2 lines
drivers/net/i40e/i40e_rxtx.c +0
-0PMD_INIT_FUNC_TRACE ();
Quoted 13 lines
drivers/net/i40e/i40e_rxtx.c i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) · line 1581
Quoted 10 lines
drivers/net/i40e/i40e_rxtx.c +9
-0rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + } + +if (rxq->rx_deferred_start) +PMD_DRV_LOG (ERR ,"RX queue %u is deferrd start" , + rx_queue_id);Do we need to take any action if
rx_deferred_startis set? Just print an ERR log doesn't make sense to me.
If defer set, this queue start will be skipped. But this should not block other queues' start. So I add a log to let user know but no return error.
Maybe return WARNING will be more softer, what do you think about?
Quoted 58 lines
drivers/net/i40e/i40e_rxtx.c i40e_dev_rx_queue_stop(struct rte_eth_dev
Quoted 5 lines
drivers/net/i40e/i40e_rxtx.c +0
-0err =i40e_alloc_rx_queue_mbufs (rxq);if (err) {@@ -1602,6 +1611,11 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev*dev,
uint16_trx_queue_id)Quoted 11 lines
drivers/net/i40e/i40e_rxtx.c +5
-0struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data- dev_private); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + }/* Quoted 2 lines
*
rx_queue_idis queue id application refers to, while @@ -1630,6
+1644,15 @@ i40e_dev_tx_queue_start(structrte_eth_dev*dev,uint16_t
tx_queue_id)drivers/net/i40e/i40e_rxtx.c i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id) · line 1655
Quoted 12 lines
PMD_INIT_FUNC_TRACE(); txq = dev->data->tx_queues[tx_queue_id];drivers/net/i40e/i40e_rxtx.c +9
-0+if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + } + +if (txq->tx_deferred_start) +PMD_DRV_LOG (ERR ,"TX queue %u is deferrd start" , + tx_queue_id);Ditto.
Thanks,
XiaolongQuoted 4 lines
/* * tx_queue_id is queue id application refers to, while @@ -1654,6+1677,11 @@ i40e_dev_tx_queue_stop(struct
rte_eth_dev*dev,uint16_t
tx_queue_id)Quoted 15 lines
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
dev_private);txq = dev->data->tx_queues[tx_queue_id];drivers/net/i40e/i40e_rxtx.c +5
-0+if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + }/* * tx_queue_id is queue id application refers to, while--
2.9.5
PATCH v2 1/1 net/i40e: fix queue related exception handling
In reply to Qiming YangThere should have different behavior in queue start fail and stop fail case. When queue start fail, all the next actions should be terminated and then started queues should be cleared. But for queue stop stage, one queue stop fail should not end other queues stop. This patch fixed that issue in PF and VF.
--- drivers/net/i40e/i40e_ethdev.c | 116 ++++++++------------------------------ drivers/net/i40e/i40e_ethdev_vf.c | 2 - drivers/net/i40e/i40e_rxtx.c | 28 +++++++++ 3 files changed, 53 insertions(+), 93 deletions(-)
drivers/net/i40e/i40e_ethdev.c +25 -91
@@ -2276,6 +2276,7 @@ i40e_dev_start(struct rte_eth_dev *dev)struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;uint32_t intr_vector =0 ;struct i40e_vsi *vsi; +uint16_t nb_rxq, nb_txq; hw->adapter_stopped =0 ;
@@ -2307,7 +2308,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_dev_rxtx_init (pf);if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"Failed to init rx/tx queues" ); - goto err_up; +return ret; }/* Map queues with MSIX interrupt */
@@ -2332,10 +2333,16 @@ i40e_dev_start(struct rte_eth_dev *dev) }/* Enable all queues which have been configured */ - ret =i40e_dev_switch_queues (pf, TRUE); -if (ret !=I40E_SUCCESS ) { -PMD_DRV_LOG (ERR ,"Failed to enable VSI" ); - goto err_up; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + ret =i40e_dev_rx_queue_start (dev, nb_rxq); +if (ret) + goto rx_err; + } + +for (nb_txq =0 ; nb_txq < dev->data->nb_tx_queues; nb_txq++) { + ret =i40e_dev_tx_queue_start (dev, nb_txq); +if (ret) + goto tx_err; }/* Enable receiving broadcast packets */
@@ -2365,7 +2372,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_aq_set_lb_modes (hw, dev->data->dev_conf.lpbk_mode,NULL );if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"fail to set loopback link" ); - goto err_up; + goto tx_err; } }
@@ -2373,7 +2380,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_apply_link_speed (dev);if (I40E_SUCCESS != ret) {PMD_DRV_LOG (ERR ,"Fail to apply link setting" ); - goto err_up; + goto tx_err; }if (!rte_intr_allow_others (intr_handle)) {
@@ -2416,9 +2423,12 @@ i40e_dev_start(struct rte_eth_dev *dev)return I40E_SUCCESS ; -err_up: -i40e_dev_switch_queues (pf, FALSE); -i40e_dev_clear_queues (dev); +tx_err: +for (i =0 ; i < nb_txq; i++) +i40e_dev_tx_queue_stop (dev, i); +rx_err: +for (i =0 ; i < nb_rxq; i++) +i40e_dev_rx_queue_stop (dev, i);return ret; }
@@ -2442,7 +2452,11 @@ i40e_dev_stop(struct rte_eth_dev *dev) }/* Disable all queues */ -i40e_dev_switch_queues (pf, FALSE); +for (i =0 ; i < dev->data->nb_tx_queues; i++) +i40e_dev_tx_queue_stop (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +i40e_dev_rx_queue_stop (dev, i);/* un-map queues with interrupt registers */ i40e_vsi_disable_queues_intr (main_vsi);
@@ -6278,33 +6292,6 @@ i40e_switch_tx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)return I40E_SUCCESS ; } -/* Swith on or off the tx queues */ -static int -i40e_dev_switch_tx_queues (struct i40e_pf *pf,bool on) -{ -struct rte_eth_dev_data *dev_data = pf->dev_data; -struct i40e_tx_queue *txq; -struct rte_eth_dev *dev = pf->adapter->eth_dev; -uint16_t i; -int ret; - -for (i =0 ; i < dev_data->nb_tx_queues; i++) { - txq = dev_data->tx_queues[i]; -/* Don't operate the queue if not configured or -* if starting only per queue */ -if (!txq || !txq->q_set || (on && txq->tx_deferred_start)) -continue ; -if (on) - ret =i40e_dev_tx_queue_start (dev, i); -else - ret =i40e_dev_tx_queue_stop (dev, i); -if ( ret !=I40E_SUCCESS ) -return ret; - } - -return I40E_SUCCESS ; -} -int i40e_switch_rx_queue (struct i40e_hw *hw,uint16_t q_idx,bool on) {
@@ -6356,59 +6343,6 @@ i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)return I40E_SUCCESS ; } -/* Switch on or off the rx queues */ -static int -i40e_dev_switch_rx_queues (struct i40e_pf *pf,bool on) -{ -struct rte_eth_dev_data *dev_data = pf->dev_data; -struct i40e_rx_queue *rxq; -struct rte_eth_dev *dev = pf->adapter->eth_dev; -uint16_t i; -int ret; - -for (i =0 ; i < dev_data->nb_rx_queues; i++) { - rxq = dev_data->rx_queues[i]; -/* Don't operate the queue if not configured or -* if starting only per queue */ -if (!rxq || !rxq->q_set || (on && rxq->rx_deferred_start)) -continue ; -if (on) - ret =i40e_dev_rx_queue_start (dev, i); -else - ret =i40e_dev_rx_queue_stop (dev, i); -if (ret !=I40E_SUCCESS ) -return ret; - } - -return I40E_SUCCESS ; -} - -/* Switch on or off all the rx/tx queues */ -int -i40e_dev_switch_queues (struct i40e_pf *pf,bool on) -{ -int ret; - -if (on) { -/* enable rx queues before enabling tx queues */ - ret =i40e_dev_switch_rx_queues (pf, on); -if (ret) { -PMD_DRV_LOG (ERR ,"Failed to switch rx queues" ); -return ret; - } - ret =i40e_dev_switch_tx_queues (pf, on); - }else { -/* Stop tx queues before stopping rx queues */ - ret =i40e_dev_switch_tx_queues (pf, on); -if (ret) { -PMD_DRV_LOG (ERR ,"Failed to switch tx queues" ); -return ret; - } - ret =i40e_dev_switch_rx_queues (pf, on); - } - -return ret; -}/* Initialize VSI for TX */ static int
drivers/net/i40e/i40e_ethdev_vf.c +0 -2
@@ -789,7 +789,6 @@ i40evf_stop_queues(struct rte_eth_dev *dev)for (i =0 ; i < dev->data->nb_tx_queues; i++) {if (i40evf_dev_tx_queue_stop (dev, i) !=0 ) {PMD_DRV_LOG (ERR ,"Fail to stop queue %u" , i); -return -1 ; } }
@@ -797,7 +796,6 @@ i40evf_stop_queues(struct rte_eth_dev *dev)for (i =0 ; i < dev->data->nb_rx_queues; i++) {if (i40evf_dev_rx_queue_stop (dev, i) !=0 ) {PMD_DRV_LOG (ERR ,"Fail to stop queue %u" , i); -return -1 ; } }
drivers/net/i40e/i40e_rxtx.c +28 -0
@@ -1570,6 +1570,15 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)PMD_INIT_FUNC_TRACE (); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + } + +if (rxq->rx_deferred_start) +PMD_DRV_LOG (WARNING ,"RX queue %u is deferrd start" , + rx_queue_id); err =i40e_alloc_rx_queue_mbufs (rxq);if (err) {
@@ -1602,6 +1611,11 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + }/* * rx_queue_id is queue id application refers to, while
@@ -1630,6 +1644,15 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)PMD_INIT_FUNC_TRACE (); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + } + +if (txq->tx_deferred_start) +PMD_DRV_LOG (WARNING ,"TX queue %u is deferrd start" , + tx_queue_id);/* * tx_queue_id is queue id application refers to, while
@@ -1654,6 +1677,11 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + }/* * tx_queue_id is queue id application refers to, while
Signature · 1 line
2.9.5
Quoted 8 lines · Qiming Yang
There should have different behavior in queue start fail and stop fail case. When queue start fail, all the next actions should be terminated and then started queues should be cleared. But for queue stop stage, one queue stop fail should not end other queues stop. This patch fixed that issue in PF and VF.
Fixes b6583ee40265 ("i40e: full VMDQ pools support")Fixes 3f6a696f1054 ("i40evf: queue start and stop")
Need to cc stable.
Quoted 274 lines
Signed-off-by Qiming Yang <[email protected]>---
drivers/net/i40e/i40e_ethdev.c | 116 ++++++++------------------------------ drivers/net/i40e/i40e_ethdev_vf.c | 2 - drivers/net/i40e/i40e_rxtx.c | 28 +++++++++ 3 files changed, 53 insertions(+), 93 deletions(-)drivers/net/i40e/i40e_ethdev.c +25
-38@@ -2276,6 +2276,7 @@ i40e_dev_start(struct rte_eth_dev *dev)struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;uint32_t intr_vector =0 ;struct i40e_vsi *vsi; +uint16_t nb_rxq, nb_txq; hw->adapter_stopped =0 ;@@ -2307,7 +2308,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_dev_rxtx_init (pf);if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"Failed to init rx/tx queues" ); - goto err_up; +return ret; }/* Map queues with MSIX interrupt */ @@ -2332,10 +2333,16 @@ i40e_dev_start(struct rte_eth_dev *dev) }/* Enable all queues which have been configured */ - ret =i40e_dev_switch_queues (pf, TRUE); -if (ret !=I40E_SUCCESS ) { -PMD_DRV_LOG (ERR ,"Failed to enable VSI" ); - goto err_up; +for (nb_rxq =0 ; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + ret =i40e_dev_rx_queue_start (dev, nb_rxq); +if (ret) + goto rx_err; + } + +for (nb_txq =0 ; nb_txq < dev->data->nb_tx_queues; nb_txq++) { + ret =i40e_dev_tx_queue_start (dev, nb_txq); +if (ret) + goto tx_err; }/* Enable receiving broadcast packets */ @@ -2365,7 +2372,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_aq_set_lb_modes (hw, dev->data->dev_conf.lpbk_mode,NULL );if (ret !=I40E_SUCCESS ) {PMD_DRV_LOG (ERR ,"fail to set loopback link" ); - goto err_up; + goto tx_err; } }@@ -2373,7 +2380,7 @@ i40e_dev_start(struct rte_eth_dev *dev) ret =i40e_apply_link_speed (dev);if (I40E_SUCCESS != ret) {PMD_DRV_LOG (ERR ,"Fail to apply link setting" ); - goto err_up; + goto tx_err; }if (!rte_intr_allow_others (intr_handle)) {@@ -2416,9 +2423,12 @@ i40e_dev_start(struct rte_eth_dev *dev)return I40E_SUCCESS ; -err_up: -i40e_dev_switch_queues (pf, FALSE); -i40e_dev_clear_queues (dev); +tx_err: +for (i =0 ; i < nb_txq; i++) +i40e_dev_tx_queue_stop (dev, i); +rx_err: +for (i =0 ; i < nb_rxq; i++) +i40e_dev_rx_queue_stop (dev, i);return ret; }@@ -2442,7 +2452,11 @@ i40e_dev_stop(struct rte_eth_dev *dev) }/* Disable all queues */ -i40e_dev_switch_queues (pf, FALSE); +for (i =0 ; i < dev->data->nb_tx_queues; i++) +i40e_dev_tx_queue_stop (dev, i); + +for (i =0 ; i < dev->data->nb_rx_queues; i++) +i40e_dev_rx_queue_stop (dev, i);/* un-map queues with interrupt registers */ i40e_vsi_disable_queues_intr (main_vsi);@@ -6278,33 +6292,6 @@ i40e_switch_tx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)return I40E_SUCCESS ; } -/* Swith on or off the tx queues */ -static int -i40e_dev_switch_tx_queues (struct i40e_pf *pf,bool on) -{ -struct rte_eth_dev_data *dev_data = pf->dev_data; -struct i40e_tx_queue *txq; -struct rte_eth_dev *dev = pf->adapter->eth_dev; -uint16_t i; -int ret; - -for (i =0 ; i < dev_data->nb_tx_queues; i++) { - txq = dev_data->tx_queues[i]; -/* Don't operate the queue if not configured or -* if starting only per queue */ -if (!txq || !txq->q_set || (on && txq->tx_deferred_start)) -continue ; -if (on) - ret =i40e_dev_tx_queue_start (dev, i); -else - ret =i40e_dev_tx_queue_stop (dev, i); -if ( ret !=I40E_SUCCESS ) -return ret; - } - -return I40E_SUCCESS ; -} -int
i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on){drivers/net/i40e/i40e_ethdev.c +0
-53@@ -6356,59 +6343,6 @@ i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)return I40E_SUCCESS ; } -/* Switch on or off the rx queues */ -static int -i40e_dev_switch_rx_queues (struct i40e_pf *pf,bool on) -{ -struct rte_eth_dev_data *dev_data = pf->dev_data; -struct i40e_rx_queue *rxq; -struct rte_eth_dev *dev = pf->adapter->eth_dev; -uint16_t i; -int ret; - -for (i =0 ; i < dev_data->nb_rx_queues; i++) { - rxq = dev_data->rx_queues[i]; -/* Don't operate the queue if not configured or -* if starting only per queue */ -if (!rxq || !rxq->q_set || (on && rxq->rx_deferred_start)) -continue ; -if (on) - ret =i40e_dev_rx_queue_start (dev, i); -else - ret =i40e_dev_rx_queue_stop (dev, i); -if (ret !=I40E_SUCCESS ) -return ret; - } - -return I40E_SUCCESS ; -} - -/* Switch on or off all the rx/tx queues */ -int -i40e_dev_switch_queues (struct i40e_pf *pf,bool on) -{ -int ret; - -if (on) { -/* enable rx queues before enabling tx queues */ - ret =i40e_dev_switch_rx_queues (pf, on); -if (ret) { -PMD_DRV_LOG (ERR ,"Failed to switch rx queues" ); -return ret; - } - ret =i40e_dev_switch_tx_queues (pf, on); - }else { -/* Stop tx queues before stopping rx queues */ - ret =i40e_dev_switch_tx_queues (pf, on); -if (ret) { -PMD_DRV_LOG (ERR ,"Failed to switch tx queues" ); -return ret; - } - ret =i40e_dev_switch_rx_queues (pf, on); - } - -return ret; -}/* Initialize VSI for TX */ static int
drivers/net/i40e/i40e_ethdev_vf.c +0
-2@@ -789,7 +789,6 @@ i40evf_stop_queues(struct rte_eth_dev *dev)for (i =0 ; i < dev->data->nb_tx_queues; i++) {if (i40evf_dev_tx_queue_stop (dev, i) !=0 ) {PMD_DRV_LOG (ERR ,"Fail to stop queue %u" , i); -return -1 ; } }@@ -797,7 +796,6 @@ i40evf_stop_queues(struct rte_eth_dev *dev)for (i =0 ; i < dev->data->nb_rx_queues; i++) {if (i40evf_dev_rx_queue_stop (dev, i) !=0 ) {PMD_DRV_LOG (ERR ,"Fail to stop queue %u" , i); -return -1 ; } }drivers/net/i40e/i40e_rxtx.c +28
-0@@ -1570,6 +1570,15 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)PMD_INIT_FUNC_TRACE (); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + } + +if (rxq->rx_deferred_start) +PMD_DRV_LOG (WARNING ,"RX queue %u is deferrd start" , + rx_queue_id); err =i40e_alloc_rx_queue_mbufs (rxq);if (err) {@@ -1602,6 +1611,11 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); rxq = dev->data->rx_queues[rx_queue_id]; +if (!rxq || !rxq->q_set) { +PMD_DRV_LOG (ERR ,"RX queue %u not available or setup" , + rx_queue_id); +return -EINVAL ; + }/* * rx_queue_id is queue id application refers to, while @@ -1630,6 +1644,15 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)PMD_INIT_FUNC_TRACE (); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + } + +if (txq->tx_deferred_start) +PMD_DRV_LOG (WARNING ,"TX queue %u is deferrd start" , + tx_queue_id);/* * tx_queue_id is queue id application refers to, while @@ -1654,6 +1677,11 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)struct i40e_hw *hw =I40E_DEV_PRIVATE_TO_HW (dev->data->dev_private); txq = dev->data->tx_queues[tx_queue_id]; +if (!txq || !txq->q_set) { +PMD_DRV_LOG (ERR ,"TX queue %u is not available or setup" , + tx_queue_id); +return -EINVAL ; + }/* * tx_queue_id is queue id application refers to, while Signature · 1 line
2.9.5
Applied to dpdk-next-net-intel, Thanks.