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

Commit 524b698d authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove GC_MAX_EVICTS break 



Instead of breaking loop and instant resched, don't bother checking
this in first place (the loop calls cond_resched for every bucket anyway).

Suggested-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3fd0b634

net/netfilter/nf_conntrack_core.c

+2 −5
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ static __read_mostly bool nf_conntrack_locks_all; 
#define GC_MAX_BUCKETS_DIV	64u

/* upper bound of scan intervals */

#define GC_INTERVAL_MAX		(2 * HZ)

/* maximum conntracks to evict per gc run */

#define GC_MAX_EVICTS		256u



static struct conntrack_gc_work conntrack_gc_work;
@@ -979,8 +977,7 @@ static void gc_worker(struct work_struct *work) 
		 */

		rcu_read_unlock();

		cond_resched_rcu_qs();

	} while (++buckets < goal &&

		 expired_count < GC_MAX_EVICTS);

	} while (++buckets < goal);



	if (gc_work->exiting)

		return;
@@ -1005,7 +1002,7 @@ static void gc_worker(struct work_struct *work) 
	 * In case we have lots of evictions next scan is done immediately.

	 */

	ratio = scanned ? expired_count * 100 / scanned : 0;

	if (ratio >= 90 || expired_count == GC_MAX_EVICTS) {

	if (ratio >= 90) {

		gc_work->next_gc_run = 0;

		next_run = 0;

	} else if (expired_count) {