diff options
| author | Yipeng Zou <zouyipeng@huawei.com> | 2024-08-20 05:45:31 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2024-08-20 22:09:01 +0300 |
| commit | 9ad2861b773d7da1cf3a5a04a4e8f1aa7d092bbb (patch) | |
| tree | 4935ddc2a336432c9b0b39d69d5faa27adc2f014 | |
| parent | 5ac998574f93ac042cb84b4f1d919e2b20966afe (diff) | |
| download | linux-9ad2861b773d7da1cf3a5a04a4e8f1aa7d092bbb.tar.xz | |
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")
Signed-off-by: Yipeng Zou <zouyipeng@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
| -rw-r--r-- | kernel/sched/ext.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index 571a7ea0b5cb..b9bf9ee5ed01 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -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) |