diff options
| author | Eric Dumazet <edumazet@google.com> | 2024-02-06 14:43:11 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-07 18:55:12 -0800 |
| commit | 806b67850787bae3df1bc2e5a30e8c658c579d80 (patch) | |
| tree | f23ee5b07d696ed545ecde6eb868881d387dcfb8 /net/bridge | |
| parent | 9b5b36374ed6953f3efcc82e7cb4c353b9869faf (diff) | |
| download | linux-806b67850787bae3df1bc2e5a30e8c658c579d80.tar.gz | |
bridge: use exit_batch_rtnl() method
exit_batch_rtnl() is called while RTNL is held,
and devices to be unregistered can be queued in the dev_kill_list.
This saves one rtnl_lock()/rtnl_unlock() pair per netns
and one unregister_netdevice_many() call.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Antoine Tenart <atenart@kernel.org>
Link: https://lore.kernel.org/r/20240206144313.2050392-16-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index ac19b797dbece..2cab878e0a39c 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -356,26 +356,21 @@ void br_opt_toggle(struct net_bridge *br, enum net_bridge_opts opt, bool on) clear_bit(opt, &br->options); } -static void __net_exit br_net_exit_batch(struct list_head *net_list) +static void __net_exit br_net_exit_batch_rtnl(struct list_head *net_list, + struct list_head *dev_to_kill) { struct net_device *dev; struct net *net; - LIST_HEAD(list); - - rtnl_lock(); + ASSERT_RTNL(); list_for_each_entry(net, net_list, exit_list) for_each_netdev(net, dev) if (netif_is_bridge_master(dev)) - br_dev_delete(dev, &list); - - unregister_netdevice_many(&list); - - rtnl_unlock(); + br_dev_delete(dev, dev_to_kill); } static struct pernet_operations br_net_ops = { - .exit_batch = br_net_exit_batch, + .exit_batch_rtnl = br_net_exit_batch_rtnl, }; static const struct stp_proto br_stp_proto = { |