Commit 7e1a9208 authored by Juri Lelli's avatar Juri Lelli Committed by Ingo Molnar
Browse files

sched/cpufreq: Move arch_scale_{freq,cpu}_capacity() outside of #ifdef CONFIG_SMP 



Currently, frequency and cpu capacity scaling is only performed on
CONFIG_SMP systems (as CFS PELT signals are only present for such
systems). However, other scheduling classes want to do freq/cpu scaling,
and for !CONFIG_SMP configurations as well.

arch_scale_freq_capacity() is useful to implement frequency scaling even
on !CONFIG_SMP platforms, so we simply move it outside CONFIG_SMP
ifdeffery.

Even if arch_scale_cpu_capacity() is not useful on !CONFIG_SMP platforms,
we make a default implementation available for such configurations anyway
to simplify scheduler code doing CPU scale invariance.

Signed-off-by: default avatarJuri Lelli <juri.lelli@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: alessio.balsini@arm.com
Cc: bristot@redhat.com
Cc: claudio@evidence.eu.com
Cc: dietmar.eggemann@arm.com
Cc: joelaf@google.com
Cc: juri.lelli@redhat.com
Cc: luca.abeni@santannapisa.it
Cc: mathieu.poirier@linaro.org
Cc: morten.rasmussen@arm.com
Cc: patrick.bellasi@arm.com
Cc: rjw@rjwysocki.net
Cc: tkjos@android.com
Cc: tommaso.cucinotta@santannapisa.it
Cc: vincent.guittot@linaro.org
Cc: viresh.kumar@linaro.org
Link: http://lkml.kernel.org/r/20171204102325.5110-8-juri.lelli@redhat.com


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

include/linux/sched/topology.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -6,6 +6,12 @@ 




#include <linux/sched/idle.h>

#include <linux/sched/idle.h>





/*

 * Increase resolution of cpu_capacity calculations

 */

#define SCHED_CAPACITY_SHIFT	SCHED_FIXEDPOINT_SHIFT

#define SCHED_CAPACITY_SCALE	(1L << SCHED_CAPACITY_SHIFT)



/*

/*

 * sched-domains (multiprocessor balancing) declarations:

 * sched-domains (multiprocessor balancing) declarations:

 */

 */
@@ -27,12 +33,6 @@ 
#define SD_OVERLAP		0x2000	/* sched_domains of this level overlap */

#define SD_OVERLAP		0x2000	/* sched_domains of this level overlap */

#define SD_NUMA			0x4000	/* cross-node balancing */

#define SD_NUMA			0x4000	/* cross-node balancing */





/*

 * Increase resolution of cpu_capacity calculations

 */

#define SCHED_CAPACITY_SHIFT	SCHED_FIXEDPOINT_SHIFT

#define SCHED_CAPACITY_SCALE	(1L << SCHED_CAPACITY_SHIFT)



#ifdef CONFIG_SCHED_SMT

#ifdef CONFIG_SCHED_SMT

static inline int cpu_smt_flags(void)

static inline int cpu_smt_flags(void)

{

{

kernel/sched/sched.h

+10 −3
Original line number Original line Diff line number Diff line
@@ -1670,9 +1670,6 @@ static inline int hrtick_enabled(struct rq *rq) 




#endif /* CONFIG_SCHED_HRTICK */

#endif /* CONFIG_SCHED_HRTICK */





#ifdef CONFIG_SMP

extern void sched_avg_update(struct rq *rq);



#ifndef arch_scale_freq_capacity

#ifndef arch_scale_freq_capacity

static __always_inline

static __always_inline

unsigned long arch_scale_freq_capacity(int cpu)

unsigned long arch_scale_freq_capacity(int cpu)
@@ -1681,6 +1678,9 @@ unsigned long arch_scale_freq_capacity(int cpu) 
}

}

#endif

#endif





#ifdef CONFIG_SMP

extern void sched_avg_update(struct rq *rq);



#ifndef arch_scale_cpu_capacity

#ifndef arch_scale_cpu_capacity

static __always_inline

static __always_inline

unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)

unsigned long arch_scale_cpu_capacity(struct sched_domain *sd, int cpu)
@@ -1698,6 +1698,13 @@ static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) 
	sched_avg_update(rq);

	sched_avg_update(rq);

}

}

#else

#else

#ifndef arch_scale_cpu_capacity

static __always_inline

unsigned long arch_scale_cpu_capacity(void __always_unused *sd, int cpu)

{

	return SCHED_CAPACITY_SCALE;

}

#endif

static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { }

static inline void sched_rt_avg_update(struct rq *rq, u64 rt_delta) { }

static inline void sched_avg_update(struct rq *rq) { }

static inline void sched_avg_update(struct rq *rq) { }

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE