Commit a7ec2512 authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski

nexthop: convert nexthop_net_exit_batch to exit_batch_rtnl method

exit_batch_rtnl() is called while RTNL is held.

This saves one rtnl_lock()/rtnl_unlock() pair.

We also need to create nexthop_net_exit()
to make sure net->nexthop.devhash is not freed too soon,
otherwise we will not be able to unregister netdev
from exit_batch_rtnl() methods.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Reviewed-by: default avatarAntoine Tenart <atenart@kernel.org>
Link: https://lore.kernel.org/r/20240206144313.2050392-4-edumazet@google.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fd4f101e
...@@ -3737,16 +3737,20 @@ void nexthop_res_grp_activity_update(struct net *net, u32 id, u16 num_buckets, ...@@ -3737,16 +3737,20 @@ void nexthop_res_grp_activity_update(struct net *net, u32 id, u16 num_buckets,
} }
EXPORT_SYMBOL(nexthop_res_grp_activity_update); EXPORT_SYMBOL(nexthop_res_grp_activity_update);
static void __net_exit nexthop_net_exit_batch(struct list_head *net_list) static void __net_exit nexthop_net_exit_batch_rtnl(struct list_head *net_list,
struct list_head *dev_to_kill)
{ {
struct net *net; struct net *net;
rtnl_lock(); ASSERT_RTNL();
list_for_each_entry(net, net_list, exit_list) { list_for_each_entry(net, net_list, exit_list)
flush_all_nexthops(net); flush_all_nexthops(net);
}
static void __net_exit nexthop_net_exit(struct net *net)
{
kfree(net->nexthop.devhash); kfree(net->nexthop.devhash);
} net->nexthop.devhash = NULL;
rtnl_unlock();
} }
static int __net_init nexthop_net_init(struct net *net) static int __net_init nexthop_net_init(struct net *net)
...@@ -3764,7 +3768,8 @@ static int __net_init nexthop_net_init(struct net *net) ...@@ -3764,7 +3768,8 @@ static int __net_init nexthop_net_init(struct net *net)
static struct pernet_operations nexthop_net_ops = { static struct pernet_operations nexthop_net_ops = {
.init = nexthop_net_init, .init = nexthop_net_init,
.exit_batch = nexthop_net_exit_batch, .exit = nexthop_net_exit,
.exit_batch_rtnl = nexthop_net_exit_batch_rtnl,
}; };
static int __init nexthop_init(void) static int __init nexthop_init(void)
......
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