diff options
author | Peter Zijlstra <peterz@infradead.org> | 2016-05-06 06:21:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-12 03:55:33 -0400 |
commit | 1be0eb2a97d756fb7dd8c9baf372d81fa9699c09 (patch) | |
tree | 1031c2ea02335ca83616934ce9fb5d37472e55d4 | |
parent | 444969223c81c7d0a95136b7b4cfdcfbc96ac5bd (diff) |
sched/fair: Clean up scale confusion
Wanpeng noted that the scale_load_down() in calculate_imbalance() was
weird. I agree, it should be SCHED_CAPACITY_SCALE, since we're going
to compare against busiest->group_capacity, which is in [capacity]
units.
Reported-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Morten Rasmussen <morten.rasmussen@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yuyang Du <yuyang.du@intel.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | kernel/sched/fair.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index d28d89d774aa..23381056b4b5 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
@@ -7066,8 +7066,7 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s | |||
7066 | */ | 7066 | */ |
7067 | if (busiest->group_type == group_overloaded && | 7067 | if (busiest->group_type == group_overloaded && |
7068 | local->group_type == group_overloaded) { | 7068 | local->group_type == group_overloaded) { |
7069 | load_above_capacity = busiest->sum_nr_running * | 7069 | load_above_capacity = busiest->sum_nr_running * SCHED_CAPACITY_SCALE; |
7070 | scale_load_down(NICE_0_LOAD); | ||
7071 | if (load_above_capacity > busiest->group_capacity) | 7070 | if (load_above_capacity > busiest->group_capacity) |
7072 | load_above_capacity -= busiest->group_capacity; | 7071 | load_above_capacity -= busiest->group_capacity; |
7073 | else | 7072 | else |