Currently, most of the rcutorture scenarios do not explicitly set the
CONFIG_PREEMPT_LAZY Kconfig option one way or the other.  This can
result int "improperly set" diagnostics from kvm.sh, which indicate
that the scenario in question isn't testing what it is supposed to test,
which can result in missed bugs.   This commit therefore explicitly sets
CONFIG_PREEMPT_LAZY as needed.

Signed-off-by: Paul E. McKenney <[email protected]>
---
 tools/testing/selftests/rcutorture/configs/rcu/TINY01 | 1 +
 tools/testing/selftests/rcutorture/configs/rcu/TREE04 | 2 ++
 tools/testing/selftests/rcutorture/configs/rcu/TREE05 | 1 +
 tools/testing/selftests/rcutorture/configs/rcu/TREE06 | 2 ++
 tools/testing/selftests/rcutorture/configs/rcu/TREE10 | 1 +
 5 files changed, 7 insertions(+)

diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TINY01 
b/tools/testing/selftests/rcutorture/configs/rcu/TINY01
index 0953c52fcfd76..bd5ed7b0da5f0 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TINY01
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY01
@@ -3,6 +3,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_VOLUNTARY=n
 CONFIG_PREEMPT=n
 CONFIG_PREEMPT_DYNAMIC=n
+CONFIG_PREEMPT_LAZY=n
 #CHECK#CONFIG_TINY_RCU=y
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=y
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE04 
b/tools/testing/selftests/rcutorture/configs/rcu/TREE04
index 67caf4276bb01..f49fda1c88811 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE04
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE04
@@ -4,7 +4,9 @@ CONFIG_PREEMPT_NONE=n
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PREEMPT=n
 CONFIG_PREEMPT_DYNAMIC=n
+CONFIG_PREEMPT_LAZY=n
 #CHECK#CONFIG_TREE_RCU=y
+#CHECK#CONFIG_PREEMPT_RCU=n
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=n
 CONFIG_NO_HZ_FULL=y
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE05 
b/tools/testing/selftests/rcutorture/configs/rcu/TREE05
index 9f48c73709ec3..0513aa33c32c4 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE05
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE05
@@ -3,6 +3,7 @@ CONFIG_NR_CPUS=8
 CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_VOLUNTARY=n
 CONFIG_PREEMPT=n
+CONFIG_PREEMPT_LAZY=n
 #CHECK#CONFIG_TREE_RCU=y
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=y
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE06 
b/tools/testing/selftests/rcutorture/configs/rcu/TREE06
index db27651de04b8..bfd88c46dbd73 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE06
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE06
@@ -3,7 +3,9 @@ CONFIG_NR_CPUS=8
 CONFIG_PREEMPT_NONE=y
 CONFIG_PREEMPT_VOLUNTARY=n
 CONFIG_PREEMPT=n
+CONFIG_PREEMPT_LAZY=n
 #CHECK#CONFIG_TREE_RCU=y
+#CHECK#CONFIG_PREEMPT_RCU=n
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ_FULL=n
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE10 
b/tools/testing/selftests/rcutorture/configs/rcu/TREE10
index 420632b030dc4..b2ce37861e71a 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE10
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE10
@@ -6,6 +6,7 @@ CONFIG_PREEMPT_VOLUNTARY=n
 CONFIG_PREEMPT=n
 CONFIG_PREEMPT_DYNAMIC=n
 #CHECK#CONFIG_TREE_RCU=y
+CONFIG_PREEMPT_RCU=n
 CONFIG_HZ_PERIODIC=n
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ_FULL=n
-- 
2.40.1


Reply via email to