bonding: fix negotiation flapping in 802.3ad passive mode
Subsystems (4)
v3 cover bonding: fix negotiation flapping in 802.3ad passive mode
This patch fixes unstable LACP negotiation when bonding is configured in passive mode (lacp_active=off).
Previously, the actor would stop sending LACPDUs after initial negotiation succeeded, leading to the partner timing out and restarting the negotiation cycle. This resulted in continuous LACP state flapping.
The fix ensures the passive actor starts sending periodic LACPDUs after receiving the first LACPDU from the partner, in accordance with IEEE 802.1AX-2020 section 6.4.1.
v3:
a) const bond_params for ad_initialize_port (Paolo Abeni)
b) add comment about why we need to sleep in test script (Paolo Abeni)
v2:
a) Split the patch in to 2 parts. One for lacp_active setting. One for passive mode negotiation flapping issue. (Nikolay Aleksandrov)
b) Update fixes tags and some comments (Nikolay Aleksandrov)
c) Update selftest to pass on normal kernel (Jakub Kicinski)
Hangbin Liu (3):
bonding: update LACP activity flag after setting lacp_active
bonding: send LACPDUs periodically in passive mode after receiving
partner's LACPDU
selftests: bonding: add test for passive LACP mode
drivers/net/bonding/bond_3ad.c | 67 ++++++++--- drivers/net/bonding/bond_options.c | 1 + include/net/bond_3ad.h | 1 + .../selftests/drivers/net/bonding/Makefile | 3 +- .../drivers/net/bonding/bond_passive_lacp.sh | 105 ++++++++++++++++++ .../selftests/drivers/net/bonding/config | 1 + 6 files changed, 159 insertions(+), 19 deletions(-) create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh
Signature · 1 line
2.50.1
PATCH v3 1/3 bonding: update LACP activity flag after setting lacp_active
The port's actor_oper_port_state activity flag should be updated immediately after changing the lacp_active option to reflect the current mode correctly.
--- drivers/net/bonding/bond_3ad.c | 25 +++++++++++++++++++++++++ drivers/net/bonding/bond_options.c | 1 + include/net/bond_3ad.h | 1 + 3 files changed, 27 insertions(+)
drivers/net/bonding/bond_3ad.c +25 -0
@@ -2883,6 +2883,31 @@ void bond_3ad_update_lacp_rate(struct bonding *bond)spin_unlock_bh (&bond->mode_lock); } +/** +* bond_3ad_update_lacp_active - change the lacp active +* @bond: bonding struct +* +* Update actor_oper_port_state when lacp_active is modified. +*/ +void bond_3ad_update_lacp_active (struct bonding *bond) +{ +struct port *port =NULL ; +struct list_head *iter; +struct slave *slave; +int lacp_active; + + lacp_active = bond->params.lacp_active; +spin_lock_bh (&bond->mode_lock); +bond_for_each_slave (bond, slave, iter) { + port = &(SLAVE_AD_INFO (slave)->port); +if (lacp_active) + port->actor_oper_port_state |=LACP_STATE_LACP_ACTIVITY ; +else + port->actor_oper_port_state &= ~LACP_STATE_LACP_ACTIVITY ; + } +spin_unlock_bh (&bond->mode_lock); +} +size_t bond_3ad_stats_size (void ) { return nla_total_size_64bit(sizeof(u64)) + /* BOND_3AD_STAT_LACPDU_RX */
drivers/net/bonding/bond_options.c +1 -0
@@ -1660,6 +1660,7 @@ static int bond_option_lacp_active_set(struct bonding *bond,netdev_dbg (bond->dev,"Setting LACP active to %s (%llu)\n" , newval->string, newval->value); bond->params.lacp_active = newval->value; +bond_3ad_update_lacp_active (bond);return 0 ; }
include/net/bond_3ad.h +1 -0
@@ -307,6 +307,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave);int bond_3ad_set_carrier (struct bonding *bond);void bond_3ad_update_lacp_rate (struct bonding *bond); +void bond_3ad_update_lacp_active (struct bonding *bond);void bond_3ad_update_ad_actor_settings (struct bonding *bond);int bond_3ad_stats_fill (struct sk_buff *skb,struct bond_3ad_stats *stats);size_t bond_3ad_stats_size (void );
Signature · 1 line
2.50.1
PATCH v3 2/3 bonding: send LACPDUs periodically in passive mode after receiving partner's LACPDU
In reply to Hangbin LiuWhen lacp_active is set to off, the bond operates in passive mode, meaning it only "speaks when spoken to." However, the current kernel implementation only sends an LACPDU in response when the partner's state changes.
As a result, once LACP negotiation succeeds, the actor stops sending LACPDUs until the partner times out and sends an "expired" LACPDU. This causes continuous LACP state flapping.
According to IEEE 802.1AX-2014, 6.4.13 Periodic Transmission machine. The values of Partner_Oper_Port_State.LACP_Activity and Actor_Oper_Port_State.LACP_Activity determine whether periodic transmissions take place. If either or both parameters are set to Active LACP, then periodic transmissions occur; if both are set to Passive LACP, then periodic transmissions do not occur.
To comply with this, we remove the !bond->params.lacp_active check in ad_periodic_machine(). Instead, we initialize the actor's port's LACP_STATE_LACP_ACTIVITY state based on lacp_active setting.
Additionally, we avoid setting the partner's state to LACP_STATE_LACP_ACTIVITY in the EXPIRED state, since we should not assume the partner is active by default.
This ensures that in passive mode, the bond starts sending periodic LACPDUs after receiving one from the partner, and avoids flapping due to inactivity.
--- drivers/net/bonding/bond_3ad.c | 42 +++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 18 deletions(-)
drivers/net/bonding/bond_3ad.c +24 -18
@@ -95,13 +95,13 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker);static void ad_mux_machine (struct port *port,bool *update_slave_arr);static void ad_rx_machine (struct lacpdu *lacpdu,struct port *port);static void ad_tx_machine (struct port *port); -static void ad_periodic_machine (struct port *port,struct bond_params *bond_params); +static void ad_periodic_machine (struct port *port);static void ad_port_selection_logic (struct port *port,bool *update_slave_arr);static void ad_agg_selection_logic (struct aggregator *aggregator,bool *update_slave_arr);static void ad_clear_agg (struct aggregator *aggregator);static void ad_initialize_agg (struct aggregator *aggregator); -static void ad_initialize_port (struct port *port,int lacp_fast); +static void ad_initialize_port (struct port *port,const struct bond_params *bond_params);static void ad_enable_collecting (struct port *port);static void ad_disable_distributing (struct port *port,bool *update_slave_arr);
@@ -1307,10 +1307,16 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)* case of EXPIRED even if LINK_DOWN didn't arrive for * the port. */ - port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION ; port->sm_vars &= ~AD_PORT_MATCHED ; +/* Based on IEEE 8021AX-2014, Figure 6-18 - Receive +* machine state diagram, the statue should be +* Partner_Oper_Port_State.Synchronization = FALSE; +* Partner_Oper_Port_State.LACP_Timeout = Short Timeout; +* start current_while_timer(Short Timeout); +* Actor_Oper_Port_State.Expired = TRUE; +*/ + port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION ; port->partner_oper.port_state |=LACP_STATE_LACP_TIMEOUT ; - port->partner_oper.port_state |=LACP_STATE_LACP_ACTIVITY ; port->sm_rx_timer_counter =__ad_timer_to_ticks (AD_CURRENT_WHILE_TIMER , (u16)(AD_SHORT_TIMEOUT )); port->actor_oper_port_state |=LACP_STATE_EXPIRED ; port->sm_vars |=AD_PORT_CHURNED ;
@@ -1417,11 +1423,10 @@ static void ad_tx_machine(struct port *port)/** * ad_periodic_machine - handle a port's periodic state machine * @port: the port we're looking at -* @bond_params: bond parameters we will use * * Turn ntt flag on priodically to perform periodic transmission of lacpdu's. */ -static void ad_periodic_machine (struct port *port,struct bond_params *bond_params) +static void ad_periodic_machine (struct port *port) {periodic_states_t last_state;
@@ -1430,8 +1435,7 @@ static void ad_periodic_machine(struct port *port, struct bond_params *bond_para/* check if port was reinitialized */ if (((port->sm_vars &AD_PORT_BEGIN ) || !(port->sm_vars &AD_PORT_LACP_ENABLED ) || !port->is_enabled) || - (!(port->actor_oper_port_state &LACP_STATE_LACP_ACTIVITY ) && !(port->partner_oper.port_state &LACP_STATE_LACP_ACTIVITY )) || - !bond_params->lacp_active) { + (!(port->actor_oper_port_state &LACP_STATE_LACP_ACTIVITY ) && !(port->partner_oper.port_state &LACP_STATE_LACP_ACTIVITY ))) { port->sm_periodic_state =AD_NO_PERIODIC ; }/* check if state machine should change state */
@@ -1955,16 +1959,16 @@ static void ad_initialize_agg(struct aggregator *aggregator)/** * ad_initialize_port - initialize a given port's parameters * @port: the port we're looking at -* @lacp_fast: boolean. whether fast periodic should be used +* @bond_params: bond parameters we will use */ -static void ad_initialize_port (struct port *port,int lacp_fast) +static void ad_initialize_port (struct port *port,const struct bond_params *bond_params) {static const struct port_params tmpl = { .system_priority =0xffff , .key =1 , .port_number =1 , .port_priority =0xff , - .port_state =1 , + .port_state =0 , };static const struct lacpdu lacpdu = { .subtype =0x01 ,
@@ -1982,12 +1986,14 @@ static void ad_initialize_port(struct port *port, int lacp_fast) port->actor_port_priority =0xff ; port->actor_port_aggregator_identifier =0 ; port->ntt = false; - port->actor_admin_port_state =LACP_STATE_AGGREGATION | -LACP_STATE_LACP_ACTIVITY ; - port->actor_oper_port_state =LACP_STATE_AGGREGATION | -LACP_STATE_LACP_ACTIVITY ; + port->actor_admin_port_state =LACP_STATE_AGGREGATION ; + port->actor_oper_port_state =LACP_STATE_AGGREGATION ; +if (bond_params->lacp_active) { + port->actor_admin_port_state |=LACP_STATE_LACP_ACTIVITY ; + port->actor_oper_port_state |=LACP_STATE_LACP_ACTIVITY ; + } -if (lacp_fast) +if (bond_params->lacp_fast) port->actor_oper_port_state |=LACP_STATE_LACP_TIMEOUT ;memcpy (&port->partner_admin, &tmpl,sizeof (tmpl));
@@ -2201,7 +2207,7 @@ void bond_3ad_bind_slave(struct slave *slave)/* port initialization */ port = &(SLAVE_AD_INFO (slave)->port); -ad_initialize_port (port, bond->params.lacp_fast); +ad_initialize_port (port, &bond->params); port->slave = slave; port->actor_port_number =SLAVE_AD_INFO (slave)->id;
@@ -2513,7 +2519,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work) }ad_rx_machine (NULL , port); -ad_periodic_machine (port, &bond->params); +ad_periodic_machine (port);ad_port_selection_logic (port, &update_slave_arr);ad_mux_machine (port, &update_slave_arr);ad_tx_machine (port);
Signature · 1 line
2.50.1
PATCH v3 3/3 selftests: bonding: add test for passive LACP mode
In reply to Hangbin LiuAdd a selftest to verify bonding behavior when lacp_active is set to off.
The test checks the following:
- The passive LACP bond should not send LACPDUs before receiving a partner's LACPDU.
- The transmitted LACPDUs must not include the active flag.
- After transitioning to EXPIRED and DEFAULTED states, the passive side should still not initiate LACPDUs.
--- .../selftests/drivers/net/bonding/Makefile | 3 +- .../drivers/net/bonding/bond_passive_lacp.sh | 105 ++++++++++++++++++ .../selftests/drivers/net/bonding/config | 1 + 3 files changed, 108 insertions(+), 1 deletion(-) create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh
tools/testing/selftests/drivers/net/bonding/Makefile +2 -1
@@ -10,7 +10,8 @@ TEST_PROGS := \ mode-2-recovery-updelay.sh \ bond_options.sh \ bond-eth-type-change.sh \ - bond_macvlan_ipvlan.sh + bond_macvlan_ipvlan.sh \ + bond_passive_lacp.sh TEST_FILES := \ lag_lib.sh \
tools/testing/selftests/drivers/net/bonding/bond_passive_lacp.sh new file +105 -0
105 lines not on this page · raw message
tools/testing/selftests/drivers/net/bonding/config +1 -0
@@ -6,6 +6,7 @@ CONFIG_MACVLAN=y CONFIG_IPVLAN=y CONFIG_NET_ACT_GACT=y CONFIG_NET_CLS_FLOWER=y +CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_SCH_INGRESS=y CONFIG_NLMON=y CONFIG_VETH=y
Signature · 1 line
2.50.1
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 8 lines · On Fri, 15 Aug 2025 06:19:57 +0000 you wrote:
This patch fixes unstable LACP negotiation when bonding is configured in passive mode (
lacp_active=off).Previously, the actor would stop sending LACPDUs after initial negotiation succeeded, leading to the partner timing out and restarting the negotiation cycle. This resulted in continuous LACP state flapping.
[...]
Here is the summary with links:
- [PATCHv3,net,1/3] bonding: update LACP activity flag after setting lacp_active
https://git.kernel.org/netdev/net/c/b64d035f77b1 - [PATCHv3,net,2/3] bonding: send LACPDUs periodically in passive mode after receiving partner's LACPDU https://git.kernel.org/netdev/net/c/0599640a21e9 - [PATCHv3,net,3/3] selftests: bonding: add test for passive LACP mode https://git.kernel.org/netdev/net/c/87951b566446
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html