Skip to content

Commit

Permalink
bridge: switch br_net_exit to batch mode
Browse files Browse the repository at this point in the history
cleanup_net() is competing with other rtnl users.

Instead of calling br_net_exit() for each netns,
call br_net_exit_batch() once.

This gives cleanup_net() ability to group more devices
and call unregister_netdevice_many() only once for all bridge devices.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Roopa Prabhu <roopa@nvidia.com>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Eric Dumazet authored and davem330 committed Feb 19, 2022
1 parent a7cc346 commit 36a29fb
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions net/bridge/br.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,23 +342,26 @@ 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(struct net *net)
static void __net_exit br_net_exit_batch(struct list_head *net_list)
{
struct net_device *dev;
struct net *net;
LIST_HEAD(list);

rtnl_lock();
for_each_netdev(net, dev)
if (netif_is_bridge_master(dev))
br_dev_delete(dev, &list);

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();

rtnl_unlock();
}

static struct pernet_operations br_net_ops = {
.exit = br_net_exit,
.exit_batch = br_net_exit_batch,
};

static const struct stp_proto br_stp_proto = {
Expand Down

0 comments on commit 36a29fb

Please sign in to comment.