* [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
@ 2019-03-15 9:06 Liang Zhang
2019-03-15 9:06 ` Liang Zhang
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Liang Zhang @ 2019-03-15 9:06 UTC (permalink / raw)
To: dev; +Cc: 3chas3, Liang Zhang
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.
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
^ permalink raw reply [flat|nested] 8+ messages in thread* [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
2019-03-15 9:06 [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed Liang Zhang
@ 2019-03-15 9:06 ` Liang Zhang
2019-03-18 13:45 ` Chas Williams
2019-03-19 16:03 ` Kevin Traynor
2 siblings, 0 replies; 8+ messages in thread
From: Liang Zhang @ 2019-03-15 9:06 UTC (permalink / raw)
To: dev; +Cc: 3chas3, Liang Zhang
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.
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
2019-03-15 9:06 [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed Liang Zhang
2019-03-15 9:06 ` Liang Zhang
@ 2019-03-18 13:45 ` Chas Williams
2019-03-18 13:45 ` Chas Williams
2019-03-19 16:03 ` Kevin Traynor
2 siblings, 1 reply; 8+ messages in thread
From: Chas Williams @ 2019-03-18 13:45 UTC (permalink / raw)
To: Liang Zhang, dev
On 3/15/19 5:06 AM, Liang Zhang wrote:
> 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.
>
> Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
Acked-by: Chas Williams <chas3@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 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 */
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
2019-03-18 13:45 ` Chas Williams
@ 2019-03-18 13:45 ` Chas Williams
0 siblings, 0 replies; 8+ messages in thread
From: Chas Williams @ 2019-03-18 13:45 UTC (permalink / raw)
To: Liang Zhang, dev
On 3/15/19 5:06 AM, Liang Zhang wrote:
> 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.
>
> Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
Acked-by: Chas Williams <chas3@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 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 */
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
2019-03-15 9:06 [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed Liang Zhang
2019-03-15 9:06 ` Liang Zhang
2019-03-18 13:45 ` Chas Williams
@ 2019-03-19 16:03 ` Kevin Traynor
2019-03-19 16:03 ` Kevin Traynor
2 siblings, 1 reply; 8+ messages in thread
From: Kevin Traynor @ 2019-03-19 16:03 UTC (permalink / raw)
To: Liang Zhang, dev; +Cc: 3chas3
On 15/03/2019 09:06, Liang Zhang wrote:
> 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.
>
Please add a 'Fixes:' tag, and if appropriate for backport to stable
branches, also a 'Cc: stable@dpdk.org' tag.
> Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
> ---
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
2019-03-19 16:03 ` Kevin Traynor
@ 2019-03-19 16:03 ` Kevin Traynor
0 siblings, 0 replies; 8+ messages in thread
From: Kevin Traynor @ 2019-03-19 16:03 UTC (permalink / raw)
To: Liang Zhang, dev; +Cc: 3chas3
On 15/03/2019 09:06, Liang Zhang wrote:
> 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.
>
Please add a 'Fixes:' tag, and if appropriate for backport to stable
branches, also a 'Cc: stable@dpdk.org' tag.
> Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
> ---
^ permalink raw reply [flat|nested] 8+ messages in thread
* [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
@ 2019-03-13 13:23 Liang Zhang
2019-03-13 18:02 ` Chas Williams
0 siblings, 1 reply; 8+ messages in thread
From: Liang Zhang @ 2019-03-13 13:23 UTC (permalink / raw)
To: dev; +Cc: Liang Zhang
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.
Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
---
drivers/net/bonding/rte_eth_bond_8023ad.c | 9 +++++++--
drivers/net/bonding/rte_eth_bond_8023ad_private.h | 1 +
2 files changed, 8 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..e518956 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -784,13 +784,17 @@ 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 is LACP frame 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);
@@ -1140,6 +1144,7 @@ bond_mode_8023ad_setup(struct rte_eth_dev *dev,
bond_mode_8023ad_conf_assign(mode4, conf);
mode4->slowrx_cb = conf->slowrx_cb;
mode4->agg_selection = AGG_STABLE;
+ rte_eth_macaddr_get(internals->port_id, &mode4->mac_addr);
if (dev->data->dev_started)
bond_mode_8023ad_start(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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed
2019-03-13 13:23 Liang Zhang
@ 2019-03-13 18:02 ` Chas Williams
0 siblings, 0 replies; 8+ messages in thread
From: Chas Williams @ 2019-03-13 18:02 UTC (permalink / raw)
To: Liang Zhang, dev
At a minimum you need to address the long lines in your patch. See
http://mails.dpdk.org/archives/test-report/2019-March/076663.html
otherwise this looks fine to me.
On 3/13/19 9:23 AM, Liang Zhang wrote:
> 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.
>
> Signed-off-by: Liang Zhang <zhangliang@bigo.sg>
> ---
> drivers/net/bonding/rte_eth_bond_8023ad.c | 9 +++++++--
> drivers/net/bonding/rte_eth_bond_8023ad_private.h | 1 +
> 2 files changed, 8 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..e518956 100644
> --- a/drivers/net/bonding/rte_eth_bond_8023ad.c
> +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
> @@ -784,13 +784,17 @@ 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 is LACP frame 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);
> @@ -1140,6 +1144,7 @@ bond_mode_8023ad_setup(struct rte_eth_dev *dev,
> bond_mode_8023ad_conf_assign(mode4, conf);
> mode4->slowrx_cb = conf->slowrx_cb;
> mode4->agg_selection = AGG_STABLE;
> + rte_eth_macaddr_get(internals->port_id, &mode4->mac_addr);
>
> if (dev->data->dev_started)
> bond_mode_8023ad_start(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 */
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-03-19 16:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-15 9:06 [dpdk-dev] [PATCH] bonding: fix lacp negotiation failed Liang Zhang
2019-03-15 9:06 ` Liang Zhang
2019-03-18 13:45 ` Chas Williams
2019-03-18 13:45 ` Chas Williams
2019-03-19 16:03 ` Kevin Traynor
2019-03-19 16:03 ` Kevin Traynor
-- strict thread matches above, loose matches on Subject: below --
2019-03-13 13:23 Liang Zhang
2019-03-13 18:02 ` Chas Williams
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).