Skip to content

Commit 03dcad7

Browse files
torvaldstorvalds
committed
Merge tag 'rcu-fixes.v7.0-20260307a' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux
Pull RCU selftest fixes from Boqun Feng: "Fix a regression in RCU torture test pre-defined scenarios caused by commit 7dadeaa ("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
2 parents aed0af0 + 78c2ce0 commit 03dcad7

17 files changed

Lines changed: 39 additions & 18 deletions

File tree

‎tools/testing/selftests/rcutorture/configs/rcu/SRCU-N‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ CONFIG_RCU_TRACE=n
22
CONFIG_SMP=y
33
CONFIG_NR_CPUS=4
44
CONFIG_HOTPLUG_CPU=y
5-
CONFIG_PREEMPT_NONE=y
5+
CONFIG_PREEMPT_DYNAMIC=n
6+
CONFIG_PREEMPT_LAZY=y
7+
CONFIG_PREEMPT_NONE=n
68
CONFIG_PREEMPT_VOLUNTARY=n
79
CONFIG_PREEMPT=n
810
#CHECK#CONFIG_RCU_EXPERT=n

‎tools/testing/selftests/rcutorture/configs/rcu/SRCU-T‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_SMP=n
2-
CONFIG_PREEMPT_NONE=y
2+
CONFIG_PREEMPT_LAZY=y
3+
CONFIG_PREEMPT_NONE=n
34
CONFIG_PREEMPT_VOLUNTARY=n
45
CONFIG_PREEMPT=n
56
CONFIG_PREEMPT_DYNAMIC=n

‎tools/testing/selftests/rcutorture/configs/rcu/SRCU-U‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
CONFIG_SMP=n
2-
CONFIG_PREEMPT_NONE=y
2+
CONFIG_PREEMPT_LAZY=y
3+
CONFIG_PREEMPT_NONE=n
34
CONFIG_PREEMPT_VOLUNTARY=n
45
CONFIG_PREEMPT=n
56
CONFIG_PREEMPT_DYNAMIC=n
67
#CHECK#CONFIG_TINY_SRCU=y
78
CONFIG_RCU_TRACE=n
89
CONFIG_DEBUG_LOCK_ALLOC=n
910
CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
10-
CONFIG_PREEMPT_COUNT=n

‎tools/testing/selftests/rcutorture/configs/rcu/TASKS02‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_SMP=n
2-
CONFIG_PREEMPT_NONE=y
2+
CONFIG_PREEMPT_LAZY=y
3+
CONFIG_PREEMPT_NONE=n
34
CONFIG_PREEMPT_VOLUNTARY=n
45
CONFIG_PREEMPT=n
56
CONFIG_PREEMPT_DYNAMIC=n

‎tools/testing/selftests/rcutorture/configs/rcu/TINY01‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_SMP=n
2-
CONFIG_PREEMPT_NONE=y
2+
CONFIG_PREEMPT_LAZY=y
3+
CONFIG_PREEMPT_NONE=n
34
CONFIG_PREEMPT_VOLUNTARY=n
45
CONFIG_PREEMPT=n
56
CONFIG_PREEMPT_DYNAMIC=n
@@ -11,4 +12,3 @@ CONFIG_RCU_TRACE=n
1112
#CHECK#CONFIG_RCU_STALL_COMMON=n
1213
CONFIG_DEBUG_LOCK_ALLOC=n
1314
CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
14-
CONFIG_PREEMPT_COUNT=n

‎tools/testing/selftests/rcutorture/configs/rcu/TINY02‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_SMP=n
2-
CONFIG_PREEMPT_NONE=y
2+
CONFIG_PREEMPT_LAZY=y
3+
CONFIG_PREEMPT_NONE=n
34
CONFIG_PREEMPT_VOLUNTARY=n
45
CONFIG_PREEMPT=n
56
CONFIG_PREEMPT_DYNAMIC=n

‎tools/testing/selftests/rcutorture/configs/rcu/TRACE01‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
CONFIG_SMP=y
22
CONFIG_NR_CPUS=5
33
CONFIG_HOTPLUG_CPU=y
4-
CONFIG_PREEMPT_NONE=y
4+
CONFIG_PREEMPT_LAZY=y
5+
CONFIG_PREEMPT_NONE=n
56
CONFIG_PREEMPT_VOLUNTARY=n
67
CONFIG_PREEMPT=n
78
CONFIG_PREEMPT_DYNAMIC=n

‎tools/testing/selftests/rcutorture/configs/rcu/TREE04‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
CONFIG_SMP=y
22
CONFIG_NR_CPUS=8
3+
CONFIG_PREEMPT_LAZY=y
34
CONFIG_PREEMPT_NONE=n
4-
CONFIG_PREEMPT_VOLUNTARY=y
5+
CONFIG_PREEMPT_VOLUNTARY=n
56
CONFIG_PREEMPT=n
67
CONFIG_PREEMPT_DYNAMIC=n
78
#CHECK#CONFIG_TREE_RCU=y
9+
#CHECK#CONFIG_PREEMPT_RCU=n
810
CONFIG_HZ_PERIODIC=n
911
CONFIG_NO_HZ_IDLE=n
1012
CONFIG_NO_HZ_FULL=y

‎tools/testing/selftests/rcutorture/configs/rcu/TREE05‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
CONFIG_SMP=y
22
CONFIG_NR_CPUS=8
3-
CONFIG_PREEMPT_NONE=y
3+
CONFIG_PREEMPT_DYNAMIC=n
4+
CONFIG_PREEMPT_LAZY=y
5+
CONFIG_PREEMPT_NONE=n
46
CONFIG_PREEMPT_VOLUNTARY=n
57
CONFIG_PREEMPT=n
68
#CHECK#CONFIG_TREE_RCU=y

‎tools/testing/selftests/rcutorture/configs/rcu/TREE06‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
CONFIG_SMP=y
22
CONFIG_NR_CPUS=8
3-
CONFIG_PREEMPT_NONE=y
3+
CONFIG_PREEMPT_DYNAMIC=n
4+
CONFIG_PREEMPT_LAZY=y
5+
CONFIG_PREEMPT_NONE=n
46
CONFIG_PREEMPT_VOLUNTARY=n
57
CONFIG_PREEMPT=n
68
#CHECK#CONFIG_TREE_RCU=y
9+
#CHECK#CONFIG_PREEMPT_RCU=n
710
CONFIG_HZ_PERIODIC=n
811
CONFIG_NO_HZ_IDLE=y
912
CONFIG_NO_HZ_FULL=n

0 commit comments

Comments
 (0)