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

Commit f01415fd authored by Patrick Bellasi's avatar Patrick Bellasi Committed by Ingo Molnar
Browse files

sched/fair: Use 'unsigned long' for utilization, consistently 



Utilization and capacity are tracked as 'unsigned long', however some
functions using them return an 'int' which is ultimately assigned back to
'unsigned long' variables.

Since there is not scope on using a different and signed type,
consolidate the signature of functions returning utilization to always
use the native type.

This change improves code consistency, and it also benefits
code paths where utilizations should be clamped by avoiding
further type conversions or ugly type casts.

Signed-off-by: default avatarPatrick Bellasi <patrick.bellasi@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarChris Redpath <chris.redpath@arm.com>
Reviewed-by: default avatarBrendan Jackman <brendan.jackman@arm.com>
Reviewed-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Joel Fernandes <joelaf@google.com>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Morten Rasmussen <morten.rasmussen@arm.com>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Todd Kjos <tkjos@android.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Link: http://lkml.kernel.org/r/20171205171018.9203-2-patrick.bellasi@arm.com


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

kernel/sched/fair.c

+5 −5
Original line number Diff line number Diff line
@@ -5765,8 +5765,8 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, 
	return affine;

}



static inline int task_util(struct task_struct *p);

static int cpu_util_wake(int cpu, struct task_struct *p);

static inline unsigned long task_util(struct task_struct *p);

static unsigned long cpu_util_wake(int cpu, struct task_struct *p);



static unsigned long capacity_spare_wake(int cpu, struct task_struct *p)

{
@@ -6247,7 +6247,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) 
 * capacity_orig) as it useful for predicting the capacity required after task

 * migrations (scheduler-driven DVFS).

 */

static int cpu_util(int cpu)

static unsigned long cpu_util(int cpu)

{

	unsigned long util = cpu_rq(cpu)->cfs.avg.util_avg;

	unsigned long capacity = capacity_orig_of(cpu);
@@ -6255,7 +6255,7 @@ static int cpu_util(int cpu) 
	return (util >= capacity) ? capacity : util;

}



static inline int task_util(struct task_struct *p)

static inline unsigned long task_util(struct task_struct *p)

{

	return p->se.avg.util_avg;

}
@@ -6264,7 +6264,7 @@ static inline int task_util(struct task_struct *p) 
 * cpu_util_wake: Compute cpu utilization with any contributions from

 * the waking task p removed.

 */

static int cpu_util_wake(int cpu, struct task_struct *p)

static unsigned long cpu_util_wake(int cpu, struct task_struct *p)

{

	unsigned long util, capacity;