History

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 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

Linus Torvalds committed 8 months ago

Commit 03dcad72 parents aed0af0 78c2ce017 files · +39 −18Browse files

Unified · Split

17 files
  1. tools/testing/selftests/rcutorture/configs/rcu/SRCU-N +3 −1
  2. tools/testing/selftests/rcutorture/configs/rcu/SRCU-T +2 −1
  3. tools/testing/selftests/rcutorture/configs/rcu/SRCU-U +2 −2
  4. tools/testing/selftests/rcutorture/configs/rcu/TASKS02 +2 −1
  5. tools/testing/selftests/rcutorture/configs/rcu/TINY01 +2 −2
  6. tools/testing/selftests/rcutorture/configs/rcu/TINY02 +2 −1
  7. tools/testing/selftests/rcutorture/configs/rcu/TRACE01 +2 −1
  8. tools/testing/selftests/rcutorture/configs/rcu/TREE04 +3 −1
  9. tools/testing/selftests/rcutorture/configs/rcu/TREE05 +3 −1
  10. tools/testing/selftests/rcutorture/configs/rcu/TREE06 +4 −1
  11. tools/testing/selftests/rcutorture/configs/rcu/TREE10 +1 −0
  12. tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL +3 −1
  13. tools/testing/selftests/rcutorture/configs/rcuscale/TINY +2 −1
  14. tools/testing/selftests/rcutorture/configs/rcuscale/TRACE01 +2 −1
  15. tools/testing/selftests/rcutorture/configs/refscale/NOPREEMPT +2 −1
  16. tools/testing/selftests/rcutorture/configs/refscale/TINY +2 −1
  17. tools/testing/selftests/rcutorture/configs/scf/NOPREEMPT +2 −1
tools/testing/selftests/rcutorture/configs/rcu/SRCU-N+3−1
@@ -2,7 +2,9 @@ CONFIG_RCU_TRACE=n · 1 unmodified line
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+2−1
@@ -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+2−2
@@ -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
@@ -7,4 +8,3 @@ CONFIG_PREEMPT_DYNAMIC=n · 1 unmodified line
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+2−1
@@ -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+2−2
@@ -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 · 5 unmodified lines
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+2−1
@@ -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+2−1
@@ -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+3−1
@@ -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+3−1
@@ -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+4−1
@@ -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
tools/testing/selftests/rcutorture/configs/rcu/TREE10+1−0
@@ -6,6 +6,7 @@ CONFIG_PREEMPT_VOLUNTARY=n · 5 unmodified lines
66 CONFIG_PREEMPT=n
77 CONFIG_PREEMPT_DYNAMIC=n
88 #CHECK#CONFIG_TREE_RCU=y
9+CONFIG_PREEMPT_RCU=n
910 CONFIG_HZ_PERIODIC=n
1011 CONFIG_NO_HZ_IDLE=y
1112 CONFIG_NO_HZ_FULL=n
tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL+3−1
@@ -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 CONFIG_HZ_PERIODIC=n
tools/testing/selftests/rcutorture/configs/rcuscale/TINY+2−1
@@ -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/rcuscale/TRACE01+2−1
@@ -1,5 +1,6 @@
11 CONFIG_SMP=y
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/refscale/NOPREEMPT+2−1
@@ -1,5 +1,6 @@
11 CONFIG_SMP=y
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/refscale/TINY+2−1
@@ -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/scf/NOPREEMPT+2−1
@@ -1,5 +1,6 @@
11 CONFIG_SMP=y
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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t