Commit 554873e5 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller

net: Do not take net_rwsem in __rtnl_link_unregister()

This function calls call_netdevice_notifier(), which also
may take net_rwsem. So, we can't use net_rwsem here.

This patch makes callers of this functions take pernet_ops_rwsem,
like register_netdevice_notifier() does. This will protect
the modifications of net_namespace_list, and allows notifiers
to take it (they won't have to care about context).

Since __rtnl_link_unregister() is used on module load
and unload (which are not frequent operations), this looks
for me better, than make all call_netdevice_notifier()
always executing in "protected net_namespace_list" context.

Also, this fixes the problem we had a deal in 328fbe74
"Close race between {un, }register_netdevice_notifier and ...",
and guarantees __rtnl_link_unregister() does not skip
exitting net.
Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc1dd369
...@@ -219,6 +219,7 @@ static int __init dummy_init_module(void) ...@@ -219,6 +219,7 @@ static int __init dummy_init_module(void)
{ {
int i, err = 0; int i, err = 0;
down_write(&pernet_ops_rwsem);
rtnl_lock(); rtnl_lock();
err = __rtnl_link_register(&dummy_link_ops); err = __rtnl_link_register(&dummy_link_ops);
if (err < 0) if (err < 0)
...@@ -233,6 +234,7 @@ static int __init dummy_init_module(void) ...@@ -233,6 +234,7 @@ static int __init dummy_init_module(void)
out: out:
rtnl_unlock(); rtnl_unlock();
up_write(&pernet_ops_rwsem);
return err; return err;
} }
......
...@@ -330,6 +330,7 @@ static int __init ifb_init_module(void) ...@@ -330,6 +330,7 @@ static int __init ifb_init_module(void)
{ {
int i, err; int i, err;
down_write(&pernet_ops_rwsem);
rtnl_lock(); rtnl_lock();
err = __rtnl_link_register(&ifb_link_ops); err = __rtnl_link_register(&ifb_link_ops);
if (err < 0) if (err < 0)
...@@ -344,6 +345,7 @@ static int __init ifb_init_module(void) ...@@ -344,6 +345,7 @@ static int __init ifb_init_module(void)
out: out:
rtnl_unlock(); rtnl_unlock();
up_write(&pernet_ops_rwsem);
return err; return err;
} }
......
...@@ -51,6 +51,7 @@ static bool init_net_initialized; ...@@ -51,6 +51,7 @@ static bool init_net_initialized;
* outside. * outside.
*/ */
DECLARE_RWSEM(pernet_ops_rwsem); DECLARE_RWSEM(pernet_ops_rwsem);
EXPORT_SYMBOL_GPL(pernet_ops_rwsem);
#define MIN_PERNET_OPS_ID \ #define MIN_PERNET_OPS_ID \
((sizeof(struct net_generic) + sizeof(void *) - 1) / sizeof(void *)) ((sizeof(struct net_generic) + sizeof(void *) - 1) / sizeof(void *))
......
...@@ -412,17 +412,17 @@ static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops) ...@@ -412,17 +412,17 @@ static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops)
* __rtnl_link_unregister - Unregister rtnl_link_ops from rtnetlink. * __rtnl_link_unregister - Unregister rtnl_link_ops from rtnetlink.
* @ops: struct rtnl_link_ops * to unregister * @ops: struct rtnl_link_ops * to unregister
* *
* The caller must hold the rtnl_mutex. * The caller must hold the rtnl_mutex and guarantee net_namespace_list
* integrity (hold pernet_ops_rwsem for writing to close the race
* with setup_net() and cleanup_net()).
*/ */
void __rtnl_link_unregister(struct rtnl_link_ops *ops) void __rtnl_link_unregister(struct rtnl_link_ops *ops)
{ {
struct net *net; struct net *net;
down_read(&net_rwsem);
for_each_net(net) { for_each_net(net) {
__rtnl_kill_links(net, ops); __rtnl_kill_links(net, ops);
} }
up_read(&net_rwsem);
list_del(&ops->list); list_del(&ops->list);
} }
EXPORT_SYMBOL_GPL(__rtnl_link_unregister); EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment