diff options
| author | Vincent Guittot <vincent.guittot@linaro.org> | 2014-08-26 13:06:46 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-12-04 11:00:43 +0800 |
| commit | 44162ed20206e773b6005e916c3addb42bea64cf (patch) | |
| tree | ce35cdb030fc9d69eaf3e1e00eb83a2756bbf682 | |
| parent | f300eeb7f8547dc448d955cc4442946ff5dfc87c (diff) | |
sched: Fix avg_load computation
The computation of avg_load and avg_load_per_task should only take into
account the number of CFS tasks. The non-CFS tasks are already taken into
account by decreasing the CPU's capacity and they will be tracked in the
CPU's utilization (group_utilization) of the next patches.
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: riel@redhat.com
Cc: Morten.Rasmussen@arm.com
Cc: efault@gmx.de
Cc: nicolas.pitre@linaro.org
Cc: daniel.lezcano@linaro.org
Cc: dietmar.eggemann@arm.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/1409051215-16788-4-git-send-email-vincent.guittot@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 65fdac08c264506ff95ee1e34ae066e308c9e6e3)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Conflicts:
kernel/sched/fair.c
| -rw-r--r-- | kernel/sched/fair.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 49cf7c00ff9..339075a0d0c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3029,7 +3029,7 @@ static unsigned long capacity_of(int cpu) static unsigned long cpu_avg_load_per_task(int cpu) { struct rq *rq = cpu_rq(cpu); - unsigned long nr_running = ACCESS_ONCE(rq->nr_running); + unsigned long nr_running = ACCESS_ONCE(rq->cfs.h_nr_running); unsigned long load_avg = rq->cfs.runnable_load_avg; if (nr_running) @@ -4760,7 +4760,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, load = source_load(i, load_idx); sgs->group_load += load; - sgs->sum_nr_running += rq->nr_running; + sgs->sum_nr_running += rq->cfs.h_nr_running; sgs->sum_weighted_load += weighted_cpuload(i); if (idle_cpu(i)) sgs->idle_cpus++; |