diff options
| author | Tejun Heo <tj@kernel.org> | 2026-10-17 05:35:31 -1000 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2026-10-17 05:35:31 -1000 |
| commit | db87a8f530b62d43033ff41172d479d2ccd6fee3 (patch) | |
| tree | 4455045cbfeb6f5e86eb090388c422021526c43b /tools/perf/scripts/python/stackcollapse.py | |
| parent | 67d0d8d018f35beaa58a5e62a1d9c83414e570cd (diff) | |
| parent | 5809f749fbdbaf9c6b34ecbe6d2b413e56eec6e3 (diff) | |
sched_ext: Merge branch 'for-7.3-fixes' into for-7.4
Pull to receive 30fb2b1e4d41 ("sched_ext: Fix the running task keeping its
protection into bypass") and 5809f749fbdb ("sched_ext: Fix a bypassed task
stalling on a cpu its scheduler has no caps on") and resolve their conflicts
with the proxy execution work here.
Conflicts:
- scx_bypass(): 30fb2b1e4d41 drops the protection strip in the runnable_list
walk, which never sees the running task, and strips rq->curr ahead of the
walk instead. 3d6577ea93c9 ("sched_ext: Split curr|donor references
properly") moved the walk's strip to task_current_donor(), as protection
belongs to the scheduling context. set_next_task_scx() takes the donor off
the runnable_list, so that strip is dead too. Dropped it, and the new
strip takes rq->donor.
- scx_bypass(), merged without a marker: 5809f749fbdb evicts the running
task when bypass lifts if it can't stay on the cpu, on rq->curr.
3d6577ea93c9 moved the cap revoke eviction of the running task in
reenq_local() to rq->donor. The lift eviction takes rq->donor too, and
both comments in the block say the current donor.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/stackcollapse.py')
0 files changed, 0 insertions, 0 deletions
