bpf: sched_ext: Mark ops argument container pointer fields as trusted
Subsystems (3)
Tejun Heo
reviewerPATCH 1/1 bpf: sched_ext: Mark ops argument container pointer fields as trusted
Walking an unannotated pointer field of a trusted struct yields a bare PTR_TO_BTF_ID in non-sleepable programs, which kfuncs and helpers accept, but PTR_UNTRUSTED in sleepable programs, which they reject. This gets in the way of making ops.init_task() sleepable, which schedulers want for allocations. For example, passing args->cgroup into bpf_cgrp_storage_get() then fails verification and the only recourse is round-tripping through the cgroup ID with bpf_cgroup_from_id().
The pointer fields in the sched_ext ops argument containers are all pinned by the callers for the duration of the ops calls and are never NULL. Add them to the verifier's trusted-fields whitelist so that they are PTR_TRUSTED in both sleepable and non-sleepable programs.
--- kernel/bpf/verifier.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
kernel/bpf/verifier.c +26 -0
@@ -5661,6 +5661,28 @@ BTF_TYPE_SAFE_TRUSTED(struct file) {struct inode *f_inode; }; +/* +* The pointer fields in the sched_ext ops argument containers are pinned by the +* callers for the duration of the ops calls and are never NULL. +*/ +BTF_TYPE_SAFE_TRUSTED(struct scx_init_task_args) { +#ifdef CONFIG_EXT_GROUP_SCHED +struct cgroup *cgroup; +#endif +}; + +BTF_TYPE_SAFE_TRUSTED(struct scx_cpu_release_args) { +struct task_struct *task; +}; + +BTF_TYPE_SAFE_TRUSTED(struct scx_sub_attach_args) { +struct sched_ext_ops *ops; +}; + +BTF_TYPE_SAFE_TRUSTED(struct scx_sub_detach_args) { +struct sched_ext_ops *ops; +}; + BTF_TYPE_SAFE_TRUSTED_OR_NULL(struct dentry) {struct inode *d_inode; };
@@ -5705,6 +5727,10 @@ static bool type_is_trusted(struct bpf_vBTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct bpf_iter__task ));BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct linux_binprm ));BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct file )); +BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct scx_init_task_args )); +BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct scx_cpu_release_args )); +BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct scx_sub_attach_args )); +BTF_TYPE_EMIT (BTF_TYPE_SAFE_TRUSTED(struct scx_sub_detach_args ));return btf_nested_type_is_trusted (&env->log, reg, field_name, btf_id,"__safe_trusted" ); }
[email protected]
AI reviewThis looks like a bug fix for verification failures in sleepable programs. Should this include:
Quoted 10 lines
bpf:
sched_ext: Mark ops argument container pointer fields as trustedWalking an unannotated pointer field of a trusted struct yields a bare
PTR_TO_BTF_IDin non-sleepable programs, which kfuncs and helpers accept, butPTR_UNTRUSTEDin sleepable programs, which they reject. This gets in the way of makingops.init_task()sleepable, which schedulers want for allocations. For example, passingargs->cgroupintobpf_cgrp_storage_get()then fails verification and the only recourse is round-tripping through the cgroup ID withbpf_cgroup_from_id().
Quoted 6 lines
The pointer fields in the
sched_extops argument containers are all pinned by the callers for the duration of the ops calls and are never NULL. Add them to the verifier's trusted-fields whitelist so that they arePTR_TRUSTEDin both sleepable and non-sleepable programs.Signed-off-by Tejun Heo <[email protected]>
This looks like a bug fix for verification failures in sleepable programs. Should this include:
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/32336047878
Tejun Heo
reviewerQuoted 15 lines · On Thu, Aug 20, 2026 at 06:16:48AM +0000, [email protected] wrote:
Quoted 15 lines
bpf:
sched_ext: Mark ops argument container pointer fields as trustedWalking an unannotated pointer field of a trusted struct yields a bare
PTR_TO_BTF_IDin non-sleepable programs, which kfuncs and helpers accept, butPTR_UNTRUSTEDin sleepable programs, which they reject. This gets in the way of makingops.init_task()sleepable, which schedulers want for allocations. For example, passingargs->cgroupintobpf_cgrp_storage_get()then fails verification and the only recourse is round-tripping through the cgroup ID withbpf_cgroup_from_id().The pointer fields in the
sched_extops argument containers are all pinned by the callers for the duration of the ops calls and are never NULL. Add them to the verifier's trusted-fields whitelist so that they arePTR_TRUSTEDin both sleepable and non-sleepable programs.
Quoted 6 lines
Quoted 1 line
Signed-off-by Tejun Heo <[email protected]>This looks like a bug fix for verification failures in sleepable programs. Should this include:
Fixes 8195136669661 ("sched_ext: Add cgroup support")
Nothing has been using it, so not strictly necessary but yeah I don't see why not.
Thanks.
Signature · 1 line
tejun
Quoted 8 lines · Tejun Heo
Walking an unannotated pointer field of a trusted struct yields a bare
PTR_TO_BTF_IDin non-sleepable programs, which kfuncs and helpers accept, butPTR_UNTRUSTEDin sleepable programs, which they reject. This gets in the way of makingops.init_task()sleepable, which schedulers want for allocations. For example, passingargs->cgroupintobpf_cgrp_storage_get()then fails verification and the only recourse is round-tripping through the cgroup ID withbpf_cgroup_from_id().
Quoted 7 lines
The pointer fields in the
sched_extops argument containers are all pinned by the callers for the duration of the ops calls and are never NULL. Add them to the verifier's trusted-fields whitelist so that they arePTR_TRUSTEDin both sleepable and non-sleepable programs.Signed-off-by Tejun Heo <[email protected]>---
I (or others) will add Fixes tag when applying, no need to respin.
Quoted 1 line
[...]
This patch was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Quoted 9 lines · On Wed, 19 Aug 2026 19:20:21 -1000 you wrote:
Walking an unannotated pointer field of a trusted struct yields a bare
PTR_TO_BTF_IDin non-sleepable programs, which kfuncs and helpers accept, butPTR_UNTRUSTEDin sleepable programs, which they reject. This gets in the way of makingops.init_task()sleepable, which schedulers want for allocations. For example, passingargs->cgroupintobpf_cgrp_storage_get()then fails verification and the only recourse is round-tripping through the cgroup ID withbpf_cgroup_from_id().[...]
Here is the summary with links:
- [bpf-next] bpf: sched_ext: Mark ops argument container pointer fields as trusted
https://git.kernel.org/bpf/bpf-next/c/aed1bf1a352a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html