Merge branch 'for-7.0-fixes' into for-7.1

Browse source

Conflict in kernel/sched/ext.c init_sched_ext_class() between:

  415cb193bb ("sched_ext: Fix SCX_KICK_WAIT deadlock by deferring wait
  to balance callback")

which adds cpus_to_sync cpumask allocation, and:

  84b1a0ea0b ("sched_ext: Implement scx_bpf_dsq_reenq() for user DSQs")
  8c1b9453fd ("sched_ext: Convert deferred_reenq_locals from llist to
  regular list")

which add deferred_reenq init code at the same location. Both are
independent additions. Include both.

Signed-off-by: Tejun Heo <tj@kernel.org>

...

This commit is contained in:

Tejun Heo 2026-03-30 08:52:33 -10:00

parent 238aa43f0b 090d34f0f0

commit 94555ca6d0

6 changed files with 337 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

95

kernel/sched/ext.c

View file

2

kernel/sched/ext_idle.c

View file

3

kernel/sched/sched.h

View file

1

tools/testing/selftests/sched_ext/Makefile

View file

68

tools/testing/selftests/sched_ext/cyclic_kick_wait.bpf.c

View file

194

tools/testing/selftests/sched_ext/cyclic_kick_wait.c

View file