Commit 41346d68 authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Make scx_prio_less() handle multiple schedulers 



Call ops.core_sched_before() iff both tasks belong to the same scx_sched.
Otherwise, use timestamp based ordering.

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

kernel/sched/ext.c

+4 −3
Original line number Diff line number Diff line
@@ -2809,16 +2809,17 @@ void ext_server_init(struct rq *rq) 
bool scx_prio_less(const struct task_struct *a, const struct task_struct *b,

		   bool in_fi)

{

	struct scx_sched *sch = scx_root;

	struct scx_sched *sch_a = scx_task_sched(a);

	struct scx_sched *sch_b = scx_task_sched(b);



	/*

	 * The const qualifiers are dropped from task_struct pointers when

	 * calling ops.core_sched_before(). Accesses are controlled by the

	 * verifier.

	 */

	if (SCX_HAS_OP(sch, core_sched_before) &&

	if (sch_a == sch_b && SCX_HAS_OP(sch_a, core_sched_before) &&

	    !scx_rq_bypassing(task_rq(a)))

		return SCX_CALL_OP_2TASKS_RET(sch, SCX_KF_REST, core_sched_before,

		return SCX_CALL_OP_2TASKS_RET(sch_a, SCX_KF_REST, core_sched_before,

					      NULL,

					      (struct task_struct *)a,

					      (struct task_struct *)b);