bonding: 802.3ad: fix no transmission of LACPDUs
Subsystems (4)
v4 cover bonding: 802.3ad: fix no transmission of LACPDUs
Configuring a bond in a specific order can leave the bond in a state where it never transmits LACPDUs.
The first patch adds some kselftest infrastructure and the reproducer that demonstrates the problem. The second patch fixes the issue. The new third patch makes ad_ticks_per_sec a static const and removes the passing of this variable via the stack.
v4:
* rebased to latest net/master
* removed if check around bond_3ad_initialize function contents
* created a new patch that makes ad_ticks_per_sec a static const
v3:
* rebased to latest net/master
* addressed comment from Hangbin
Jonathan Toppins (3):
selftests: include bonding tests into the kselftest infra
bonding: 802.3ad: fix no transmission of LACPDUs
bonding: 3ad: make ad_ticks_per_sec a const
MAINTAINERS | 1 + drivers/net/bonding/bond_3ad.c | 40 ++++----- drivers/net/bonding/bond_main.c | 2 +- include/net/bond_3ad.h | 2 +- tools/testing/selftests/Makefile | 1 + .../selftests/drivers/net/bonding/Makefile | 6 ++ .../net/bonding/bond-break-lacpdu-tx.sh | 81 +++++++++++++++++++ .../selftests/drivers/net/bonding/config | 1 + .../selftests/drivers/net/bonding/settings | 1 + 9 files changed, 108 insertions(+), 27 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/bonding/Makefile create mode 100755 tools/testing/selftests/drivers/net/bonding/bond-break-lacpdu-tx.sh create mode 100644 tools/testing/selftests/drivers/net/bonding/config create mode 100644 tools/testing/selftests/drivers/net/bonding/settings
Signature · 1 line
2.31.1
PATCH v4 1/3 selftests: include bonding tests into the kselftest infra
This creates a test collection in drivers/net/bonding for bonding specific kernel selftests.
The first test is a reproducer that provisions a bond and given the specific order in how the ip-link(8) commands are issued the bond never transmits an LACPDU frame on any of its slaves.
---
Notes:
v2:
* fully integrated the test into the kselftests infrastructure
* moved the reproducer to under tools/testing/selftests/drivers/net/bonding
* reduced the test to its minimial amount and used ip-link(8) for all bond interface configuration
v3:
* rebase to latest net/master
* remove #set -x requested by Hangbin
v4:
* no changes
MAINTAINERS | 1 + tools/testing/selftests/Makefile | 1 + .../selftests/drivers/net/bonding/Makefile | 6 ++ .../net/bonding/bond-break-lacpdu-tx.sh | 81 +++++++++++++++++++ .../selftests/drivers/net/bonding/config | 1 + .../selftests/drivers/net/bonding/settings | 1 + 6 files changed, 91 insertions(+) create mode 100644 tools/testing/selftests/drivers/net/bonding/Makefile create mode 100755 tools/testing/selftests/drivers/net/bonding/bond-break-lacpdu-tx.sh create mode 100644 tools/testing/selftests/drivers/net/bonding/config create mode 100644 tools/testing/selftests/drivers/net/bonding/settings
MAINTAINERS +1 -0
@@ -3672,6 +3672,7 @@ F: Documentation/networking/bonding.rst F: drivers/net/bonding/ F: include/net/bond* F: include/uapi/linux/if_bonding.h +F: tools/testing/selftests/net/bonding/ BOSCH SENSORTEC BMA400 ACCELEROMETER IIO DRIVER M: Dan Robertson <[email protected]>
tools/testing/selftests/Makefile +1 -0
@@ -12,6 +12,7 @@ TARGETS += cpu-hotplug TARGETS += damon TARGETS += drivers/dma-buf TARGETS += drivers/s390x/uvdevice +TARGETS += drivers/net/bonding TARGETS += efivarfs TARGETS += exec TARGETS += filesystems
tools/testing/selftests/drivers/net/bonding/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# Makefile for net selftests + +TEST_PROGS := bond-break-lacpdu-tx.sh + +include ../../../lib.mk
tools/testing/selftests/drivers/net/bonding/bond-break-lacpdu-tx.sh new file +81 -0
81 lines not on this page · raw message
tools/testing/selftests/drivers/net/bonding/config new file +1 -0
@@ -0,0 +1 @@ +CONFIG_BONDING=y
tools/testing/selftests/drivers/net/bonding/settings new file +1 -0
@@ -0,0 +1 @@ +timeout=60
Signature · 1 line
2.31.1
PATCH v4 2/3 bonding: 802.3ad: fix no transmission of LACPDUs
In reply to Jonathan ToppinsThis is caused by the global variable ad_ticks_per_sec being zero as demonstrated by the reproducer script discussed below. This causes all timer values in __ad_timer_to_ticks to be zero, resulting in the periodic timer to never fire.
To reproduce:
Run the script in tools/testing/selftests/drivers/net/bonding/bond-break-lacpdu-tx.sh which puts bonding into a state where it never transmits LACPDUs.
line 44: ip link add fbond type bond mode 4 miimon 200 \
xmit_hash_policy 1 ad_actor_sys_prio 65535 lacp_rate fast
setting bond param: ad_actor_sys_prio
given:
params.ad_actor_system = 0
call stack:
bond_option_ad_actor_sys_prio()
-> bond_3ad_update_ad_actor_settings()
-> set ad.system.sys_priority = bond->params.ad_actor_sys_prio
-> ad.system.sys_mac_addr = bond->dev->dev_addr; because
params.ad_actor_system == 0
results:
ad.system.sys_mac_addr = bond->dev->dev_addrline 48: ip link set fbond address 52:54:00:3B:7C:A6 setting bond MAC addr
call stack:
bond->dev->dev_addr = new_mac
line 52: ip link set fbond type bond ad_actor_sys_prio 65535 setting bond param: ad_actor_sys_prio
given:
params.ad_actor_system = 0
call stack:
bond_option_ad_actor_sys_prio()
-> bond_3ad_update_ad_actor_settings()
-> set ad.system.sys_priority = bond->params.ad_actor_sys_prio
-> ad.system.sys_mac_addr = bond->dev->dev_addr; because
params.ad_actor_system == 0
results:
ad.system.sys_mac_addr = bond->dev->dev_addrline 60: ip link set veth1-bond down master fbond
given:
params.ad_actor_system = 0
params.mode = BOND_MODE_8023AD
ad.system.sys_mac_addr == bond->dev->dev_addr
call stack:
bond_enslave
-> bond_3ad_initialize(); because first slave
-> if ad.system.sys_mac_addr != bond->dev->dev_addr
returnresults:
Nothing is run in bond_3ad_initialize() because dev_addr equals sys_mac_addr leaving the global ad_ticks_per_sec zero as it is never initialized anywhere else.
The if check around the contents of bond_3ad_initialize() is no longer needed due to commit 5ee14e6d336f ("bonding: 3ad: apply ad_actor settings changes immediately") which sets ad.system.sys_mac_addr if any one of the bonding parameters whos set function calls bond_3ad_update_ad_actor_settings(). This is because if ad.system.sys_mac_addr is zero it will be set to the current bond mac address, this causes the if check to never be true.
---
Notes:
v2:
* split this fix from the reproducer
v3:
* rebased to latest net/master
v4:
* instead of setting ad_ticks_per_sec remove the if statement around the body of the function of bond_3ad_initialize().
drivers/net/bonding/bond_3ad.c | 38 ++++++++++++++-------------------- 1 file changed, 16 insertions(+), 22 deletions(-)
drivers/net/bonding/bond_3ad.c +16 -22
@@ -2007,30 +2007,24 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)*/ void bond_3ad_initialize (struct bonding *bond,u16 tick_resolution) { -/* check that the bond is not initialized yet */ -if (!MAC_ADDRESS_EQUAL (&(BOND_AD_INFO (bond).system.sys_mac_addr), - bond->dev->dev_addr)) { - -BOND_AD_INFO (bond).aggregator_identifier =0 ; - -BOND_AD_INFO (bond).system.sys_priority = - bond->params.ad_actor_sys_prio; -if (is_zero_ether_addr (bond->params.ad_actor_system)) -BOND_AD_INFO (bond).system.sys_mac_addr = - *((struct mac_addr *)bond->dev->dev_addr); -else -BOND_AD_INFO (bond).system.sys_mac_addr = - *((struct mac_addr *)bond->params.ad_actor_system); +BOND_AD_INFO (bond).aggregator_identifier =0 ; +BOND_AD_INFO (bond).system.sys_priority = + bond->params.ad_actor_sys_prio; +if (is_zero_ether_addr (bond->params.ad_actor_system)) +BOND_AD_INFO (bond).system.sys_mac_addr = + *((struct mac_addr *)bond->dev->dev_addr); +else +BOND_AD_INFO (bond).system.sys_mac_addr = + *((struct mac_addr *)bond->params.ad_actor_system); -/* initialize how many times this module is called in one -* second (should be about every 100ms) -*/ - ad_ticks_per_sec = tick_resolution; +/* initialize how many times this module is called in one +* second (should be about every 100ms) +*/ + ad_ticks_per_sec = tick_resolution; -bond_3ad_initiate_agg_selection (bond, -AD_AGGREGATOR_SELECTION_TIMER * - ad_ticks_per_sec); - } +bond_3ad_initiate_agg_selection (bond, +AD_AGGREGATOR_SELECTION_TIMER * + ad_ticks_per_sec); }/**
Signature · 1 line
2.31.1
PATCH v4 3/3 bonding: 3ad: make ad_ticks_per_sec a const
In reply to Jonathan ToppinsThe value is only ever set once in bond_3ad_initialize and only ever read otherwise. There seems to be no reason to set the variable via bond_3ad_initialize when setting the global variable will do. Change ad_ticks_per_sec to a const to enforce its read-only usage.
---
Notes:
v4:
* remove passing the value of ad_ticks_per_sec on the stack and set ad_ticks_per_sec and make as const
drivers/net/bonding/bond_3ad.c | 10 +++------- drivers/net/bonding/bond_main.c | 2 +- include/net/bond_3ad.h | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-)
drivers/net/bonding/bond_3ad.c +3 -7
@@ -84,7 +84,8 @@ enum ad_link_speed_type { static const u8 null_mac_addr[ETH_ALEN + 2] __long_aligned = {0 ,0 ,0 ,0 ,0 ,0 }; -static u16 ad_ticks_per_sec; + +static const u16 ad_ticks_per_sec =1000 /AD_TIMER_INTERVAL ;static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL *HZ ) /1000 ; static const u8 lacpdu_mcast_addr[ETH_ALEN + 2] __long_aligned =
@@ -2005,7 +2006,7 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)* * Can be called only after the mac address of the bond is set. */ -void bond_3ad_initialize (struct bonding *bond,u16 tick_resolution) +void bond_3ad_initialize (struct bonding *bond) {BOND_AD_INFO (bond).aggregator_identifier =0 ; BOND_AD_INFO(bond).system.sys_priority =
@@ -2017,11 +2018,6 @@ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution)BOND_AD_INFO (bond).system.sys_mac_addr = *((struct mac_addr *)bond->params.ad_actor_system); -/* initialize how many times this module is called in one -* second (should be about every 100ms) -*/ - ad_ticks_per_sec = tick_resolution; -bond_3ad_initiate_agg_selection (bond,AD_AGGREGATOR_SELECTION_TIMER * ad_ticks_per_sec);
drivers/net/bonding/bond_main.c +1 -1
@@ -2081,7 +2081,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,/* Initialize AD with the number of times that the AD timer is called in 1 second * can be called only after the mac address of the bond is set */ -bond_3ad_initialize (bond,1000 /AD_TIMER_INTERVAL ); +bond_3ad_initialize (bond); }else {SLAVE_AD_INFO (new_slave)->id =SLAVE_AD_INFO (prev_slave)->id +1 ;
include/net/bond_3ad.h +1 -1
@@ -290,7 +290,7 @@ static inline const char *bond_3ad_churn_desc(churn_state_t state) }/* ========== AD Exported functions to the main bonding code ========== */ -void bond_3ad_initialize (struct bonding *bond,u16 tick_resolution); +void bond_3ad_initialize (struct bonding *bond);void bond_3ad_bind_slave (struct slave *slave);void bond_3ad_unbind_slave (struct slave *slave);void bond_3ad_state_machine_handler (struct work_struct *);
Signature · 1 line
2.31.1
Jakub Kicinski
maintainerRe: [PATCH net v4 3/3] bonding: 3ad: make ad_ticks_per_sec a const
drivers/net/bonding/bond_3ad.c void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout) · line 2009
Quoted 6 lines · On Thu, 18 Aug 2022 10:41:12 -0400 Jonathan Toppins wrote:
drivers/net/bonding/bond_3ad.c +1
-1@@ -2005,7 +2006,7 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)* * Can be called only after the mac address of the bond is set. */ -void bond_3ad_initialize (struct bonding *bond,u16 tick_resolution) +void bond_3ad_initialize (struct bonding *bond)
kdoc needs updating here
Quoted 16 lines · Jonathan Toppins
Configuring a bond in a specific order can leave the bond in a state where it never transmits LACPDUs.
The first patch adds some kselftest infrastructure and the reproducer that demonstrates the problem. The second patch fixes the issue. The new third patch makes
ad_ticks_per_seca static const and removes the passing of this variable via the stack.v4:
* rebased to latest net/master
* removed if check aroundbond_3ad_initializefunction contents
* created a new patch that makesad_ticks_per_seca static const v3:
* rebased to latest net/master
* addressed comment from Hangbin
Quoted 4 lines
Jonathan Toppins (3):
selftests: include bonding tests into the kselftest infra
bonding: 802.3ad: fix no transmission of LACPDUs
bonding: 3ad: makead_ticks_per_seca const
For the series:
-J
---
-Jay Vosburgh, [email protected]