Skip to content

Commit

Permalink
sched: Fix the place where group powers are updated
Browse files Browse the repository at this point in the history
We want to update the sched_group_powers when balance_cpu == this_cpu.

Currently the group powers are updated only if the balance_cpu is the
first CPU in the local group. But balance_cpu = this_cpu could also be
the first idle cpu in the group. Hence fix the place where the group
powers are updated.

Signed-off-by: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1264017764.5717.127.camel@jschopp-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Gautham R Shenoy authored and Ingo Molnar committed Jan 21, 2010
1 parent 8f190fb commit 871e35b
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions kernel/sched_fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -2418,11 +2418,8 @@ static inline void update_sg_lb_stats(struct sched_domain *sd,
unsigned long sum_avg_load_per_task;
unsigned long avg_load_per_task;

if (local_group) {
if (local_group)
balance_cpu = group_first_cpu(group);
if (balance_cpu == this_cpu)
update_group_power(sd, this_cpu);
}

/* Tally up the load of all CPUs in the group */
sum_avg_load_per_task = avg_load_per_task = 0;
Expand Down Expand Up @@ -2470,6 +2467,8 @@ static inline void update_sg_lb_stats(struct sched_domain *sd,
return;
}

update_group_power(sd, this_cpu);

/* Adjust by relative CPU power of the group */
sgs->avg_load = (sgs->group_load * SCHED_LOAD_SCALE) / group->cpu_power;

Expand Down

0 comments on commit 871e35b

Please sign in to comment.