net/hns3: encapsulate DFX stats in datapath

[dpdk.git] / drivers / net / bnxt / bnxt_rxq.c

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 1003ca6..f46b10c 100644 (file)
--- 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.
  */
 
@@ -207,11 +207,9 @@ 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) {
                for (i = 0;
@@ -248,7 +246,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)
@@ -273,12 +270,21 @@ void bnxt_rx_queue_release_op(void *rx_queue)
                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);
@@ -305,7 +311,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        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);
@@ -314,8 +320,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) {
@@ -327,8 +332,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;
@@ -344,8 +348,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;
@@ -357,13 +364,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, 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);
 
@@ -381,13 +387,14 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
                rxq->rx_started = true;
        }
        eth_dev->data->rx_queue_state[queue_idx] = queue_state;
-       rte_spinlock_init(&rxq->lock);
 
        /* 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;
 }
 
@@ -466,7 +473,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);
        }
@@ -551,12 +558,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
@@ -576,6 +583,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)