diff options
| author | Tejun Heo <tj@kernel.org> | 2026-07-17 21:42:18 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-07-17 21:50:21 -1000 |
| commit | 7c2cd767705d60287a6683b24fe22c7bdb73229d (patch) | |
| tree | 3b4711722f064ad0f19f50d7bf5061ebaa4e2fe2 /include/linux | |
| parent | 8946dbd3aa91acfb75b1633859290ba248e313b2 (diff) | |
| parent | 5cdc928598095b2c7d5f265e5f21eadd1634bfbe (diff) | |
Merge branch 'for-7.2-fixes' into for-7.3
Pull to receive:
477869bfafea ("sched_ext: Reject setting disallow from init_task outside the enable path")
5f8b69642d18 ("sched_ext: Take cgroup_lock() first in scx_cgroup_lock()")
8c13364db9c9 ("sched_ext: Skip sub-disable teardown for never-linked sub-schedulers")
5cdc92859809 ("sched_ext: Don't enable non-ext tasks in the sub-sched task loops")
as dependencies for the upcoming cgroup migration patchset and to
resolve the conflicts with the ext.c/sub.c split on for-7.3.
5f8b69642d18 comments scx_cgroup_lock() which for-7.3 exported for
sub.c. Resolved by keeping the exported version with the comment.
8c13364db9c9 and 5cdc92859809 patch the pre-split sub-sched enable and
disable paths in ext.c which for-7.3 moved to sub.c. Resolved by
applying the never-linked teardown skip and the class gates to sub.c.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched/ext.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/sched/ext.h b/include/linux/sched/ext.h index 803da0f1e509..cce42b21f5f5 100644 --- a/include/linux/sched/ext.h +++ b/include/linux/sched/ext.h @@ -265,11 +265,11 @@ struct sched_ext_entity { * to %SCHED_EXT with -%EACCES. * * Can be set from ops.init_task() while the BPF scheduler is being - * loaded (!scx_init_task_args->fork). If set and the task's policy is - * already %SCHED_EXT, the task's policy is rejected and forcefully - * reverted to %SCHED_NORMAL. The number of such events are reported - * through /sys/kernel/debug/sched_ext::nr_rejected. Setting this flag - * during fork is not allowed. + * loaded. If set and the task's policy is already %SCHED_EXT, the + * task's policy is rejected and forcefully reverted to %SCHED_NORMAL. + * The number of such events are reported through + * /sys/kernel/sched_ext/nr_rejected. Setting this flag from any other + * ops.init_task() invocation, such as during fork, fails the scheduler. */ bool disallow; /* reject switching into SCX */ |