Skip to contentSkip to conversation

sched_ext: Allow dequeue_task_scx to fail

PATCH Applied Yipeng Zou 2 participants 2 messages Aug 20, 2024 Scheduler

lore
Share & tools
lore

Yipeng Zou

author
#0 lore raw

PATCH 1/1 sched_ext: Allow dequeue_task_scx to fail

Since dequeue_task() allowed to fail, there is a compile error:

kernel/sched/ext.c:3630:19: error: initialization of ‘bool (*)(struct rq*, struct task_struct *, int)’ {aka ‘_Bool (*)(struct rq *, struct task_struct *, int)’} from incompatible pointer type ‘void (*)(struct rq*, struct task_struct *, int)’
3630 | .dequeue_task = dequeue_task_scx,

       |                   ^~~~~~~~~~~~~~~~

Allow dequeue_task_scx to fail too.

Fixes 863ccdbb918a ("sched: Allow sched_class::dequeue_task() to fail")
---
 kernel/sched/ext.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/sched/ext.c +3 -2
index 571a7ea0b5cb..b9bf9ee5ed01 100644
@@ -2033,11 +2033,11 @@ static void ops_dequeue(struct task_struct *p, u64 deq_flags)
 	}
 }
 
-static void dequeue_task_scx(struct rq *rq, struct task_struct *p, int deq_flags)
+static bool dequeue_task_scx(struct rq *rq, struct task_struct *p, int deq_flags)
 {
 	if (!(p->scx.flags & SCX_TASK_QUEUED)) {
 		WARN_ON_ONCE(task_runnable(p));
-		return;
+		return true;
 	}
 
 	ops_dequeue(p, deq_flags);
@@ -2072,6 +2072,7 @@ static void dequeue_task_scx(struct rq *rq, struct task_struct *p, int deq_flags
 	sub_nr_running(rq, 1);
 
 	dispatch_dequeue(rq, p);
+	return true;
 }
 
 static void yield_task_scx(struct rq *rq)
Signature · 1 line
2.34.1
Applied
#1 lore raw
Quoted 10 lines · Yipeng Zou

Since dequeue_task() allowed to fail, there is a compile error:

kernel/sched/ext.c:3630:19: error: initialization of ‘bool (*)(struct rq*, struct task_struct *, int)’ {aka ‘_Bool (*)(struct rq *, struct task_struct *, int)’} from incompatible pointer type ‘void (*)(struct rq*, struct task_struct *, int)’
3630 | .dequeue_task = dequeue_task_scx,

       |                   ^~~~~~~~~~~~~~~~

Allow dequeue_task_scx to fail too.

Fixes 863ccdbb918a ("sched: Allow sched_class::dequeue_task() to fail")

Applied to sched_ext/for-6.12.

Thanks.

Signature · 1 line
tejun