sched,numa: update migrate_improves/degrades_locality
PATCH 1/1 sched,numa: update migrate_improves/degrades_locality
Update the migrate_improves/degrades_locality functions with knowledge of pseudo-interleaving.
Do not consider moving tasks around within the set of group's active nodes as improving or degrading locality. Instead, leave the load balancer free to balance the load between a numa_group's active nodes.
Also, switch from the group/task_weight functions to the group/task_fault functions. The "weight" functions involve a division, but both calls use the same divisor, so there's no point in doing that from these functions.
On a 4 node (x10 core) system, performance of SPECjbb2005 seems unaffected, though the number of migrations with 2 8-warehouse wide instances seems to have almost halved, due to the scheduler running each instance on a single node.
--- kernel/sched/fair.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
kernel/sched/fair.c +29 -13
@@ -4971,6 +4971,7 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)/* Returns true if the destination node has incurred more faults */ static bool migrate_improves_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =ACCESS_ONCE (p->numa_group);int src_nid, dst_nid; if (!sched_feat(NUMA_FAVOUR_HIGHER) || !p->numa_faults_memory ||
@@ -4984,21 +4985,29 @@ static bool migrate_improves_locality(struct task_struct *p, struct lb_env *env)if (src_nid == dst_nid)return false; -/* Always encourage migration to the preferred node. */ -if (dst_nid == p->numa_preferred_nid) -return true; +if (numa_group) { +/* Task is already in the group's interleave set. */ +if (node_isset (src_nid, numa_group->active_nodes)) +return false; + +/* Task is moving into the group's interleave set. */ +if (node_isset (dst_nid, numa_group->active_nodes)) +return true; -/* If both task and group weight improve, this move is a winner. */ -if (task_weight (p, dst_nid) >task_weight (p, src_nid) && -group_weight (p, dst_nid) >group_weight (p, src_nid)) +return group_faults (p, dst_nid) >group_faults (p, src_nid); + } + +/* Encourage migration to the preferred node. */ +if (dst_nid == p->numa_preferred_nid)return true; -return false; +return task_faults (p, dst_nid) >task_faults (p, src_nid); }static bool migrate_degrades_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =ACCESS_ONCE (p->numa_group);int src_nid, dst_nid;if (!sched_feat (NUMA ) || !sched_feat (NUMA_RESIST_LOWER ))
@@ -5013,16 +5022,23 @@ static bool migrate_degrades_locality(struct task_struct *p, struct lb_env *env)if (src_nid == dst_nid)return false; +if (numa_group) { +/* Task is moving within/into the group's interleave set. */ +if (node_isset (dst_nid, numa_group->active_nodes)) +return false; + +/* Task is moving out of the group's interleave set. */ +if (node_isset (src_nid, numa_group->active_nodes)) +return true; + +return group_faults (p, dst_nid) <group_faults (p, src_nid); + } +/* Migrating away from the preferred node is always bad. */ if (src_nid == p->numa_preferred_nid)return true; -/* If either task or group weight get worse, don't do it. */ -if (task_weight (p, dst_nid) <task_weight (p, src_nid) || -group_weight (p, dst_nid) <group_weight (p, src_nid)) -return true; - - return false; + return task_faults(p, dst_nid) < task_faults(p, src_nid); }#else
Peter Zijlstra
maintainerQuoted 26 lines · Rik van Riel
Update the migrate_improves/degrades_locality functions with knowledge of pseudo-interleaving.
Do not consider moving tasks around within the set of group's active nodes as improving or degrading locality. Instead, leave the load balancer free to balance the load between a numa_group's active nodes.
Also, switch from the group/task_weight functions to the group/task_fault functions. The "weight" functions involve a division, but both calls use the same divisor, so there's no point in doing that from these functions.
On a 4 node (x10 core) system, performance of SPECjbb2005 seems unaffected, though the number of migrations with 2 8-warehouse wide instances seems to have almost halved, due to the scheduler running each instance on a single node.
Signed-off-by Rik van Riel <[email protected]>--- kernel/sched/fair.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)kernel/sched/fair.c +0
-0
kernel/sched/fair.c task_hot(struct task_struct *p, u64 now, struct sched_domain *sd) · line 4974
Quoted 4 lines
kernel/sched/fair.c +1
-0@@ -4971,6 +4971,7 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)/* Returns true if the destination node has incurred more faults */ static bool migrate_improves_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =ACCESS_ONCE (p->numa_group);
That wants to be rcu_dereference() to match the rcu_assign_pointer() we use to set it.
Same in that wake_numa patch
Quoted 3 lines
kernel/sched/fair.c +0
-0int src_nid, dst_nid; if (!sched_feat(NUMA_FAVOUR_HIGHER) || !p->numa_faults_memory ||
tip-bot for Rik van Riel
merge bot[tip:sched/core] sched,numa: Update migrate_improves/ degrades_locality
In reply to Rik van Rielsched,numa: Update migrate_improves/degrades_locality
Commit-ID: f5c1e1af91b2a4238d7c2a6dc4aa0076908b5864 Gitweb: http://git.kernel.org/tip/f5c1e1af91b2a4238d7c2a6dc4aa0076908b5864 Author: Rik van Riel <[email protected]> AuthorDate: Thu, 15 May 2014 13:03:06 -0400 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 19 May 2014 22:02:43 +0900
sched,numa: Update migrate_improves/degrades_locality
Update the migrate_improves/degrades_locality functions with knowledge of pseudo-interleaving.
Do not consider moving tasks around within the set of group's active nodes as improving or degrading locality. Instead, leave the load balancer free to balance the load between a numa_group's active nodes.
Also, switch from the group/task_weight functions to the group/task_fault functions. The "weight" functions involve a division, but both calls use the same divisor, so there's no point in doing that from these functions.
On a 4 node (x10 core) system, performance of SPECjbb2005 seems unaffected, though the number of migrations with 2 8-warehouse wide instances seems to have almost halved, due to the scheduler running each instance on a single node.
--- kernel/sched/fair.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
kernel/sched/fair.c +29 -13
@@ -5123,6 +5123,7 @@ task_hot(struct task_struct *p, u64 now)/* Returns true if the destination node has incurred more faults */ static bool migrate_improves_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =rcu_dereference (p->numa_group);int src_nid, dst_nid; if (!sched_feat(NUMA_FAVOUR_HIGHER) || !p->numa_faults_memory ||
@@ -5136,21 +5137,29 @@ static bool migrate_improves_locality(struct task_struct *p, struct lb_env *env)if (src_nid == dst_nid)return false; -/* Always encourage migration to the preferred node. */ -if (dst_nid == p->numa_preferred_nid) -return true; +if (numa_group) { +/* Task is already in the group's interleave set. */ +if (node_isset (src_nid, numa_group->active_nodes)) +return false; + +/* Task is moving into the group's interleave set. */ +if (node_isset (dst_nid, numa_group->active_nodes)) +return true; -/* If both task and group weight improve, this move is a winner. */ -if (task_weight (p, dst_nid) >task_weight (p, src_nid) && -group_weight (p, dst_nid) >group_weight (p, src_nid)) +return group_faults (p, dst_nid) >group_faults (p, src_nid); + } + +/* Encourage migration to the preferred node. */ +if (dst_nid == p->numa_preferred_nid)return true; -return false; +return task_faults (p, dst_nid) >task_faults (p, src_nid); }static bool migrate_degrades_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =rcu_dereference (p->numa_group);int src_nid, dst_nid;if (!sched_feat (NUMA ) || !sched_feat (NUMA_RESIST_LOWER ))
@@ -5165,16 +5174,23 @@ static bool migrate_degrades_locality(struct task_struct *p, struct lb_env *env)if (src_nid == dst_nid)return false; +if (numa_group) { +/* Task is moving within/into the group's interleave set. */ +if (node_isset (dst_nid, numa_group->active_nodes)) +return false; + +/* Task is moving out of the group's interleave set. */ +if (node_isset (src_nid, numa_group->active_nodes)) +return true; + +return group_faults (p, dst_nid) <group_faults (p, src_nid); + } +/* Migrating away from the preferred node is always bad. */ if (src_nid == p->numa_preferred_nid)return true; -/* If either task or group weight get worse, don't do it. */ -if (task_weight (p, dst_nid) <task_weight (p, src_nid) || -group_weight (p, dst_nid) <group_weight (p, src_nid)) -return true; - - return false; + return task_faults(p, dst_nid) < task_faults(p, src_nid); }#else
tip-bot for Rik van Riel
merge bot[tip:sched/core] sched/numa: Update migrate_improves/ degrades_locality()
In reply to Rik van Rielsched/numa: Update migrate_improves/degrades_locality()
Commit-ID: b1ad065e65f56103db8b97edbd218a271ff5b1bb Gitweb: http://git.kernel.org/tip/b1ad065e65f56103db8b97edbd218a271ff5b1bb Author: Rik van Riel <[email protected]> AuthorDate: Thu, 15 May 2014 13:03:06 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 22 May 2014 11:16:39 +0200
sched/numa: Update migrate_improves/degrades_locality()
Update the migrate_improves/degrades_locality() functions with knowledge of pseudo-interleaving.
Do not consider moving tasks around within the set of group's active nodes as improving or degrading locality. Instead, leave the load balancer free to balance the load between a numa_group's active nodes.
Also, switch from the group/task_weight functions to the group/task_fault functions. The "weight" functions involve a division, but both calls use the same divisor, so there's no point in doing that from these functions.
On a 4 node (x10 core) system, performance of SPECjbb2005 seems unaffected, though the number of migrations with 2 8-warehouse wide instances seems to have almost halved, due to the scheduler running each instance on a single node.
--- kernel/sched/fair.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
kernel/sched/fair.c +29 -13
@@ -5123,6 +5123,7 @@ task_hot(struct task_struct *p, u64 now)/* Returns true if the destination node has incurred more faults */ static bool migrate_improves_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =rcu_dereference (p->numa_group);int src_nid, dst_nid; if (!sched_feat(NUMA_FAVOUR_HIGHER) || !p->numa_faults_memory ||
@@ -5136,21 +5137,29 @@ static bool migrate_improves_locality(struct task_struct *p, struct lb_env *env)if (src_nid == dst_nid)return false; -/* Always encourage migration to the preferred node. */ -if (dst_nid == p->numa_preferred_nid) -return true; +if (numa_group) { +/* Task is already in the group's interleave set. */ +if (node_isset (src_nid, numa_group->active_nodes)) +return false; + +/* Task is moving into the group's interleave set. */ +if (node_isset (dst_nid, numa_group->active_nodes)) +return true; -/* If both task and group weight improve, this move is a winner. */ -if (task_weight (p, dst_nid) >task_weight (p, src_nid) && -group_weight (p, dst_nid) >group_weight (p, src_nid)) +return group_faults (p, dst_nid) >group_faults (p, src_nid); + } + +/* Encourage migration to the preferred node. */ +if (dst_nid == p->numa_preferred_nid)return true; -return false; +return task_faults (p, dst_nid) >task_faults (p, src_nid); }static bool migrate_degrades_locality (struct task_struct *p,struct lb_env *env) { +struct numa_group *numa_group =rcu_dereference (p->numa_group);int src_nid, dst_nid;if (!sched_feat (NUMA ) || !sched_feat (NUMA_RESIST_LOWER ))
@@ -5165,16 +5174,23 @@ static bool migrate_degrades_locality(struct task_struct *p, struct lb_env *env)if (src_nid == dst_nid)return false; +if (numa_group) { +/* Task is moving within/into the group's interleave set. */ +if (node_isset (dst_nid, numa_group->active_nodes)) +return false; + +/* Task is moving out of the group's interleave set. */ +if (node_isset (src_nid, numa_group->active_nodes)) +return true; + +return group_faults (p, dst_nid) <group_faults (p, src_nid); + } +/* Migrating away from the preferred node is always bad. */ if (src_nid == p->numa_preferred_nid)return true; -/* If either task or group weight get worse, don't do it. */ -if (task_weight (p, dst_nid) <task_weight (p, src_nid) || -group_weight (p, dst_nid) <group_weight (p, src_nid)) -return true; - - return false; + return task_faults(p, dst_nid) < task_faults(p, src_nid); }#else