Commit-ID: 65fdac08c264506ff95ee1e34ae066e308c9e6e3 Gitweb: http://git.kernel.org/tip/65fdac08c264506ff95ee1e34ae066e308c9e6e3 Author: Vincent Guittot <vincent.guit...@linaro.org> AuthorDate: Tue, 26 Aug 2014 13:06:46 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 19 Sep 2014 12:35:26 +0200
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 <pre...@linux.vnet.ibm.com> Signed-off-by: Vincent Guittot <vincent.guit...@linaro.org> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: r...@redhat.com Cc: morten.rasmus...@arm.com Cc: efa...@gmx.de Cc: nicolas.pi...@linaro.org Cc: daniel.lezc...@linaro.org Cc: dietmar.eggem...@arm.com Cc: Linus Torvalds <torva...@linux-foundation.org> Link: http://lkml.kernel.org/r/1409051215-16788-4-git-send-email-vincent.guit...@linaro.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 391eaf2..eb87229 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4095,7 +4095,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) @@ -5985,7 +5985,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; if (rq->nr_running > 1) *overload = true; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
