aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2009-12-03 02:29:06 +0000
committerDavid S. Miller <davem@davemloft.net>2009-12-03 12:22:03 -0800
commit3a765edadb28cc736d185f67d1ba6bedcc85f4b9 (patch)
tree79cbd70d9ef551cb75e897ddeb8e17749d0596b8 /net
parentnet: Allow xfrm_user_net_exit to batch efficiently. (diff)
downloadlinux-dev-3a765edadb28cc736d185f67d1ba6bedcc85f4b9.tar.xz
linux-dev-3a765edadb28cc736d185f67d1ba6bedcc85f4b9.zip
netns: Add an explicit rcu_barrier to unregister_pernet_{device|subsys}
This allows namespace exit methods to batch work that comes requires an rcu barrier using call_rcu without having to treat the unregister_pernet_operations cases specially. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/net_namespace.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 4026a4cff93c..bd8c4712ea24 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -413,8 +413,11 @@ again:
}
}
error = __register_pernet_operations(list, ops);
- if (error && ops->id)
- ida_remove(&net_generic_ids, *ops->id);
+ if (error) {
+ rcu_barrier();
+ if (ops->id)
+ ida_remove(&net_generic_ids, *ops->id);
+ }
return error;
}
@@ -423,6 +426,7 @@ static void unregister_pernet_operations(struct pernet_operations *ops)
{
__unregister_pernet_operations(ops);
+ rcu_barrier();
if (ops->id)
ida_remove(&net_generic_ids, *ops->id);
}