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

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

UPSTREAM: sched/uclamp: Rename uclamp_util_with() into uclamp_rq_util_with() 



The current helper returns (CPU) rq utilization with uclamp restrictions
taken into account. A uclamp task utilization helper would be quite
helpful, but this requires some renaming.

Prepare the code for the introduction of a uclamp_task_util() by renaming
the existing uclamp_util_with() to uclamp_rq_util_with().

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-4-valentin.schneider@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
(cherry picked from commit d2b58a286e89824900d501db0be1d4f6aed474fc)
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Change-Id: I33d3f6ad4faba10da5a0a20a9ecb444cee81d8da
parent fedb670f

kernel/sched/cpufreq_schedutil.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, 
	 */

	util = util_cfs + cpu_util_rt(rq);

	if (type == FREQUENCY_UTIL)

		util = uclamp_util_with(rq, util, p);

		util = uclamp_rq_util_with(rq, util, p);



	dl_util = cpu_util_dl(rq);

kernel/sched/sched.h

+5 −4
Original line number Diff line number Diff line
@@ -2331,7 +2331,7 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {} 
unsigned long uclamp_eff_value(struct task_struct *p, enum uclamp_id clamp_id);



static __always_inline

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

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

				  struct task_struct *p)

{

	unsigned long min_util = READ_ONCE(rq->uclamp[UCLAMP_MIN].value);
@@ -2358,7 +2358,8 @@ static inline bool uclamp_boosted(struct task_struct *p) 
	return uclamp_eff_value(p, UCLAMP_MIN) > 0;

}

#else /* CONFIG_UCLAMP_TASK */

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

static inline

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

				  struct task_struct *p)

{

	return util;