lkml.org 
[lkml]   [2013]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC patch v2 5/7] sched: compute runnable load avg in cpu_load and cpu_avg_load_per_task
    Date
    They are the base values in load balance, update them with rq runnable
    load average, then the load balance will consider runnable load avg
    naturally.

    Signed-off-by: Alex Shi <alex.shi@intel.com>
    ---
    kernel/sched/core.c | 4 ++--
    kernel/sched/fair.c | 4 ++--
    2 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/kernel/sched/core.c b/kernel/sched/core.c
    index 4f4714e..5da13ff 100644
    --- a/kernel/sched/core.c
    +++ b/kernel/sched/core.c
    @@ -2539,7 +2539,7 @@ static void __update_cpu_load(struct rq *this_rq, unsigned long this_load,
    void update_idle_cpu_load(struct rq *this_rq)
    {
    unsigned long curr_jiffies = ACCESS_ONCE(jiffies);
    - unsigned long load = this_rq->load.weight;
    + unsigned long load = (unsigned long)this_rq->cfs.runnable_load_avg;
    unsigned long pending_updates;

    /*
    @@ -2589,7 +2589,7 @@ static void update_cpu_load_active(struct rq *this_rq)
    * See the mess around update_idle_cpu_load() / update_cpu_load_nohz().
    */
    this_rq->last_load_update_tick = jiffies;
    - __update_cpu_load(this_rq, this_rq->load.weight, 1);
    + __update_cpu_load(this_rq, this_rq->cfs.runnable_load_avg, 1);

    calc_load_account_active(this_rq);
    }
    diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
    index 017e040..729221b 100644
    --- a/kernel/sched/fair.c
    +++ b/kernel/sched/fair.c
    @@ -2905,7 +2905,7 @@ 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)->load.weight;
    + return (unsigned long)cpu_rq(cpu)->cfs.runnable_load_avg;
    }

    /*
    @@ -2952,7 +2952,7 @@ static unsigned long cpu_avg_load_per_task(int cpu)
    unsigned long nr_running = ACCESS_ONCE(rq->nr_running);

    if (nr_running)
    - return rq->load.weight / nr_running;
    + return (unsigned long)rq->cfs.runnable_load_avg / nr_running;

    return 0;
    }
    --
    1.7.12


    \
     
     \ /
      Last update: 2013-01-26 03:21    [W:3.648 / U:0.796 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site