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

Commit 30f6e1b5 authored by Quentin Perret's avatar Quentin Perret
Browse files

FROMLIST: sched: Relocate arch_scale_cpu_capacity 



By default, arch_scale_cpu_capacity() is only visible from within the
kernel/sched folder. Relocate it to include/linux/sched/topology.h to
make it visible to other clients needing to know about the capacity of
CPUs, such as the Energy Model framework.

Change-Id: I144c7299e122201dbcadc431d55d0a6d24d90005
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarQuentin Perret <quentin.perret@arm.com>
Message-Id: <20181016101513.26919-2-quentin.perret@arm.com>
Signed-off-by: default avatarQuentin Perret <quentin.perret@arm.com>
parent d9634ab4

include/linux/sched/topology.h

+19 −0
Original line number Diff line number Diff line
@@ -202,6 +202,17 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl); 
# define SD_INIT_NAME(type)

#endif



#ifndef arch_scale_cpu_capacity

static __always_inline

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

{

	if (sd && (sd->flags & SD_SHARE_CPUCAPACITY) && (sd->span_weight > 1))

		return sd->smt_gain / sd->span_weight;



	return SCHED_CAPACITY_SCALE;

}

#endif



#else /* CONFIG_SMP */



struct sched_domain_attr;
@@ -217,6 +228,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) 
	return true;

}



#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



#endif	/* !CONFIG_SMP */



static inline int task_node(const struct task_struct *p)

kernel/sched/sched.h

+0 −21
Original line number Diff line number Diff line
@@ -1764,27 +1764,6 @@ unsigned long arch_scale_freq_capacity(int cpu) 
}

#endif



#ifdef CONFIG_SMP

#ifndef arch_scale_cpu_capacity

static __always_inline

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

{

	if (sd && (sd->flags & SD_SHARE_CPUCAPACITY) && (sd->span_weight > 1))

		return sd->smt_gain / sd->span_weight;



	return SCHED_CAPACITY_SCALE;

}

#endif

#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

#endif



struct rq *__task_rq_lock(struct task_struct *p, struct rq_flags *rf)

	__acquires(rq->lock);