* [PATCH 1/4 v2] bonding: don't call slave_xxx_netpoll under spinlocks
@ 2013-07-23 7:25 Ding Tianhong
2013-07-25 0:45 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ding Tianhong @ 2013-07-23 7:25 UTC (permalink / raw)
To: Jay Vosburgh, Andy Gospodarek, David S. Miller, Netdev
The slave_xxx_netpoll will call synchronize_rcu_bh(),
so the function may schedule and sleep, it should't be
called under spinlocks.
bond_netpoll_setup() and bond_netpoll_cleanup() are always
protected by rtnl lock, it is no need to take the read lock,
as the slave list couldn't be changed outside rtnl lock.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
---
drivers/net/bonding/bond_main.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 07f257d4..5eb75ef 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1249,8 +1249,9 @@ static void bond_poll_controller(struct net_device *bond_dev)
{
}
-static void __bond_netpoll_cleanup(struct bonding *bond)
+static void bond_netpoll_cleanup(struct net_device *bond_dev)
{
+ struct bonding *bond = netdev_priv(bond_dev);
struct slave *slave;
int i;
@@ -1258,14 +1259,6 @@ static void __bond_netpoll_cleanup(struct bonding *bond)
if (IS_UP(slave->dev))
slave_disable_netpoll(slave);
}
-static void bond_netpoll_cleanup(struct net_device *bond_dev)
-{
- struct bonding *bond = netdev_priv(bond_dev);
-
- read_lock(&bond->lock);
- __bond_netpoll_cleanup(bond);
- read_unlock(&bond->lock);
-}
static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, gfp_t gfp)
{
@@ -1273,15 +1266,13 @@ static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni, g
struct slave *slave;
int i, err = 0;
- read_lock(&bond->lock);
bond_for_each_slave(bond, slave, i) {
err = slave_enable_netpoll(slave);
if (err) {
- __bond_netpoll_cleanup(bond);
+ bond_netpoll_cleanup(dev);
break;
}
}
- read_unlock(&bond->lock);
return err;
}
--
1.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/4 v2] bonding: don't call slave_xxx_netpoll under spinlocks
2013-07-23 7:25 [PATCH 1/4 v2] bonding: don't call slave_xxx_netpoll under spinlocks Ding Tianhong
@ 2013-07-25 0:45 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-07-25 0:45 UTC (permalink / raw)
To: dingtianhong; +Cc: fubar, andy, netdev
From: Ding Tianhong <dingtianhong@huawei.com>
Date: Tue, 23 Jul 2013 15:25:27 +0800
> The slave_xxx_netpoll will call synchronize_rcu_bh(),
> so the function may schedule and sleep, it should't be
> called under spinlocks.
>
> bond_netpoll_setup() and bond_netpoll_cleanup() are always
> protected by rtnl lock, it is no need to take the read lock,
> as the slave list couldn't be changed outside rtnl lock.
>
> Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-07-25 0:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-23 7:25 [PATCH 1/4 v2] bonding: don't call slave_xxx_netpoll under spinlocks Ding Tianhong
2013-07-25 0:45 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.