diff options
| author | Peter Zijlstra | 2012-05-31 14:47:33 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2012-06-06 16:52:26 +0200 |
| commit | c1174876874dcf8986806e4dad3d7d07af20b439 (patch) | |
| tree | 7e2ea14ba9421bddd63e1810716f1929c753e28b /kernel/sched/fair.c | |
| parent | sched/rt: Fix lockdep annotation within find_lock_lowest_rq() (diff) | |
| download | kernel-qcow2-linux-c1174876874dcf8986806e4dad3d7d07af20b439.tar.gz kernel-qcow2-linux-c1174876874dcf8986806e4dad3d7d07af20b439.tar.xz kernel-qcow2-linux-c1174876874dcf8986806e4dad3d7d07af20b439.zip | |
sched: Fix domain iteration
Weird topologies can lead to asymmetric domain setups. This needs
further consideration since these setups are typically non-minimal
too.
For now, make it work by adding an extra mask selecting which CPUs
are allowed to iterate up.
The topology that triggered it is the one from David Rientjes:
10 20 20 30
20 10 20 20
20 20 10 20
30 20 20 10
resulting in boxes that wouldn't even boot.
Reported-by: David Rientjes <rientjes@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-3p86l9cuaqnxz7uxsojmz5rm@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b2a2d236f27b..54cbaa4e7b37 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3652,7 +3652,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, int i; if (local_group) - balance_cpu = group_first_cpu(group); + balance_cpu = group_balance_cpu(group); /* Tally up the load of all CPUs in the group */ max_cpu_load = 0; @@ -3667,7 +3667,8 @@ static inline void update_sg_lb_stats(struct lb_env *env, /* Bias balancing toward cpus of our domain */ if (local_group) { - if (idle_cpu(i) && !first_idle_cpu) { + if (idle_cpu(i) && !first_idle_cpu && + cpumask_test_cpu(i, sched_group_mask(group))) { first_idle_cpu = 1; balance_cpu = i; } |