mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 10:59:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'net-hold-per-netns-rtnl-during-netdev-notifier-registration'

Browse Source 
Kuniyuki Iwashima says:

====================
net: Hold per-netns RTNL during netdev notifier registration.

This series adds per-netns RTNL for registration of the global
and per-netns netdev notifiers.

v1: https://lore.kernel.org/netdev/20250104063735.36945-1-kuniyu@amazon.com/
====================

Link: https://patch.msgid.link/20250106070751.63146-1-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-01-07 17:49:24 -08:00
parent 4ce1aeece9 7fb1073300
commit aca14bbc87
1 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
net/core/dev.c
View File

@@ -1769,14 +1769,19 @@ int register_netdevice_notifier(struct notifier_block *nb)
/* Close race with setup_net() and cleanup_net() */
down_write(&pernet_ops_rwsem);
/* When RTNL is removed, we need protection for netdev_chain. */
rtnl_lock();
err = raw_notifier_chain_register(&netdev_chain, nb);
if (err)
goto unlock;
if (dev_boot_phase)
goto unlock;
for_each_net(net) {
__rtnl_net_lock(net);
err = call_netdevice_register_net_notifiers(nb, net);
__rtnl_net_unlock(net);
if (err)
goto rollback;
}
@@ -1787,8 +1792,11 @@ int register_netdevice_notifier(struct notifier_block *nb)
return err;
rollback:
for_each_net_continue_reverse(net)
for_each_net_continue_reverse(net) {
__rtnl_net_lock(net);
call_netdevice_unregister_net_notifiers(nb, net);
__rtnl_net_unlock(net);
}
raw_notifier_chain_unregister(&netdev_chain, nb);
goto unlock;
@@ -1821,8 +1829,11 @@ int unregister_netdevice_notifier(struct notifier_block *nb)
if (err)
goto unlock;
for_each_net(net)
for_each_net(net) {
__rtnl_net_lock(net);
call_netdevice_unregister_net_notifiers(nb, net);
__rtnl_net_unlock(net);
}
unlock:
rtnl_unlock();
@@ -1886,9 +1897,10 @@ int register_netdevice_notifier_net(struct net *net, struct notifier_block *nb)
{
int err;
rtnl_lock();
rtnl_net_lock(net);
err = __register_netdevice_notifier_net(net, nb, false);
rtnl_unlock();
rtnl_net_unlock(net);
return err;
}
EXPORT_SYMBOL(register_netdevice_notifier_net);
@@ -1914,9 +1926,10 @@ int unregister_netdevice_notifier_net(struct net *net,
{
int err;
rtnl_lock();
rtnl_net_lock(net);
err = __unregister_netdevice_notifier_net(net, nb);
rtnl_unlock();
rtnl_net_unlock(net);
return err;
}
EXPORT_SYMBOL(unregister_netdevice_notifier_net);
@@ -1933,15 +1946,17 @@ int register_netdevice_notifier_dev_net(struct net_device *dev,
struct notifier_block *nb,
struct netdev_net_notifier *nn)
{
struct net *net = dev_net(dev);
int err;
rtnl_lock();
err = __register_netdevice_notifier_net(dev_net(dev), nb, false);
rtnl_net_lock(net);
err = __register_netdevice_notifier_net(net, nb, false);
if (!err) {
nn->nb = nb;
list_add(&nn->list, &dev->net_notifier_list);
}
rtnl_unlock();
rtnl_net_unlock(net);
return err;
}
EXPORT_SYMBOL(register_netdevice_notifier_dev_net);
@@ -1950,12 +1965,14 @@ int unregister_netdevice_notifier_dev_net(struct net_device *dev,
struct notifier_block *nb,
struct netdev_net_notifier *nn)
{
struct net *net = dev_net(dev);
int err;
rtnl_lock();
rtnl_net_lock(net);
list_del(&nn->list);
err = __unregister_netdevice_notifier_net(dev_net(dev), nb);
rtnl_unlock();
err = __unregister_netdevice_notifier_net(net, nb);
rtnl_net_unlock(net);
return err;
}
EXPORT_SYMBOL(unregister_netdevice_notifier_dev_net);