[dpdk-stable] patch 'net/avf: fix endless loop' has been queued to LTS release 18.11.3

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.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 09/12/19. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c452a379d36f0c8b99c38deca831606f848f7a10

Thanks.

Kevin Traynor

---
From c452a379d36f0c8b99c38deca831606f848f7a10 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Thu, 25 Jul 2019 12:38:29 +0800
Subject: [PATCH] net/avf: fix endless loop

[ upstream commit 43b29221c1f13189f41d5200027a22f11149dfee ]

Change loop index from uint16_t to uint32_t since max
index 65535 could be exceeded when ring size is 2k+.

Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")

Reported-by: Lei Yao <lei.a.yao@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 drivers/net/avf/avf_rxtx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
index 1073876e4..8c8771e66 100644
--- a/drivers/net/avf/avf_rxtx.c
+++ b/drivers/net/avf/avf_rxtx.c
@@ -145,5 +145,6 @@ static inline void
 reset_rx_queue(struct avf_rx_queue *rxq)
 {
-	uint16_t len, i;
+	uint16_t len;
+	uint32_t i;
 
 	if (!rxq)
@@ -175,5 +176,6 @@ reset_tx_queue(struct avf_tx_queue *txq)
 {
 	struct avf_tx_entry *txe;
-	uint16_t i, prev, size;
+	uint32_t i, size;
+	uint16_t prev;
 
 	if (!txq) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:48.364367038 +0100
+++ 0014-net-avf-fix-endless-loop.patch	2019-09-05 10:36:47.483701169 +0100
@@ -1 +1 @@
-From 43b29221c1f13189f41d5200027a22f11149dfee Mon Sep 17 00:00:00 2001
+From c452a379d36f0c8b99c38deca831606f848f7a10 Mon Sep 17 00:00:00 2001
@@ -4 +4,3 @@
-Subject: [PATCH] net/iavf: fix endless loop
+Subject: [PATCH] net/avf: fix endless loop
+
+[ upstream commit 43b29221c1f13189f41d5200027a22f11149dfee ]
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- drivers/net/iavf/iavf_rxtx.c | 6 ++++--
+ drivers/net/avf/avf_rxtx.c | 6 ++++--
@@ -19,4 +20,4 @@
-diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
-index d8eb6d296..22d7bb612 100644
---- a/drivers/net/iavf/iavf_rxtx.c
-+++ b/drivers/net/iavf/iavf_rxtx.c
+diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
+index 1073876e4..8c8771e66 100644
+--- a/drivers/net/avf/avf_rxtx.c
++++ b/drivers/net/avf/avf_rxtx.c
@@ -24 +25 @@
- reset_rx_queue(struct iavf_rx_queue *rxq)
+ reset_rx_queue(struct avf_rx_queue *rxq)
@@ -31 +32 @@
-@@ -175,5 +176,6 @@ reset_tx_queue(struct iavf_tx_queue *txq)
+@@ -175,5 +176,6 @@ reset_tx_queue(struct avf_tx_queue *txq)
@@ -33 +34 @@
- 	struct iavf_tx_entry *txe;
+ 	struct avf_tx_entry *txe;