Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af75d1a9 authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Ingo Molnar
Browse files

sched/fair: Remove sgs->sum_weighted_load 



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: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarRik van Riel <riel@surriel.com>
Acked-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Morten Rasmussen <morten.rasmussen@arm.com>
Cc: Patrick Bellasi <patrick.bellasi@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Perret <quentin.perret@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20190527062116.11512-7-dietmar.eggemann@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0e1fef63

kernel/sched/fair.c

+1 −3
Original line number Diff line number Diff line
@@ -7577,7 +7577,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 */
@@ -7944,7 +7943,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

		 */
@@ -7963,7 +7961,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;