Messages in this thread Patch in this message | | | Date | Mon, 6 Jul 2015 23:48:44 -0700 | From | "tip-bot for " <> | Subject | [tip:sched/core] sched/numa: Check sched_feat(NUMA) in migrate_improves_locality() |
| |
Commit-ID: 6dfec8d9493f48a42896386b41ec1a4644331b0b Gitweb: http://git.kernel.org/tip/6dfec8d9493f48a42896386b41ec1a4644331b0b Author: bsegall@google.com <bsegall@google.com> AuthorDate: Tue, 16 Jun 2015 12:18:21 -0700 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Tue, 7 Jul 2015 08:46:09 +0200
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> --- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d113c3b..98b2b96 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5680,8 +5680,8 @@ static bool migrate_improves_locality(struct task_struct *p, struct lb_env *env) unsigned long src_faults, dst_faults; int src_nid, dst_nid; - if (!sched_feat(NUMA_FAVOUR_HIGHER) || !p->numa_faults || - !(env->sd->flags & SD_NUMA)) { + if (!sched_feat(NUMA) || !sched_feat(NUMA_FAVOUR_HIGHER) || + !p->numa_faults || !(env->sd->flags & SD_NUMA)) { return false; }
| |