[dpdk-stable] patch 'net/bonding: fix LACP negotiation' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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/25/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.

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/42f2a8331c4b65fa1f18e61533d60fbca2f408a1

Thanks.

Kevin.

---
>From 42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Mon Sep 17 00:00:00 2001
From: Yicai Lu <luyicai at huawei.com>
Date: Fri, 10 Jul 2020 11:29:35 +0800
Subject: [PATCH] net/bonding: fix LACP negotiation

[ upstream commit a9cbca743083ace5232e9df90119b4defa7df6e5 ]

When two host is connected directly without any devices like switch,
rx_machine_update would receiving partner LACP negotiation packets,
and partner's port mac is filled with zeros in this packet, which is
different with internal's mode4 mac. So in this situation, it would
never go rx_machine branch and then execute mac swap for negotiation!
Thus bond mode 4 will negotiation failed.

Fixes: 56cbc0817399 ("net/bonding: fix LACP negotiation")

Signed-off-by: Yicai Lu <luyicai at huawei.com>
Reviewed-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index a66a027545..99884c0049 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -790,5 +790,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
 
 		partner = &lacp->lacpdu.partner;
-		if (is_same_ether_addr(&partner->port_params.system,
+		if (is_zero_ether_addr(&partner->port_params.system) ||
+			is_same_ether_addr(&partner->port_params.system,
 			&internals->mode4.mac_addr)) {
 			/* This LACP frame is sending to the bonding port
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.988120619 +0100
+++ 0033-net-bonding-fix-LACP-negotiation.patch	2020-08-20 16:26:15.829324369 +0100
@@ -1 +1 @@
-From a9cbca743083ace5232e9df90119b4defa7df6e5 Mon Sep 17 00:00:00 2001
+From 42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a9cbca743083ace5232e9df90119b4defa7df6e5 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index b7ffa2f2cf..3991825ad9 100644
+index a66a027545..99884c0049 100644
@@ -26 +27 @@
-@@ -799,5 +799,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
+@@ -790,5 +790,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
@@ -29,3 +30,3 @@
--		if (rte_is_same_ether_addr(&partner->port_params.system,
-+		if (rte_is_zero_ether_addr(&partner->port_params.system) ||
-+			rte_is_same_ether_addr(&partner->port_params.system,
+-		if (is_same_ether_addr(&partner->port_params.system,
++		if (is_zero_ether_addr(&partner->port_params.system) ||
++			is_same_ether_addr(&partner->port_params.system,