Skip to contentSkip to conversation

net/bnxt: update ring group after ring stop start

PATCH In review Ajit Khaparde 1 participant 2 messages Aug 18, 2021 – Aug 19, 2021 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/bnxt: update ring group after ring stop start

A Rx ring stop start sequence may result in the FW returning a different set of Rx ring and AGG ring IDs. If the ring group is not updated with the new IDs, the HW sees the host driver using incorrect BD types for the Rx ring and AGG ring. This can cause the chip to go into a bad state or encounter RE_flush issue or leak MBUFs in the HW.

Fix this by issuing a bnxt_hwrm_ring_grp_free() and an bnxt_hwrm_ring_grp_alloc() to refresh the ring group information.

Fixes 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop")
---
 drivers/net/bnxt/bnxt_hwrm.c | 3 +++
 drivers/net/bnxt/bnxt_ring.c | 6 ++++++
 2 files changed, 9 insertions(+)
drivers/net/bnxt/bnxt_hwrm.c +3 -0
index 73deb41f81..eb9de45cb9 100644
@@ -2717,6 +2717,9 @@ 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 (BNXT_HAS_RING_GRPS(bp))
+		bnxt_hwrm_ring_grp_free(bp, queue_index);
+
 	bnxt_hwrm_ring_free(bp, ring,
 			    HWRM_RING_FREE_INPUT_RING_TYPE_RX,
 			    cpr->cp_ring_struct->fw_ring_id);
drivers/net/bnxt/bnxt_ring.c +6 -0
index b05c470766..957b175f1b 100644
@@ -631,6 +631,12 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)
 	if (rc)
 		goto err_out;
 
+	if (BNXT_HAS_RING_GRPS(bp)) {
+		rc = bnxt_hwrm_ring_grp_alloc(bp, queue_index);
+		if (rc)
+			goto err_out;
+	}
+
 	if (rxq->rx_started) {
 		if (bnxt_init_one_rx_ring(rxq)) {
 			PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring failed!\n");
Signature · 1 line
2.21.1 (Apple Git-122.3)
#1 lore raw
Quoted 7 lines · Ajit Khaparde

A Rx ring stop start sequence may result in the FW returning a different set of Rx ring and AGG ring IDs. If the ring group is not updated with the new IDs, the HW sees the host driver using incorrect BD types for the Rx ring and AGG ring. This can cause the chip to go into a bad state or encounter RE_flush issue or leak MBUFs in the HW.

Quoted 9 lines

Fix this by issuing a bnxt_hwrm_ring_grp_free() and an bnxt_hwrm_ring_grp_alloc() to refresh the ring group information.

Fixes 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop")

Patch applied to dpdk-next-net-brcm for-next-net branch.

Quoted 43 lines
---
 drivers/net/bnxt/bnxt_hwrm.c | 3 +++
 drivers/net/bnxt/bnxt_ring.c | 6 ++++++
 2 files changed, 9 insertions(+)
drivers/net/bnxt/bnxt_hwrm.c +3 -0
index 73deb41f81..eb9de45cb9 100644
@@ -2717,6 +2717,9 @@ 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 (BNXT_HAS_RING_GRPS(bp))
+               bnxt_hwrm_ring_grp_free(bp, queue_index);
+
        bnxt_hwrm_ring_free(bp, ring,
                            HWRM_RING_FREE_INPUT_RING_TYPE_RX,
                            cpr->cp_ring_struct->fw_ring_id);
drivers/net/bnxt/bnxt_ring.c +6 -0
index b05c470766..957b175f1b 100644
@@ -631,6 +631,12 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int
 queue_index)
        if (rc)
                goto err_out;
 
+       if (BNXT_HAS_RING_GRPS(bp)) {
+               rc = bnxt_hwrm_ring_grp_alloc(bp, queue_index);
+               if (rc)
+                       goto err_out;
+       }
+
        if (rxq->rx_started) {
                if (bnxt_init_one_rx_ring(rxq)) {

PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring
failed!\n");
--
2.21.1 (Apple Git-122.3)