sched: fix sched_domain aggregation

Keeping the aggregate on the first cpu of the sched domain has two problems:
 - it could collide between different sched domains on different cpus
 - it could slow things down because of the remote accesses

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Cc: Mike Galbraith <efault@gmx.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 509092af0330..40cf24ab4de8 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1429,11 +1429,11 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
                 /*
                  * empty group
                  */
-                if (!aggregate(tg, sd)->task_weight)
+                if (!aggregate(tg, this_cpu)->task_weight)
                         continue;
 
-                rem_load = rem_load_move * aggregate(tg, sd)->rq_weight;
-                rem_load /= aggregate(tg, sd)->load + 1;
+                rem_load = rem_load_move * aggregate(tg, this_cpu)->rq_weight;
+                rem_load /= aggregate(tg, this_cpu)->load + 1;
 
                 this_weight = tg->cfs_rq[this_cpu]->task_weight;
                 busiest_weight = tg->cfs_rq[busiest_cpu]->task_weight;
@@ -1451,10 +1451,10 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
                 if (!moved_load)
                         continue;
 
-                move_group_shares(tg, sd, busiest_cpu, this_cpu);
+                move_group_shares(tg, this_cpu, sd, busiest_cpu, this_cpu);
 
-                moved_load *= aggregate(tg, sd)->load;
-                moved_load /= aggregate(tg, sd)->rq_weight + 1;
+                moved_load *= aggregate(tg, this_cpu)->load;
+                moved_load /= aggregate(tg, this_cpu)->rq_weight + 1;
 
                 rem_load_move -= moved_load;
                 if (rem_load_move < 0)