From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ding Tianhong Subject: [PATCH net-next 1/5] bonding: remove bond read lock for bond_mii_monitor() Date: Mon, 21 Oct 2013 16:58:48 +0800 Message-ID: <5264ECC8.9090700@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit To: Jay Vosburgh , Andy Gospodarek , "David S. Miller" , Nikolay Aleksandrov , Veaceslav Falico , Netdev Return-path: Received: from szxga01-in.huawei.com ([119.145.14.64]:25814 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753138Ab3JUJEd (ORCPT ); Mon, 21 Oct 2013 05:04:33 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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_mii_monitor(). Signed-off-by: Ding Tianhong --- drivers/net/bonding/bond_main.c | 44 +++++++++++------------------------------ 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index d90734f..ba90f45 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2155,49 +2155,29 @@ void bond_mii_monitor(struct work_struct *work) struct bonding *bond = container_of(work, struct bonding, mii_work.work); bool should_notify_peers = false; - unsigned long delay; - read_lock(&bond->lock); - - delay = msecs_to_jiffies(bond->params.miimon); + if (!rtnl_trylock()) + goto re_arm; - if (!bond_has_slaves(bond)) + if (!bond_has_slaves(bond)) { + rtnl_unlock(); goto re_arm; + } should_notify_peers = bond_should_notify_peers(bond); - if (bond_miimon_inspect(bond)) { - read_unlock(&bond->lock); - - /* Race avoidance with bond_close cancel of workqueue */ - if (!rtnl_trylock()) { - read_lock(&bond->lock); - delay = 1; - should_notify_peers = false; - goto re_arm; - } - - read_lock(&bond->lock); - + if (bond_miimon_inspect(bond)) bond_miimon_commit(bond); - read_unlock(&bond->lock); - rtnl_unlock(); /* might sleep, hold no other locks */ - read_lock(&bond->lock); - } + if (should_notify_peers) + call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond->dev); + + rtnl_unlock(); re_arm: if (bond->params.miimon) - queue_delayed_work(bond->wq, &bond->mii_work, delay); - - read_unlock(&bond->lock); - - if (should_notify_peers) { - if (!rtnl_trylock()) - return; - call_netdevice_notifiers(NETDEV_NOTIFY_PEERS, bond->dev); - rtnl_unlock(); - } + queue_delayed_work(bond->wq, &bond->mii_work, + msecs_to_jiffies(bond->params.miimon)); } static bool bond_has_this_ip(struct bonding *bond, __be32 ip) -- 1.8.2.1