]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: bonding: update the slave array for broadcast mode
authorTonghao Zhang <tonghao@bamaicloud.com>
Thu, 16 Oct 2025 12:51:36 +0000 (20:51 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 17 Oct 2025 23:29:59 +0000 (16:29 -0700)
This patch fixes ce7a381697cb ("net: bonding: add broadcast_neighbor option for 802.3ad").
Before this commit, on the broadcast mode, all devices were traversed using the
bond_for_each_slave_rcu. This patch supports traversing devices by using all_slaves.
Therefore, we need to update the slave array when enslave or release slave.

Fixes: ce7a381697cb ("net: bonding: add broadcast_neighbor option for 802.3ad")
Cc: Simon Horman <horms@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>
Cc: <stable@vger.kernel.org>
Reported-by: Jiri Slaby <jirislaby@kernel.org>
Tested-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/all/a97e6e1e-81bc-4a79-8352-9e4794b0d2ca@kernel.org/
Signed-off-by: Tonghao Zhang <tonghao@bamaicloud.com>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Acked-by: Jay Vosburgh <jv@jvosburgh.net>
Link: https://patch.msgid.link/20251016125136.16568-1-tonghao@bamaicloud.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/bonding/bond_main.c

index 4da619210c1fa8b2d7b2baee68aba4b39bc9a78c..67fdcbdd2764d296b4d668485f7261e814e104b8 100644 (file)
@@ -2287,7 +2287,9 @@ skip_mac_set:
                unblock_netpoll_tx();
        }
 
-       if (bond_mode_can_use_xmit_hash(bond))
+       /* broadcast mode uses the all_slaves to loop through slaves. */
+       if (bond_mode_can_use_xmit_hash(bond) ||
+           BOND_MODE(bond) == BOND_MODE_BROADCAST)
                bond_update_slave_arr(bond, NULL);
 
        if (!slave_dev->netdev_ops->ndo_bpf ||
@@ -2463,7 +2465,8 @@ static int __bond_release_one(struct net_device *bond_dev,
 
        bond_upper_dev_unlink(bond, slave);
 
-       if (bond_mode_can_use_xmit_hash(bond))
+       if (bond_mode_can_use_xmit_hash(bond) ||
+           BOND_MODE(bond) == BOND_MODE_BROADCAST)
                bond_update_slave_arr(bond, slave);
 
        slave_info(bond_dev, slave_dev, "Releasing %s interface\n",