bonding: force carrier update when releasing slave
authorZhang Changzhong <zhangchangzhong@huawei.com>
Wed, 16 Feb 2022 14:18:08 +0000 (22:18 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Feb 2022 18:55:21 +0000 (10:55 -0800)
In __bond_release_one(), bond_set_carrier() is only called when bond
device has no slave. Therefore, if we remove the up slave from a master
with two slaves and keep the down slave, the master will remain up.

Fix this by moving bond_set_carrier() out of if (!bond_has_slaves(bond))
statement.

Reproducer:
$ insmod bonding.ko mode=0 miimon=100 max_bonds=2
$ ifconfig bond0 up
$ ifenslave bond0 eth0 eth1
$ ifconfig eth0 down
$ ifenslave -d bond0 eth1
$ cat /proc/net/bonding/bond0

Fixes: ff59c4563a8d ("[PATCH] bonding: support carrier state for master")
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Link: https://lore.kernel.org/r/1645021088-38370-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/bonding/bond_main.c

index 238b56d77c369d9595d55bc681c2191c49dd2905..aebeb46e6fa6f1c7cdbe6e6f01f6ae05ca5fb590 100644 (file)
@@ -2379,10 +2379,9 @@ static int __bond_release_one(struct net_device *bond_dev,
                bond_select_active_slave(bond);
        }
 
-       if (!bond_has_slaves(bond)) {
-               bond_set_carrier(bond);
+       bond_set_carrier(bond);
+       if (!bond_has_slaves(bond))
                eth_hw_addr_random(bond_dev);
-       }
 
        unblock_netpoll_tx();
        synchronize_rcu();