From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9CEBDA046B for ; Tue, 23 Jul 2019 03:02:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8437C1BF5A; Tue, 23 Jul 2019 03:02:26 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id D5DB91BEED for ; Tue, 23 Jul 2019 03:02:24 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE2 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Jul 2019 04:02:21 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6N11HfM026580; Tue, 23 Jul 2019 04:02:20 +0300 From: Yongseok Koh To: Liang Zhang Cc: Chas Williams , dpdk stable Date: Mon, 22 Jul 2019 18:00:03 -0700 Message-Id: <20190723010115.6446-36-yskoh@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190723010115.6446-1-yskoh@mellanox.com> References: <20190723010115.6446-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix LACP negotiation' has been queued to LTS release 17.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 07/27/19. So please shout if anyone has objection. 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. Yongseok --- >From 75ce196d3b2b5d5bd8a119eff5c4137af5cec8c0 Mon Sep 17 00:00:00 2001 From: Liang Zhang 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 Acked-by: Chas Williams --- 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 1351808c44..14b82bb304 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -805,13 +805,20 @@ static void 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) { lacp = rte_pktmbuf_mtod(lacp_pkt, struct lacpdu_header *); 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 rx_machine(internals, slave_id, NULL); @@ -1186,6 +1193,7 @@ bond_mode_8023ad_start(struct rte_eth_dev *bond_dev) struct mode8023ad_private *mode4 = &internals->mode4; 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, bond_dev); diff --git a/drivers/net/bonding/rte_eth_bond_8023ad_private.h b/drivers/net/bonding/rte_eth_bond_8023ad_private.h index 433c7000d0..8923e38bbc 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad_private.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad_private.h @@ -179,6 +179,7 @@ struct mode8023ad_private { uint64_t update_timeout_us; rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb; uint8_t external_sm; + struct ether_addr mac_addr; struct rte_eth_link slave_link; /***< slave link properties */ -- 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-07-22 17:55:08.458839417 -0700 +++ 0036-net-bonding-fix-LACP-negotiation.patch 2019-07-22 17:55:05.997473000 -0700 @@ -1,14 +1,15 @@ -From 56cbc08173995d6d57bd5927dfe9b11ad269bf8d Mon Sep 17 00:00:00 2001 +From 75ce196d3b2b5d5bd8a119eff5c4137af5cec8c0 Mon Sep 17 00:00:00 2001 From: Liang Zhang 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@dpdk.org Signed-off-by: Liang Zhang Acked-by: Chas Williams @@ -18,10 +19,10 @@ 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 dd847c6f6e..dac23ac7b6 100644 +index 1351808c44..14b82bb304 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c -@@ -784,13 +784,20 @@ static void +@@ -805,13 +805,20 @@ static void rx_machine_update(struct bond_dev_private *internals, uint8_t slave_id, struct rte_mbuf *lacp_pkt) { struct lacpdu_header *lacp; @@ -44,7 +45,7 @@ rte_pktmbuf_free(lacp_pkt); } else rx_machine(internals, slave_id, NULL); -@@ -1165,6 +1172,7 @@ bond_mode_8023ad_start(struct rte_eth_dev *bond_dev) +@@ -1186,6 +1193,7 @@ bond_mode_8023ad_start(struct rte_eth_dev *bond_dev) struct mode8023ad_private *mode4 = &internals->mode4; static const uint64_t us = BOND_MODE_8023AX_UPDATE_TIMEOUT_MS * 1000; @@ -53,10 +54,10 @@ return rte_eal_alarm_set(us, &bond_mode_8023ad_ext_periodic_cb, bond_dev); diff --git a/drivers/net/bonding/rte_eth_bond_8023ad_private.h b/drivers/net/bonding/rte_eth_bond_8023ad_private.h -index c51426b858..f91902ebd7 100644 +index 433c7000d0..8923e38bbc 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad_private.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad_private.h -@@ -150,6 +150,7 @@ struct mode8023ad_private { +@@ -179,6 +179,7 @@ struct mode8023ad_private { uint64_t update_timeout_us; rte_eth_bond_8023ad_ext_slowrx_fn slowrx_cb; uint8_t external_sm;