ipv6: change route cache aging logic (31afeb42) · Commits · 戴 / test

In current route cache aging logic, if a route has both RTF_EXPIRE and RTF_GATEWAY set, the route will only be removed if the neighbor cache has no NTF_ROUTER flag. Otherwise, even if the route has expired, it won't get deleted. Fix this logic to always check if the route has expired first and then do the gateway neighbor cache check if previous check decide to not remove the exception entry. Fixes: ("ipv6: remove from fib tree aged out RTF_CACHE dst") Signed-off-by:

Wei Wang <weiwan@google.com> Signed-off-by:

Eric Dumazet <edumazet@google.com> Acked-by:

Martin KaFai Lau <kafai@fb.com> Acked-by:

Paolo Abeni <pabeni@redhat.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv6/route.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -1585,12 +1585,19 @@ static void rt6_age_examine_exception(struct rt6_exception_bucket *bucket,
		* EXPIRES exceptions - e.g. pmtu-generated ones are pruned when
		* expired, independently from their aging, as per RFC 8201 section 4
		*/
		if (!(rt->rt6i_flags & RTF_EXPIRES) &&
		time_after_eq(now, rt->dst.lastuse + gc_args->timeout)) {
		if (!(rt->rt6i_flags & RTF_EXPIRES)) {
		if (time_after_eq(now, rt->dst.lastuse + gc_args->timeout)) {
		RT6_TRACE("aging clone %p\n", rt);
		rt6_remove_exception(bucket, rt6_ex);
		return;
		} else if (rt->rt6i_flags & RTF_GATEWAY) {
		}
		} else if (time_after(jiffies, rt->dst.expires)) {
		RT6_TRACE("purging expired route %p\n", rt);
		rt6_remove_exception(bucket, rt6_ex);
		return;
		}

		if (rt->rt6i_flags & RTF_GATEWAY) {
		struct neighbour *neigh;
		__u8 neigh_flags = 0;

		@@ -1605,11 +1612,8 @@ static void rt6_age_examine_exception(struct rt6_exception_bucket *bucket,
		rt6_remove_exception(bucket, rt6_ex);
		return;
		}
		} else if (__rt6_check_expired(rt)) {
		RT6_TRACE("purging expired route %p\n", rt);
		rt6_remove_exception(bucket, rt6_ex);
		return;
		}

		gc_args->more++;
		}

Admin message