lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: sched/core] sched: Account number of SCHED_IDLE entities on each cfs_rq
    The following commit has been merged into the sched/core branch of tip:

    Commit-ID: 4b1e9afe8af5becd9b33640a7c996ccfce4ea310
    Gitweb: https://git.kernel.org/tip/4b1e9afe8af5becd9b33640a7c996ccfce4ea310
    Author: Josh Don <joshdon@google.com>
    AuthorDate: Thu, 19 Aug 2021 18:04:01 -07:00
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Thu, 09 Sep 2021 11:27:31 +02:00

    sched: Account number of SCHED_IDLE entities on each cfs_rq

    Adds cfs_rq->idle_nr_running, which accounts the number of idle entities
    directly enqueued on the cfs_rq.

    Signed-off-by: Josh Don <joshdon@google.com>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
    Link: https://lore.kernel.org/r/20210820010403.946838-3-joshdon@google.com
    ---
    kernel/sched/debug.c | 2 ++
    kernel/sched/fair.c | 25 ++++++++++++++++++++++++-
    kernel/sched/sched.h | 1 +
    3 files changed, 27 insertions(+), 1 deletion(-)

    diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
    index 4971622..3353857 100644
    --- a/kernel/sched/debug.c
    +++ b/kernel/sched/debug.c
    @@ -608,6 +608,8 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
    cfs_rq->nr_spread_over);
    SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
    SEQ_printf(m, " .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running);
    + SEQ_printf(m, " .%-30s: %d\n", "idle_nr_running",
    + cfs_rq->idle_nr_running);
    SEQ_printf(m, " .%-30s: %d\n", "idle_h_nr_running",
    cfs_rq->idle_h_nr_running);
    SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight);
    diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
    index 2a5efde..d7c0b9d 100644
    --- a/kernel/sched/fair.c
    +++ b/kernel/sched/fair.c
    @@ -2995,6 +2995,8 @@ account_entity_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se)
    }
    #endif
    cfs_rq->nr_running++;
    + if (se_is_idle(se))
    + cfs_rq->idle_nr_running++;
    }

    static void
    @@ -3008,6 +3010,8 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se)
    }
    #endif
    cfs_rq->nr_running--;
    + if (se_is_idle(se))
    + cfs_rq->idle_nr_running--;
    }

    /*
    @@ -5544,6 +5548,17 @@ static int sched_idle_rq(struct rq *rq)
    rq->nr_running);
    }

    +/*
    + * Returns true if cfs_rq only has SCHED_IDLE entities enqueued. Note the use
    + * of idle_nr_running, which does not consider idle descendants of normal
    + * entities.
    + */
    +static bool sched_idle_cfs_rq(struct cfs_rq *cfs_rq)
    +{
    + return cfs_rq->nr_running &&
    + cfs_rq->nr_running == cfs_rq->idle_nr_running;
    +}
    +
    #ifdef CONFIG_SMP
    static int sched_idle_cpu(int cpu)
    {
    @@ -11542,7 +11557,7 @@ int sched_group_set_idle(struct task_group *tg, long idle)
    for_each_possible_cpu(i) {
    struct rq *rq = cpu_rq(i);
    struct sched_entity *se = tg->se[i];
    - struct cfs_rq *grp_cfs_rq = tg->cfs_rq[i];
    + struct cfs_rq *parent_cfs_rq, *grp_cfs_rq = tg->cfs_rq[i];
    bool was_idle = cfs_rq_is_idle(grp_cfs_rq);
    long idle_task_delta;
    struct rq_flags rf;
    @@ -11553,6 +11568,14 @@ int sched_group_set_idle(struct task_group *tg, long idle)
    if (WARN_ON_ONCE(was_idle == cfs_rq_is_idle(grp_cfs_rq)))
    goto next_cpu;

    + if (se->on_rq) {
    + parent_cfs_rq = cfs_rq_of(se);
    + if (cfs_rq_is_idle(grp_cfs_rq))
    + parent_cfs_rq->idle_nr_running++;
    + else
    + parent_cfs_rq->idle_nr_running--;
    + }
    +
    idle_task_delta = grp_cfs_rq->h_nr_running -
    grp_cfs_rq->idle_h_nr_running;
    if (!cfs_rq_is_idle(grp_cfs_rq))
    diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
    index 30b7bd2..413298d 100644
    --- a/kernel/sched/sched.h
    +++ b/kernel/sched/sched.h
    @@ -530,6 +530,7 @@ struct cfs_rq {
    struct load_weight load;
    unsigned int nr_running;
    unsigned int h_nr_running; /* SCHED_{NORMAL,BATCH,IDLE} */
    + unsigned int idle_nr_running; /* SCHED_IDLE */
    unsigned int idle_h_nr_running; /* SCHED_IDLE */

    u64 exec_clock;
    \
     
     \ /
      Last update: 2021-09-09 13:21    [W:4.209 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site