net/qede: fix assignment of Rx/Tx handlers
PATCH 1/2 net/qede: fix assignment of Rx/Tx handlers
Fix to assign dummy Rx/Tx handlers in dev_stop.
For MTU set, assignment of the appropriate Rx/Tx handlers will be handled by dev_start/dev_stop.
--- drivers/net/qede/qede_ethdev.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/net/qede/qede_ethdev.c +16 -17
@@ -320,13 +320,19 @@ qede_interrupt_handler(void *param) }static void -qede_assign_rxtx_handlers (struct rte_eth_dev *dev) +qede_assign_rxtx_handlers (struct rte_eth_dev *dev,bool is_dummy) {uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;struct qede_dev *qdev = dev->data->dev_private;struct ecore_dev *edev = &qdev->edev;bool use_tx_offload = false; +if (is_dummy) { + dev->rx_pkt_burst = qede_rxtx_pkts_dummy; + dev->tx_pkt_burst = qede_rxtx_pkts_dummy; +return ; + } +if (ECORE_IS_CMT (edev)) { dev->rx_pkt_burst = qede_recv_pkts_cmt; dev->tx_pkt_burst = qede_xmit_pkts_cmt;
@@ -1150,7 +1156,9 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)/* Start/resume traffic */ qede_fastpath_start (edev); -qede_assign_rxtx_handlers (eth_dev); +/* Assign I/O handlers */ +qede_assign_rxtx_handlers (eth_dev, false); +DP_INFO (edev,"Device started\n" );return 0 ;
@@ -1166,6 +1174,11 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)PMD_INIT_FUNC_TRACE (edev); +/* Replace I/O functions with dummy ones. It cannot +* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. +*/ +qede_assign_rxtx_handlers (eth_dev, true); +/* Disable vport */ if (qede_activate_vport (eth_dev, false))return ;
@@ -2316,11 +2329,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) dev->data->min_rx_buf_size);return -EINVAL ; } -/* Temporarily replace I/O functions with dummy ones. It cannot -* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. -*/ - dev->rx_pkt_burst = qede_rxtx_pkts_dummy; - dev->tx_pkt_burst = qede_rxtx_pkts_dummy;if (dev->data->dev_started) { dev->data->dev_started =0 ;qede_dev_stop (dev);
@@ -2359,15 +2367,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)/* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len; -/* Reassign back */ -qede_assign_rxtx_handlers (dev); -if (ECORE_IS_CMT (edev)) { - dev->rx_pkt_burst = qede_recv_pkts_cmt; - dev->tx_pkt_burst = qede_xmit_pkts_cmt; - }else { - dev->rx_pkt_burst = qede_recv_pkts; - dev->tx_pkt_burst = qede_xmit_pkts; - }return 0 ; }
@@ -2570,7 +2569,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)strncpy ((char *)params.name,QEDE_PMD_VER_PREFIX ,QEDE_PMD_DRV_VER_STR_SIZE ); -qede_assign_rxtx_handlers (eth_dev); +qede_assign_rxtx_handlers (eth_dev, true); eth_dev->tx_pkt_prepare = qede_xmit_prep_pkts;/* For CMT mode device do periodic polling for slowpath events.
Signature · 1 line
2.18.0
PATCH 2/2 net/qede: restore Tx queue setup
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
--- drivers/net/qede/qede_ethdev.h | 3 +++ drivers/net/qede/qede_rxtx.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)
drivers/net/qede/qede_ethdev.h +3 -0
@@ -235,6 +235,9 @@ struct qede_dev {bool enable_lro;uint8_t num_rx_queues;uint8_t num_tx_queues; +uint16_t num_rx_desc; +uint16_t num_tx_desc; +const struct rte_eth_txconf *tx_conf; SLIST_HEAD(vlan_list_head, qede_vlan_entry)vlan_list_head;uint16_t configured_vlans;bool accept_any_vlan;
drivers/net/qede/qede_rxtx.c +24 -1
@@ -151,6 +151,7 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev, rxq->qdev = qdev; rxq->mb_pool = mp; rxq->nb_rx_desc = nb_desc; + qdev->num_rx_desc = rxq->nb_rx_desc; rxq->queue_id = queue_idx; rxq->port_id = dev->data->port_id;
@@ -405,6 +406,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev, } txq->nb_tx_desc = nb_desc; + qdev->num_tx_desc = txq->nb_tx_desc; txq->qdev = qdev; txq->port_id = dev->data->port_id;
@@ -443,6 +445,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev, txq->nb_tx_avail = txq->nb_tx_desc; + qdev->tx_conf = tx_conf; txq->tx_free_thresh = tx_conf->tx_free_thresh ? tx_conf->tx_free_thresh : (txq->nb_tx_desc -QEDE_DEFAULT_TX_FREE_THRESH );
@@ -593,7 +596,7 @@ qede_alloc_mem_sb(struct qede_dev *qdev, struct ecore_sb_info *sb_info,int qede_alloc_fp_resc (struct qede_dev *qdev) { -struct ecore_dev *edev = &qdev->edev; +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev);struct qede_fastpath *fp;uint32_t num_sbs;uint16_t sb_idx;
@@ -1005,9 +1008,29 @@ static int qede_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)int qede_start_queues (struct rte_eth_dev *eth_dev) {struct qede_dev *qdev =QEDE_INIT_QDEV (eth_dev); +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev); +struct qede_tx_queue *txq; +struct qede_fastpath *fp;uint8_t id;int rc =-1 ; +/* Restore setup of Tx queues */ +for (id =0 ; id < qdev->num_tx_queues; id++) { + fp = &qdev->fp_array[id]; + txq = fp->txq; + +if (!txq) { + rc =qede_tx_queue_setup (eth_dev, id, qdev->num_tx_desc, + eth_dev->data->numa_node, + qdev->tx_conf); +if (rc !=ECORE_SUCCESS ) { +DP_ERR (edev,"TX queue %u not setup rc=%d\n" , + id, rc); +return -1 ; + } + } + } +for (id =0 ; id < qdev->num_rx_queues; id++) { rc =qede_rx_queue_start (eth_dev, id);if (rc !=ECORE_SUCCESS )
Signature · 1 line
2.18.0
Re: [dpdk-dev] [PATCH 2/2] net/qede: restore Tx queue setup
Quoted 5 lines · Rasesh Mody
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
This would avoid the following case
- The application works only on a specific PMD.
- every PMD duplicating such restoration code.
Quoted 92 lines
Signed-off-by Rasesh Mody <[email protected]>Signed-off-by Igor Russkikh <[email protected]>--- drivers/net/qede/qede_ethdev.h | 3 +++ drivers/net/qede/qede_rxtx.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)drivers/net/qede/qede_ethdev.h +3
-0@@ -235,6 +235,9 @@ struct qede_dev {bool enable_lro;uint8_t num_rx_queues;uint8_t num_tx_queues; +uint16_t num_rx_desc; +uint16_t num_tx_desc; +const struct rte_eth_txconf *tx_conf; SLIST_HEAD(vlan_list_head, qede_vlan_entry)vlan_list_head;uint16_t configured_vlans;bool accept_any_vlan;drivers/net/qede/qede_rxtx.c +24
-2@@ -151,6 +151,7 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev, rxq->qdev = qdev; rxq->mb_pool = mp; rxq->nb_rx_desc = nb_desc; + qdev->num_rx_desc = rxq->nb_rx_desc; rxq->queue_id = queue_idx; rxq->port_id = dev->data->port_id;@@ -405,6 +406,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev, } txq->nb_tx_desc = nb_desc; + qdev->num_tx_desc = txq->nb_tx_desc; txq->qdev = qdev; txq->port_id = dev->data->port_id;@@ -443,6 +445,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev, txq->nb_tx_avail = txq->nb_tx_desc; + qdev->tx_conf = tx_conf; txq->tx_free_thresh = tx_conf->tx_free_thresh ? tx_conf->tx_free_thresh : (txq->nb_tx_desc -QEDE_DEFAULT_TX_FREE_THRESH );@@ -593,7 +596,7 @@ qede_alloc_mem_sb(struct qede_dev *qdev, struct ecore_sb_info *sb_info,int qede_alloc_fp_resc (struct qede_dev *qdev) { -struct ecore_dev *edev = &qdev->edev; +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev);struct qede_fastpath *fp;uint32_t num_sbs;uint16_t sb_idx;@@ -1005,9 +1008,29 @@ static int qede_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)int qede_start_queues (struct rte_eth_dev *eth_dev) {struct qede_dev *qdev =QEDE_INIT_QDEV (eth_dev); +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev); +struct qede_tx_queue *txq; +struct qede_fastpath *fp;uint8_t id;int rc =-1 ; +/* Restore setup of Tx queues */ +for (id =0 ; id < qdev->num_tx_queues; id++) { + fp = &qdev->fp_array[id]; + txq = fp->txq; + +if (!txq) { + rc =qede_tx_queue_setup (eth_dev, id, qdev->num_tx_desc, + eth_dev->data->numa_node, + qdev->tx_conf); +if (rc !=ECORE_SUCCESS ) { +DP_ERR (edev,"TX queue %u not setup rc=%d\n" , + id, rc); +return -1 ; + } + } + } +for (id =0 ; id < qdev->num_rx_queues; id++) { rc =qede_rx_queue_start (eth_dev, id);if (rc !=ECORE_SUCCESS ) --2.18.0
Re: [dpdk-dev] [PATCH 2/2] net/qede: restore Tx queue setup
Quoted 11 lines · Jerin Jacob
Quoted 5 lines · Rasesh Mody
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.
Quoted 98 lines
This would avoid the following case
- The application works only on a specific PMD.
- every PMD duplicating such restoration code.Quoted 92 lines
Signed-off-by Rasesh Mody <[email protected]>Signed-off-by Igor Russkikh <[email protected]>--- drivers/net/qede/qede_ethdev.h | 3 +++ drivers/net/qede/qede_rxtx.c | 25 ++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)drivers/net/qede/qede_ethdev.h +3
-0@@ -235,6 +235,9 @@ struct qede_dev {bool enable_lro;uint8_t num_rx_queues;uint8_t num_tx_queues; +uint16_t num_rx_desc; +uint16_t num_tx_desc; +const struct rte_eth_txconf *tx_conf; SLIST_HEAD(vlan_list_head, qede_vlan_entry)vlan_list_head;uint16_t configured_vlans;bool accept_any_vlan;drivers/net/qede/qede_rxtx.c +24
-2@@ -151,6 +151,7 @@ qede_alloc_rx_queue_mem(struct rte_eth_dev *dev, rxq->qdev = qdev; rxq->mb_pool = mp; rxq->nb_rx_desc = nb_desc; + qdev->num_rx_desc = rxq->nb_rx_desc; rxq->queue_id = queue_idx; rxq->port_id = dev->data->port_id;@@ -405,6 +406,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev, } txq->nb_tx_desc = nb_desc; + qdev->num_tx_desc = txq->nb_tx_desc; txq->qdev = qdev; txq->port_id = dev->data->port_id;@@ -443,6 +445,7 @@ qede_alloc_tx_queue_mem(struct rte_eth_dev *dev, txq->nb_tx_avail = txq->nb_tx_desc; + qdev->tx_conf = tx_conf; txq->tx_free_thresh = tx_conf->tx_free_thresh ? tx_conf->tx_free_thresh : (txq->nb_tx_desc -QEDE_DEFAULT_TX_FREE_THRESH );@@ -593,7 +596,7 @@ qede_alloc_mem_sb(struct qede_dev *qdev, struct ecore_sb_info *sb_info,int qede_alloc_fp_resc (struct qede_dev *qdev) { -struct ecore_dev *edev = &qdev->edev; +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev);struct qede_fastpath *fp;uint32_t num_sbs;uint16_t sb_idx;@@ -1005,9 +1008,29 @@ static int qede_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)int qede_start_queues (struct rte_eth_dev *eth_dev) {struct qede_dev *qdev =QEDE_INIT_QDEV (eth_dev); +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev); +struct qede_tx_queue *txq; +struct qede_fastpath *fp;uint8_t id;int rc =-1 ; +/* Restore setup of Tx queues */ +for (id =0 ; id < qdev->num_tx_queues; id++) { + fp = &qdev->fp_array[id]; + txq = fp->txq; + +if (!txq) { + rc =qede_tx_queue_setup (eth_dev, id, qdev->num_tx_desc, + eth_dev->data->numa_node, + qdev->tx_conf); +if (rc !=ECORE_SUCCESS ) { +DP_ERR (edev,"TX queue %u not setup rc=%d\n" , + id, rc); +return -1 ; + } + } + } +for (id =0 ; id < qdev->num_rx_queues; id++) { rc =qede_rx_queue_start (eth_dev, id);if (rc !=ECORE_SUCCESS ) --2.18.0
Re: [dpdk-dev] [PATCH 2/2] net/qede: restore Tx queue setup
05/05/2020 10:59, Ferruh Yigit:
Quoted 10 lines · Jerin Jacob
Quoted 9 lines · Rasesh Mody
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
Quoted 7 lines
Quoted 2 lines
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.
+1
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
Hi,
Quoted 18 lines
From: Thomas Monjalon <[email protected]>
Sent: Tuesday, May 05, 2020 2:15 AM05/05/2020 10:59, Ferruh Yigit:
Quoted 2 lines · Jerin Jacob
Quoted 1 line
On Tue, May 5, 2020 at 8:39 AM Rasesh Mody <[email protected]>
Quoted 11 lines · wrote:
Quoted 10 lines
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
Quoted 7 lines
Quoted 4 lines
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.+1
This is a case of KNI application performing device re-configuration to change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues. Some other applications make use of rte_eth_dev_set_mtu() ethdev op, which looks to be cleaner approach.
Thanks!
-Rasesh
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
Quoted 26 lines · Rasesh Mody
Hi,
Quoted 23 lines
From: Thomas Monjalon <[email protected]>
Sent: Tuesday, May 05, 2020 2:15 AM05/05/2020 10:59, Ferruh Yigit:
Quoted 2 lines · Jerin Jacob
Quoted 1 line
On Tue, May 5, 2020 at 8:39 AM Rasesh Mody <[email protected]>
Quoted 15 lines · wrote:
Quoted 10 lines
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.
Quoted 4 lines
Quoted 2 lines
+1
This is a case of KNI application performing device re-configuration to change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues.
Can we fix the KNI application then?
Quoted 5 lines
Some other applications make use of
rte_eth_dev_set_mtu()ethdev op, which looks to be cleaner approach.Thanks!
-Rasesh
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
Hi Jerin,
Quoted 33 lines
From: Jerin Jacob <[email protected]>
Sent: Sunday, May 10, 2020 12:04 AMQuoted 29 lines · Rasesh Mody
Hi,
Quoted 25 lines
From: Thomas Monjalon <[email protected]>
Sent: Tuesday, May 05, 2020 2:15 AM05/05/2020 10:59, Ferruh Yigit:
Quoted 2 lines · Jerin Jacob
Quoted 1 line
On Tue, May 5, 2020 at 8:39 AM Rasesh Mody <[email protected]>
Quoted 8 lines · wrote:
Quoted 8 lines
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
Quoted 7 lines
Quoted 2 lines
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.+1
Quoted 6 lines
Quoted 1 line
This is a case of KNI application performing device re-configuration to
change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues.
Can we fix the KNI application then?
Yes, I have submitted a v2 series with changes to KNI application. Please apply for -rc3.
Thanks!
-Rasesh
Quoted 7 lines
Quoted 2 lines
Some other applications make use of
rte_eth_dev_set_mtu()ethdev op,which looks to be cleaner approach.
Quoted 4 lines
Thanks!
-Rasesh
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
Quoted 15 lines · Rasesh Mody
Quoted 15 lines
Quoted 15 lines
Quoted 14 lines
Quoted 11 lines
Quoted 6 lines
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.+1
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
This is a case of KNI application performing device re-configuration to
change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues.
Can we fix the KNI application then?
Yes, I have submitted a v2 series with changes to KNI application. Please apply for -rc3.
Since it has the KNI app change, I have delegated the series to @Ferruh Yigit to take it over next-net instead of next-net-mrvl.
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
In reply to Rasesh ModyQuoted 25 lines · Rasesh Mody
Hi,
Quoted 23 lines
From: Thomas Monjalon <[email protected]>
Sent: Tuesday, May 05, 2020 2:15 AM05/05/2020 10:59, Ferruh Yigit:
Quoted 2 lines · Jerin Jacob
Quoted 1 line
On Tue, May 5, 2020 at 8:39 AM Rasesh Mody <[email protected]>
Quoted 15 lines · wrote:
Quoted 10 lines
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.
Quoted 4 lines
Quoted 2 lines
+1
This is a case of KNI application performing device re-configuration to change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues.
Why it crash? Device re-configuration should not be changing the number of the queues, it is always 1. What is missing/wrong without the Tx queue setup?
Quoted 2 lines
Some other applications make use of
rte_eth_dev_set_mtu()ethdev op, which looks to be cleaner approach.
+1. I don't know history if there is a specific reason this way selected, but after release I think we can try this.
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
Quoted 32 lines
From: Ferruh Yigit <[email protected]>
Sent: Thursday, May 14, 2020 7:33 AMQuoted 28 lines · Rasesh Mody
Hi,
Quoted 25 lines
From: Thomas Monjalon <[email protected]>
Sent: Tuesday, May 05, 2020 2:15 AM05/05/2020 10:59, Ferruh Yigit:
Quoted 2 lines · Jerin Jacob
Quoted 1 line
On Tue, May 5, 2020 at 8:39 AM Rasesh Mody <[email protected]>
Quoted 8 lines · wrote:
Quoted 8 lines
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
Quoted 7 lines
Quoted 2 lines
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.+1
Quoted 8 lines
Quoted 1 line
This is a case of KNI application performing device re-configuration to
change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues.
Why it crash? Device re-configuration should not be changing the number of the queues, it is always 1. What is missing/wrong without the Tx queue setup?
QEDE PMD deallocates all fastpath resources unconditionally, including Tx queue, when re-configuring the device. When reallocating resources PMD relies on application to explicitly setup the Rx/Tx queue.
Deallocation of all the resources is only required if the Rx/Tx queue configuration changes. So when KNI MTU change performs device re-configuration it exposes a bug, where there are no Tx queue resources setup. Then while starting the Tx queue in HW from PMD, application crashes. I'll submit a PMD fix for device re-configuration.
Quoted 7 lines
Quoted 1 line
Some other applications make use of
rte_eth_dev_set_mtu()ethdev op,which looks to be cleaner approach.
Quoted 1 line
+1. I don't know history if there is a specific reason this way +selected, but
after release I think we can try this.
Sure.
Thanks!
-Rasesh
Re: [dpdk-dev] [EXT] Re: [PATCH 2/2] net/qede: restore Tx queue setup
Quoted 37 lines · Rasesh Mody
Quoted 37 lines
From: Ferruh Yigit <[email protected]>
Sent: Thursday, May 14, 2020 7:33 AMQuoted 25 lines · Rasesh Mody
Hi,
Quoted 23 lines
From: Thomas Monjalon <[email protected]>
Sent: Tuesday, May 05, 2020 2:15 AM05/05/2020 10:59, Ferruh Yigit:
Quoted 2 lines · Jerin Jacob
Quoted 1 line
On Tue, May 5, 2020 at 8:39 AM Rasesh Mody <[email protected]>
Quoted 15 lines · wrote:
Quoted 10 lines
Quoted 5 lines
Some applications do not explicitly restore Tx queues setup during port re-configuration. This patch adds changes to check for released Tx queues and restore the setup if application doesn't explicitly does that.
+ethdev maintainers.
I think, Ideally, the fix should be in common code if we need to support such applications.
Is this a case application re-configures to increase the number of queues but doesn't setup new queues?
If so this looks like application error and application should be fixed instead of recover this in the ethdev.Quoted 4 lines
Quoted 2 lines
+1
This is a case of KNI application performing device re-configuration to
change MTU. The application explicitly calls Rx queue setup, however doesn't call Tx queue setup. When MTU for KNI interface is changed it runs into a segfault when trying to start Tx queues.
Quoted 7 lines
Quoted 3 lines
Why it crash? Device re-configuration should not be changing the number of the queues, it is always 1. What is missing/wrong without the Tx queue setup?
QEDE PMD deallocates all fastpath resources unconditionally, including Tx queue, when re-configuring the device. When reallocating resources PMD relies on application to explicitly setup the Rx/Tx queue.
Deallocation of all the resources is only required if the Rx/Tx queue configuration changes. So when KNI MTU change performs device re-configuration it exposes a bug, where there are no Tx queue resources setup. Then while starting the Tx queue in HW from PMD, application crashes. I'll submit a PMD fix for device re-configuration.
Got it.
But if there is no change in queue number in the re-configure, application doesn't have to call the Rx/Tx setup. In this case even you fix the KNI sample app, any other user application can hit same issue.
Quoted 13 lines
Quoted 8 lines
Quoted 2 lines
Some other applications make use of
rte_eth_dev_set_mtu()ethdev op,which looks to be cleaner approach.
Quoted 1 line
+1. I don't know history if there is a specific reason this way +selected, but
after release I think we can try this.Sure.
Thanks!
-Rasesh
Quoted 51 lines · Rasesh Mody
Fix to assign dummy Rx/Tx handlers in
dev_stop.
For MTU set, assignment of the appropriate Rx/Tx handlers will be handled by dev_start/dev_stop.Fixes 81f8804992c9 ("net/qede: enhance Rx CPU utilization")Fixes 8de0c4201926 ("net/qede: fix odd number of queues usage in 100G mode")Signed-off-by Rasesh Mody <[email protected]>Signed-off-by Igor Russkikh <[email protected]>--- drivers/net/qede/qede_ethdev.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)drivers/net/qede/qede_ethdev.c +10
-2@@ -320,13 +320,19 @@ qede_interrupt_handler(void *param) }static void -qede_assign_rxtx_handlers (struct rte_eth_dev *dev) +qede_assign_rxtx_handlers (struct rte_eth_dev *dev,bool is_dummy) {uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;struct qede_dev *qdev = dev->data->dev_private;struct ecore_dev *edev = &qdev->edev;bool use_tx_offload = false; +if (is_dummy) { + dev->rx_pkt_burst = qede_rxtx_pkts_dummy; + dev->tx_pkt_burst = qede_rxtx_pkts_dummy; +return ; + } +if (ECORE_IS_CMT (edev)) { dev->rx_pkt_burst = qede_recv_pkts_cmt; dev->tx_pkt_burst = qede_xmit_pkts_cmt;@@ -1150,7 +1156,9 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)/* Start/resume traffic */ qede_fastpath_start (edev); -qede_assign_rxtx_handlers (eth_dev); +/* Assign I/O handlers */ +qede_assign_rxtx_handlers (eth_dev, false); +DP_INFO (edev,"Device started\n" );return 0 ;
drivers/net/qede/qede_ethdev.c static void qede_dev_stop(struct rte_eth_dev *eth_dev) · line 1181
Quoted 8 lines
drivers/net/qede/qede_ethdev.c +5
-0@@ -1166,6 +1174,11 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)PMD_INIT_FUNC_TRACE (edev); +/* Replace I/O functions with dummy ones. It cannot +* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. +*/ +qede_assign_rxtx_handlers (eth_dev, true); +
Why need to assign dummy handlers on stop(), what happens if you keep them as they are as many PMD does?
Quoted 41 lines
drivers/net/qede/qede_ethdev.c +1
-15/* Disable vport */ if (qede_activate_vport (eth_dev, false))return ;@@ -2316,11 +2329,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) dev->data->min_rx_buf_size);return -EINVAL ; } -/* Temporarily replace I/O functions with dummy ones. It cannot -* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. -*/ - dev->rx_pkt_burst = qede_rxtx_pkts_dummy; - dev->tx_pkt_burst = qede_rxtx_pkts_dummy;if (dev->data->dev_started) { dev->data->dev_started =0 ;qede_dev_stop (dev);@@ -2359,15 +2367,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)/* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len; -/* Reassign back */ -qede_assign_rxtx_handlers (dev); -if (ECORE_IS_CMT (edev)) { - dev->rx_pkt_burst = qede_recv_pkts_cmt; - dev->tx_pkt_burst = qede_xmit_pkts_cmt; - }else { - dev->rx_pkt_burst = qede_recv_pkts; - dev->tx_pkt_burst = qede_xmit_pkts; - }return 0 ; }@@ -2570,7 +2569,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)strncpy ((char *)params.name,QEDE_PMD_VER_PREFIX ,QEDE_PMD_DRV_VER_STR_SIZE ); -qede_assign_rxtx_handlers (eth_dev); +qede_assign_rxtx_handlers (eth_dev, true); eth_dev->tx_pkt_prepare = qede_xmit_prep_pkts;/* For CMT mode device do periodic polling for slowpath events.
Hi Ferruh,
Quoted 60 lines
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, May 05, 2020 2:01 AMQuoted 29 lines · Rasesh Mody
Fix to assign dummy Rx/Tx handlers in
dev_stop.
For MTU set, assignment of the appropriate Rx/Tx handlers will be handled by dev_start/dev_stop.Fixes 81f8804992c9 ("net/qede: enhance Rx CPU utilization")Fixes 8de0c4201926 ("net/qede: fix odd number of queues usage in 100Gmode")
Cc: [email protected]Signed-off-by Rasesh Mody <[email protected]>Signed-off-by Igor Russkikh <[email protected]>--- drivers/net/qede/qede_ethdev.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)(quoted diff) +0
-0
b/drivers/net/qede/qede_ethdev.cindexe71fa1e6a..726daa3e3100644drivers/net/qede/qede_ethdev.c +1
-1@@ -320,13 +320,19 @@ qede_interrupt_handler(void *param) }static void -qede_assign_rxtx_handlers (struct rte_eth_dev *dev) +qede_assign_rxtx_handlers (struct rte_eth_dev *dev,bool is_dummy) {uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;struct qede_dev *qdev = dev->data->dev_private;struct ecore_dev *edev = &qdev->edev;bool use_tx_offload = false;drivers/net/qede/qede_ethdev.c qede_interrupt_handler(void *param) } · line 337
Quoted 10 lines
drivers/net/qede/qede_ethdev.c +6
-0+if (is_dummy) { + dev->rx_pkt_burst = qede_rxtx_pkts_dummy; + dev->tx_pkt_burst = qede_rxtx_pkts_dummy; +return ; + } +if (ECORE_IS_CMT (edev)) { dev->rx_pkt_burst = qede_recv_pkts_cmt; dev->tx_pkt_burst = qede_xmit_pkts_cmt; @@ -1150,7+1156,9 @@
Quoted 16 lines
drivers/net/qede/qede_ethdev.c +0
-0static int qede_dev_start (struct rte_eth_dev *eth_dev)drivers/net/qede/qede_ethdev.c +3
-1/* Start/resume traffic */ qede_fastpath_start (edev); -qede_assign_rxtx_handlers (eth_dev); +/* Assign I/O handlers */ +qede_assign_rxtx_handlers (eth_dev, false); +DP_INFO (edev,"Device started\n" );return 0 ;@@ -1166,6 +1174,11 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)PMD_INIT_FUNC_TRACE (edev);
Quoted 8 lines
drivers/net/qede/qede_ethdev.c static void qede_dev_stop(struct rte_eth_dev *eth_dev) · line 1181
Quoted 5 lines
drivers/net/qede/qede_ethdev.c +5
-0+/* Replace I/O functions with dummy ones. It cannot +* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. +*/ +qede_assign_rxtx_handlers (eth_dev, true); +Why need to assign dummy handlers on
stop(), what happens if you keep them as they are as many PMD does?
It helps in preventing crash when queues are still in use.
Thanks!
-Rasesh
Quoted 45 lines
drivers/net/qede/qede_ethdev.c static int qede_set_mtu(struct rte_eth_dev
Quoted 5 lines
drivers/net/qede/qede_ethdev.c +0
-0/* Disable vport */ if (qede_activate_vport (eth_dev, false))drivers/net/qede/qede_ethdev.c +0
-0return ;@@ -2316,11 +2329,6 @@ static int qede_set_mtu(struct rte_eth_dev*dev,
uint16_tmtu)drivers/net/qede/qede_ethdev.c static int qede_set_mtu(struct rte_eth_dev
Quoted 12 lines
drivers/net/qede/qede_ethdev.c +0
-5dev->data->min_rx_buf_size);return -EINVAL ; } -/* Temporarily replace I/O functions with dummy ones. It cannot -* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. -*/ - dev->rx_pkt_burst = qede_rxtx_pkts_dummy; - dev->tx_pkt_burst = qede_rxtx_pkts_dummy;if (dev->data->dev_started) { dev->data->dev_started =0 ;qede_dev_stop (dev);@@ -2359,15 +2367,6 @@ static int qede_set_mtu(struct rte_eth_dev*dev,
uint16_tmtu)drivers/net/qede/qede_ethdev.c static int qede_common_dev_init(struct
Quoted 16 lines
drivers/net/qede/qede_ethdev.c +0
-9/* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len; -/* Reassign back */ -qede_assign_rxtx_handlers (dev); -if (ECORE_IS_CMT (edev)) { - dev->rx_pkt_burst = qede_recv_pkts_cmt; - dev->tx_pkt_burst = qede_xmit_pkts_cmt; - }else { - dev->rx_pkt_burst = qede_recv_pkts; - dev->tx_pkt_burst = qede_xmit_pkts; - }return 0 ; }@@ -2570,7 +2569,7 @@ static int qede_common_dev_init(struct
rte_eth_dev*eth_dev, boolis_vf)Quoted 9 lines
drivers/net/qede/qede_ethdev.c +1
-1strncpy ((char *)params.name,QEDE_PMD_VER_PREFIX ,QEDE_PMD_DRV_VER_STR_SIZE ); -qede_assign_rxtx_handlers (eth_dev); +qede_assign_rxtx_handlers (eth_dev, true); eth_dev->tx_pkt_prepare = qede_xmit_prep_pkts;/* For CMT mode device do periodic polling for slowpath events.
PATCH v2 1/2 net/qede: fix assignment of Rx/Tx handlers
In reply to Rasesh ModyFix to assign dummy Rx/Tx handlers in dev_stop.
For MTU set, assignment of the appropriate Rx/Tx handlers will be handled by dev_start/dev_stop.
--- drivers/net/qede/qede_ethdev.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/net/qede/qede_ethdev.c +16 -17
@@ -320,13 +320,19 @@ qede_interrupt_handler(void *param) }static void -qede_assign_rxtx_handlers (struct rte_eth_dev *dev) +qede_assign_rxtx_handlers (struct rte_eth_dev *dev,bool is_dummy) {uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;struct qede_dev *qdev = dev->data->dev_private;struct ecore_dev *edev = &qdev->edev;bool use_tx_offload = false; +if (is_dummy) { + dev->rx_pkt_burst = qede_rxtx_pkts_dummy; + dev->tx_pkt_burst = qede_rxtx_pkts_dummy; +return ; + } +if (ECORE_IS_CMT (edev)) { dev->rx_pkt_burst = qede_recv_pkts_cmt; dev->tx_pkt_burst = qede_xmit_pkts_cmt;
@@ -1153,7 +1159,9 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)/* Start/resume traffic */ qede_fastpath_start (edev); -qede_assign_rxtx_handlers (eth_dev); +/* Assign I/O handlers */ +qede_assign_rxtx_handlers (eth_dev, false); +DP_INFO (edev,"Device started\n" );return 0 ;
@@ -1175,6 +1183,11 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)/* Update link status */ qede_link_update (eth_dev,0 ); +/* Replace I/O functions with dummy ones. It cannot +* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. +*/ +qede_assign_rxtx_handlers (eth_dev, true); +/* Disable vport */ if (qede_activate_vport (eth_dev, false))return ;
@@ -2323,11 +2336,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) dev->data->min_rx_buf_size);return -EINVAL ; } -/* Temporarily replace I/O functions with dummy ones. It cannot -* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. -*/ - dev->rx_pkt_burst = qede_rxtx_pkts_dummy; - dev->tx_pkt_burst = qede_rxtx_pkts_dummy;if (dev->data->dev_started) { dev->data->dev_started =0 ;qede_dev_stop (dev);
@@ -2366,15 +2374,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)/* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len; -/* Reassign back */ -qede_assign_rxtx_handlers (dev); -if (ECORE_IS_CMT (edev)) { - dev->rx_pkt_burst = qede_recv_pkts_cmt; - dev->tx_pkt_burst = qede_xmit_pkts_cmt; - }else { - dev->rx_pkt_burst = qede_recv_pkts; - dev->tx_pkt_burst = qede_xmit_pkts; - }return 0 ; }
@@ -2577,7 +2576,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)strncpy ((char *)params.name,QEDE_PMD_VER_PREFIX ,QEDE_PMD_DRV_VER_STR_SIZE ); -qede_assign_rxtx_handlers (eth_dev); +qede_assign_rxtx_handlers (eth_dev, true); eth_dev->tx_pkt_prepare = qede_xmit_prep_pkts;/* For CMT mode device do periodic polling for slowpath events.
Signature · 1 line
2.18.0
PATCH v2 2/2 examples/kni: fix MTU change to setup Tx queue
In reply to Rasesh ModyThis patch adds a fix to setup Tx queue when changing KNI interface MTU. It ensures device can safely start txq post MTU change operation.
--- examples/kni/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
examples/kni/main.c +13 -1
@@ -774,9 +774,11 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) {int ret;uint16_t nb_rxd =NB_RXD ; +uint16_t nb_txd =NB_TXD ;struct rte_eth_conf conf;struct rte_eth_dev_info dev_info;struct rte_eth_rxconf rxq_conf; +struct rte_eth_txconf txq_conf;if (!rte_eth_dev_is_valid_port (port_id)) {RTE_LOG (ERR ,APP ,"Invalid port id %d\n" , port_id);
@@ -804,7 +806,7 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)return ret; } - ret =rte_eth_dev_adjust_nb_rx_tx_desc (port_id, &nb_rxd,NULL ); + ret =rte_eth_dev_adjust_nb_rx_tx_desc (port_id, &nb_rxd, &nb_txd);if (ret <0 ) rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors " "for port%u (%d)\n", (unsigned int)port_id,
@@ -829,6 +831,16 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)return ret; } + txq_conf = dev_info.default_txconf; + txq_conf.offloads = conf.txmode.offloads; + ret =rte_eth_tx_queue_setup (port_id,0 , nb_txd, +rte_eth_dev_socket_id (port_id), &txq_conf); +if (ret <0 ) { +RTE_LOG (ERR ,APP ,"Fail to setup Tx queue of port %d\n" , + port_id); +return ret; + } +/* Restart specific port */ ret =rte_eth_dev_start (port_id);if (ret <0 ) {
Signature · 1 line
2.18.0
Re: [dpdk-dev] [PATCH v2 2/2] examples/kni: fix MTU change to setup Tx queue
Quoted 44 lines · Rasesh Mody
This patch adds a fix to setup Tx queue when changing KNI interface MTU. It ensures device can safely start txq post MTU change operation.
Fixes fc9ee41b7016 ("examples/kni: convert to new ethdev offloads API")Signed-off-by Rasesh Mody <[email protected]>--- examples/kni/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)examples/kni/main.c +6
-1@@ -774,9 +774,11 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu) {int ret;uint16_t nb_rxd =NB_RXD ; +uint16_t nb_txd =NB_TXD ;struct rte_eth_conf conf;struct rte_eth_dev_info dev_info;struct rte_eth_rxconf rxq_conf; +struct rte_eth_txconf txq_conf;if (!rte_eth_dev_is_valid_port (port_id)) {RTE_LOG (ERR ,APP ,"Invalid port id %d\n" , port_id);@@ -804,7 +806,7 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)return ret; } - ret =rte_eth_dev_adjust_nb_rx_tx_desc (port_id, &nb_rxd,NULL ); + ret =rte_eth_dev_adjust_nb_rx_tx_desc (port_id, &nb_rxd, &nb_txd);if (ret <0 ) rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors " "for port%u (%d)\n", (unsigned int)port_id,@@ -829,6 +831,16 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)return ret; } + txq_conf = dev_info.default_txconf; + txq_conf.offloads = conf.txmode.offloads; + ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
examples/kni/main.c kni_change_mtu(uint16_t port_id, unsigned int new_mtu) · line 846
Quoted 10 lines
examples/kni/main.c +7
-0+ rte_eth_dev_socket_id(port_id), &txq_conf); +if (ret <0 ) { +RTE_LOG (ERR ,APP ,"Fail to setup Tx queue of port %d\n" , + port_id); +return ret; + } +/* Restart specific port */ ret =rte_eth_dev_start (port_id);if (ret <0 ) {
Hi Rasesh,
The change looks OK but I am trying to understand the need for it, already asked in other tread, will follow there.
Re: [dpdk-dev] [PATCH v2 2/2] examples/kni: fix MTU change to setup Tx queue
In reply to Rasesh ModyQuoted 7 lines · Rasesh Mody
This patch adds a fix to setup Tx queue when changing KNI interface MTU. It ensures device can safely start txq post MTU change operation.
Fixes fc9ee41b7016 ("examples/kni: convert to new ethdev offloads API")Signed-off-by Rasesh Mody <[email protected]>
I see you are going with a fix in the PMD, but the fix in the KNI sample also looks reasonable, so I guess we can keep this.
Thomas Monjalon
AppliedRe: [dpdk-dev] [PATCH v2 2/2] examples/kni: fix MTU change to setup Tx queue
15/05/2020 13:29, Ferruh Yigit:
Quoted 7 lines · Rasesh Mody
Quoted 6 lines
This patch adds a fix to setup Tx queue when changing KNI interface MTU. It ensures device can safely start txq post MTU change operation.
Fixes fc9ee41b7016 ("examples/kni: convert to new ethdev offloads API")
Quoted 6 lines
Quoted 1 line
Signed-off-by Rasesh Mody <[email protected]>I see you are going with a fix in the PMD, but the fix in the KNI sample also looks reasonable, so I guess we can keep this.
Acked-by Ferruh Yigit <[email protected]>
Applied, thanks
PATCH v3 1/2 net/qede: fix assignment of Rx/Tx handlers
In reply to Rasesh ModyFix to assign dummy Rx/Tx handlers in dev_stop.
For MTU set, assignment of the appropriate Rx/Tx handlers will be handled by dev_start/dev_stop.
--- drivers/net/qede/qede_ethdev.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)
drivers/net/qede/qede_ethdev.c +16 -17
@@ -320,13 +320,19 @@ qede_interrupt_handler(void *param) }static void -qede_assign_rxtx_handlers (struct rte_eth_dev *dev) +qede_assign_rxtx_handlers (struct rte_eth_dev *dev,bool is_dummy) {uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;struct qede_dev *qdev = dev->data->dev_private;struct ecore_dev *edev = &qdev->edev;bool use_tx_offload = false; +if (is_dummy) { + dev->rx_pkt_burst = qede_rxtx_pkts_dummy; + dev->tx_pkt_burst = qede_rxtx_pkts_dummy; +return ; + } +if (ECORE_IS_CMT (edev)) { dev->rx_pkt_burst = qede_recv_pkts_cmt; dev->tx_pkt_burst = qede_xmit_pkts_cmt;
@@ -1153,7 +1159,9 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)/* Start/resume traffic */ qede_fastpath_start (edev); -qede_assign_rxtx_handlers (eth_dev); +/* Assign I/O handlers */ +qede_assign_rxtx_handlers (eth_dev, false); +DP_INFO (edev,"Device started\n" );return 0 ;
@@ -1175,6 +1183,11 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)/* Update link status */ qede_link_update (eth_dev,0 ); +/* Replace I/O functions with dummy ones. It cannot +* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. +*/ +qede_assign_rxtx_handlers (eth_dev, true); +/* Disable vport */ if (qede_activate_vport (eth_dev, false))return ;
@@ -2323,11 +2336,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) dev->data->min_rx_buf_size);return -EINVAL ; } -/* Temporarily replace I/O functions with dummy ones. It cannot -* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. -*/ - dev->rx_pkt_burst = qede_rxtx_pkts_dummy; - dev->tx_pkt_burst = qede_rxtx_pkts_dummy;if (dev->data->dev_started) { dev->data->dev_started =0 ;qede_dev_stop (dev);
@@ -2366,15 +2374,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)/* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len; -/* Reassign back */ -qede_assign_rxtx_handlers (dev); -if (ECORE_IS_CMT (edev)) { - dev->rx_pkt_burst = qede_recv_pkts_cmt; - dev->tx_pkt_burst = qede_xmit_pkts_cmt; - }else { - dev->rx_pkt_burst = qede_recv_pkts; - dev->tx_pkt_burst = qede_xmit_pkts; - }return 0 ; }
@@ -2577,7 +2576,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)strncpy ((char *)params.name,QEDE_PMD_VER_PREFIX ,QEDE_PMD_DRV_VER_STR_SIZE ); -qede_assign_rxtx_handlers (eth_dev); +qede_assign_rxtx_handlers (eth_dev, true); eth_dev->tx_pkt_prepare = qede_xmit_prep_pkts;/* For CMT mode device do periodic polling for slowpath events.
Signature · 1 line
2.18.0
Quoted 11 lines · Rasesh Mody
Fix to assign dummy Rx/Tx handlers in
dev_stop.
For MTU set, assignment of the appropriate Rx/Tx handlers will be handled by dev_start/dev_stop.Fixes 81f8804992c9 ("net/qede: enhance Rx CPU utilization")Fixes 8de0c4201926 ("net/qede: fix odd number of queues usage in 100G mode")Signed-off-by Rasesh Mody <[email protected]>Signed-off-by Igor Russkikh <[email protected]>
Series applied to dpdk-next-net-mrvl/master after fixing the below issue.
Wrong tag:
Wrong 'Fixes' reference:
Quoted 92 lines
--- drivers/net/qede/qede_ethdev.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-)drivers/net/qede/qede_ethdev.c +16
-18@@ -320,13 +320,19 @@ qede_interrupt_handler(void *param) }static void -qede_assign_rxtx_handlers (struct rte_eth_dev *dev) +qede_assign_rxtx_handlers (struct rte_eth_dev *dev,bool is_dummy) {uint64_t tx_offloads = dev->data->dev_conf.txmode.offloads;struct qede_dev *qdev = dev->data->dev_private;struct ecore_dev *edev = &qdev->edev;bool use_tx_offload = false; +if (is_dummy) { + dev->rx_pkt_burst = qede_rxtx_pkts_dummy; + dev->tx_pkt_burst = qede_rxtx_pkts_dummy; +return ; + } +if (ECORE_IS_CMT (edev)) { dev->rx_pkt_burst = qede_recv_pkts_cmt; dev->tx_pkt_burst = qede_xmit_pkts_cmt;@@ -1153,7 +1159,9 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)/* Start/resume traffic */ qede_fastpath_start (edev); -qede_assign_rxtx_handlers (eth_dev); +/* Assign I/O handlers */ +qede_assign_rxtx_handlers (eth_dev, false); +DP_INFO (edev,"Device started\n" );return 0 ;@@ -1175,6 +1183,11 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)/* Update link status */ qede_link_update (eth_dev,0 ); +/* Replace I/O functions with dummy ones. It cannot +* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. +*/ +qede_assign_rxtx_handlers (eth_dev, true); +/* Disable vport */ if (qede_activate_vport (eth_dev, false))return ;@@ -2323,11 +2336,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) dev->data->min_rx_buf_size);return -EINVAL ; } -/* Temporarily replace I/O functions with dummy ones. It cannot -* be set to NULL because rte_eth_rx_burst() doesn't check for NULL. -*/ - dev->rx_pkt_burst = qede_rxtx_pkts_dummy; - dev->tx_pkt_burst = qede_rxtx_pkts_dummy;if (dev->data->dev_started) { dev->data->dev_started =0 ;qede_dev_stop (dev);@@ -2366,15 +2374,6 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)/* update max frame size */ dev->data->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len; -/* Reassign back */ -qede_assign_rxtx_handlers (dev); -if (ECORE_IS_CMT (edev)) { - dev->rx_pkt_burst = qede_recv_pkts_cmt; - dev->tx_pkt_burst = qede_xmit_pkts_cmt; - }else { - dev->rx_pkt_burst = qede_recv_pkts; - dev->tx_pkt_burst = qede_xmit_pkts; - }return 0 ; }@@ -2577,7 +2576,7 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)strncpy ((char *)params.name,QEDE_PMD_VER_PREFIX ,QEDE_PMD_DRV_VER_STR_SIZE ); -qede_assign_rxtx_handlers (eth_dev); +qede_assign_rxtx_handlers (eth_dev, true); eth_dev->tx_pkt_prepare = qede_xmit_prep_pkts;/* For CMT mode device do periodic polling for slowpath events. -- 2.18.0
PATCH v3 2/2 net/qede: fix port reconfiguration
In reply to Rasesh ModyThis patch fixes deallocation of all fastpath resources unconditionally, when re-configuring the device. When re-allocating resources PMD depends on application to explicitly setup the Rx/Tx queue.
Deallocation of all the resources is only required if the Rx/Tx queue configuration changes. For other scenarios like KNI MTU change we'd keep existing configuration.
mode")
--- drivers/net/qede/qede_ethdev.c | 19 +++++++++++++------ drivers/net/qede/qede_rxtx.c | 4 +++- 2 files changed, 16 insertions(+), 7 deletions(-)
drivers/net/qede/qede_ethdev.c +13 -6
@@ -1273,6 +1273,8 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)struct qede_dev *qdev =QEDE_INIT_QDEV (eth_dev);struct ecore_dev *edev =QEDE_INIT_EDEV (qdev);struct rte_eth_rxmode *rxmode = ð_dev->data->dev_conf.rxmode; +uint8_t num_rxqs; +uint8_t num_txqs;int ret;PMD_INIT_FUNC_TRACE (edev);
@@ -1305,12 +1307,17 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)if (qede_check_fdir_support (eth_dev))return -ENOTSUP ; -qede_dealloc_fp_resc (eth_dev); - qdev->num_tx_queues = eth_dev->data->nb_tx_queues * edev->num_hwfns; - qdev->num_rx_queues = eth_dev->data->nb_rx_queues * edev->num_hwfns; - -if (qede_alloc_fp_resc (qdev)) -return -ENOMEM ; +/* Allocate/reallocate fastpath resources only for new queue config */ + num_txqs = eth_dev->data->nb_tx_queues * edev->num_hwfns; + num_rxqs = eth_dev->data->nb_rx_queues * edev->num_hwfns; +if (qdev->num_tx_queues != num_txqs || + qdev->num_rx_queues != num_rxqs) { +qede_dealloc_fp_resc (eth_dev); + qdev->num_tx_queues = num_txqs; + qdev->num_rx_queues = num_rxqs; +if (qede_alloc_fp_resc (qdev)) +return -ENOMEM ; + }/* If jumbo enabled adjust MTU */ if (rxmode->offloads &DEV_RX_OFFLOAD_JUMBO_FRAME )
drivers/net/qede/qede_rxtx.c +3 -1
@@ -593,12 +593,14 @@ qede_alloc_mem_sb(struct qede_dev *qdev, struct ecore_sb_info *sb_info,int qede_alloc_fp_resc (struct qede_dev *qdev) { -struct ecore_dev *edev = &qdev->edev; +struct ecore_dev *edev =QEDE_INIT_EDEV (qdev);struct qede_fastpath *fp;uint32_t num_sbs;uint16_t sb_idx;int i; +PMD_INIT_FUNC_TRACE (edev); +if (IS_VF (edev))ecore_vf_get_num_sbs (ECORE_LEADING_HWFN (edev), &num_sbs);else
Signature · 1 line
2.18.0