[dpdk-stable] patch 'net/bonding: fix LACP negotiation' 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 07/26/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 6c80d377ec382218298318e1a22a92e319710da6 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 b7ffa2f2c..3991825ad 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -798,7 +798,8 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
 		RTE_ASSERT(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP);
 
 		partner = &lacp->lacpdu.partner;
-		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,
 			&internals->mode4.mac_addr)) {
 			/* This LACP frame is sending to the bonding port
 			 * so pass it to rx_machine.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.073524306 +0100
+++ 0143-net-bonding-fix-LACP-negotiation.patch	2020-07-24 12:53:48.483010111 +0100
@@ -1,8 +1,10 @@
-From a9cbca743083ace5232e9df90119b4defa7df6e5 Mon Sep 17 00:00:00 2001
+From 6c80d377ec382218298318e1a22a92e319710da6 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
@@ -11,7 +13,6 @@
 Thus bond mode 4 will negotiation failed.
 
 Fixes: 56cbc0817399 ("net/bonding: fix LACP negotiation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Yicai Lu <luyicai at huawei.com>
 Reviewed-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>