From: Liang Zhang <zhangliang@bigo.sg>
To: dev@dpdk.org
Cc: 3chas3@gmail.com, ktraynor@redhat.com,
Liang Zhang <zhangliang@bigo.sg>,
stable@dpdk.org
Subject: [dpdk-dev] [PATCH v2] net/bonding: fix lacp negotiation failed
Date: Thu, 21 Mar 2019 18:22:47 +0800 [thread overview]
Message-ID: <1553163767-27576-1-git-send-email-zhangliang@bigo.sg> (raw)
Message-ID: <20190321102247.msPcFzhmov7ouYsd6-mpw18HDC_Y9CU4TJ_Ke9bUWmk@z> (raw)
When monitor(port-mirroring) traffic from other lacp port-channel,
rx_machine_update may recieving other lacp negotiation packets.
Thus bond mode 4 will negotiation failed.
Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control")
Cc: stable@dpdk.org
Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
---
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 dd847c6..dac23ac 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
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);
@@ -1165,6 +1172,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 c51426b..f91902e 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 {
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.7.4
next reply other threads:[~2019-03-21 10:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-21 10:22 Liang Zhang [this message]
2019-03-21 10:22 ` Liang Zhang
2019-03-21 19:34 ` Ferruh Yigit
2019-03-21 19:34 ` Ferruh Yigit
[not found] <1589887092-26360-1>
2020-07-10 3:29 ` [dpdk-dev] [PATCH V2] " luyicai
2020-07-11 1:20 ` Wei Hu (Xavier)
2020-07-11 3:07 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1553163767-27576-1-git-send-email-zhangliang@bigo.sg \
--to=zhangliang@bigo.sg \
--cc=3chas3@gmail.com \
--cc=dev@dpdk.org \
--cc=ktraynor@redhat.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).