[dpdk-stable] patch 'net/bnxt: fix Rx ring producer index' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/29/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 586faf5a4ff8e35fc5abb083327ba7f92bf3cd4e Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahul.gupta at broadcom.com>
Date: Wed, 20 May 2020 23:09:18 +0530
Subject: [PATCH] net/bnxt: fix Rx ring producer index

[ upstream commit 20cb28a0ec7fb0c49807c63e6f57b5e0cdb36065 ]

When a queue is started after deferred_start, then increment raw_prod
irrespective of new mbuf is allocated or old mbufs are used.

Fixes: d256c73c1122 ("net/bnxt: fix memory leak during queue restart")

Signed-off-by: Rahul Gupta <rahul.gupta at broadcom.com>
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_rxr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 3ebc398375..fa3b4a6be4 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -860,9 +860,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
 					    rxq->queue_id, i, ring->ring_size);
 				break;
 			}
-			rxr->rx_prod = prod;
-			prod = RING_NEXT(rxr->rx_ring_struct, prod);
 		}
+		rxr->rx_prod = prod;
+		prod = RING_NEXT(rxr->rx_ring_struct, prod);
 	}
 
 	ring = rxr->ag_ring_struct;
@@ -878,9 +878,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
 					    rxq->queue_id, i, ring->ring_size);
 				break;
 			}
-			rxr->ag_prod = prod;
-			prod = RING_NEXT(rxr->ag_ring_struct, prod);
 		}
+		rxr->ag_prod = prod;
+		prod = RING_NEXT(rxr->ag_ring_struct, prod);
 	}
 	PMD_DRV_LOG(DEBUG, "AGG Done!\n");
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-27 10:23:31.856330131 +0100
+++ 0006-net-bnxt-fix-Rx-ring-producer-index.patch	2020-05-27 10:23:31.627933720 +0100
@@ -1,13 +1,14 @@
-From 20cb28a0ec7fb0c49807c63e6f57b5e0cdb36065 Mon Sep 17 00:00:00 2001
+From 586faf5a4ff8e35fc5abb083327ba7f92bf3cd4e Mon Sep 17 00:00:00 2001
 From: Rahul Gupta <rahul.gupta at broadcom.com>
 Date: Wed, 20 May 2020 23:09:18 +0530
 Subject: [PATCH] net/bnxt: fix Rx ring producer index
 
+[ upstream commit 20cb28a0ec7fb0c49807c63e6f57b5e0cdb36065 ]
+
 When a queue is started after deferred_start, then increment raw_prod
 irrespective of new mbuf is allocated or old mbufs are used.
 
 Fixes: d256c73c1122 ("net/bnxt: fix memory leak during queue restart")
-Cc: stable at dpdk.org
 
 Signed-off-by: Rahul Gupta <rahul.gupta at broadcom.com>
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
@@ -18,10 +19,10 @@
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
-index d2955bae3c..ee1acb1969 100644
+index 3ebc398375..fa3b4a6be4 100644
 --- a/drivers/net/bnxt/bnxt_rxr.c
 +++ b/drivers/net/bnxt/bnxt_rxr.c
-@@ -987,9 +987,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
+@@ -860,9 +860,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
  					    rxq->queue_id, i, ring->ring_size);
  				break;
  			}
@@ -33,7 +34,7 @@
  	}
  
  	ring = rxr->ag_ring_struct;
-@@ -1005,9 +1005,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
+@@ -878,9 +878,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
  					    rxq->queue_id, i, ring->ring_size);
  				break;
  			}