Re: [PATCH 6/7] sched/fair: Remove sgs->sum_weighted_load

From: Vincent Guittot
Date: Mon May 27 2019 - 10:10:31 EST


On Mon, 27 May 2019 at 08:21, Dietmar Eggemann <dietmar.eggemann@xxxxxxx> wrote:
>
> Since sg_lb_stats::sum_weighted_load is now identical with
> sg_lb_stats::group_load remove it and replace its use case
> (calculating load per task) with the latter.
>
> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>

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

> ---
> kernel/sched/fair.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 88779c45e8e6..a33f196703a7 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -7580,7 +7580,6 @@ static unsigned long task_h_load(struct task_struct *p)
> struct sg_lb_stats {
> unsigned long avg_load; /*Avg load across the CPUs of the group */
> unsigned long group_load; /* Total load over the CPUs of the group */
> - unsigned long sum_weighted_load; /* Weighted load of group's tasks */
> unsigned long load_per_task;
> unsigned long group_capacity;
> unsigned long group_util; /* Total utilization of the group */
> @@ -7947,7 +7946,6 @@ static inline void update_sg_lb_stats(struct lb_env *env,
> sgs->nr_numa_running += rq->nr_numa_running;
> sgs->nr_preferred_running += rq->nr_preferred_running;
> #endif
> - sgs->sum_weighted_load += weighted_cpuload(rq);
> /*
> * No need to call idle_cpu() if nr_running is not 0
> */
> @@ -7966,7 +7964,7 @@ static inline void update_sg_lb_stats(struct lb_env *env,
> sgs->avg_load = (sgs->group_load*SCHED_CAPACITY_SCALE) / sgs->group_capacity;
>
> if (sgs->sum_nr_running)
> - sgs->load_per_task = sgs->sum_weighted_load / sgs->sum_nr_running;
> + sgs->load_per_task = sgs->group_load / sgs->sum_nr_running;
>
> sgs->group_weight = group->group_weight;
>
> --
> 2.17.1
>