2015-06-16 19:18:32

by Benjamin Segall

Subject: [PATCH] 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 <[email protected]>
---
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 7210ae8..c736f0c 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -5672,8 +5672,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;
}

2015-07-06 15:40:04

by tip-bot for Vasyl Gomonovych

Subject: [tip:sched/core] sched/numa: Check sched_feat(NUMA) in migrate_improves_locality()

Commit-ID: c79ca895092dba6995fc78db20649ab55ce9149d
Gitweb: http://git.kernel.org/tip/c79ca895092dba6995fc78db20649ab55ce9149d
Author: [email protected] <[email protected]>
AuthorDate: Tue, 16 Jun 2015 12:18:21 -0700
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 6 Jul 2015 15:03:14 +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 <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
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;
}

2015-07-07 06:49:35

by tip-bot for Vasyl Gomonovych

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: [email protected] <[email protected]>
AuthorDate: Tue, 16 Jun 2015 12:18:21 -0700
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
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;
}