Commit 086ed90a authored by Andrea Righi's avatar Andrea Righi Committed by Tejun Heo
Browse files

sched_ext: Make scx_locked_rq() inline 



scx_locked_rq() is used both from ext.c and ext_idle.c, move it to ext.h
as a static inline function.

No functional changes.

v2: Rename locked_rq to scx_locked_rq_state, expose it and make
    scx_locked_rq() inline, as suggested by Tejun.

Signed-off-by: default avatarAndrea Righi <arighi@nvidia.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent e212743b

kernel/sched/ext.c

+2 −11
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static void scx_kf_disallow(u32 mask) 
 * This allows kfuncs to safely operate on rq from any scx ops callback,

 * knowing which rq is already locked.

 */

static DEFINE_PER_CPU(struct rq *, locked_rq);

DEFINE_PER_CPU(struct rq *, scx_locked_rq_state);



static inline void update_locked_rq(struct rq *rq)

{
@@ -1258,16 +1258,7 @@ static inline void update_locked_rq(struct rq *rq) 
	 */

	if (rq)

		lockdep_assert_rq_held(rq);

	__this_cpu_write(locked_rq, rq);

}



/*

 * Return the rq currently locked from an scx callback, or NULL if no rq is

 * locked.

 */

static inline struct rq *scx_locked_rq(void)

{

	return __this_cpu_read(locked_rq);

	__this_cpu_write(scx_locked_rq_state, rq);

}



#define SCX_CALL_OP(sch, mask, op, rq, args...)					\

kernel/sched/ext.h

+11 −0
Original line number Diff line number Diff line
@@ -20,6 +20,17 @@ static inline bool scx_rq_bypassing(struct rq *rq) 


DECLARE_STATIC_KEY_FALSE(scx_ops_allow_queued_wakeup);



DECLARE_PER_CPU(struct rq *, scx_locked_rq_state);



/*

 * Return the rq currently locked from an scx callback, or NULL if no rq is

 * locked.

 */

static inline struct rq *scx_locked_rq(void)

{

	return __this_cpu_read(scx_locked_rq_state);

}



void scx_tick(struct rq *rq);

void init_scx_entity(struct sched_ext_entity *scx);

void scx_pre_fork(struct task_struct *p);