X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fbnxt_rxq.c;h=bbcb3b06e7df50f600217414d5436bc47c424d2f;hb=f1f6ebc0eaf68a825c6175f5e6a436f7d91660c3;hp=8cc77f7f9e0cb94d3139ef574e5c1cb890c4ffeb;hpb=bd881e8d2a075b2dd69362176e2f8c76c88187ec;p=dpdk.git diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 8cc77f7f9e..bbcb3b06e7 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2014-2018 Broadcom + * Copyright(c) 2014-2021 Broadcom * All rights reserved. */ @@ -40,35 +40,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp) bp->nr_vnics = 0; - /* Single queue mode */ - if (bp->rx_cp_nr_rings < 2) { - vnic = &bp->vnic_info[0]; - if (!vnic) { - PMD_DRV_LOG(ERR, "VNIC alloc failed\n"); - rc = -ENOMEM; - goto err_out; - } - vnic->flags |= BNXT_VNIC_INFO_BCAST; - bp->nr_vnics++; - - rxq = bp->eth_dev->data->rx_queues[0]; - rxq->vnic = vnic; - - vnic->func_default = true; - vnic->start_grp_id = 0; - vnic->end_grp_id = vnic->start_grp_id; - filter = bnxt_alloc_filter(bp); - if (!filter) { - PMD_DRV_LOG(ERR, "L2 filter alloc failed\n"); - rc = -ENOMEM; - goto err_out; - } - filter->mac_index = 0; - filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST; - STAILQ_INSERT_TAIL(&vnic->filter, filter, next); - goto out; - } - /* Multi-queue mode */ if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB_RSS) { /* VMDq ONLY, VMDq+RSS, VMDq+DCB, VMDq+DCB+RSS */ @@ -106,7 +77,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp) pools = RTE_MIN(pools, bp->rx_cp_nr_rings); nb_q_per_grp = bp->rx_cp_nr_rings / pools; - bp->rx_num_qs_per_vnic = nb_q_per_grp; PMD_DRV_LOG(DEBUG, "pools = %u nb_q_per_grp = %u\n", pools, nb_q_per_grp); start_grp_id = 0; @@ -164,7 +134,8 @@ skip_filter_allocation: end_grp_id += nb_q_per_grp; } -out: + bp->rx_num_qs_per_vnic = nb_q_per_grp; + if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) { struct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf; @@ -172,9 +143,15 @@ out: bp->flags &= ~BNXT_FLAG_UPDATE_HASH; for (i = 0; i < bp->nr_vnics; i++) { + uint32_t lvl = ETH_RSS_LEVEL(rss->rss_hf); + vnic = &bp->vnic_info[i]; vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss->rss_hf); + vnic->hash_mode = + bnxt_rte_to_hwrm_hash_level(bp, + rss->rss_hf, + lvl); /* * Use the supplied key if the key length is @@ -201,13 +178,21 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq) struct bnxt_tpa_info *tpa_info; uint16_t i; - if (!rxq) + if (!rxq || !rxq->rx_ring) return; - rte_spinlock_lock(&rxq->lock); - sw_ring = rxq->rx_ring->rx_buf_ring; if (sw_ring) { +#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) + /* + * The vector receive burst function does not set used + * mbuf pointers to NULL, do that here to simplify + * cleanup logic. + */ + for (i = 0; i < rxq->rxrearm_nb; i++) + sw_ring[rxq->rxrearm_start + i] = NULL; + rxq->rxrearm_nb = 0; +#endif for (i = 0; i < rxq->rx_ring->rx_ring_struct->ring_size; i++) { if (sw_ring[i]) { @@ -242,7 +227,6 @@ void bnxt_rx_queue_release_mbufs(struct bnxt_rx_queue *rxq) } } - rte_spinlock_unlock(&rxq->lock); } void bnxt_free_rx_mbufs(struct bnxt *bp) @@ -264,15 +248,25 @@ 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 */ - bnxt_free_ring(rxq->rx_ring->rx_ring_struct); - /* Free RX Agg ring hardware descriptors */ - bnxt_free_ring(rxq->rx_ring->ag_ring_struct); - + if (rxq->rx_ring) { + bnxt_free_ring(rxq->rx_ring->rx_ring_struct); + rte_free(rxq->rx_ring->rx_ring_struct); + /* Free RX Agg ring hardware descriptors */ + bnxt_free_ring(rxq->rx_ring->ag_ring_struct); + rte_free(rxq->rx_ring->ag_ring_struct); + + rte_free(rxq->rx_ring); + } /* Free RX completion ring hardware descriptors */ - bnxt_free_ring(rxq->cp_ring->cp_ring_struct); + if (rxq->cp_ring) { + bnxt_free_ring(rxq->cp_ring->cp_ring_struct); + rte_free(rxq->cp_ring->cp_ring_struct); + rte_free(rxq->cp_ring); + } bnxt_free_rxq_stats(rxq); rte_memzone_free(rxq->mz); @@ -293,13 +287,12 @@ 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) return rc; - if (queue_idx >= BNXT_MAX_RINGS(bp)) { + if (queue_idx >= bnxt_max_rings(bp)) { PMD_DRV_LOG(ERR, "Cannot create Rx ring %d. Only %d rings available\n", queue_idx, bp->max_rx_rings); @@ -308,8 +301,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, if (nb_desc < BNXT_MIN_RING_DESC || nb_desc > MAX_RX_DESC_CNT) { PMD_DRV_LOG(ERR, "nb_desc %d is invalid\n", nb_desc); - rc = -EINVAL; - goto out; + return -EINVAL; } if (eth_dev->data->rx_queues) { @@ -321,8 +313,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, RTE_CACHE_LINE_SIZE, socket_id); if (!rxq) { PMD_DRV_LOG(ERR, "bnxt_rx_queue allocation failed!\n"); - rc = -ENOMEM; - goto out; + return -ENOMEM; } rxq->bp = bp; rxq->mb_pool = mp; @@ -338,8 +329,11 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, PMD_DRV_LOG(DEBUG, "RX Buf MTU %d\n", eth_dev->data->mtu); rc = bnxt_init_rx_ring_struct(rxq, socket_id); - if (rc) - goto out; + if (rc) { + PMD_DRV_LOG(ERR, + "init_rx_ring_struct failed!\n"); + goto err; + } PMD_DRV_LOG(DEBUG, "RX Buf size is %d\n", rxq->rx_buf_size); rxq->queue_id = queue_idx; @@ -351,13 +345,12 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, eth_dev->data->rx_queues[queue_idx] = rxq; /* Allocate RX ring hardware descriptors */ - if (bnxt_alloc_rings(bp, queue_idx, NULL, rxq, rxq->cp_ring, NULL, - "rxr")) { + rc = bnxt_alloc_rings(bp, socket_id, queue_idx, NULL, rxq, rxq->cp_ring, + NULL, "rxr"); + if (rc) { PMD_DRV_LOG(ERR, - "ring_dma_zone_reserve for rx_ring failed!\n"); - bnxt_rx_queue_release_op(rxq); - rc = -ENOMEM; - goto out; + "ring_dma_zone_reserve for rx_ring failed!\n"); + goto err; } rte_atomic64_init(&rxq->rx_mbuf_alloc_fail); @@ -367,21 +360,16 @@ 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; - rte_spinlock_init(&rxq->lock); + 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) bnxt_mtu_set_op(eth_dev, eth_dev->data->mtu); -out: + return 0; +err: + bnxt_rx_queue_release_op(rxq); return rc; } @@ -460,7 +448,7 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) if (rc) return rc; - if (BNXT_CHIP_THOR(bp)) { + if (BNXT_CHIP_P5(bp)) { /* Reconfigure default receive ring and MRU. */ bnxt_hwrm_vnic_cfg(bp, rxq->vnic); } @@ -545,12 +533,12 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) rc = bnxt_vnic_rss_configure(bp, vnic); } - if (BNXT_CHIP_THOR(bp)) { - /* Compute current number of active receive queues. */ - for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) - if (bp->rx_queues[i]->rx_started) - active_queue_cnt++; + /* Compute current number of active receive queues. */ + for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) + if (bp->rx_queues[i]->rx_started) + active_queue_cnt++; + if (BNXT_CHIP_P5(bp)) { /* * For Thor, we need to ensure that the VNIC default receive * ring corresponds to an active receive queue. When no queue @@ -570,6 +558,22 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id) /* Reconfigure default receive ring. */ bnxt_hwrm_vnic_cfg(bp, vnic); } + } else if (active_queue_cnt) { + /* + * If the queue being stopped is the current default queue and + * there are other active queues, pick one of them as the + * default and reconfigure the vnic. + */ + if (vnic->dflt_ring_grp == bp->grp_info[rx_queue_id].fw_grp_id) { + for (i = vnic->start_grp_id; i < vnic->end_grp_id; i++) { + if (bp->rx_queues[i]->rx_started) { + vnic->dflt_ring_grp = + bp->grp_info[i].fw_grp_id; + bnxt_hwrm_vnic_cfg(bp, vnic); + break; + } + } + } } if (rc == 0)