Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4331debc authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

ipv4: rt_cache_valid must check expired routes 



commit d2d68ba9 (ipv4: Cache input routes in fib_info nexthops.)
introduced rt_cache_valid() helper. It unfortunately doesn't check if
route is expired before caching it.

I noticed sk_setup_caps() was constantly called on a tcp workload.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d8d2dd8

net/ipv4/route.c

+5 −3
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static inline int ip_rt_proc_init(void) 
}

#endif /* CONFIG_PROC_FS */



static inline int rt_is_expired(struct rtable *rth)

static inline bool rt_is_expired(const struct rtable *rth)

{

	return rth->rt_genid != rt_genid(dev_net(rth->dst.dev));

}
@@ -1222,9 +1222,11 @@ static void rt_cache_route(struct fib_nh *nh, struct rtable *rt) 
	}

}



static bool rt_cache_valid(struct rtable *rt)

static bool rt_cache_valid(const struct rtable *rt)

{

	return (rt && rt->dst.obsolete == DST_OBSOLETE_FORCE_CHK);

	return	rt &&

		rt->dst.obsolete == DST_OBSOLETE_FORCE_CHK &&

		!rt_is_expired(rt);

}



static void rt_set_nexthop(struct rtable *rt, __be32 daddr,