[dpdk-stable] patch 'net/bonding: fix packet count type for LACP' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/24/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.

Thanks.

Kevin Traynor

---
>From e20f0cf99d9e5b1acc87435a3f041a75a0e4d807 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 20 Mar 2019 12:47:21 +0100
Subject: [PATCH] net/bonding: fix packet count type for LACP

[ upstream commit 646d3f20aa5140ae6152e3b30e59fae9dde3d6a8 ]

Caught by code review, those variables are supposed to be on 16bits to
avoid endless loops in the (unlikely?) case where the application asks
for receiving more than 256 packets and the accumulated num_rx_total
count reaches 256:

uint16_t num_rx_total = 0;
uint8_t j, k;

j = num_rx_total;
num_rx_total += rte_eth_rx_burst();

for (k = j; k < 2 && k < num_rx_total; k++)
	rte_prefetch0(rte_pktmbuf_mtod(bufs[k], void *));

while (j < num_rx_total) {
	j++;
}

Fixes: 46fb43683679 ("bond: add mode 4")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index bbe2568cd..ae66a70f4 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -406,6 +406,7 @@ bond_ethdev_rx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 	const uint8_t promisc = internals->promiscuous_en;
 	uint8_t subtype;
-	uint8_t j, k;
 	uint16_t i;
+	uint16_t j;
+	uint16_t k;
 
 	/* Copy slave list to protect against slave up/down changes during tx
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-16 15:34:27.069878017 +0100
+++ 0042-net-bonding-fix-packet-count-type-for-LACP.patch	2019-04-16 15:34:25.200179506 +0100
@@ -1,8 +1,10 @@
-From 646d3f20aa5140ae6152e3b30e59fae9dde3d6a8 Mon Sep 17 00:00:00 2001
+From e20f0cf99d9e5b1acc87435a3f041a75a0e4d807 Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Wed, 20 Mar 2019 12:47:21 +0100
 Subject: [PATCH] net/bonding: fix packet count type for LACP
 
+[ upstream commit 646d3f20aa5140ae6152e3b30e59fae9dde3d6a8 ]
+
 Caught by code review, those variables are supposed to be on 16bits to
 avoid endless loops in the (unlikely?) case where the application asks
 for receiving more than 256 packets and the accumulated num_rx_total
@@ -22,7 +24,6 @@
 }
 
 Fixes: 46fb43683679 ("bond: add mode 4")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>