bonding: fix link recovery in mode 2 when updelay is nonzero

[ Upstream commit f8a65ab2f3ff7410921ebbf0dc55453102c33c56 ]

Before this change when a bond in mode 2 lost link, all of its slaves
lost link, the bonding device would never recover even after the
expiration of updelay. This change removes the updelay when the bond
currently has no usable links. Conforming to bonding.txt section 13.1
paragraph 4.

Fixes: 41f891004063 ("bonding: ignore updelay param when there is no active slave")
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 402dffc508efb6c290944fc6eb5c6501a06d7eba..6dca5bfe82474e7f4be8fa85dd1afa93f4c7d268 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2504,7 +2504,16 @@ static int bond_miimon_inspect(struct bonding *bond)
        struct slave *slave;
        bool ignore_updelay;
 
-       ignore_updelay = !rcu_dereference(bond->curr_active_slave);
+       if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP) {
+               ignore_updelay = !rcu_dereference(bond->curr_active_slave);
+       } else {
+               struct bond_up_slave *usable_slaves;
+
+               usable_slaves = rcu_dereference(bond->usable_slaves);
+
+               if (usable_slaves && usable_slaves->count == 0)
+                       ignore_updelay = true;
+       }
 
        bond_for_each_slave_rcu(bond, slave, iter) {
                bond_propose_link_state(slave, BOND_LINK_NOCHANGE);