diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2013-02-11 10:25:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-11 19:19:33 -0500 |
| commit | 2cde6acd49daca58b96f1fbc697492825511ad31 (patch) | |
| tree | 77353244a904fbb41e8658cceedb4b5120c5552a /net/8021q | |
| parent | f05de73bf82fbbc00265c06d12efb7273f7dc54a (diff) | |
| download | op-kernel-dev-2cde6acd49daca58b96f1fbc697492825511ad31.zip op-kernel-dev-2cde6acd49daca58b96f1fbc697492825511ad31.tar.gz | |
netpoll: Fix __netpoll_rcu_free so that it can hold the rtnl lock
__netpoll_rcu_free is used to free netpoll structures when the rtnl_lock is
already held. The mechanism is used to asynchronously call __netpoll_cleanup
outside of the holding of the rtnl_lock, so as to avoid deadlock.
Unfortunately, __netpoll_cleanup modifies pointers (dev->np), which means the
rtnl_lock must be held while calling it. Further, it cannot be held, because
rcu callbacks may be issued in softirq contexts, which cannot sleep.
Fix this by converting the rcu callback to a work queue that is guaranteed to
get scheduled in process context, so that we can hold the rtnl properly while
calling __netpoll_cleanup
Tested successfully by myself.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: Cong Wang <amwang@redhat.com>
CC: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 34df5b3..19cf81b 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -733,7 +733,7 @@ static void vlan_dev_netpoll_cleanup(struct net_device *dev) vlan->netpoll = NULL; - __netpoll_free_rcu(netpoll); + __netpoll_free_async(netpoll); } #endif /* CONFIG_NET_POLL_CONTROLLER */ |
