net/bnxt: fix Rx queue start/stop

Driver should not change "deferred_start" state of the rx queues.
It should get the state in queue_setup_op() and use that value.

Since the deferred start state was being used in the packet receive
functions to determine whether a stopped rx ring should be polled,
introduced a per-rxq flag to track queue stopped/started state.

Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop")
Cc: stable@dpdk.org
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 4095e9c..d1c5acb 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1945,7 +1945,7 @@ bnxt_rxq_info_get_op(struct rte_eth_dev *dev, uint16_t queue_id,
 
        qinfo->conf.rx_free_thresh = rxq->rx_free_thresh;
        qinfo->conf.rx_drop_en = 0;
-       qinfo->conf.rx_deferred_start = 0;
+       qinfo->conf.rx_deferred_start = rxq->rx_deferred_start;
 }
 
 static void

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 73eee43..eeb4e91 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -561,8 +561,7 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)
        if (rc)
                goto err_out;
 
-       if (bp->eth_dev->data->rx_queue_state[queue_index] ==
-           RTE_ETH_QUEUE_STATE_STARTED) {
+       if (rxq->rx_started) {
                if (bnxt_init_one_rx_ring(rxq)) {
                        RTE_LOG(ERR, PMD,
                                "bnxt_init_one_rx_ring failed!\n");

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 192ffd8..4b506f8 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -357,9 +357,19 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        }
        rte_atomic64_init(&rxq->rx_mbuf_alloc_fail);
 
-       rxq->rx_deferred_start = rx_conf->rx_deferred_start;
-       queue_state = rxq->rx_deferred_start ? RTE_ETH_QUEUE_STATE_STOPPED :
-                                               RTE_ETH_QUEUE_STATE_STARTED;
+       /* rxq 0 must not be stopped when used as async CPR */
+       if (!BNXT_NUM_ASYNC_CPR(bp) && queue_idx == 0)
+               rxq->rx_deferred_start = false;
+       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);
 
@@ -432,6 +442,11 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
                return -EINVAL;
        }
 
+       /* Set the queue state to started here.
+        * We check the status of the queue while posting buffer.
+        * If queue is it started, we do not post buffers for Rx.
+        */
+       rxq->rx_started = true;
        bnxt_free_hwrm_rx_ring(bp, rx_queue_id);
        rc = bnxt_alloc_hwrm_rx_ring(bp, rx_queue_id);
        if (rc)
@@ -448,20 +463,19 @@ int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 
                        vnic->fw_grp_ids[rx_queue_id] =
                                        bp->grp_info[rx_queue_id].fw_grp_id;
+                       PMD_DRV_LOG(DEBUG,
+                                   "vnic = %p fw_grp_id = %d\n",
+                                   vnic, bp->grp_info[rx_queue_id].fw_grp_id);
                }
 
-               PMD_DRV_LOG(DEBUG,
-                           "vnic = %p fw_grp_id = %d\n",
-                           vnic, bp->grp_info[rx_queue_id].fw_grp_id);
-
                rc = bnxt_vnic_rss_configure(bp, vnic);
        }
 
-       if (rc == 0) {
+       if (rc == 0)
                dev->data->rx_queue_state[rx_queue_id] =
                                RTE_ETH_QUEUE_STATE_STARTED;
-               rxq->rx_deferred_start = false;
-       }
+       else
+               rxq->rx_started = false;
 
        PMD_DRV_LOG(INFO,
                    "queue %d, rx_deferred_start %d, state %d!\n",
@@ -500,7 +514,7 @@ int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        }
 
        dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
-       rxq->rx_deferred_start = true;
+       rxq->rx_started = false;
        PMD_DRV_LOG(DEBUG, "Rx queue stopped\n");
 
        if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {

diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h
index c60b044..3693d89 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.h
+++ b/drivers/net/bnxt/bnxt_rxq.h
@@ -30,6 +30,7 @@ struct bnxt_rx_queue {
        uint16_t                port_id; /* Device port identifier */
        uint8_t                 crc_len; /* 0 if CRC stripped, 4 otherwise */
        uint8_t                 rx_deferred_start; /* not in global dev start */
+       uint8_t                 rx_started; /* RX queue is started */
 
        struct bnxt             *bp;
        int                     index;

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index f60880c..b3cc0d8 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -574,10 +574,9 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
        if (unlikely(is_bnxt_in_error(rxq->bp)))
                return 0;
 
-       /* If Rx Q was stopped return. RxQ0 cannot be stopped. */
-       if (unlikely(((rxq->rx_deferred_start ||
-                      !rte_spinlock_trylock(&rxq->lock)) &&
-                     rxq->queue_id)))
+       /* If Rx Q was stopped return */
+       if (unlikely(!rxq->rx_started ||
+                    !rte_spinlock_trylock(&rxq->lock)))
                return 0;
 
        /* Handle RX burst request */

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index 2e6e83c..5ae812f 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -224,7 +224,7 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                             0xFF, 0xFF, 0xFF, 0xFF); /* pkt_type (zeroes) */
 
        /* If Rx Q was stopped return */
-       if (rxq->rx_deferred_start)
+       if (unlikely(!rxq->rx_started))
                return 0;
 
        if (rxq->rxrearm_nb >= RTE_BNXT_RXQ_REARM_THRESH)