Revert "Merge branch 'bonding_monitor_locking'"

This reverts commit 4d961a101e032b4bf223b279b4b35bc77576f5a8, reversing
changes made to a00f6fcc7d0c62a91768d9c4ccba4c7d64fbbce3.

Revert bond locking changes, they cause regressions and Veaceslav Falico
doesn't like how the commit messages were done at all.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 4 deletions

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 5d79f5e529e0..02872405d35d 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1495,13 +1495,11 @@ void bond_alb_monitor(struct work_struct *work)
         struct list_head *iter;
         struct slave *slave;
 
-        if (!rtnl_trylock())
-                goto re_arm;
+        read_lock(&bond->lock);
 
         if (!bond_has_slaves(bond)) {
                 bond_info->tx_rebalance_counter = 0;
                 bond_info->lp_counter = 0;
-                rtnl_unlock();
                 goto re_arm;
         }
 
@@ -1550,6 +1548,16 @@ void bond_alb_monitor(struct work_struct *work)
                 if (bond_info->primary_is_promisc &&
                     (++bond_info->rlb_promisc_timeout_counter >= RLB_PROMISC_TIMEOUT)) {
 
+                        /*
+                         * dev_set_promiscuity requires rtnl and
+                         * nothing else.  Avoid race with bond_close.
+                         */
+                        read_unlock(&bond->lock);
+                        if (!rtnl_trylock()) {
+                                read_lock(&bond->lock);
+                                goto re_arm;
+                        }
+
                         bond_info->rlb_promisc_timeout_counter = 0;
 
                         /* If the primary was set to promiscuous mode
@@ -1558,6 +1566,9 @@ void bond_alb_monitor(struct work_struct *work)
                          */
                         dev_set_promiscuity(bond->curr_active_slave->dev, -1);
                         bond_info->primary_is_promisc = 0;
+
+                        rtnl_unlock();
+                        read_lock(&bond->lock);
                 }
 
                 if (bond_info->rlb_rebalance) {
@@ -1580,9 +1591,10 @@ void bond_alb_monitor(struct work_struct *work)
                 }
         }
 
-        rtnl_unlock();
 re_arm:
         queue_delayed_work(bond->wq, &bond->alb_work, alb_delta_in_ticks);
+
+        read_unlock(&bond->lock);
 }
 
 /* assumption: called before the slave is attached to the bond