Commit 6dfec8d9 authored Jun 16, 2015 by bsegall@google.com Committed by Ingo Molnar Jul 07, 2015

sched/numa: Check sched_feat(NUMA) in migrate_improves_locality()



migrate_improves_locality checked sched_feat(NUMA_FAVOUR_HIGHER) but not
sched_feat(NUMA), so disabling just the NUMA feature would leave it
working off of old data.

Signed-off-by: Ben Segall <bsegall@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/xm26si9rtqbm.fsf@sword-of-the-dawn.mtv.corp.google.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent d49db342

kernel/sched/fair.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5680,8 +5680,8 @@ static bool migrate_improves_locality(struct task_struct p, struct lb_env env)
	unsigned long src_faults, dst_faults;		unsigned long src_faults, dst_faults;
	int src_nid, dst_nid;		int src_nid, dst_nid;

	if (!sched_feat(NUMA_FAVOUR_HIGHER) \|\| !p->numa_faults \|\|		if (!sched_feat(NUMA) \|\| !sched_feat(NUMA_FAVOUR_HIGHER) \|\|
	!(env->sd->flags & SD_NUMA)) {		!p->numa_faults \|\| !(env->sd->flags & SD_NUMA)) {
	return false;		return false;
	}		}