[dpdk-stable] patch 'net/bonding: fix LACP negotiation' 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/24/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 52a5cdadf575164b02001616db20003c7a2474dc Mon Sep 17 00:00:00 2001
From: Liang Zhang <zhangliang at bigo.sg>
Date: Thu, 21 Mar 2019 18:22:47 +0800
Subject: [PATCH] net/bonding: fix LACP negotiation

[ upstream commit 56cbc08173995d6d57bd5927dfe9b11ad269bf8d ]

When monitor(port-mirroring) traffic from other LACP port-channel,
rx_machine_update may be receiving other LACP negotiation packets.
Thus bond mode 4 negotiation will fail.

Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control")

Signed-off-by: Liang Zhang <zhangliang at bigo.sg>
Acked-by: Chas Williams <chas3 at att.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.c         | 12 ++++++++++--
 drivers/net/bonding/rte_eth_bond_8023ad_private.h |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index dd847c6f6..dac23ac7b 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -785,4 +785,5 @@ rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id,
 		struct rte_mbuf *lacp_pkt) {
 	struct lacpdu_header *lacp;
+	struct lacpdu_actor_partner_params *partner;
 
 	if (lacp_pkt != NULL) {
@@ -790,6 +791,12 @@ rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id,
 		RTE_ASSERT(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP);
 
-		/* This is LACP frame so pass it to rx_machine */
-		rx_machine(internals, slave_id, &lacp->lacpdu);
+		partner = &lacp->lacpdu.partner;
+		if (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.
+			 */
+			rx_machine(internals, slave_id, &lacp->lacpdu);
+		}
 		rte_pktmbuf_free(lacp_pkt);
 	} else
@@ -1166,4 +1173,5 @@ bond_mode_8023ad_start(struct rte_eth_dev *bond_dev)
 	static const uint64_t us = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS * 1000;
 
+	rte_eth_macaddr_get(internals->port_id, &mode4->mac_addr);
 	if (mode4->slowrx_cb)
 		return rte_eal_alarm_set(us, &bond_mode_8023ad_ext_periodic_cb,
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad_private.h b/drivers/net/bonding/rte_eth_bond_8023ad_private.h
index c51426b85..f91902ebd 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad_private.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad_private.h
@@ -151,4 +151,5 @@ struct mode8023ad_private {
 	rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb;
 	uint8_t external_sm;
+	struct ether_addr mac_addr;
 
 	struct rte_eth_link slave_link;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-16 15:34:26.839924497 +0100
+++ 0037-net-bonding-fix-LACP-negotiation.patch	2019-04-16 15:34:25.189179750 +0100
@@ -1,14 +1,15 @@
-From 56cbc08173995d6d57bd5927dfe9b11ad269bf8d Mon Sep 17 00:00:00 2001
+From 52a5cdadf575164b02001616db20003c7a2474dc Mon Sep 17 00:00:00 2001
 From: Liang Zhang <zhangliang at bigo.sg>
 Date: Thu, 21 Mar 2019 18:22:47 +0800
 Subject: [PATCH] net/bonding: fix LACP negotiation
 
+[ upstream commit 56cbc08173995d6d57bd5927dfe9b11ad269bf8d ]
+
 When monitor(port-mirroring) traffic from other LACP port-channel,
 rx_machine_update may be receiving other LACP negotiation packets.
 Thus bond mode 4 negotiation will fail.
 
 Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control")
-Cc: stable at dpdk.org
 
 Signed-off-by: Liang Zhang <zhangliang at bigo.sg>
 Acked-by: Chas Williams <chas3 at att.com>