[dpdk-stable] patch 'net/bonding: fix slave Tx burst for mode 4' 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/16/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 0b58135e247bfffb9b852aa68a715e58f61a0cb4 Mon Sep 17 00:00:00 2001
From: Chas Williams <chas3 at att.com>
Date: Thu, 14 Feb 2019 14:09:58 -0500
Subject: [PATCH] net/bonding: fix slave Tx burst for mode 4

[ upstream commit af91947cd236ece51b026ad9648b12cb59deeee5 ]

The Tx burst routine always needs to check for pending LACPDUs
and send them if available. Do this first to prioritize the
control traffic.  We can still early exit, before calculating
the distribution slaves, if there isn't any data packets.

Fixes: 09150784a776 ("net/bonding: burst mode hash calculation")

Reported-by: Hui Zhao <zhaohui8 at huawei.com>
Signed-off-by: Chas Williams <chas3 at att.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 48 +++++++++++++-------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index d709b077d..a39f72898 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1299,7 +1299,4 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 	uint16_t i;
 
-	if (unlikely(nb_bufs == 0))
-		return 0;
-
 	/* Copy slave list to protect against slave up/down changes during tx
 	 * bursting */
@@ -1311,4 +1308,28 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 			sizeof(slave_port_ids[0]) * slave_count);
 
+	/* Check for LACP control packets and send if available */
+	for (i = 0; i < slave_count; i++) {
+		struct port *port = &bond_mode_8023ad_ports[slave_port_ids[i]];
+		struct rte_mbuf *ctrl_pkt = NULL;
+
+		if (likely(rte_ring_empty(port->tx_ring)))
+			continue;
+
+		if (rte_ring_dequeue(port->tx_ring,
+				     (void **)&ctrl_pkt) != -ENOENT) {
+			slave_tx_count = rte_eth_tx_burst(slave_port_ids[i],
+					bd_tx_q->queue_id, &ctrl_pkt, 1);
+			/*
+			 * re-enqueue LAG control plane packets to buffering
+			 * ring if transmission fails so the packet isn't lost.
+			 */
+			if (slave_tx_count != 1)
+				rte_ring_enqueue(port->tx_ring,	ctrl_pkt);
+		}
+	}
+
+	if (unlikely(nb_bufs == 0))
+		return 0;
+
 	dist_slave_count = 0;
 	for (i = 0; i < slave_count; i++) {
@@ -1366,25 +1387,4 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 	}
 
-	/* Check for LACP control packets and send if available */
-	for (i = 0; i < slave_count; i++) {
-		struct port *port = &bond_mode_8023ad_ports[slave_port_ids[i]];
-		struct rte_mbuf *ctrl_pkt = NULL;
-
-		if (likely(rte_ring_empty(port->tx_ring)))
-			continue;
-
-		if (rte_ring_dequeue(port->tx_ring,
-				     (void **)&ctrl_pkt) != -ENOENT) {
-			slave_tx_count = rte_eth_tx_burst(slave_port_ids[i],
-					bd_tx_q->queue_id, &ctrl_pkt, 1);
-			/*
-			 * re-enqueue LAG control plane packets to buffering
-			 * ring if transmission fails so the packet isn't lost.
-			 */
-			if (slave_tx_count != 1)
-				rte_ring_enqueue(port->tx_ring,	ctrl_pkt);
-		}
-	}
-
 	return total_tx_count;
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-10 14:06:09.025517511 +0100
+++ 0013-net-bonding-fix-slave-Tx-burst-for-mode-4.patch	2019-04-10 14:06:07.803295640 +0100
@@ -1,15 +1,16 @@
-From af91947cd236ece51b026ad9648b12cb59deeee5 Mon Sep 17 00:00:00 2001
+From 0b58135e247bfffb9b852aa68a715e58f61a0cb4 Mon Sep 17 00:00:00 2001
 From: Chas Williams <chas3 at att.com>
 Date: Thu, 14 Feb 2019 14:09:58 -0500
 Subject: [PATCH] net/bonding: fix slave Tx burst for mode 4
 
+[ upstream commit af91947cd236ece51b026ad9648b12cb59deeee5 ]
+
 The Tx burst routine always needs to check for pending LACPDUs
 and send them if available. Do this first to prioritize the
 control traffic.  We can still early exit, before calculating
 the distribution slaves, if there isn't any data packets.
 
 Fixes: 09150784a776 ("net/bonding: burst mode hash calculation")
-Cc: stable at dpdk.org
 
 Reported-by: Hui Zhao <zhaohui8 at huawei.com>
 Signed-off-by: Chas Williams <chas3 at att.com>
@@ -18,7 +19,7 @@
  1 file changed, 24 insertions(+), 24 deletions(-)
 
 diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
-index 2304172d0..61e731a8f 100644
+index d709b077d..a39f72898 100644
 --- a/drivers/net/bonding/rte_eth_bond_pmd.c
 +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
 @@ -1299,7 +1299,4 @@ bond_ethdev_tx_burst_8023ad(void *queue, struct rte_mbuf **bufs,