sched/fair: Fix scale_rt_capacity() for SMT

vingu-linaro · Ingo Molnar · commit 287cdaac5700 · 2018-09-10T10:13:47.000+02:00
Since commit: 523e979 ("sched/core: Use PELT for scale_rt_capacity()") scale_rt_capacity() returns the remaining capacity and not a scale factor to apply on cpu_capacity_orig. arch_scale_cpu() is directly called by scale_rt_capacity() so we must take the sched_domain argument. Reported-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: 523e979 ("sched/core: Use PELT for scale_rt_capacity()") Link: http://lkml.kernel.org/r/20180904093626.GA23936@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
@@ -7488,10 +7488,10 @@ static inline int get_sd_load_idx(struct sched_domain *sd,
 	return load_idx;
 }
 
-static unsigned long scale_rt_capacity(int cpu)
+static unsigned long scale_rt_capacity(struct sched_domain *sd, int cpu)
 {
 	struct rq *rq = cpu_rq(cpu);
-	unsigned long max = arch_scale_cpu_capacity(NULL, cpu);
+	unsigned long max = arch_scale_cpu_capacity(sd, cpu);
 	unsigned long used, free;
 	unsigned long irq;
 
@@ -7513,7 +7513,7 @@ static unsigned long scale_rt_capacity(int cpu)
 
 static void update_cpu_capacity(struct sched_domain *sd, int cpu)
 {
-	unsigned long capacity = scale_rt_capacity(cpu);
+	unsigned long capacity = scale_rt_capacity(sd, cpu);
 	struct sched_group *sdg = sd->groups;
 
 	cpu_rq(cpu)->cpu_capacity_orig = arch_scale_cpu_capacity(sd, cpu);

Original file line number	Diff line number	Diff line change
`@@ -7488,10 +7488,10 @@ static inline int get_sd_load_idx(struct sched_domain *sd,`
`7488`	`7488`	`return load_idx;`
`7489`	`7489`	`}`
`7490`	`7490`
`7491`		`-static unsigned long scale_rt_capacity(int cpu)`
	`7491`	`+static unsigned long scale_rt_capacity(struct sched_domain *sd, int cpu)`
`7492`	`7492`	`{`
`7493`	`7493`	`struct rq *rq = cpu_rq(cpu);`
`7494`		`- unsigned long max = arch_scale_cpu_capacity(NULL, cpu);`
	`7494`	`+ unsigned long max = arch_scale_cpu_capacity(sd, cpu);`
`7495`	`7495`	`unsigned long used, free;`
`7496`	`7496`	`unsigned long irq;`
`7497`	`7497`
`@@ -7513,7 +7513,7 @@ static unsigned long scale_rt_capacity(int cpu)`
`7513`	`7513`
`7514`	`7514`	`static void update_cpu_capacity(struct sched_domain *sd, int cpu)`
`7515`	`7515`	`{`
`7516`		`- unsigned long capacity = scale_rt_capacity(cpu);`
	`7516`	`+ unsigned long capacity = scale_rt_capacity(sd, cpu);`
`7517`	`7517`	`struct sched_group *sdg = sd->groups;`
`7518`	`7518`
`7519`	`7519`	`cpu_rq(cpu)->cpu_capacity_orig = arch_scale_cpu_capacity(sd, cpu);`