[dpdk-stable] patch 'net/bonding: fix dead loop on RSS RETA update' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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 d41943482e2d1d4372b3d6aa69e71f40d2ea9fc2 Mon Sep 17 00:00:00 2001
From: Zhiguang He <hezhiguang3 at huawei.com>
Date: Sun, 2 Aug 2020 20:27:27 +0800
Subject: [PATCH] net/bonding: fix dead loop on RSS RETA update

[ upstream commit eb8939538fddced05b906c34ba9f545bf6717ad2 ]

When parameter reta_size < RTE_RETA_GROUP_SIZE, reta_count will be 0.
Then this function will be deadloop.

Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")

Signed-off-by: Zhiguang He <hezhiguang3 at huawei.com>
Acked-by: Wei Hu (Xavier) <xavier.huwei at huawei.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 419e03c00..fccfcb2c8 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2935,7 +2935,8 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,
 		return -EINVAL;
 
 	 /* Copy RETA table */
-	reta_count = reta_size / RTE_RETA_GROUP_SIZE;
+	reta_count = (reta_size + RTE_RETA_GROUP_SIZE - 1) /
+			RTE_RETA_GROUP_SIZE;
 
 	for (i = 0; i < reta_count; i++) {
 		internals->reta_conf[i].mask = reta_conf[i].mask;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.295130569 +0100
+++ 0039-net-bonding-fix-dead-loop-on-RSS-RETA-update.patch	2020-08-06 10:53:15.836598114 +0100
@@ -1,13 +1,14 @@
-From eb8939538fddced05b906c34ba9f545bf6717ad2 Mon Sep 17 00:00:00 2001
+From d41943482e2d1d4372b3d6aa69e71f40d2ea9fc2 Mon Sep 17 00:00:00 2001
 From: Zhiguang He <hezhiguang3 at huawei.com>
 Date: Sun, 2 Aug 2020 20:27:27 +0800
 Subject: [PATCH] net/bonding: fix dead loop on RSS RETA update
 
+[ upstream commit eb8939538fddced05b906c34ba9f545bf6717ad2 ]
+
 When parameter reta_size < RTE_RETA_GROUP_SIZE, reta_count will be 0.
 Then this function will be deadloop.
 
 Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")
-Cc: stable at dpdk.org
 
 Signed-off-by: Zhiguang He <hezhiguang3 at huawei.com>
 Acked-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
@@ -16,7 +17,7 @@
  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 116e2f29d..cdbd8151e 100644
+index 419e03c00..fccfcb2c8 100644
 --- a/drivers/net/bonding/rte_eth_bond_pmd.c
 +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
 @@ -2935,7 +2935,8 @@ bond_ethdev_rss_reta_update(struct rte_eth_dev *dev,