diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-07-25 05:11:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-25 15:24:14 -0700 |
| commit | 4331debc51ee1ce319f4a389484e0e8e05de2aca (patch) | |
| tree | 84eafe4afed26328cfe3098ff7103c1222d70aa8 /net/ipv4 | |
| parent | 6d8d2dd8ad92ec89f540e73b7a46c5835a7a06a6 (diff) | |
| download | op-kernel-dev-4331debc51ee1ce319f4a389484e0e8e05de2aca.zip op-kernel-dev-4331debc51ee1ce319f4a389484e0e8e05de2aca.tar.gz | |
ipv4: rt_cache_valid must check expired routes
commit d2d68ba9fe8 (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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/route.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 6bcb8fc..3f7bb71 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -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, |
