bet/bnxt: add runtime queue setup support
cover bet/bnxt: add runtime queue setup support
This patchset adds runtime queue setup support.
Ajit Khaparde (2):
net/bnxt: add support for runtime queue setup
net/bnxt: fix ring alloc and free logic
drivers/net/bnxt/bnxt_ethdev.c | 2 + drivers/net/bnxt/bnxt_hwrm.c | 181 +++++++++++++++++---------------- drivers/net/bnxt/bnxt_hwrm.h | 3 + drivers/net/bnxt/bnxt_ring.c | 81 ++++++++++----- drivers/net/bnxt/bnxt_rxq.c | 12 +-- drivers/net/bnxt/bnxt_txq.c | 2 + drivers/net/bnxt/bnxt_txr.c | 6 ++ 7 files changed, 164 insertions(+), 123 deletions(-)
Signature · 1 line
2.21.1 (Apple Git-122.3)
PATCH 1/2 net/bnxt: add support for runtime queue setup
Add support for runtime Rx and Tx queue setup. This will allow Rx/Tx queue setup after the interface is started.
--- drivers/net/bnxt/bnxt_ethdev.c | 2 ++ drivers/net/bnxt/bnxt_hwrm.c | 46 ++++++++++++++++++++++++------ drivers/net/bnxt/bnxt_hwrm.h | 3 ++ drivers/net/bnxt/bnxt_ring.c | 51 ++++++++++++++++++++++++++++++++++ drivers/net/bnxt/bnxt_rxq.c | 12 ++------ drivers/net/bnxt/bnxt_txq.c | 2 ++ drivers/net/bnxt/bnxt_txr.c | 6 ++++ 7 files changed, 105 insertions(+), 17 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +2 -0
@@ -987,6 +987,8 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, dev_info->flow_type_rss_offloads =BNXT_ETH_RSS_SUPPORT ; dev_info->speed_capa =bnxt_get_speed_capabilities (bp); + dev_info->dev_capa =RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP | +RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP ; dev_info->default_rxconf = (struct rte_eth_rxconf ) { .rx_thresh = {
drivers/net/bnxt/bnxt_hwrm.c +38 -8
79 lines not on this page · raw message
drivers/net/bnxt/bnxt_hwrm.h +3 -0
@@ -304,4 +304,7 @@ int bnxt_hwrm_ring_stats(struct bnxt *bp, uint32_t cid, int idx,int bnxt_hwrm_read_sfp_module_eeprom_info (struct bnxt *bp,uint16_t i2c_addr,uint16_t page_number,uint16_t start_addr,uint16_t data_length,uint8_t *buf); +int bnxt_hwrm_stat_ctx_alloc (struct bnxt *bp,struct bnxt_cp_ring_info *cpr); +void bnxt_free_hwrm_tx_ring (struct bnxt *bp,int queue_index); +int bnxt_alloc_hwrm_tx_ring (struct bnxt *bp,int queue_index);#endif
drivers/net/bnxt/bnxt_ring.c +51 -0
60 lines not on this page · raw message
drivers/net/bnxt/bnxt_rxq.c +3 -9
@@ -248,6 +248,7 @@ void bnxt_rx_queue_release_op(void *rx_queue)if (is_bnxt_in_error (rxq->bp))return ; +bnxt_free_hwrm_rx_ring (rxq->bp, rxq->queue_id);bnxt_rx_queue_release_mbufs (rxq);/* Free RX ring hardware descriptors */
@@ -286,7 +287,6 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads;struct bnxt_rx_queue *rxq;int rc =0 ; -uint8_t queue_state; rc =is_bnxt_in_error (bp);if (rc)
@@ -360,14 +360,8 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,else rxq->rx_deferred_start = rx_conf->rx_deferred_start; -if (rxq->rx_deferred_start) { - queue_state =RTE_ETH_QUEUE_STATE_STOPPED ; - rxq->rx_started = false; - }else { - queue_state =RTE_ETH_QUEUE_STATE_STARTED ; - rxq->rx_started = true; - } - eth_dev->data->rx_queue_state[queue_idx] = queue_state; + rxq->rx_started = rxq->rx_deferred_start ? false : true; + rxq->vnic =BNXT_GET_DEFAULT_VNIC (bp);/* Configure mtu if it is different from what was configured before */ if (!queue_idx)
drivers/net/bnxt/bnxt_txq.c +2 -0
@@ -8,6 +8,7 @@#include <rte_malloc.h> #include "bnxt.h" +#include "bnxt_hwrm.h" #include "bnxt_ring.h" #include "bnxt_txq.h" #include "bnxt_txr.h"
@@ -61,6 +62,7 @@ void bnxt_tx_queue_release_op(void *tx_queue)return ;/* Free TX ring hardware descriptors */ +bnxt_free_hwrm_tx_ring (txq->bp, txq->queue_id);bnxt_tx_queue_release_mbufs (txq);if (txq->tx_ring) {bnxt_free_ring (txq->tx_ring->tx_ring_struct);
drivers/net/bnxt/bnxt_txr.c +6 -0
@@ -9,6 +9,7 @@#include <rte_malloc.h> #include "bnxt.h" +#include "bnxt_hwrm.h" #include "bnxt_ring.h" #include "bnxt_txq.h" #include "bnxt_txr.h"
@@ -547,6 +548,11 @@ int bnxt_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)if (rc)return rc; +bnxt_free_hwrm_tx_ring (bp, tx_queue_id); + rc =bnxt_alloc_hwrm_tx_ring (bp, tx_queue_id); +if (rc) +return rc; + dev->data->tx_queue_state[tx_queue_id] =RTE_ETH_QUEUE_STATE_STARTED ; txq->tx_started = true;PMD_DRV_LOG (DEBUG ,"Tx queue started\n" );
Signature · 1 line
2.21.1 (Apple Git-122.3)
PATCH 2/2 net/bnxt: fix ring alloc and free logic
In reply to Ajit KhapardeFix handling of ring alloc and free logic to fix check for invalid ring and context IDs. This also avoids code duplication.
--- drivers/net/bnxt/bnxt_hwrm.c | 173 +++++++++++++++-------------------- drivers/net/bnxt/bnxt_ring.c | 30 +----- 2 files changed, 78 insertions(+), 125 deletions(-)
drivers/net/bnxt/bnxt_hwrm.c +76 -97
@@ -1810,6 +1810,9 @@ int bnxt_hwrm_ring_free(struct bnxt *bp,struct hwrm_ring_free_input req = {.req_type =0 };struct hwrm_ring_free_output *resp = bp->hwrm_cmd_resp_addr; +if (ring->fw_ring_id ==INVALID_HW_RING_ID ) +return -EINVAL ; +HWRM_PREP (&req,HWRM_RING_FREE ,BNXT_USE_CHIMP_MB ); req.ring_type = ring_type;
@@ -1817,6 +1820,7 @@ int bnxt_hwrm_ring_free(struct bnxt *bp, req.cmpl_ring =rte_cpu_to_le_16 (cp_ring_id); rc =bnxt_hwrm_send_message (bp, &req,sizeof (req),BNXT_USE_CHIMP_MB ); + ring->fw_ring_id =INVALID_HW_RING_ID ;if (rc || resp->error_code) {if (rc ==0 && resp->error_code)
@@ -1902,7 +1906,7 @@ int bnxt_hwrm_stat_clear(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)struct hwrm_stat_ctx_clr_stats_input req = {.req_type =0 };struct hwrm_stat_ctx_clr_stats_output *resp = bp->hwrm_cmd_resp_addr; -if (cpr->hw_stats_ctx_id == (uint32_t )HWRM_NA_SIGNATURE ) +if (cpr->hw_stats_ctx_id ==HWRM_NA_SIGNATURE )return rc;HWRM_PREP (&req,HWRM_STAT_CTX_CLR_STATS ,BNXT_USE_CHIMP_MB );
@@ -1923,6 +1927,9 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)struct hwrm_stat_ctx_alloc_input req = {.req_type =0 };struct hwrm_stat_ctx_alloc_output *resp = bp->hwrm_cmd_resp_addr; +if (cpr->hw_stats_ctx_id !=HWRM_NA_SIGNATURE ) +return 0 ; +HWRM_PREP (&req,HWRM_STAT_CTX_ALLOC ,BNXT_USE_CHIMP_MB ); req.update_period_ms =rte_cpu_to_le_32 (0 );
@@ -1946,6 +1953,9 @@ static int bnxt_hwrm_stat_ctx_free(struct bnxt *bp, struct bnxt_cp_ring_info *cpstruct hwrm_stat_ctx_free_input req = {.req_type =0 };struct hwrm_stat_ctx_free_output *resp = bp->hwrm_cmd_resp_addr; +if (cpr->hw_stats_ctx_id ==HWRM_NA_SIGNATURE ) +return 0 ; +HWRM_PREP (&req,HWRM_STAT_CTX_FREE ,BNXT_USE_CHIMP_MB ); req.stat_ctx_id =rte_cpu_to_le_32 (cpr->hw_stats_ctx_id);
@@ -1955,6 +1965,8 @@ static int bnxt_hwrm_stat_ctx_free(struct bnxt *bp, struct bnxt_cp_ring_info *cpHWRM_CHECK_RESULT ();HWRM_UNLOCK (); + cpr->hw_stats_ctx_id =HWRM_NA_SIGNATURE ; +return rc; }
@@ -2600,49 +2612,54 @@ bnxt_free_all_hwrm_stat_ctxs(struct bnxt *bp)unsigned int i;struct bnxt_cp_ring_info *cpr; -for (i =0 ; i < bp->rx_cp_nr_rings + bp->tx_cp_nr_rings; i++) { +for (i =0 ; i < bp->rx_cp_nr_rings; i++) { -if (i >= bp->rx_cp_nr_rings) { - cpr = bp->tx_queues[i - bp->rx_cp_nr_rings]->cp_ring; - }else { - cpr = bp->rx_queues[i]->cp_ring; -if (BNXT_HAS_RING_GRPS (bp)) - bp->grp_info[i].fw_stats_ctx =-1 ; - } -if (cpr->hw_stats_ctx_id !=HWRM_NA_SIGNATURE ) { - rc =bnxt_hwrm_stat_ctx_free (bp, cpr); - cpr->hw_stats_ctx_id =HWRM_NA_SIGNATURE ; -if (rc) -return rc; - } + cpr = bp->rx_queues[i]->cp_ring; +if (BNXT_HAS_RING_GRPS (bp)) + bp->grp_info[i].fw_stats_ctx =-1 ; + rc =bnxt_hwrm_stat_ctx_free (bp, cpr); +if (rc) +return rc; + } + +for (i =0 ; i < bp->tx_cp_nr_rings; i++) { + cpr = bp->tx_queues[i]->cp_ring; + rc =bnxt_hwrm_stat_ctx_free (bp, cpr); +if (rc) +return rc; } +return 0 ; }int bnxt_alloc_all_hwrm_stat_ctxs (struct bnxt *bp) { +struct bnxt_cp_ring_info *cpr;unsigned int i;int rc =0 ; -for (i =0 ; i < bp->rx_cp_nr_rings + bp->tx_cp_nr_rings; i++) { -struct bnxt_tx_queue *txq; -struct bnxt_rx_queue *rxq; -struct bnxt_cp_ring_info *cpr; +for (i =0 ; i < bp->rx_cp_nr_rings; i++) { +struct bnxt_rx_queue *rxq = bp->rx_queues[i]; -if (i >= bp->rx_cp_nr_rings) { - txq = bp->tx_queues[i - bp->rx_cp_nr_rings]; - cpr = txq->cp_ring; - }else { - rxq = bp->rx_queues[i]; - cpr = rxq->cp_ring; + cpr = rxq->cp_ring; +if (cpr->hw_stats_ctx_id ==HWRM_NA_SIGNATURE ) { + rc =bnxt_hwrm_stat_ctx_alloc (bp, cpr); +if (rc) +return rc; } + } + +for (i =0 ; i < bp->tx_cp_nr_rings; i++) { +struct bnxt_tx_queue *txq = bp->tx_queues[i]; + cpr = txq->cp_ring;if (cpr->hw_stats_ctx_id ==HWRM_NA_SIGNATURE ) { rc =bnxt_hwrm_stat_ctx_alloc (bp, cpr);if (rc)return rc; } } +return rc; }
@@ -2675,9 +2692,8 @@ void bnxt_free_nq_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)bnxt_hwrm_ring_free (bp, cp_ring,HWRM_RING_FREE_INPUT_RING_TYPE_NQ ,INVALID_HW_RING_ID ); - cp_ring->fw_ring_id =INVALID_HW_RING_ID ; -memset (cpr->cp_desc_ring,0 , cpr->cp_ring_struct->ring_size * -sizeof (*cpr->cp_desc_ring)); +memset (cpr->cp_desc_ring,0 , + cpr->cp_ring_struct->ring_size *sizeof (*cpr->cp_desc_ring)); cpr->cp_raw_cons =0 ; }
@@ -2686,11 +2702,10 @@ void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)struct bnxt_ring *cp_ring = cpr->cp_ring_struct;bnxt_hwrm_ring_free (bp, cp_ring, -HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL , -INVALID_HW_RING_ID ); - cp_ring->fw_ring_id =INVALID_HW_RING_ID ; -memset (cpr->cp_desc_ring,0 , cpr->cp_ring_struct->ring_size * -sizeof (*cpr->cp_desc_ring)); +HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL , +INVALID_HW_RING_ID ); +memset (cpr->cp_desc_ring,0 , + cpr->cp_ring_struct->ring_size *sizeof (*cpr->cp_desc_ring)); cpr->cp_raw_cons =0 ; }
@@ -2701,34 +2716,24 @@ void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int queue_index)struct bnxt_ring *ring = rxr->rx_ring_struct;struct bnxt_cp_ring_info *cpr = rxq->cp_ring; -if (ring->fw_ring_id !=INVALID_HW_RING_ID ) { -bnxt_hwrm_ring_free (bp, ring, -HWRM_RING_FREE_INPUT_RING_TYPE_RX , - cpr->cp_ring_struct->fw_ring_id); - ring->fw_ring_id =INVALID_HW_RING_ID ; -if (BNXT_HAS_RING_GRPS (bp)) - bp->grp_info[queue_index].rx_fw_ring_id = -INVALID_HW_RING_ID ; - } +bnxt_hwrm_ring_free (bp, ring, +HWRM_RING_FREE_INPUT_RING_TYPE_RX , + cpr->cp_ring_struct->fw_ring_id); +if (BNXT_HAS_RING_GRPS (bp)) + bp->grp_info[queue_index].rx_fw_ring_id =INVALID_HW_RING_ID ; + ring = rxr->ag_ring_struct; -if (ring->fw_ring_id !=INVALID_HW_RING_ID ) { -bnxt_hwrm_ring_free (bp, ring, -BNXT_CHIP_P5 (bp) ? -HWRM_RING_FREE_INPUT_RING_TYPE_RX_AGG : -HWRM_RING_FREE_INPUT_RING_TYPE_RX , - cpr->cp_ring_struct->fw_ring_id); -if (BNXT_HAS_RING_GRPS (bp)) - bp->grp_info[queue_index].ag_fw_ring_id = -INVALID_HW_RING_ID ; - } +bnxt_hwrm_ring_free (bp, ring, +BNXT_CHIP_P5 (bp) ? +HWRM_RING_FREE_INPUT_RING_TYPE_RX_AGG : +HWRM_RING_FREE_INPUT_RING_TYPE_RX , + cpr->cp_ring_struct->fw_ring_id); +if (BNXT_HAS_RING_GRPS (bp)) + bp->grp_info[queue_index].ag_fw_ring_id =INVALID_HW_RING_ID ; -if (cpr->hw_stats_ctx_id !=HWRM_NA_SIGNATURE ) { -bnxt_hwrm_stat_ctx_free (bp, cpr); - cpr->hw_stats_ctx_id =HWRM_NA_SIGNATURE ; - } +bnxt_hwrm_stat_ctx_free (bp, cpr); -if (cpr->cp_ring_struct->fw_ring_id !=INVALID_HW_RING_ID ) -bnxt_free_cp_ring (bp, cpr); +bnxt_free_cp_ring (bp, cpr);if (BNXT_HAS_RING_GRPS (bp)) bp->grp_info[queue_index].cp_fw_ring_id =INVALID_HW_RING_ID ;
@@ -2758,31 +2763,8 @@ bnxt_free_all_hwrm_rings(struct bnxt *bp) {unsigned int i; -for (i =0 ; i < bp->tx_cp_nr_rings; i++) { -struct bnxt_tx_queue *txq = bp->tx_queues[i]; -struct bnxt_tx_ring_info *txr = txq->tx_ring; -struct bnxt_ring *ring = txr->tx_ring_struct; -struct bnxt_cp_ring_info *cpr = txq->cp_ring; - -if (ring->fw_ring_id !=INVALID_HW_RING_ID ) { -bnxt_hwrm_ring_free (bp, ring, -HWRM_RING_FREE_INPUT_RING_TYPE_TX , - cpr->cp_ring_struct->fw_ring_id); - ring->fw_ring_id =INVALID_HW_RING_ID ; -memset (txr->tx_desc_ring,0 , - txr->tx_ring_struct->ring_size * -sizeof (*txr->tx_desc_ring)); -memset (txr->tx_buf_ring,0 , - txr->tx_ring_struct->ring_size * -sizeof (*txr->tx_buf_ring)); - txr->tx_raw_prod =0 ; - txr->tx_raw_cons =0 ; - } -if (cpr->cp_ring_struct->fw_ring_id !=INVALID_HW_RING_ID ) { -bnxt_free_cp_ring (bp, cpr); - cpr->cp_ring_struct->fw_ring_id =INVALID_HW_RING_ID ; - } - } +for (i =0 ; i < bp->tx_cp_nr_rings; i++) +bnxt_free_hwrm_tx_ring (bp, i);for (i =0 ; i < bp->rx_cp_nr_rings; i++)bnxt_free_hwrm_rx_ring (bp, i);
@@ -6207,20 +6189,17 @@ void bnxt_free_hwrm_tx_ring(struct bnxt *bp, int queue_index)struct bnxt_ring *ring = txr->tx_ring_struct;struct bnxt_cp_ring_info *cpr = txq->cp_ring; -if (ring->fw_ring_id !=INVALID_HW_RING_ID ) { -bnxt_hwrm_ring_free (bp, ring, -HWRM_RING_FREE_INPUT_RING_TYPE_TX , - cpr->cp_ring_struct->fw_ring_id); - ring->fw_ring_id =INVALID_HW_RING_ID ; - } +bnxt_hwrm_ring_free (bp, ring, +HWRM_RING_FREE_INPUT_RING_TYPE_TX , + cpr->cp_ring_struct->fw_ring_id); + txr->tx_raw_prod =0 ; + txr->tx_raw_cons =0 ; +memset (txr->tx_desc_ring,0 , + txr->tx_ring_struct->ring_size *sizeof (*txr->tx_desc_ring)); +memset (txr->tx_buf_ring,0 , + txr->tx_ring_struct->ring_size *sizeof (*txr->tx_buf_ring)); -if (cpr->hw_stats_ctx_id !=HWRM_NA_SIGNATURE ) { -bnxt_hwrm_stat_ctx_free (bp, cpr); - cpr->hw_stats_ctx_id =HWRM_NA_SIGNATURE ; - } +bnxt_hwrm_stat_ctx_free (bp, cpr); -if (cpr->cp_ring_struct->fw_ring_id !=INVALID_HW_RING_ID ) { -bnxt_free_cp_ring (bp, cpr); - cpr->cp_ring_struct->fw_ring_id =INVALID_HW_RING_ID ; - } +bnxt_free_cp_ring (bp, cpr); }
drivers/net/bnxt/bnxt_ring.c +2 -28
@@ -700,7 +700,6 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) {struct bnxt_coal coal;unsigned int i; -uint8_t ring_type;int rc =0 ;bnxt_init_dflt_coal (&coal);
@@ -712,36 +711,11 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp) goto err_out; } +/* If something is wrong with Rx ring alloc, skip Tx ring alloc */ for (i =0 ; i < bp->tx_cp_nr_rings; i++) { -struct bnxt_tx_queue *txq = bp->tx_queues[i]; -struct bnxt_cp_ring_info *cpr = txq->cp_ring; -struct bnxt_ring *cp_ring = cpr->cp_ring_struct; -struct bnxt_tx_ring_info *txr = txq->tx_ring; -struct bnxt_ring *ring = txr->tx_ring_struct; -unsigned int idx = i + bp->rx_cp_nr_rings; -uint16_t tx_cosq_id =0 ; - -if (bnxt_alloc_cmpl_ring (bp, idx, cpr)) - goto err_out; - -if (bp->vnic_cap_flags &BNXT_VNIC_CAP_COS_CLASSIFY ) - tx_cosq_id = bp->tx_cosq_id[i < bp->max_lltc ? i :0 ]; -else - tx_cosq_id = bp->tx_cosq_id[0 ]; -/* Tx ring */ - ring_type =HWRM_RING_ALLOC_INPUT_RING_TYPE_TX ; - rc =bnxt_hwrm_ring_alloc (bp, ring, - ring_type, - i, cpr->hw_stats_ctx_id, - cp_ring->fw_ring_id, - tx_cosq_id); + rc =bnxt_alloc_hwrm_tx_ring (bp, i);if (rc) goto err_out; - -bnxt_set_db (bp, &txr->tx_db, ring_type, i, ring->fw_ring_id, - ring->ring_mask); - txq->index = idx; -bnxt_hwrm_set_ring_coal (bp, &coal, cp_ring->fw_ring_id); } err_out:
Signature · 1 line
2.21.1 (Apple Git-122.3)
Quoted 6 lines · Ajit Khaparde
This patchset adds runtime queue setup support.
Ajit Khaparde (2):
net/bnxt: add support for runtime queue setup
net/bnxt: fix ring alloc and free logic
Patchset applied to dpdk-next-net-brcm, for-next-net branch. Thanks
Quoted 13 lines
drivers/net/bnxt/bnxt_ethdev.c | 2 + drivers/net/bnxt/bnxt_hwrm.c | 181 +++++++++++++++++---------------- drivers/net/bnxt/bnxt_hwrm.h | 3 + drivers/net/bnxt/bnxt_ring.c | 81 ++++++++++----- drivers/net/bnxt/bnxt_rxq.c | 12 +-- drivers/net/bnxt/bnxt_txq.c | 2 + drivers/net/bnxt/bnxt_txr.c | 6 ++ 7 files changed, 164 insertions(+), 123 deletions(-)--
2.21.1 (Apple Git-122.3)