Re: [PATCH v9 4/7] sched/fair: Rename select_idle_mask to select_rq_mask

[Vincent Guittot]

On Mon, 23 May 2022 at 17:52, Vincent Donnefort <vdonnefort@xxxxxxxxxx> wrote:
>
> From: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>
>
> 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@xxxxxxx>

Reviewed-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx>

>
> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
> index c531976ee960..68f5eb8a1de7 100644
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -9502,7 +9502,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)
>  {
> @@ -9551,7 +9551,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 73a9dc522b73..2d7bba2f1da2 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -5897,7 +5897,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
>
> @@ -6387,7 +6387,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();
> @@ -6473,7 +6473,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.36.1.124.g0e6072fb45-goog
>