leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipip: Optimize multiple unregistration

Browse Source 
Speedup module unloading by factorizing synchronize_rcu() calls

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-10-27 07:06:59 +00:00 committed by David S. Miller
parent 63c8099d90
commit 0694c4c016
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/ipv4/ipip.c
View File

@ -754,16 +754,19 @@ static struct xfrm_tunnel ipip_handler = {
static const char banner[] __initconst = static const char banner[] __initconst =
KERN_INFO "IPv4 over IPv4 tunneling driver\n"; KERN_INFO "IPv4 over IPv4 tunneling driver\n";
static void ipip_destroy_tunnels(struct ipip_net *ipn) static void ipip_destroy_tunnels(struct ipip_net *ipn, struct list_head *head)
{ {
int prio; int prio;
for (prio = 1; prio < 4; prio++) { for (prio = 1; prio < 4; prio++) {
int h; int h;
for (h = 0; h < HASH_SIZE; h++) { for (h = 0; h < HASH_SIZE; h++) {
struct ip_tunnel *t; struct ip_tunnel *t = ipn->tunnels[prio][h];
while ((t = ipn->tunnels[prio][h]) != NULL)
unregister_netdevice(t->dev); while (t != NULL) {
unregister_netdevice_queue(t->dev, head);
t = t->next;
}
} }
} }
} }
@ -816,11 +819,13 @@ err_alloc:
static void ipip_exit_net(struct net *net) static void ipip_exit_net(struct net *net)
{ {
struct ipip_net *ipn; struct ipip_net *ipn;
LIST_HEAD(list);
ipn = net_generic(net, ipip_net_id); ipn = net_generic(net, ipip_net_id);
rtnl_lock(); rtnl_lock();
ipip_destroy_tunnels(ipn); ipip_destroy_tunnels(ipn, &list);
unregister_netdevice(ipn->fb_tunnel_dev); unregister_netdevice_queue(ipn->fb_tunnel_dev, &list);
unregister_netdevice_many(&list);
rtnl_unlock(); rtnl_unlock();
kfree(ipn); kfree(ipn);
} }