Skip to content

Commit ac511b5

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 5b05078 commit ac511b5

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
@@ -98,13 +98,13 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker);
9898
static void ad_mux_machine(struct port *port, bool *update_slave_arr);
9999
static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port);
100100
static void ad_tx_machine(struct port *port);
101-
static void ad_periodic_machine(struct port *port, struct bond_params *bond_params);
101+
static void ad_periodic_machine(struct port *port);
102102
static void ad_port_selection_logic(struct port *port, bool *update_slave_arr);
103103
static void ad_agg_selection_logic(struct aggregator *aggregator,
104104
bool *update_slave_arr);
105105
static void ad_clear_agg(struct aggregator *aggregator);
106106
static void ad_initialize_agg(struct aggregator *aggregator);
107-
static void ad_initialize_port(struct port *port, int lacp_fast);
107+
static void ad_initialize_port(struct port *port, const struct bond_params *bond_params);
108108
static void ad_enable_collecting(struct port *port);
109109
static void ad_disable_distributing(struct port *port,
110110
bool *update_slave_arr);
@@ -1291,10 +1291,16 @@ static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port)
12911291
* case of EXPIRED even if LINK_DOWN didn't arrive for
12921292
* the port.
12931293
*/
1294-
port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION;
12951294
port->sm_vars &= ~AD_PORT_MATCHED;
1295+
/* Based on IEEE 8021AX-2014, Figure 6-18 - Receive
1296+
* machine state diagram, the statue should be
1297+
* Partner_Oper_Port_State.Synchronization = FALSE;
1298+
* Partner_Oper_Port_State.LACP_Timeout = Short Timeout;
1299+
* start current_while_timer(Short Timeout);
1300+
* Actor_Oper_Port_State.Expired = TRUE;
1301+
*/
1302+
port->partner_oper.port_state &= ~LACP_STATE_SYNCHRONIZATION;
12961303
port->partner_oper.port_state |= LACP_STATE_LACP_TIMEOUT;
1297-
port->partner_oper.port_state |= LACP_STATE_LACP_ACTIVITY;
12981304
port->sm_rx_timer_counter = __ad_timer_to_ticks(AD_CURRENT_WHILE_TIMER, (u16)(AD_SHORT_TIMEOUT));
12991305
port->actor_oper_port_state |= LACP_STATE_EXPIRED;
13001306
port->sm_vars |= AD_PORT_CHURNED;
@@ -1400,11 +1406,10 @@ static void ad_tx_machine(struct port *port)
14001406
/**
14011407
* ad_periodic_machine - handle a port's periodic state machine
14021408
* @port: the port we're looking at
1403-
* @bond_params: bond parameters we will use
14041409
*
14051410
* Turn ntt flag on priodically to perform periodic transmission of lacpdu's.
14061411
*/
1407-
static void ad_periodic_machine(struct port *port, struct bond_params *bond_params)
1412+
static void ad_periodic_machine(struct port *port)
14081413
{
14091414
periodic_states_t last_state;
14101415

@@ -1413,8 +1418,7 @@ static void ad_periodic_machine(struct port *port, struct bond_params *bond_para
14131418

14141419
/* check if port was reinitialized */
14151420
if (((port->sm_vars & AD_PORT_BEGIN) || !(port->sm_vars & AD_PORT_LACP_ENABLED) || !port->is_enabled) ||
1416-
(!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY)) ||
1417-
!bond_params->lacp_active) {
1421+
(!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY))) {
14181422
port->sm_periodic_state = AD_NO_PERIODIC;
14191423
}
14201424
/* check if state machine should change state */
@@ -1938,16 +1942,16 @@ static void ad_initialize_agg(struct aggregator *aggregator)
19381942
/**
19391943
* ad_initialize_port - initialize a given port's parameters
19401944
* @port: the port we're looking at
1941-
* @lacp_fast: boolean. whether fast periodic should be used
1945+
* @bond_params: bond parameters we will use
19421946
*/
1943-
static void ad_initialize_port(struct port *port, int lacp_fast)
1947+
static void ad_initialize_port(struct port *port, const struct bond_params *bond_params)
19441948
{
19451949
static const struct port_params tmpl = {
19461950
.system_priority = 0xffff,
19471951
.key = 1,
19481952
.port_number = 1,
19491953
.port_priority = 0xff,
1950-
.port_state = 1,
1954+
.port_state = 0,
19511955
};
19521956
static const struct lacpdu lacpdu = {
19531957
.subtype = 0x01,
@@ -1965,12 +1969,14 @@ static void ad_initialize_port(struct port *port, int lacp_fast)
19651969
port->actor_port_priority = 0xff;
19661970
port->actor_port_aggregator_identifier = 0;
19671971
port->ntt = false;
1968-
port->actor_admin_port_state = LACP_STATE_AGGREGATION |
1969-
LACP_STATE_LACP_ACTIVITY;
1970-
port->actor_oper_port_state = LACP_STATE_AGGREGATION |
1971-
LACP_STATE_LACP_ACTIVITY;
1972+
port->actor_admin_port_state = LACP_STATE_AGGREGATION;
1973+
port->actor_oper_port_state = LACP_STATE_AGGREGATION;
1974+
if (bond_params->lacp_active) {
1975+
port->actor_admin_port_state |= LACP_STATE_LACP_ACTIVITY;
1976+
port->actor_oper_port_state |= LACP_STATE_LACP_ACTIVITY;
1977+
}
19721978

1973-
if (lacp_fast)
1979+
if (bond_params->lacp_fast)
19741980
port->actor_oper_port_state |= LACP_STATE_LACP_TIMEOUT;
19751981

19761982
memcpy(&port->partner_admin, &tmpl, sizeof(tmpl));
@@ -2186,7 +2192,7 @@ void bond_3ad_bind_slave(struct slave *slave)
21862192
/* port initialization */
21872193
port = &(SLAVE_AD_INFO(slave)->port);
21882194

2189-
ad_initialize_port(port, bond->params.lacp_fast);
2195+
ad_initialize_port(port, &bond->params);
21902196

21912197
port->slave = slave;
21922198
port->actor_port_number = SLAVE_AD_INFO(slave)->id;
@@ -2498,7 +2504,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
24982504
}
24992505

25002506
ad_rx_machine(NULL, port);
2501-
ad_periodic_machine(port, &bond->params);
2507+
ad_periodic_machine(port);
25022508
ad_port_selection_logic(port, &update_slave_arr);
25032509
ad_mux_machine(port, &update_slave_arr);
25042510
ad_tx_machine(port);

0 commit comments

Comments
 (0)