| Message ID | 1476794252-12398-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote: > When the maximum evictions number is reached, do not wait 5 seconds before > the next run. > > CC: Florian Westphal <fw@strlen.de> Acked-by: Florian Westphal <fw@strlen.de>
On Tue, Oct 18, 2016 at 02:37:32PM +0200, Nicolas Dichtel wrote: > When the maximum evictions number is reached, do not wait 5 seconds before > the next run. Applied, thanks Nicolas.
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index ba6a1d421222..df2f5a3901df 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -983,7 +983,7 @@ static void gc_worker(struct work_struct *work) return; ratio = scanned ? expired_count * 100 / scanned : 0; - if (ratio >= 90) + if (ratio >= 90 || expired_count == GC_MAX_EVICTS) next_run = 0; gc_work->last_bucket = i;
When the maximum evictions number is reached, do not wait 5 seconds before the next run. CC: Florian Westphal <fw@strlen.de> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- net/netfilter/nf_conntrack_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)