Commit 5003e52c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bonding-802-3ad-fix-no-transmission-of-lacpdus' 

Jonathan Toppins says:

====================
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.
====================

Link: https://lore.kernel.org/r/cover.1660919940.git.jtoppins@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0ee7828d f2e44dff

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3679,6 +3679,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 <dan@dlrobertson.com>
































drivers/net/bonding/bond_3ad.c



+15
−26






























Original line number
Diff line number
Diff line







@@ -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 =








@@ -2001,18 +2002,12 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout)







/**









 * bond_3ad_initialize - initialize a bond's 802.3ad parameters and structures









 * @bond: bonding struct to work on









 * @tick_resolution: tick duration (millisecond resolution)









 *









 * 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)









{









	/* 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))








@@ -2022,16 +2017,10 @@ 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);









}









}



















/**









 * bond_3ad_bind_slave - initialize a slave's port
































drivers/net/bonding/bond_main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -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






























Original line number
Diff line number
Diff line







@@ -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 *);
































tools/testing/selftests/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -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