bonding: remove bond read lock for bond_loadbalance_arp_mon()

PATCH In review Ding Tianhong 1 participant 1 message Oct 21, 2013

Subsystems (3)

Networking Network drivers Bonding driver

lore

Share & tools

lore

Ding Tianhong

author

2013-10-21 09:05 UTC #0 lore raw

PATCH 3/5 bonding: remove bond read lock for bond_loadbalance_arp_mon()

The bond now only attach and detach slave in rtnl lock,
so read_lock for bond could not protect slave list, replace bond read lock with rtnl lock for bond_loadbalance_arp_mon().

Signed-off-by Ding Tianhong <[email protected]>

---
 drivers/net/bonding/bond_main.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

drivers/net/bonding/bond_main.c +6 -4

index ba90f45..149f4b9 100644
@@ -2433,10 +2433,13 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
 	struct list_head *iter;
 	int do_failover = 0;
 
-	read_lock(&bond->lock);
+	if (!rtnl_trylock())
+		goto re_arm;
 
-	if (!bond_has_slaves(bond))
+	if (!bond_has_slaves(bond)) {
+		rtnl_unlock();
 		goto re_arm;
+	}
 
 	oldcurrent = bond->curr_active_slave;
 	/* see if any of the previous devices are up now (i.e. they have

@@ -2518,13 +2521,12 @@ void bond_loadbalance_arp_mon(struct work_struct *work)
 		write_unlock_bh(&bond->curr_slave_lock);
 		unblock_netpoll_tx();
 	}
+	rtnl_unlock();
 
 re_arm:
 	if (bond->params.arp_interval)
 		queue_delayed_work(bond->wq, &bond->arp_work,
 				   msecs_to_jiffies(bond->params.arp_interval));
-
-	read_unlock(&bond->lock);
 }
 
 /*

Signature · 1 line

1.8.2.1