Commit 5fca5a4c authored by Xuewen Yan's avatar Xuewen Yan Committed by Ingo Molnar
Browse files

sched/uclamp: Use the uclamp_is_used() helper instead of open-coding it 



Don't open-code static_branch_unlikely(&sched_uclamp_used), we have
the uclamp_is_used() wrapper around it.

[ mingo: Clean up the changelog ]

Signed-off-by: default avatarXuewen Yan <xuewen.yan@unisoc.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarHongyan Xia <hongyan.xia2@arm.com>
Reviewed-by: default avatarChristian Loehle <christian.loehle@arm.com>
Reviewed-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20250219093747.2612-1-xuewen.yan@unisoc.com
parent e6644c96

kernel/sched/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1756,7 +1756,7 @@ static inline void uclamp_rq_inc(struct rq *rq, struct task_struct *p) 
	 * The condition is constructed such that a NOP is generated when

	 * sched_uclamp_used is disabled.

	 */

	if (!static_branch_unlikely(&sched_uclamp_used))

	if (!uclamp_is_used())

		return;



	if (unlikely(!p->sched_class->uclamp_enabled))
@@ -1783,7 +1783,7 @@ static inline void uclamp_rq_dec(struct rq *rq, struct task_struct *p) 
	 * The condition is constructed such that a NOP is generated when

	 * sched_uclamp_used is disabled.

	 */

	if (!static_branch_unlikely(&sched_uclamp_used))

	if (!uclamp_is_used())

		return;



	if (unlikely(!p->sched_class->uclamp_enabled))

kernel/sched/sched.h

+14 −14
Original line number Diff line number Diff line
@@ -3394,6 +3394,19 @@ static inline bool update_other_load_avgs(struct rq *rq) { return false; } 


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



/*

 * When uclamp is compiled in, the aggregation at rq level is 'turned off'

 * by default in the fast path and only gets turned on once userspace performs

 * an operation that requires it.

 *

 * Returns true if userspace opted-in to use uclamp and aggregation at rq level

 * hence is active.

 */

static inline bool uclamp_is_used(void)

{

	return static_branch_likely(&sched_uclamp_used);

}



static inline unsigned long uclamp_rq_get(struct rq *rq,

					  enum uclamp_id clamp_id)

{
@@ -3417,7 +3430,7 @@ static inline bool uclamp_rq_is_capped(struct rq *rq) 
	unsigned long rq_util;

	unsigned long max_util;



	if (!static_branch_likely(&sched_uclamp_used))

	if (!uclamp_is_used())

		return false;



	rq_util = cpu_util_cfs(cpu_of(rq)) + cpu_util_rt(rq);
@@ -3426,19 +3439,6 @@ static inline bool uclamp_rq_is_capped(struct rq *rq) 
	return max_util != SCHED_CAPACITY_SCALE && rq_util >= max_util;

}



/*

 * When uclamp is compiled in, the aggregation at rq level is 'turned off'

 * by default in the fast path and only gets turned on once userspace performs

 * an operation that requires it.

 *

 * Returns true if userspace opted-in to use uclamp and aggregation at rq level

 * hence is active.

 */

static inline bool uclamp_is_used(void)

{

	return static_branch_likely(&sched_uclamp_used);

}



#define for_each_clamp_id(clamp_id) \

	for ((clamp_id) = 0; (clamp_id) < UCLAMP_CNT; (clamp_id)++)