uek-rpm: config-debug: Turn off torture testing by default

The OL7 debug kernels are configured with multiple torture tests
built into the kernel, and consequently are all of them
trying to run by default during boot. This is a waste
of time and kWs.

This can be observed by the following
messages in the system log during boot:

 kernel: spin_lock-torture:--- Start of test [debug]: nwriters_stress=4 nreaders_stress=0 stat_interval=60 verbose=1 shuffle_interval=3 stutter=5 shutdown_secs=0
 kernel: spin_lock-torture: Creating torture_shuffle task
 kernel: spin_lock-torture: Creating torture_stutter task
 kernel: spin_lock-torture: torture_shuffle task started
 kernel: spin_lock-torture: Creating lock_torture_writer task
 kernel: spin_lock-torture: torture_stutter task started
 kernel: spin_lock-torture: Creating lock_torture_writer task
 kernel: spin_lock-torture: lock_torture_writer task started
 kernel: spin_lock-torture: Creating lock_torture_writer task
 kernel: spin_lock-torture: lock_torture_writer task started
 kernel: spin_lock-torture: Creating lock_torture_writer task
 kernel: spin_lock-torture: lock_torture_writer task started
 kernel: spin_lock-torture: Creating lock_torture_stats task
 kernel: spin_lock-torture: lock_torture_writer task started
 kernel: spin_lock-torture: lock_torture_stats task started
 kernel: torture_init_begin: Refusing rcu init: spin_lock running.
 kernel: torture_init_begin: One torture test at a time!

Better to compile these as modules to make them readily
available for testing if need be, than to run them all
at boot which does not seem to make sense at all judging
from the above log.

Orabug: 28261886

Signed-off-by: Knut Omang <knut.omang@oracle.com>
Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>
Acked-by: Victor Erminpour <victor.erminpour@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/uek-rpm/ol7/config-x86_64-debug b/uek-rpm/ol7/config-x86_64-debug
index 5a29b72568db7044191b8619a7e91f338eb723ff..28a63a802bfe72f166d01186236ad05fd889a3d9 100644 (file)
--- a/uek-rpm/ol7/config-x86_64-debug
+++ b/uek-rpm/ol7/config-x86_64-debug
@@ -6054,7 +6054,7 @@ CONFIG_LOCK_STAT=y
 # CONFIG_DEBUG_LOCKDEP is not set
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_LOCK_TORTURE_TEST=y
+CONFIG_LOCK_TORTURE_TEST=m
 CONFIG_TRACE_IRQFLAGS=y
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
@@ -6072,8 +6072,8 @@ CONFIG_DEBUG_CREDENTIALS=y
 CONFIG_PROVE_RCU=y
 # CONFIG_PROVE_RCU_REPEATEDLY is not set
 CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_TORTURE_TEST=y
-CONFIG_RCU_TORTURE_TEST=y
+CONFIG_TORTURE_TEST=m
+CONFIG_RCU_TORTURE_TEST=m
 # CONFIG_RCU_TORTURE_TEST_RUNNABLE is not set
 CONFIG_RCU_TORTURE_TEST_SLOW_INIT=y
 CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3