diff options
| author | Tejun Heo <tj@kernel.org> | 2026-03-07 04:57:53 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-03-07 04:57:53 -1000 |
| commit | f68971bcec23c53979531aab0904afec9b8d0b4a (patch) | |
| tree | ea8cfc7cb10bfa8f4e0a623eec31b5fc51a61e8d /kernel | |
| parent | 4f8b122848dbc353a193de0fa707bc40b5f067ff (diff) | |
| parent | 57ccf5ccdc56954f2a91a7f66684fd31c566bde5 (diff) | |
Merge branch 'for-7.0-fixes' into for-7.1
Pull in 57ccf5ccdc56 ("sched_ext: Fix enqueue_task_scx() truncation of
upper enqueue flags") which conflicts with ebf1ccff79c4 ("sched_ext: Fix
ops.dequeue() semantics").
Signed-off-by: Tejun Heo <tj@kernel.org>
# Conflicts:
# kernel/sched/ext.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/ext.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched/ext.c b/kernel/sched/ext.c index e25b3593dd30..72b7a87f66ec 100644 --- a/kernel/sched/ext.c +++ b/kernel/sched/ext.c @@ -1728,16 +1728,15 @@ static void clr_task_runnable(struct task_struct *p, bool reset_runnable_at) p->scx.flags |= SCX_TASK_RESET_RUNNABLE_AT; } -static void enqueue_task_scx(struct rq *rq, struct task_struct *p, int enq_flags) +static void enqueue_task_scx(struct rq *rq, struct task_struct *p, int core_enq_flags) { struct scx_sched *sch = scx_task_sched(p); int sticky_cpu = p->scx.sticky_cpu; + u64 enq_flags = core_enq_flags | rq->scx.extra_enq_flags; if (enq_flags & ENQUEUE_WAKEUP) rq->scx.flags |= SCX_RQ_IN_WAKEUP; - enq_flags |= rq->scx.extra_enq_flags; - /* * Restoring a running task will be immediately followed by * set_next_task_scx() which expects the task to not be on the BPF |