sched/uclamp: Rename uclamp_util_with() into uclamp_rq_util_with() (d2b58a28) · Commits · 戴 / test

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(). Tested-By:

Dietmar Eggemann <dietmar.eggemann@arm.com> Signed-off-by:

Valentin Schneider <valentin.schneider@arm.com> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by:

Quentin Perret <qperret@google.com> Reviewed-by:

Vincent Guittot <vincent.guittot@linaro.org> Reviewed-by:

Dietmar 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:

Ingo Molnar <mingo@kernel.org>

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
		@@ -2303,7 +2303,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);
		@@ -2325,7 +2325,8 @@ unsigned long uclamp_util_with(struct rq *rq, unsigned long util,
		return clamp(util, min_util, max_util);
		}
		#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;

Admin message