Commit 6ab228ec authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Minor cleanups in kernel/sched/ext.h 



- scx_ops_cpu_preempt is only used in kernel/sched/ext.c and doesn't need to
  be global. Make it static.

- Relocate task_on_scx() so that the inline functions are located together.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid Vernet <void@manifault.com>
parent 9f391f94

kernel/sched/ext.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static bool scx_warned_zero_slice; 


static DEFINE_STATIC_KEY_FALSE(scx_ops_enq_last);

static DEFINE_STATIC_KEY_FALSE(scx_ops_enq_exiting);

DEFINE_STATIC_KEY_FALSE(scx_ops_cpu_preempt);

static DEFINE_STATIC_KEY_FALSE(scx_ops_cpu_preempt);

static DEFINE_STATIC_KEY_FALSE(scx_builtin_idle_enabled);



struct static_key_false scx_has_op[SCX_OPI_END] =

kernel/sched/ext.h

+5 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ DECLARE_STATIC_KEY_FALSE(__scx_switched_all); 
#define scx_enabled()		static_branch_unlikely(&__scx_ops_enabled)

#define scx_switched_all()	static_branch_unlikely(&__scx_switched_all)



DECLARE_STATIC_KEY_FALSE(scx_ops_cpu_preempt);



static inline bool task_on_scx(const struct task_struct *p)

{

	return scx_enabled() && p->sched_class == &ext_sched_class;

}



void scx_tick(struct rq *rq);

void init_scx_entity(struct sched_ext_entity *scx);

void scx_pre_fork(struct task_struct *p);
@@ -54,6 +47,11 @@ static inline u32 scx_cpuperf_target(s32 cpu) 
		return 0;

}



static inline bool task_on_scx(const struct task_struct *p)

{

	return scx_enabled() && p->sched_class == &ext_sched_class;

}



static inline const struct sched_class *next_active_class(const struct sched_class *class)

{

	class++;