summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2026-10-09 22:37:05 -1000
committerTejun Heo <tj@kernel.org>2026-10-09 22:37:05 -1000
commit8b3eaeb72e8a2eb8250e67b45e98e02ffcb5bd63 (patch)
treefeac557977b128a6af8fd3fb8926932cde6a26e7 /include
parent0ded98e4c014d8bc9ced2dc7a4d1fb290a594d48 (diff)
parent069403dff337feb192bfc70fb28ddc8a171e20c1 (diff)
downloadlinux-next-8b3eaeb72e8a2eb8250e67b45e98e02ffcb5bd63.tar.gz
linux-next-8b3eaeb72e8a2eb8250e67b45e98e02ffcb5bd63.zip
sched_ext: Merge branch 'for-7.3-fixes' into for-7.4
Pull to receive 069403dff337 ("sched_ext: Fix use-after-free of a destroyed user DSQ by a deferred reenqueue") and point its new cancel sweep in free_dsq_irq_workfn() at dsq->pcpu_user, which 92344fad5b54 ("sched_ext: Skip per-CPU data allocation for built-in DSQs") renamed here, so that for-next builds. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched/ext.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched/ext.h b/include/linux/sched/ext.h
index 23f9e178bc5a..ae696d11dac9 100644
--- a/include/linux/sched/ext.h
+++ b/include/linux/sched/ext.h
@@ -220,6 +220,7 @@ struct sched_ext_entity {
s32 holding_cpu;
s32 selected_cpu;
s32 runnable_cpu; /* cpu @p is runnable on, -1 if not */
+ u32 ops_qseq; /* protected by rq lock */
struct task_struct *kf_tasks[2]; /* see SCX_CALL_OP_TASK() */
struct list_head runnable_node; /* rq->scx.runnable_list */