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

Commit fedb670f authored by Valentin Schneider's avatar Valentin Schneider Committed by Quentin Perret
Browse files

UPSTREAM: sched/uclamp: Make uclamp util helpers use and return UL values 



Vincent pointed out recently that the canonical type for utilization
values is 'unsigned long'. Internally uclamp uses 'unsigned int' values for
cache optimization, but this doesn't have to be exported to its users.

Make the uclamp helpers that deal with utilization use and return unsigned
long values.

Bug: 120440300
Tested-By: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarQuentin Perret <qperret@google.com>
Reviewed-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Reviewed-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20191211113851.24241-3-valentin.schneider@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
(cherry picked from commit 686516b55e98edf18c2a02d36aaaa6f4c0f6c39c)
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Change-Id: I8c3a191ef6ebae6b76521321ee911e9b9e4eda45
parent 6966eb9e

kernel/sched/core.c

+3 −3
Original line number Diff line number Diff line
@@ -919,17 +919,17 @@ uclamp_eff_get(struct task_struct *p, enum uclamp_id clamp_id) 
	return uc_req;

}



unsigned int uclamp_eff_value(struct task_struct *p, enum uclamp_id clamp_id)

unsigned long uclamp_eff_value(struct task_struct *p, enum uclamp_id clamp_id)

{

	struct uclamp_se uc_eff;



	/* Task currently refcounted: use back-annotated (effective) value */

	if (p->uclamp[clamp_id].active)

		return p->uclamp[clamp_id].value;

		return (unsigned long)p->uclamp[clamp_id].value;



	uc_eff = uclamp_eff_get(p, clamp_id);



	return uc_eff.value;

	return (unsigned long)uc_eff.value;

}



/*

kernel/sched/sched.h

+7 −7
Original line number Diff line number Diff line
@@ -2328,14 +2328,14 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {} 
#endif /* CONFIG_CPU_FREQ */



#ifdef CONFIG_UCLAMP_TASK

unsigned int uclamp_eff_value(struct task_struct *p, enum uclamp_id clamp_id);

unsigned long uclamp_eff_value(struct task_struct *p, enum uclamp_id clamp_id);



static __always_inline

unsigned int uclamp_util_with(struct rq *rq, unsigned int util,

unsigned long uclamp_util_with(struct rq *rq, unsigned long util,

			       struct task_struct *p)

{

	unsigned int min_util = READ_ONCE(rq->uclamp[UCLAMP_MIN].value);

	unsigned int max_util = READ_ONCE(rq->uclamp[UCLAMP_MAX].value);

	unsigned long min_util = READ_ONCE(rq->uclamp[UCLAMP_MIN].value);

	unsigned long max_util = READ_ONCE(rq->uclamp[UCLAMP_MAX].value);



	if (p) {

		min_util = max(min_util, uclamp_eff_value(p, UCLAMP_MIN));
@@ -2358,7 +2358,7 @@ static inline bool uclamp_boosted(struct task_struct *p) 
	return uclamp_eff_value(p, UCLAMP_MIN) > 0;

}

#else /* CONFIG_UCLAMP_TASK */

static inline unsigned int uclamp_util_with(struct rq *rq, unsigned int util,

static inline unsigned long uclamp_util_with(struct rq *rq, unsigned long util,

					     struct task_struct *p)

{

	return util;