diff options
| author | Eric Dumazet <edumazet@google.com> | 2024-02-06 14:43:09 +0000 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-07 18:55:12 -0800 |
| commit | de02deab27fd63063e056811d0473ad5b9a56e5e (patch) | |
| tree | 8aee11c1b8115a46765750044dbc527057fce88e /net/ipv6 | |
| parent | 7a99f3c1994b2c3add235090d8721bfbb2b95320 (diff) | |
| download | linux-de02deab27fd63063e056811d0473ad5b9a56e5e.tar.gz | |
sit: 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
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-14-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/sit.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index cc24cefdb85c0..61b2b71fa8bed 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1875,22 +1875,19 @@ err_alloc_dev: return err; } -static void __net_exit sit_exit_batch_net(struct list_head *net_list) +static void __net_exit sit_exit_batch_rtnl(struct list_head *net_list, + struct list_head *dev_to_kill) { - LIST_HEAD(list); struct net *net; - rtnl_lock(); + ASSERT_RTNL(); list_for_each_entry(net, net_list, exit_list) - sit_destroy_tunnels(net, &list); - - unregister_netdevice_many(&list); - rtnl_unlock(); + sit_destroy_tunnels(net, dev_to_kill); } static struct pernet_operations sit_net_ops = { .init = sit_init_net, - .exit_batch = sit_exit_batch_net, + .exit_batch_rtnl = sit_exit_batch_rtnl, .id = &sit_net_id, .size = sizeof(struct sit_net), }; |