From: Wei Wang <weiwan@google.com>
Date: Sat, 17 Jun 2017 10:42:36 -0700
Subject: ipv6: mark DST_NOGC and remove the operation of dst_free()
Patch-mainline: v4.13-rc1
Git-commit: 587fea74113463b74e0d2994caf9e5f8045c28af
References: bsc#1061739
With the previous preparation patches, we are ready to get rid of the
dst gc operation in ipv6 code and release dst based on refcnt only.
So this patch adds DST_NOGC flag for all IPv6 dst and remove the calls
to dst_free() and its related functions.
At this point, all dst created in ipv6 code do not use the dst gc
anymore and will be destroyed at the point when refcnt drops to 0.
Also, as icmp6 dst route is refcounted during creation and will be freed
by user during its call of dst_release(), there is no need to add this
dst to the icmp6 gc list as well.
Instead, we need to add it into uncached list so that when a
NETDEV_DOWN/NETDEV_UNREGISRER event comes, we can properly go through
these icmp6 dst as well and release the net device properly.
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>
Acked-by: Michal Kubecek <mkubecek@suse.cz>
---
net/ipv6/ip6_fib.c | 11 +----------
net/ipv6/route.c | 49 +++++++++++++++++--------------------------------
2 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 760731cac849..7bc398aa44cf 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -165,11 +165,6 @@ static void node_free(struct fib6_node *fn)
call_rcu(&fn->rcu, node_free_rcu);
}
-static void rt6_rcu_free(struct rt6_info *rt)
-{
- call_rcu(&rt->dst.rcu_head, dst_rcu_free);
-}
-
static void rt6_free_pcpu(struct rt6_info *non_pcpu_rt)
{
int cpu;
@@ -186,7 +181,6 @@ static void rt6_free_pcpu(struct rt6_info *non_pcpu_rt)
if (pcpu_rt) {
dst_dev_put(&pcpu_rt->dst);
dst_release(&pcpu_rt->dst);
- rt6_rcu_free(pcpu_rt);
*ppcpu_rt = NULL;
}
}
@@ -201,7 +195,6 @@ static void rt6_release(struct rt6_info *rt)
rt6_free_pcpu(rt);
dst_dev_put(&rt->dst);
dst_release(&rt->dst);
- rt6_rcu_free(rt);
}
}
@@ -1131,9 +1124,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt,
/* Always release dst as dst->__refcnt is guaranteed
* to be taken before entering this function
*/
- dst_release(&rt->dst);
- if (!(rt->dst.flags & DST_NOCACHE))
- dst_free(&rt->dst);
+ dst_release_immediate(&rt->dst);
return err;
}
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 504b1cd9bd1b..79708cb06f1b 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -354,7 +354,8 @@ static struct rt6_info *__ip6_dst_alloc(struct net *net,
int flags)
{
struct rt6_info *rt = dst_alloc(&net->ipv6.ip6_dst_ops, dev,
- 1, DST_OBSOLETE_FORCE_CHK, flags);
+ 1, DST_OBSOLETE_FORCE_CHK,
+ flags | DST_NOGC);
if (rt)
rt6_info_init(rt);
@@ -381,9 +382,7 @@ struct rt6_info *ip6_dst_alloc(struct net *net,
*p = NULL;
}
} else {
- dst_release(&rt->dst);
- if (!(flags & DST_NOCACHE))
- dst_destroy((struct dst_entry *)rt);
+ dst_release_immediate(&rt->dst);
return NULL;
}
}
@@ -1053,8 +1052,7 @@ static struct rt6_info *rt6_make_pcpu_route(struct rt6_info *rt)
prev = cmpxchg(p, NULL, pcpu_rt);
if (prev) {
/* If someone did it before us, return prev instead */
- dst_release(&pcpu_rt->dst);
- dst_destroy(&pcpu_rt->dst);
+ dst_release_immediate(&pcpu_rt->dst);
pcpu_rt = prev;
}
} else {
@@ -1064,8 +1062,7 @@ static struct rt6_info *rt6_make_pcpu_route(struct rt6_info *rt)
* since rt is going away anyway. The next
* dst_check() will trigger a re-lookup.
*/
- dst_release(&pcpu_rt->dst);
- dst_destroy(&pcpu_rt->dst);
+ dst_release_immediate(&pcpu_rt->dst);
pcpu_rt = rt;
}
dst_hold(&pcpu_rt->dst);
@@ -1257,9 +1254,8 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori
struct net_device *loopback_dev = net->loopback_dev;
struct dst_entry *new = NULL;
-
rt = dst_alloc(&ip6_dst_blackhole_ops, loopback_dev, 1,
- DST_OBSOLETE_NONE, 0);
+ DST_OBSOLETE_NONE, DST_NOGC);
if (rt) {
rt6_info_init(rt);
@@ -1279,8 +1275,6 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori
#ifdef CONFIG_IPV6_SUBTREES
memcpy(&rt->rt6i_src, &ort->rt6i_src, sizeof(struct rt6key));
#endif
-
- dst_free(new);
}
dst_release(dst_orig);
@@ -1701,12 +1695,10 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
rt->rt6i_idev = idev;
dst_metric_set(&rt->dst, RTAX_HOPLIMIT, 0);
- spin_lock_bh(&icmp6_dst_lock);
- rt->dst.next = icmp6_dst_gc_list;
- icmp6_dst_gc_list = &rt->dst;
- spin_unlock_bh(&icmp6_dst_lock);
-
- fib6_force_start_gc(net);
+ /* Add this dst into uncached_list so that rt6_ifdown() can
+ * do proper release of the net_device
+ */
+ rt6_uncached_list_add(rt);
dst = xfrm_lookup(net, &rt->dst, flowi6_to_flowi(fl6), NULL, 0);
@@ -2128,10 +2120,8 @@ static struct rt6_info *ip6_route_info_create(struct fib6_config *cfg)
dev_put(dev);
if (idev)
in6_dev_put(idev);
- if (rt) {
- dst_release(&rt->dst);
- dst_free(&rt->dst);
- }
+ if (rt)
+ dst_release_immediate(&rt->dst);
return ERR_PTR(err);
}
@@ -2159,10 +2149,8 @@ int ip6_route_add(struct fib6_config *cfg)
return err;
out:
- if (rt) {
- dst_release(&rt->dst);
- dst_free(&rt->dst);
- }
+ if (rt)
+ dst_release_immediate(&rt->dst);
return err;
}
@@ -3183,8 +3171,7 @@ static int ip6_route_multipath_add(struct fib6_config *cfg)
err = ip6_route_info_append(&rt6_nh_list, rt, &r_cfg);
if (err) {
- dst_release(&rt->dst);
- dst_free(&rt->dst);
+ dst_release_immediate(&rt->dst);
goto cleanup;
}
@@ -3247,10 +3234,8 @@ static int ip6_route_multipath_add(struct fib6_config *cfg)
cleanup:
list_for_each_entry_safe(nh, nh_safe, &rt6_nh_list, next) {
- if (nh->rt6_info) {
- dst_release(&nh->rt6_info->dst);
- dst_free(&nh->rt6_info->dst);
- }
+ if (nh->rt6_info)
+ dst_release_immediate(&nh->rt6_info->dst);
kfree(nh->mxc.mx);
list_del(&nh->next);
kfree(nh);
--
2.14.2