ipv6: get rid of icmp6 dst garbage collector

icmp6 dst route is currently ref counted during creation and will be
freed by user during its call of dst_release(). So no need of a garbage
collector for it.
Remove all icmp6 dst garbage collector related code.

Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index f3da9dd2a8db6e5566c11176e54cd73249e90c47..0fbf73dd531a76d6e5ad06528991a301786099df 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -116,7 +116,6 @@ struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
                            const struct in6_addr *saddr, int oif, int flags);
 
 struct dst_entry *icmp6_dst_alloc(struct net_device *dev, struct flowi6 *fl6);
-int icmp6_dst_gc(void);
 
 void fib6_force_start_gc(struct net *net);
 

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index e3b35e146eef535b64313cf3c46bf96ab43193a3..c67ec79bf0da9e117134a1ab2ffaf63748e074fa 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1822,8 +1822,7 @@ void fib6_run_gc(unsigned long expires, struct net *net, bool force)
        }
        gc_args.timeout = expires ? (int)expires :
                          net->ipv6.sysctl.ip6_rt_gc_interval;
-
-       gc_args.more = icmp6_dst_gc();
+       gc_args.more = 0;
 
        fib6_clean_all(net, fib6_age, &gc_args);
        now = jiffies;

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 5f859ee67172ae8badedf136301205292427b629..c88044b8fa7c6f5229e09184d3c3186c0021c439 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1657,9 +1657,6 @@ out:
        return mtu - lwtunnel_headroom(dst->lwtstate, mtu);
 }
 
-static struct dst_entry *icmp6_dst_gc_list;
-static DEFINE_SPINLOCK(icmp6_dst_lock);
-
 struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                  struct flowi6 *fl6)
 {
@@ -1697,48 +1694,6 @@ out:
        return dst;
 }
 
-int icmp6_dst_gc(void)
-{
-       struct dst_entry *dst, **pprev;
-       int more = 0;
-
-       spin_lock_bh(&icmp6_dst_lock);
-       pprev = &icmp6_dst_gc_list;
-
-       while ((dst = *pprev) != NULL) {
-               if (!atomic_read(&dst->__refcnt)) {
-                       *pprev = dst->next;
-                       dst_free(dst);
-               } else {
-                       pprev = &dst->next;
-                       ++more;
-               }
-       }
-
-       spin_unlock_bh(&icmp6_dst_lock);
-
-       return more;
-}
-
-static void icmp6_clean_all(int (*func)(struct rt6_info *rt, void *arg),
-                           void *arg)
-{
-       struct dst_entry *dst, **pprev;
-
-       spin_lock_bh(&icmp6_dst_lock);
-       pprev = &icmp6_dst_gc_list;
-       while ((dst = *pprev) != NULL) {
-               struct rt6_info *rt = (struct rt6_info *) dst;
-               if (func(rt, arg)) {
-                       *pprev = dst->next;
-                       dst_free(dst);
-               } else {
-                       pprev = &dst->next;
-               }
-       }
-       spin_unlock_bh(&icmp6_dst_lock);
-}
-
 static int ip6_dst_gc(struct dst_ops *ops)
 {
        struct net *net = container_of(ops, struct net, ipv6.ip6_dst_ops);
@@ -2856,7 +2811,6 @@ void rt6_ifdown(struct net *net, struct net_device *dev)
        };
 
        fib6_clean_all(net, fib6_ifdown, &adn);
-       icmp6_clean_all(fib6_ifdown, &adn);
        if (dev)
                rt6_uncached_list_flush_dev(net, dev);
 }