Skip to content

Commit e719e17

Browse files
committed
sched_ext: Warn on task-based SCX op recursion
The kf_tasks[] design assumes task-based SCX ops don't nest - if they did, kf_tasks[0] would get clobbered. The old scx_kf_allow() WARN_ONCE caught invalid nesting via kf_mask, but that machinery is gone now. Add a WARN_ON_ONCE(current->scx.kf_tasks[0]) at the top of each SCX_CALL_OP_TASK*() macro. Checking kf_tasks[0] alone is sufficient: all three variants (SCX_CALL_OP_TASK, SCX_CALL_OP_TASK_RET, SCX_CALL_OP_2TASKS_RET) write to kf_tasks[0], so a non-NULL value at entry to any of the three means re-entry from somewhere in the family. Signed-off-by: Tejun Heo <[email protected]> Acked-by: Andrea Righi <[email protected]>
1 parent 979a98b commit e719e17

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

kernel/sched/ext.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,10 +502,13 @@ do { \
502502
* held by try_to_wake_up() with rq tracking via scx_rq.in_select_cpu. So if
503503
* kf_tasks[] is set, @p's scheduler-protected fields are stable.
504504
*
505-
* These macros only work for non-nesting ops since kf_tasks[] is not stacked.
505+
* kf_tasks[] can not stack, so task-based SCX ops must not nest. The
506+
* WARN_ON_ONCE() in each macro catches a re-entry of any of the three variants
507+
* while a previous one is still in progress.
506508
*/
507509
#define SCX_CALL_OP_TASK(sch, op, rq, task, args...) \
508510
do { \
511+
WARN_ON_ONCE(current->scx.kf_tasks[0]); \
509512
current->scx.kf_tasks[0] = task; \
510513
SCX_CALL_OP((sch), op, rq, task, ##args); \
511514
current->scx.kf_tasks[0] = NULL; \
@@ -514,6 +517,7 @@ do { \
514517
#define SCX_CALL_OP_TASK_RET(sch, op, rq, task, args...) \
515518
({ \
516519
__typeof__((sch)->ops.op(task, ##args)) __ret; \
520+
WARN_ON_ONCE(current->scx.kf_tasks[0]); \
517521
current->scx.kf_tasks[0] = task; \
518522
__ret = SCX_CALL_OP_RET((sch), op, rq, task, ##args); \
519523
current->scx.kf_tasks[0] = NULL; \
@@ -523,6 +527,7 @@ do { \
523527
#define SCX_CALL_OP_2TASKS_RET(sch, op, rq, task0, task1, args...) \
524528
({ \
525529
__typeof__((sch)->ops.op(task0, task1, ##args)) __ret; \
530+
WARN_ON_ONCE(current->scx.kf_tasks[0]); \
526531
current->scx.kf_tasks[0] = task0; \
527532
current->scx.kf_tasks[1] = task1; \
528533
__ret = SCX_CALL_OP_RET((sch), op, rq, task0, task1, ##args); \

0 commit comments

Comments
 (0)