Commit 03dcad79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 7dadeaa6 ("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
parents aed0af05 78c2ce0f

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