Skip to content

Commit 2919ca8

Browse files
liuhangbingregkh
liuhangbin
authored and
gregkh
committed
bonding: send LACPDUs periodically in passive mode after receiving partner's LACPDU
[ Upstream commit 0599640 ] When `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. Fixes: 3a755cd ("bonding: add new option lacp_active") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Link: https://patch.msgid.link/20250815062000.22220-3-liuhangbin@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 45b7035 commit 2919ca8

1 file changed

Lines changed: 24 additions & 18 deletions

File tree

‎drivers/net/bonding/bond_3ad.c‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker);
9999
static void ad_mux_machine(struct port *port, bool *update_slave_arr);
100100
static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port);
101101
static void ad_tx_machine(struct port *port);
102-
static void ad_periodic_machine(struct port *port, struct bond_params *bond_params);
102+
static void ad_periodic_machine(struct port *port);
103103
static void ad_port_selection_logic(struct port *port, bool *update_slave_arr);
104104
static void ad_agg_selection_logic(struct aggregator *aggregator,
105105
bool *update_slave_arr);
106106
static void ad_clear_agg(struct aggregator *aggregator);
107107
static void ad_initialize_agg(struct aggregator *aggregator);
108-
static void ad_initialize_port(struct port *port, int lacp_fast);
108+
static void ad_initialize_port(struct port *port, const struct bond_params *bond_params);
109109
static void ad_enable_collecting(struct port *port);
110110
static void ad_disable_distributing(struct port *port,
111111
bool *update_slave_arr);
@@ -1300,10 +1300,16 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
13001300
* case of EXPIRED even if LINK_DOWN didn't arrive for
13011301
* the port.
13021302
*/
1303-
port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION;
13041303
port->sm_vars &= ~AD_PORT_MATCHED;
1304+
/* Based on IEEE 8021AX-2014, Figure 6-18 - Receive
1305+
* machine state diagram, the statue should be
1306+
* Partner_Oper_Port_State.Synchronization = FALSE;
1307+
* Partner_Oper_Port_State.LACP_Timeout = Short Timeout;
1308+
* start current_while_timer(Short Timeout);
1309+
* Actor_Oper_Port_State.Expired = TRUE;
1310+
*/
1311+
port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION;
13051312
port->partner_oper.port_state |= LACP_STATE_LACP_TIMEOUT;
1306-
port->partner_oper.port_state |= LACP_STATE_LACP_ACTIVITY;
13071313
port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(AD_SHORT_TIMEOUT));
13081314
port->actor_oper_port_state |= LACP_STATE_EXPIRED;
13091315
port->sm_vars |= AD_PORT_CHURNED;
@@ -1409,11 +1415,10 @@ static void ad_tx_machine(struct port *port)
14091415
/**
14101416
* ad_periodic_machine - handle a port's periodic state machine
14111417
* @port: the port we're looking at
1412-
* @bond_params: bond parameters we will use
14131418
*
14141419
* Turn ntt flag on priodically to perform periodic transmission of lacpdu's.
14151420
*/
1416-
static void ad_periodic_machine(struct port *port, struct bond_params *bond_params)
1421+
static void ad_periodic_machine(struct port *port)
14171422
{
14181423
periodic_states_t last_state;
14191424

@@ -1422,8 +1427,7 @@ static void ad_periodic_machine(struct port *port, struct bond_params *bond_para
14221427

14231428
/* check if port was reinitialized */
14241429
if (((port->sm_vars & AD_PORT_BEGIN) || !(port->sm_vars & AD_PORT_LACP_ENABLED) || !port->is_enabled) ||
1425-
(!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY)) ||
1426-
!bond_params->lacp_active) {
1430+
(!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY))) {
14271431
port->sm_periodic_state = AD_NO_PERIODIC;
14281432
}
14291433
/* check if state machine should change state */
@@ -1947,16 +1951,16 @@ static void ad_initialize_agg(struct aggregator *aggregator)
19471951
/**
19481952
* ad_initialize_port - initialize a given port's parameters
19491953
* @port: the port we're looking at
1950-
* @lacp_fast: boolean. whether fast periodic should be used
1954+
* @bond_params: bond parameters we will use
19511955
*/
1952-
static void ad_initialize_port(struct port *port, int lacp_fast)
1956+
static void ad_initialize_port(struct port *port, const struct bond_params *bond_params)
19531957
{
19541958
static const struct port_params tmpl = {
19551959
.system_priority = 0xffff,
19561960
.key = 1,
19571961
.port_number = 1,
19581962
.port_priority = 0xff,
1959-
.port_state = 1,
1963+
.port_state = 0,
19601964
};
19611965
static const struct lacpdu lacpdu = {
19621966
.subtype = 0x01,
@@ -1974,12 +1978,14 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
19741978
port->actor_port_priority = 0xff;
19751979
port->actor_port_aggregator_identifier = 0;
19761980
port->ntt = false;
1977-
port->actor_admin_port_state = LACP_STATE_AGGREGATION |
1978-
LACP_STATE_LACP_ACTIVITY;
1979-
port->actor_oper_port_state = LACP_STATE_AGGREGATION |
1980-
LACP_STATE_LACP_ACTIVITY;
1981+
port->actor_admin_port_state = LACP_STATE_AGGREGATION;
1982+
port->actor_oper_port_state = LACP_STATE_AGGREGATION;
1983+
if (bond_params->lacp_active) {
1984+
port->actor_admin_port_state |= LACP_STATE_LACP_ACTIVITY;
1985+
port->actor_oper_port_state |= LACP_STATE_LACP_ACTIVITY;
1986+
}
19811987

1982-
if (lacp_fast)
1988+
if (bond_params->lacp_fast)
19831989
port->actor_oper_port_state |= LACP_STATE_LACP_TIMEOUT;
19841990

19851991
memcpy(&port->partner_admin, &tmpl, sizeof(tmpl));
@@ -2195,7 +2201,7 @@ void bond_3ad_bind_slave(struct slave *slave)
21952201
/* port initialization */
21962202
port = &(SLAVE_AD_INFO(slave)->port);
21972203

2198-
ad_initialize_port(port, bond->params.lacp_fast);
2204+
ad_initialize_port(port, &bond->params);
21992205

22002206
port->slave = slave;
22012207
port->actor_port_number = SLAVE_AD_INFO(slave)->id;
@@ -2507,7 +2513,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
25072513
}
25082514

25092515
ad_rx_machine(NULL, port);
2510-
ad_periodic_machine(port, &bond->params);
2516+
ad_periodic_machine(port);
25112517
ad_port_selection_logic(port, &update_slave_arr);
25122518
ad_mux_machine(port, &update_slave_arr);
25132519
ad_tx_machine(port);

0 commit comments

Comments
 (0)