Skip to content

Commit d79944b

Browse files
committed
Merge tag 'sched_ext-for-6.12-rc7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext
Pull sched_ext fix from Tejun Heo: "One more fix for v6.12-rc7 ops.cpu_acquire() was being invoked with the wrong kfunc mask allowing the operation to call kfuncs which shouldn't be allowed. Fix it by using SCX_KF_REST instead, which is trivial and low risk" * tag 'sched_ext-for-6.12-rc7-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext: sched_ext: ops.cpu_acquire() should be called with SCX_KF_REST
2 parents c9dd457 + a4af89c commit d79944b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/sched/ext.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2645,7 +2645,7 @@ static int balance_one(struct rq *rq, struct task_struct *prev)
26452645
* emitted in scx_next_task_picked().
26462646
*/
26472647
if (SCX_HAS_OP(cpu_acquire))
2648-
SCX_CALL_OP(0, cpu_acquire, cpu_of(rq), NULL);
2648+
SCX_CALL_OP(SCX_KF_REST, cpu_acquire, cpu_of(rq), NULL);
26492649
rq->scx.cpu_released = false;
26502650
}
26512651

0 commit comments

Comments
 (0)