patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/bnxt: update ring group after ring stop start
@ 2021-08-18  5:39 Ajit Khaparde
  2021-08-19  4:49 ` Ajit Khaparde
  0 siblings, 1 reply; 2+ messages in thread
From: Ajit Khaparde @ 2021-08-18  5:39 UTC (permalink / raw)
  To: dev; +Cc: stable, Somnath Kotur

[-- Attachment #1: Type: text/plain, Size: 1894 bytes --]

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")
Cc: stable@dpdk.org

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 3 +++
 drivers/net/bnxt/bnxt_ring.c | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 73deb41f81..eb9de45cb9 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -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);
diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index b05c470766..957b175f1b 100644
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -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)


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH] net/bnxt: update ring group after ring stop start
  2021-08-18  5:39 [dpdk-stable] [PATCH] net/bnxt: update ring group after ring stop start Ajit Khaparde
@ 2021-08-19  4:49 ` Ajit Khaparde
  0 siblings, 0 replies; 2+ messages in thread
From: Ajit Khaparde @ 2021-08-19  4:49 UTC (permalink / raw)
  To: dpdk-dev; +Cc: dpdk stable, Somnath Kotur

[-- Attachment #1: Type: text/plain, Size: 2338 bytes --]

On Tue, Aug 17, 2021 at 10:39 PM Ajit Khaparde <ajit.khaparde@broadcom.com>
wrote:

> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
>
Patch applied to dpdk-next-net-brcm for-next-net branch.


> ---
>  drivers/net/bnxt/bnxt_hwrm.c | 3 +++
>  drivers/net/bnxt/bnxt_ring.c | 6 ++++++
>  2 files changed, 9 insertions(+)
>
> diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
> index 73deb41f81..eb9de45cb9 100644
> --- a/drivers/net/bnxt/bnxt_hwrm.c
> +++ b/drivers/net/bnxt/bnxt_hwrm.c
> @@ -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);
> diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
> index b05c470766..957b175f1b 100644
> --- a/drivers/net/bnxt/bnxt_ring.c
> +++ b/drivers/net/bnxt/bnxt_ring.c
> @@ -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)
>
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-08-19  4:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-18  5:39 [dpdk-stable] [PATCH] net/bnxt: update ring group after ring stop start Ajit Khaparde
2021-08-19  4:49 ` Ajit Khaparde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).