diff options
| author | morten.rasmussen@arm.com <morten.rasmussen@arm.com> | 2014-12-02 14:06:32 +0000 |
|---|---|---|
| committer | Vincent Guittot <vincent.guittot@linaro.org> | 2014-12-03 15:54:07 +0100 |
| commit | bdf391e89991cf9605b5bedfeb25ed8b3a06db56 (patch) | |
| tree | 303ea5f2f909a3885e07312a75d80dc7e0f9decc /kernel/sched/fair.c | |
| parent | 3084ddf08d482f96307e6ae111f756d322193589 (diff) | |
sched: Include blocked load in weighted_cpuload
Adds blocked_load_avg to weighted_cpuload() to take recently runnable
tasks into account in load-balancing decisions. This changes the nature
of weighted_cpuload() as it may >0 while there are currently no runnable
tasks on the cpu rq. Hence care must be taken in the load-balance code
to use cfs_rq->runnable_load_avg or nr_running when current rq status is
needed.
This patch is highly experimental and will probably have require
additional updates of the users of weighted_cpuload().
cc: Ingo Molnar <mingo@redhat.com>
cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Morten Rasmussen <morten.rasmussen@arm.com>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 764020d41ecc..811c0c677a6a 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4143,7 +4143,8 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) /* Used instead of source_load when we know the type == 0 */ static unsigned long weighted_cpuload(const int cpu) { - return cpu_rq(cpu)->cfs.runnable_load_avg; + return cpu_rq(cpu)->cfs.runnable_load_avg + + cpu_rq(cpu)->cfs.blocked_load_avg; } /* |