[dpdk-stable] patch 'net/bonding: fix possible unbalanced packet receiving' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 8b53ea69745f6fd2fc21029c3dc7f36e4ea7abdf Mon Sep 17 00:00:00 2001
From: RongQing Li <lirongqing at baidu.com>
Date: Tue, 22 Sep 2020 18:29:31 +0800
Subject: [PATCH] net/bonding: fix possible unbalanced packet receiving

[ upstream commit 97602faa9e03c91465fc55f5464762796ce641c7 ]

Current Rx round robin policy for the slaves has two issue:

1. active_slave in bond_dev_private is shared by multiple PMDS which
   maybe cause some slave Rx hungry, for example, there is two PMD and
   two slave port, both PMDs start to receive, and see that active_slave
   is 0, and receive from slave 0, after complete, they increase
   active_slave by one, totally active_slave are increased by two, next
   time, they will start to receive from slave 0 again, at last, slave 1
   maybe drop packets during to not be polled by PMD

2. active_slave is shared and written by multiple PMD in RX path for
   every time RX, this is a kind of cache false share, low performance.

So move active_slave from bond_dev_private to bond_rx_queue make it as
per queue variable

Fixes: ae2a04864a9a ("net/bonding: reduce slave starvation on Rx poll")

Signed-off-by: RongQing Li <lirongqing at baidu.com>
Signed-off-by: Dongsheng Rong <rongdongsheng at baidu.com>
Reviewed-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/bonding/eth_bond_private.h |  3 ++-
 drivers/net/bonding/rte_eth_bond_api.c |  6 ------
 drivers/net/bonding/rte_eth_bond_pmd.c | 14 +++++++-------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h
index c9b2d0fe46..af92a4c52a 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -50,6 +50,8 @@ extern const struct rte_flow_ops bond_flow_ops;
 /** Port Queue Mapping Structure */
 struct bond_rx_queue {
 	uint16_t queue_id;
+	/**< Next active_slave to poll */
+	uint16_t active_slave;
 	/**< Queue Id */
 	struct bond_dev_private *dev_private;
 	/**< Reference to eth_dev private structure */
@@ -132,7 +134,6 @@ struct bond_dev_private {
 	uint16_t nb_rx_queues;			/**< Total number of rx queues */
 	uint16_t nb_tx_queues;			/**< Total number of tx queues*/
 
-	uint16_t active_slave;		/**< Next active_slave to poll */
 	uint16_t active_slave_count;		/**< Number of active slaves */
 	uint16_t active_slaves[RTE_MAX_ETHPORTS];    /**< Active slave list */
 
diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 97c667e007..a4007fe07c 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -129,12 +129,6 @@ deactivate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id)
 	RTE_ASSERT(active_count < RTE_DIM(internals->active_slaves));
 	internals->active_slave_count = active_count;
 
-	/* Resetting active_slave when reaches to max
-	 * no of slaves in active list
-	 */
-	if (internals->active_slave >= active_count)
-		internals->active_slave = 0;
-
 	if (eth_dev->data->dev_started) {
 		if (internals->mode == BONDING_MODE_8023AD) {
 			bond_mode_8023ad_start(eth_dev);
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index fccfcb2c89..178a39096b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -69,7 +69,7 @@ bond_ethdev_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 	struct bond_rx_queue *bd_rx_q = (struct bond_rx_queue *)queue;
 	internals = bd_rx_q->dev_private;
 	slave_count = internals->active_slave_count;
-	active_slave = internals->active_slave;
+	active_slave = bd_rx_q->active_slave;
 
 	for (i = 0; i < slave_count && nb_pkts; i++) {
 		uint16_t num_rx_slave;
@@ -86,8 +86,8 @@ bond_ethdev_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
 			active_slave = 0;
 	}
 
-	if (++internals->active_slave >= slave_count)
-		internals->active_slave = 0;
+	if (++bd_rx_q->active_slave >= slave_count)
+		bd_rx_q->active_slave = 0;
 	return num_rx_total;
 }
 
@@ -303,9 +303,9 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
 	memcpy(slaves, internals->active_slaves,
 			sizeof(internals->active_slaves[0]) * slave_count);
 
-	idx = internals->active_slave;
+	idx = bd_rx_q->active_slave;
 	if (idx >= slave_count) {
-		internals->active_slave = 0;
+		bd_rx_q->active_slave = 0;
 		idx = 0;
 	}
 	for (i = 0; i < slave_count && num_rx_total < nb_pkts; i++) {
@@ -367,8 +367,8 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
 			idx = 0;
 	}
 
-	if (++internals->active_slave >= slave_count)
-		internals->active_slave = 0;
+	if (++bd_rx_q->active_slave >= slave_count)
+		bd_rx_q->active_slave = 0;
 
 	return num_rx_total;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.847205425 +0000
+++ 0165-net-bonding-fix-possible-unbalanced-packet-receiving.patch	2020-10-28 10:35:11.768833910 +0000
@@ -1,8 +1,10 @@
-From 97602faa9e03c91465fc55f5464762796ce641c7 Mon Sep 17 00:00:00 2001
+From 8b53ea69745f6fd2fc21029c3dc7f36e4ea7abdf Mon Sep 17 00:00:00 2001
 From: RongQing Li <lirongqing at baidu.com>
 Date: Tue, 22 Sep 2020 18:29:31 +0800
 Subject: [PATCH] net/bonding: fix possible unbalanced packet receiving
 
+[ upstream commit 97602faa9e03c91465fc55f5464762796ce641c7 ]
+
 Current Rx round robin policy for the slaves has two issue:
 
 1. active_slave in bond_dev_private is shared by multiple PMDS which
@@ -20,7 +22,6 @@
 per queue variable
 
 Fixes: ae2a04864a9a ("net/bonding: reduce slave starvation on Rx poll")
-Cc: stable at dpdk.org
 
 Signed-off-by: RongQing Li <lirongqing at baidu.com>
 Signed-off-by: Dongsheng Rong <rongdongsheng at baidu.com>
@@ -32,7 +33,7 @@
  3 files changed, 9 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h
-index 0a0034705d..62e3a9dbf3 100644
+index c9b2d0fe46..af92a4c52a 100644
 --- a/drivers/net/bonding/eth_bond_private.h
 +++ b/drivers/net/bonding/eth_bond_private.h
 @@ -50,6 +50,8 @@ extern const struct rte_flow_ops bond_flow_ops;
@@ -70,7 +71,7 @@
  		if (internals->mode == BONDING_MODE_8023AD) {
  			bond_mode_8023ad_start(eth_dev);
 diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
-index 1f761c7c9e..05ac25fcad 100644
+index fccfcb2c89..178a39096b 100644
 --- a/drivers/net/bonding/rte_eth_bond_pmd.c
 +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
 @@ -69,7 +69,7 @@ bond_ethdev_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)