* [PATCH net-next-2.6] net: remove synchronize_net() from netdev_set_master()
@ 2011-05-20 5:37 Eric Dumazet
2011-05-23 1:03 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2011-05-20 5:37 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Stephen Hemminger, Jiri Pirko
In the old days, we used to access dev->master in __netif_receive_skb()
in a rcu_read_lock section.
So one synchronize_net() call was needed in netdev_set_master() to make
sure another cpu could not use old master while/after we release it.
We now use netdev_rx_handler infrastructure and added one
synchronize_net() call in bond_release()/bond_release_all()
Remove the obsolete synchronize_net() from netdev_set_master() and add
one in bridge del_nbp() after its netdev_rx_handler_unregister() call.
This makes enslave -d a bit faster.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jiri Pirko <jpirko@redhat.com>
CC: Stephen Hemminger <shemminger@vyatta.com>
---
net/bridge/br_if.c | 1 +
net/core/dev.c | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 5dbdfdf..3e18d14 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -147,6 +147,7 @@ static void del_nbp(struct net_bridge_port *p)
dev->priv_flags &= ~IFF_BRIDGE_PORT;
netdev_rx_handler_unregister(dev);
+ synchronize_net();
netdev_set_master(dev, NULL);
diff --git a/net/core/dev.c b/net/core/dev.c
index 155de20..29b3f7a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4294,10 +4294,8 @@ int netdev_set_master(struct net_device *slave, struct net_device *master)
slave->master = master;
- if (old) {
- synchronize_net();
+ if (old)
dev_put(old);
- }
return 0;
}
EXPORT_SYMBOL(netdev_set_master);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next-2.6] net: remove synchronize_net() from netdev_set_master()
2011-05-20 5:37 [PATCH net-next-2.6] net: remove synchronize_net() from netdev_set_master() Eric Dumazet
@ 2011-05-23 1:03 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-05-23 1:03 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, shemminger, jpirko
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 20 May 2011 07:37:40 +0200
> In the old days, we used to access dev->master in __netif_receive_skb()
> in a rcu_read_lock section.
>
> So one synchronize_net() call was needed in netdev_set_master() to make
> sure another cpu could not use old master while/after we release it.
>
> We now use netdev_rx_handler infrastructure and added one
> synchronize_net() call in bond_release()/bond_release_all()
>
> Remove the obsolete synchronize_net() from netdev_set_master() and add
> one in bridge del_nbp() after its netdev_rx_handler_unregister() call.
>
> This makes enslave -d a bit faster.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> CC: Jiri Pirko <jpirko@redhat.com>
> CC: Stephen Hemminger <shemminger@vyatta.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-23 1:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-20 5:37 [PATCH net-next-2.6] net: remove synchronize_net() from netdev_set_master() Eric Dumazet
2011-05-23 1:03 ` 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.