lkml.org 
[lkml]   [2022]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 4/7] sched/fair: Rename select_idle_mask to select_rq_mask
    Date
    From: Dietmar Eggemann <dietmar.eggemann@arm.com>

    Decouple the name of the per-cpu cpumask select_idle_mask from its usage
    in select_idle_[cpu/capacity]() of the CFS run-queue selection
    (select_task_rq_fair()).

    This is to support the reuse of this cpumask in the Energy Aware
    Scheduling (EAS) path (find_energy_efficient_cpu()) of the CFS run-queue
    selection.

    Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>

    diff --git a/kernel/sched/core.c b/kernel/sched/core.c
    index 668ffae1888e..9808f3f33417 100644
    --- a/kernel/sched/core.c
    +++ b/kernel/sched/core.c
    @@ -9305,7 +9305,7 @@ static struct kmem_cache *task_group_cache __read_mostly;
    #endif

    DECLARE_PER_CPU(cpumask_var_t, load_balance_mask);
    -DECLARE_PER_CPU(cpumask_var_t, select_idle_mask);
    +DECLARE_PER_CPU(cpumask_var_t, select_rq_mask);

    void __init sched_init(void)
    {
    @@ -9354,7 +9354,7 @@ void __init sched_init(void)
    for_each_possible_cpu(i) {
    per_cpu(load_balance_mask, i) = (cpumask_var_t)kzalloc_node(
    cpumask_size(), GFP_KERNEL, cpu_to_node(i));
    - per_cpu(select_idle_mask, i) = (cpumask_var_t)kzalloc_node(
    + per_cpu(select_rq_mask, i) = (cpumask_var_t)kzalloc_node(
    cpumask_size(), GFP_KERNEL, cpu_to_node(i));
    }
    #endif /* CONFIG_CPUMASK_OFFSTACK */
    diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
    index 4fc63deda620..291be5c00044 100644
    --- a/kernel/sched/fair.c
    +++ b/kernel/sched/fair.c
    @@ -5709,7 +5709,7 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags)

    /* Working cpumask for: load_balance, load_balance_newidle. */
    DEFINE_PER_CPU(cpumask_var_t, load_balance_mask);
    -DEFINE_PER_CPU(cpumask_var_t, select_idle_mask);
    +DEFINE_PER_CPU(cpumask_var_t, select_rq_mask);

    #ifdef CONFIG_NO_HZ_COMMON

    @@ -6199,7 +6199,7 @@ static inline int select_idle_smt(struct task_struct *p, struct sched_domain *sd
    */
    static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, bool has_idle_core, int target)
    {
    - struct cpumask *cpus = this_cpu_cpumask_var_ptr(select_idle_mask);
    + struct cpumask *cpus = this_cpu_cpumask_var_ptr(select_rq_mask);
    int i, cpu, idle_cpu = -1, nr = INT_MAX;
    struct rq *this_rq = this_rq();
    int this = smp_processor_id();
    @@ -6285,7 +6285,7 @@ select_idle_capacity(struct task_struct *p, struct sched_domain *sd, int target)
    int cpu, best_cpu = -1;
    struct cpumask *cpus;

    - cpus = this_cpu_cpumask_var_ptr(select_idle_mask);
    + cpus = this_cpu_cpumask_var_ptr(select_rq_mask);
    cpumask_and(cpus, sched_domain_span(sd), p->cpus_ptr);

    task_util = uclamp_task_util(p);
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-01-12 17:17    [W:6.743 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site