Pull RCU selftest fixes from Boqun Feng: "Fix a regression in RCU torture test pre-defined scenarios caused by commit 7dadeaa6e851 ("sched: Further restrict the preemption modes") which limits PREEMPT_NONE to architectures that do not support preemption at all and PREEMPT_VOLUNTARY to those architectures that do not yet have PREEMPT_LAZY support. Since major architectures (e.g. x86 and arm64) no longer support CONFIG_PREEMPT_NONE and CONFIG_PREEMPT_VOLUNTARY, using them in rcutorture, rcuscale, refscale, and scftorture pre-defined scenarios causes config checking errors. Switch these kconfigs to PREEMPT_LAZY" * tag 'rcu-fixes.v7.0-20260307a' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux: scftorture: Update due to x86 not supporting none/voluntary preemption refscale: Update due to x86 not supporting none/voluntary preemption rcuscale: Update due to x86 not supporting none/voluntary preemption rcutorture: Update due to x86 not supporting none/voluntary preemption
Unified · Split
| @@ -2,7 +2,9 @@ CONFIG_RCU_TRACE=n · 1 unmodified line | |||
| 2 | CONFIG_SMP=y | 2 | CONFIG_SMP=y |
| 3 | CONFIG_NR_CPUS=4 | 3 | CONFIG_NR_CPUS=4 |
| 4 | CONFIG_HOTPLUG_CPU=y | 4 | CONFIG_HOTPLUG_CPU=y |
| 5 | CONFIG_PREEMPT_NONE=y | 5 | CONFIG_PREEMPT_DYNAMIC=n |
| 6 | CONFIG_PREEMPT_LAZY=y | ||
| 7 | CONFIG_PREEMPT_NONE=n | ||
| 6 | CONFIG_PREEMPT_VOLUNTARY=n | 8 | CONFIG_PREEMPT_VOLUNTARY=n |
| 7 | CONFIG_PREEMPT=n | 9 | CONFIG_PREEMPT=n |
| 8 | #CHECK#CONFIG_RCU_EXPERT=n | 10 | #CHECK#CONFIG_RCU_EXPERT=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -7,4 +8,3 @@ CONFIG_PREEMPT_DYNAMIC=n · 1 unmodified line | |||
| 7 | CONFIG_RCU_TRACE=n | 8 | CONFIG_RCU_TRACE=n |
| 8 | CONFIG_DEBUG_LOCK_ALLOC=n | 9 | CONFIG_DEBUG_LOCK_ALLOC=n |
| 9 | CONFIG_DEBUG_OBJECTS_RCU_HEAD=n | 10 | CONFIG_DEBUG_OBJECTS_RCU_HEAD=n |
| 10 | CONFIG_PREEMPT_COUNT=n | ||
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -11,4 +12,3 @@ CONFIG_RCU_TRACE=n · 5 unmodified lines | |||
| 11 | #CHECK#CONFIG_RCU_STALL_COMMON=n | 12 | #CHECK#CONFIG_RCU_STALL_COMMON=n |
| 12 | CONFIG_DEBUG_LOCK_ALLOC=n | 13 | CONFIG_DEBUG_LOCK_ALLOC=n |
| 13 | CONFIG_DEBUG_OBJECTS_RCU_HEAD=n | 14 | CONFIG_DEBUG_OBJECTS_RCU_HEAD=n |
| 14 | CONFIG_PREEMPT_COUNT=n | ||
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,7 +1,8 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_NR_CPUS=5 | 2 | CONFIG_NR_CPUS=5 |
| 3 | CONFIG_HOTPLUG_CPU=y | 3 | CONFIG_HOTPLUG_CPU=y |
| 4 | CONFIG_PREEMPT_NONE=y | 4 | CONFIG_PREEMPT_LAZY=y |
| 5 | CONFIG_PREEMPT_NONE=n | ||
| 5 | CONFIG_PREEMPT_VOLUNTARY=n | 6 | CONFIG_PREEMPT_VOLUNTARY=n |
| 6 | CONFIG_PREEMPT=n | 7 | CONFIG_PREEMPT=n |
| 7 | CONFIG_PREEMPT_DYNAMIC=n | 8 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,10 +1,12 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_NR_CPUS=8 | 2 | CONFIG_NR_CPUS=8 |
| 3 | CONFIG_PREEMPT_LAZY=y | ||
| 3 | CONFIG_PREEMPT_NONE=n | 4 | CONFIG_PREEMPT_NONE=n |
| 4 | CONFIG_PREEMPT_VOLUNTARY=y | 5 | CONFIG_PREEMPT_VOLUNTARY=n |
| 5 | CONFIG_PREEMPT=n | 6 | CONFIG_PREEMPT=n |
| 6 | CONFIG_PREEMPT_DYNAMIC=n | 7 | CONFIG_PREEMPT_DYNAMIC=n |
| 7 | #CHECK#CONFIG_TREE_RCU=y | 8 | #CHECK#CONFIG_TREE_RCU=y |
| 9 | #CHECK#CONFIG_PREEMPT_RCU=n | ||
| 8 | CONFIG_HZ_PERIODIC=n | 10 | CONFIG_HZ_PERIODIC=n |
| 9 | CONFIG_NO_HZ_IDLE=n | 11 | CONFIG_NO_HZ_IDLE=n |
| 10 | CONFIG_NO_HZ_FULL=y | 12 | CONFIG_NO_HZ_FULL=y |
| @@ -1,6 +1,8 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_NR_CPUS=8 | 2 | CONFIG_NR_CPUS=8 |
| 3 | CONFIG_PREEMPT_NONE=y | 3 | CONFIG_PREEMPT_DYNAMIC=n |
| 4 | CONFIG_PREEMPT_LAZY=y | ||
| 5 | CONFIG_PREEMPT_NONE=n | ||
| 4 | CONFIG_PREEMPT_VOLUNTARY=n | 6 | CONFIG_PREEMPT_VOLUNTARY=n |
| 5 | CONFIG_PREEMPT=n | 7 | CONFIG_PREEMPT=n |
| 6 | #CHECK#CONFIG_TREE_RCU=y | 8 | #CHECK#CONFIG_TREE_RCU=y |
| @@ -1,9 +1,12 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_NR_CPUS=8 | 2 | CONFIG_NR_CPUS=8 |
| 3 | CONFIG_PREEMPT_NONE=y | 3 | CONFIG_PREEMPT_DYNAMIC=n |
| 4 | CONFIG_PREEMPT_LAZY=y | ||
| 5 | CONFIG_PREEMPT_NONE=n | ||
| 4 | CONFIG_PREEMPT_VOLUNTARY=n | 6 | CONFIG_PREEMPT_VOLUNTARY=n |
| 5 | CONFIG_PREEMPT=n | 7 | CONFIG_PREEMPT=n |
| 6 | #CHECK#CONFIG_TREE_RCU=y | 8 | #CHECK#CONFIG_TREE_RCU=y |
| 9 | #CHECK#CONFIG_PREEMPT_RCU=n | ||
| 7 | CONFIG_HZ_PERIODIC=n | 10 | CONFIG_HZ_PERIODIC=n |
| 8 | CONFIG_NO_HZ_IDLE=y | 11 | CONFIG_NO_HZ_IDLE=y |
| 9 | CONFIG_NO_HZ_FULL=n | 12 | CONFIG_NO_HZ_FULL=n |
| @@ -6,6 +6,7 @@ CONFIG_PREEMPT_VOLUNTARY=n · 5 unmodified lines | |||
| 6 | CONFIG_PREEMPT=n | 6 | CONFIG_PREEMPT=n |
| 7 | CONFIG_PREEMPT_DYNAMIC=n | 7 | CONFIG_PREEMPT_DYNAMIC=n |
| 8 | #CHECK#CONFIG_TREE_RCU=y | 8 | #CHECK#CONFIG_TREE_RCU=y |
| 9 | CONFIG_PREEMPT_RCU=n | ||
| 9 | CONFIG_HZ_PERIODIC=n | 10 | CONFIG_HZ_PERIODIC=n |
| 10 | CONFIG_NO_HZ_IDLE=y | 11 | CONFIG_NO_HZ_IDLE=y |
| 11 | CONFIG_NO_HZ_FULL=n | 12 | CONFIG_NO_HZ_FULL=n |
| @@ -1,6 +1,8 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_NR_CPUS=8 | 2 | CONFIG_NR_CPUS=8 |
| 3 | CONFIG_PREEMPT_NONE=y | 3 | CONFIG_PREEMPT_DYNAMIC=n |
| 4 | CONFIG_PREEMPT_LAZY=y | ||
| 5 | CONFIG_PREEMPT_NONE=n | ||
| 4 | CONFIG_PREEMPT_VOLUNTARY=n | 6 | CONFIG_PREEMPT_VOLUNTARY=n |
| 5 | CONFIG_PREEMPT=n | 7 | CONFIG_PREEMPT=n |
| 6 | CONFIG_HZ_PERIODIC=n | 8 | CONFIG_HZ_PERIODIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=n | 1 | CONFIG_SMP=n |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |
| @@ -1,5 +1,6 @@ | |||
| 1 | CONFIG_SMP=y | 1 | CONFIG_SMP=y |
| 2 | CONFIG_PREEMPT_NONE=y | 2 | CONFIG_PREEMPT_LAZY=y |
| 3 | CONFIG_PREEMPT_NONE=n | ||
| 3 | CONFIG_PREEMPT_VOLUNTARY=n | 4 | CONFIG_PREEMPT_VOLUNTARY=n |
| 4 | CONFIG_PREEMPT=n | 5 | CONFIG_PREEMPT=n |
| 5 | CONFIG_PREEMPT_DYNAMIC=n | 6 | CONFIG_PREEMPT_DYNAMIC=n |