[NETNS][IPV6] route6 - make garbage collection work with multiple network namespaces

This patch makes the necessary changes to make IPv6 dst_entry garbage
collection work with multiple network namespaces.

In ip6_dst_gc(), static local variables are now declared
per-namespace.

Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 53b5a283a4b33ca869b8541acf238cd3a4ae38d6..90e6e24df858831316cce4f17d16da54c8f48e08 100644 (file)
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -42,6 +42,8 @@ struct netns_ipv6 {
        struct hlist_head       *fib_table_hash;
        struct fib6_table       *fib6_main_tbl;
        struct dst_ops          *ip6_dst_ops;
+       unsigned int             ip6_rt_gc_expire;
+       unsigned long            ip6_rt_last_gc;
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
        struct rt6_info         *ip6_prohibit_entry;
        struct rt6_info         *ip6_blk_hole_entry;

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d88b6ec3c5d14d254b913c1fd3509e490d72cfb2..10a6cc0aca6c421a7063438dd927ee7aecdf1d83 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -992,23 +992,22 @@ int icmp6_dst_gc(int *more)
 
 static int ip6_dst_gc(struct dst_ops *ops)
 {
-       static unsigned expire = 30*HZ;
-       static unsigned long last_gc;
+       struct net *net = ops->dst_net;
        unsigned long now = jiffies;
 
-       if (time_after(last_gc + init_net.ipv6.sysctl.ip6_rt_gc_min_interval, now) &&
-           atomic_read(&init_net.ipv6.ip6_dst_ops->entries) <= init_net.ipv6.sysctl.ip6_rt_max_size)
+       if (time_after(net->ipv6.ip6_rt_last_gc + net->ipv6.sysctl.ip6_rt_gc_min_interval, now) &&
+           atomic_read(&net->ipv6.ip6_dst_ops->entries) <= net->ipv6.sysctl.ip6_rt_max_size)
                goto out;
 
-       expire++;
-       fib6_run_gc(expire, &init_net);
-       last_gc = now;
-       if (atomic_read(&init_net.ipv6.ip6_dst_ops->entries) < init_net.ipv6.ip6_dst_ops->gc_thresh)
-               expire = init_net.ipv6.sysctl.ip6_rt_gc_timeout>>1;
+       net->ipv6.ip6_rt_gc_expire++;
+       fib6_run_gc(net->ipv6.ip6_rt_gc_expire, net);
+       net->ipv6.ip6_rt_last_gc = now;
+       if (atomic_read(&net->ipv6.ip6_dst_ops->entries) < net->ipv6.ip6_dst_ops->gc_thresh)
+               net->ipv6.ip6_rt_gc_expire = net->ipv6.sysctl.ip6_rt_gc_timeout>>1;
 
 out:
-       expire -= expire>>init_net.ipv6.sysctl.ip6_rt_gc_elasticity;
-       return (atomic_read(&init_net.ipv6.ip6_dst_ops->entries) > init_net.ipv6.sysctl.ip6_rt_max_size);
+       net->ipv6.ip6_rt_gc_expire -= net->ipv6.ip6_rt_gc_expire>>net->ipv6.sysctl.ip6_rt_gc_elasticity;
+       return (atomic_read(&net->ipv6.ip6_dst_ops->entries) > net->ipv6.sysctl.ip6_rt_max_size);
 }
 
 /* Clean host part of a prefix. Not necessary in radix tree,
@@ -2615,6 +2614,8 @@ static int ip6_route_net_init(struct net *net)
        proc_net_fops_create(net, "ipv6_route", 0, &ipv6_route_proc_fops);
        proc_net_fops_create(net, "rt6_stats", S_IRUGO, &rt6_stats_seq_fops);
 #endif
+       net->ipv6.ip6_rt_gc_expire = 30*HZ;
+
        ret = 0;
 out:
        return ret;