Commit f2fa6cc7 authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Boqun Feng
Browse files

rcutorture: Update due to x86 not supporting none/voluntary preemption 



As of v7.0-rc1, architectures that support preemption, including x86 and
arm64, no longer support CONFIG_PREEMPT_NONE or CONFIG_PREEMPT_VOLUNTARY.
Attempting to build kernels with these two Kconfig options results in
.config errors.  This commit therefore switches such rcutorture scenarios
to CONFIG_PREEMPT_LAZY.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Reviewed-by: default avatarJoel Fernandes <joelagnelf@nvidia.com>
Signed-off-by: default avatarBoqun Feng <boqun@kernel.org>
Link: https://patch.msgid.link/bfe89f6c-3b63-40c6-aa6d-5f523e3e9a31@paulmck-laptop
parent 11439c46

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

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ CONFIG_RCU_TRACE=n 
CONFIG_SMP=y

CONFIG_NR_CPUS=4

CONFIG_HOTPLUG_CPU=y

CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_DYNAMIC=n

CONFIG_PREEMPT_LAZY=y

CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=n

#CHECK#CONFIG_RCU_EXPERT=n

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

+2 −1
Original line number Diff line number Diff line 
CONFIG_SMP=n

CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_LAZY=y

CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=n

CONFIG_PREEMPT_DYNAMIC=n

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

+2 −2
Original line number Diff line number Diff line 
CONFIG_SMP=n

CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_LAZY=y

CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=n

CONFIG_PREEMPT_DYNAMIC=n
@@ -7,4 +8,3 @@ CONFIG_PREEMPT_DYNAMIC=n 
CONFIG_RCU_TRACE=n

CONFIG_DEBUG_LOCK_ALLOC=n

CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
 
CONFIG_PREEMPT_COUNT=n

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

+2 −1
Original line number Diff line number Diff line 
CONFIG_SMP=n

CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_LAZY=y

CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=n

CONFIG_PREEMPT_DYNAMIC=n

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

+2 −2
Original line number Diff line number Diff line 
CONFIG_SMP=n

CONFIG_PREEMPT_NONE=y

CONFIG_PREEMPT_LAZY=y

CONFIG_PREEMPT_NONE=n

CONFIG_PREEMPT_VOLUNTARY=n

CONFIG_PREEMPT=n

CONFIG_PREEMPT_DYNAMIC=n
@@ -11,4 +12,3 @@ CONFIG_RCU_TRACE=n 
#CHECK#CONFIG_RCU_STALL_COMMON=n

CONFIG_DEBUG_LOCK_ALLOC=n

CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
 
CONFIG_PREEMPT_COUNT=n