Commit 465a3c40 authored by Dinakar Guniguntala's avatar Dinakar Guniguntala Committed by Thomas Gleixner

sched: Fix dynamic power-balancing crash

This crash:
    
[ 1774.088275] divide error: 0000 [#1] SMP
[ 1774.100355] CPU 13
[ 1774.102498] Modules linked in:
[ 1774.105631] Pid: 30881, comm: hackbench Not tainted 2.6.31-rc8-tip-01308-g484d664-dirty #1629 X8DTN
[ 1774.114807] RIP: 0010:[<ffffffff81041c38>]  [<ffffffff81041c38>]
sched_balance_self+0x19b/0x2d4
    
Triggers because update_group_power() modifies the sd tree and does
temporary calculations there - not considering that other CPUs
could observe intermediate values, such as the zero initial value.
    
Calculate it in a temporary variable instead. (we need no memory
barrier as these are all statistical values anyway)
    
Got the same oops with the backport to -rt
Signed-off-by: default avatarDinakar Guniguntala <dino@in.ibm.com>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Darren Hart <dvhltc@us.ibm.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 1e2ea8a1
...@@ -3864,19 +3864,22 @@ static void update_group_power(struct sched_domain *sd, int cpu) ...@@ -3864,19 +3864,22 @@ static void update_group_power(struct sched_domain *sd, int cpu)
{ {
struct sched_domain *child = sd->child; struct sched_domain *child = sd->child;
struct sched_group *group, *sdg = sd->groups; struct sched_group *group, *sdg = sd->groups;
unsigned long power;
if (!child) { if (!child) {
update_cpu_power(sd, cpu); update_cpu_power(sd, cpu);
return; return;
} }
sdg->cpu_power = 0; power = 0;
group = child->groups; group = child->groups;
do { do {
sdg->cpu_power += group->cpu_power; power += group->cpu_power;
group = group->next; group = group->next;
} while (group != child->groups); } while (group != child->groups);
sdg->cpu_power = power;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment