diff options
author | Michal Kubeček <mkubecek@suse.cz> | 2013-08-01 10:04:24 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:13 +0100 |
commit | 24277c76396d5ff90832f0a60c6c5987566256ea (patch) | |
tree | 0a5e19097261f82c6ea0492ae80823e03ce5c099 /net/ipv6/ip6_fib.c | |
parent | 2491f0184830c5f1e1c794283177179937def4b7 (diff) | |
download | kernel_samsung_smdk4412-24277c76396d5ff90832f0a60c6c5987566256ea.zip kernel_samsung_smdk4412-24277c76396d5ff90832f0a60c6c5987566256ea.tar.gz kernel_samsung_smdk4412-24277c76396d5ff90832f0a60c6c5987566256ea.tar.bz2 |
ipv6: update ip6_rt_last_gc every time GC is run
commit 49a18d86f66d33a20144ecb5a34bba0d1856b260 upstream.
As pointed out by Eric Dumazet, net->ipv6.ip6_rt_last_gc should
hold the last time garbage collector was run so that we should
update it whenever fib6_run_gc() calls fib6_clean_all(), not only
if we got there from ip6_dst_gc().
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
-rw-r--r-- | net/ipv6/ip6_fib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index ddedf63..785e62d 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1475,6 +1475,8 @@ static DEFINE_SPINLOCK(fib6_gc_lock); void fib6_run_gc(unsigned long expires, struct net *net, bool force) { + unsigned long now; + if (force) { spin_lock_bh(&fib6_gc_lock); } else if (!spin_trylock_bh(&fib6_gc_lock)) { @@ -1487,10 +1489,12 @@ void fib6_run_gc(unsigned long expires, struct net *net, bool force) gc_args.more = icmp6_dst_gc(); fib6_clean_all(net, fib6_age, 0, NULL); + now = jiffies; + net->ipv6.ip6_rt_last_gc = now; if (gc_args.more) mod_timer(&net->ipv6.ip6_fib_timer, - round_jiffies(jiffies + round_jiffies(now + net->ipv6.sysctl.ip6_rt_gc_interval)); else del_timer(&net->ipv6.ip6_fib_timer); |