diff options
Diffstat (limited to 'rcutorture/configs')
-rw-r--r-- | rcutorture/configs/CFLIST (renamed from rcutorture/configs/rcu/CFLIST) | 0 | ||||
-rw-r--r-- | rcutorture/configs/SRCU-N (renamed from rcutorture/configs/rcu/SRCU-N) | 3 | ||||
-rw-r--r-- | rcutorture/configs/SRCU-N.boot (renamed from rcutorture/configs/rcu/SRCU-N.boot) | 0 | ||||
-rw-r--r-- | rcutorture/configs/SRCU-P (renamed from rcutorture/configs/rcu/SRCU-P) | 1 | ||||
-rw-r--r-- | rcutorture/configs/SRCU-P.boot (renamed from rcutorture/configs/rcu/SRCU-P.boot) | 0 | ||||
-rw-r--r-- | rcutorture/configs/TINY01 (renamed from rcutorture/configs/rcu/TINY01) | 1 | ||||
-rw-r--r-- | rcutorture/configs/TINY02 (renamed from rcutorture/configs/rcu/TINY02) | 1 | ||||
-rw-r--r-- | rcutorture/configs/TREE01 (renamed from rcutorture/configs/rcu/TREE01) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE01.boot (renamed from rcutorture/configs/rcu/TREE01.boot) | 0 | ||||
-rw-r--r-- | rcutorture/configs/TREE02 (renamed from rcutorture/configs/rcu/TREE02) | 4 | ||||
-rw-r--r-- | rcutorture/configs/TREE03 (renamed from rcutorture/configs/rcu/TREE03) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE04 (renamed from rcutorture/configs/rcu/TREE04) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE04.boot (renamed from rcutorture/configs/rcu/TREE04.boot) | 0 | ||||
-rw-r--r-- | rcutorture/configs/TREE05 (renamed from rcutorture/configs/rcu/TREE05) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE05.boot (renamed from rcutorture/configs/rcu/TREE05.boot) | 0 | ||||
-rw-r--r-- | rcutorture/configs/TREE06 (renamed from rcutorture/configs/rcu/TREE06) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE07 (renamed from rcutorture/configs/rcu/TREE07) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE08 (renamed from rcutorture/configs/rcu/TREE08) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE08-T (renamed from rcutorture/configs/rcu/TREE08-T) | 2 | ||||
-rw-r--r-- | rcutorture/configs/TREE09 (renamed from rcutorture/configs/rcu/TREE09) | 2 | ||||
-rw-r--r-- | rcutorture/configs/lock/BUSTED | 6 | ||||
-rw-r--r-- | rcutorture/configs/lock/BUSTED.boot | 1 | ||||
-rw-r--r-- | rcutorture/configs/lock/CFLIST | 1 | ||||
-rw-r--r-- | rcutorture/configs/lock/CFcommon | 2 | ||||
-rw-r--r-- | rcutorture/configs/lock/LOCK01 | 6 | ||||
-rw-r--r-- | rcutorture/configs/lock/ver_functions.sh | 43 | ||||
-rw-r--r-- | rcutorture/configs/rcu/BUSTED | 7 | ||||
-rw-r--r-- | rcutorture/configs/rcu/BUSTED.boot | 1 | ||||
-rw-r--r-- | rcutorture/configs/rcu/CFcommon | 2 | ||||
-rw-r--r-- | rcutorture/configs/rcu/TREE02-T | 24 | ||||
-rw-r--r-- | rcutorture/configs/rcu/TREE08.boot | 1 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/CFLIST (renamed from rcutorture/configs/rcu/v0.0/CFLIST) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/NT1-nh (renamed from rcutorture/configs/rcu/v0.0/NT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/NT3-NH (renamed from rcutorture/configs/rcu/v0.0/NT3-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp) | 1 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/PT1-nh (renamed from rcutorture/configs/rcu/v0.0/PT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/PT2-NH (renamed from rcutorture/configs/rcu/v0.0/PT2-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v0.0/ver_functions.sh (renamed from rcutorture/configs/rcu/v0.0/ver_functions.sh) | 22 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/CFLIST (renamed from rcutorture/configs/rcu/v3.12/CFLIST) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp (renamed from rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/NT1-nh (renamed from rcutorture/configs/rcu/v3.12/NT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/NT3-NH (renamed from rcutorture/configs/rcu/v3.12/NT3-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp) | 1 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp (renamed from rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all (renamed from rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none (renamed from rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/PT1-nh (renamed from rcutorture/configs/rcu/v3.12/PT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.12/PT2-NH (renamed from rcutorture/configs/rcu/v3.12/PT2-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/CFLIST (renamed from rcutorture/configs/rcu/v3.3/CFLIST) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/NT1-nh (renamed from rcutorture/configs/rcu/v3.3/NT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/NT3-NH (renamed from rcutorture/configs/rcu/v3.3/NT3-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp) | 1 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/PT1-nh (renamed from rcutorture/configs/rcu/v3.3/PT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/PT2-NH (renamed from rcutorture/configs/rcu/v3.3/PT2-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.3/ver_functions.sh (renamed from rcutorture/configs/rcu/v3.5/ver_functions.sh) | 26 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/CFLIST (renamed from rcutorture/configs/rcu/v3.5/CFLIST) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/NT1-nh (renamed from rcutorture/configs/rcu/v3.5/NT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/NT3-NH (renamed from rcutorture/configs/rcu/v3.5/NT3-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP (renamed from rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp (renamed from rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp (renamed from rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP (renamed from rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp (renamed from rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp) | 1 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/PT1-nh (renamed from rcutorture/configs/rcu/v3.5/PT1-nh) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/PT2-NH (renamed from rcutorture/configs/rcu/v3.5/PT2-NH) | 0 | ||||
-rw-r--r-- | rcutorture/configs/v3.5/ver_functions.sh (renamed from rcutorture/configs/rcu/ver_functions.sh) | 23 | ||||
-rw-r--r-- | rcutorture/configs/ver_functions.sh (renamed from rcutorture/configs/rcu/v3.3/ver_functions.sh) | 28 |
103 files changed, 68 insertions, 157 deletions
diff --git a/rcutorture/configs/rcu/CFLIST b/rcutorture/configs/CFLIST index cd3d29c..cd3d29c 100644 --- a/rcutorture/configs/rcu/CFLIST +++ b/rcutorture/configs/CFLIST diff --git a/rcutorture/configs/rcu/SRCU-N b/rcutorture/configs/SRCU-N index 9fbb41b..10a0e27 100644 --- a/rcutorture/configs/rcu/SRCU-N +++ b/rcutorture/configs/SRCU-N @@ -1,7 +1,8 @@ CONFIG_RCU_TRACE=n CONFIG_SMP=y -CONFIG_NR_CPUS=4 +CONFIG_NR_CPUS=8 CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/SRCU-N.boot b/rcutorture/configs/SRCU-N.boot index 238bfe3..238bfe3 100644 --- a/rcutorture/configs/rcu/SRCU-N.boot +++ b/rcutorture/configs/SRCU-N.boot diff --git a/rcutorture/configs/rcu/SRCU-P b/rcutorture/configs/SRCU-P index 4b6f272..6650e00 100644 --- a/rcutorture/configs/rcu/SRCU-P +++ b/rcutorture/configs/SRCU-P @@ -5,3 +5,4 @@ CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT_NONE=n CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/SRCU-P.boot b/rcutorture/configs/SRCU-P.boot index 238bfe3..238bfe3 100644 --- a/rcutorture/configs/rcu/SRCU-P.boot +++ b/rcutorture/configs/SRCU-P.boot diff --git a/rcutorture/configs/rcu/TINY01 b/rcutorture/configs/TINY01 index 0a63e07..0c2823f 100644 --- a/rcutorture/configs/rcu/TINY01 +++ b/rcutorture/configs/TINY01 @@ -10,3 +10,4 @@ CONFIG_RCU_TRACE=n CONFIG_DEBUG_LOCK_ALLOC=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_PREEMPT_COUNT=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TINY02 b/rcutorture/configs/TINY02 index f4feaee..e5072d7 100644 --- a/rcutorture/configs/rcu/TINY02 +++ b/rcutorture/configs/TINY02 @@ -10,3 +10,4 @@ CONFIG_RCU_TRACE=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_PREEMPT_COUNT=y +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE01 b/rcutorture/configs/TREE01 index 063b707..141119a 100644 --- a/rcutorture/configs/rcu/TREE01 +++ b/rcutorture/configs/TREE01 @@ -15,7 +15,9 @@ CONFIG_RCU_FANOUT_EXACT=n CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_NOCB_CPU_ZERO=y CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE01.boot b/rcutorture/configs/TREE01.boot index 0fc8a34..0fc8a34 100644 --- a/rcutorture/configs/rcu/TREE01.boot +++ b/rcutorture/configs/TREE01.boot diff --git a/rcutorture/configs/rcu/TREE02 b/rcutorture/configs/TREE02 index ea119ba..2d4d096 100644 --- a/rcutorture/configs/rcu/TREE02 +++ b/rcutorture/configs/TREE02 @@ -7,7 +7,7 @@ CONFIG_PREEMPT=y CONFIG_HZ_PERIODIC=n CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_FAST_NO_HZ=n CONFIG_RCU_TRACE=n CONFIG_HOTPLUG_CPU=n CONFIG_SUSPEND=n @@ -18,7 +18,9 @@ CONFIG_RCU_FANOUT_EXACT=n CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=y CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE03 b/rcutorture/configs/TREE03 index f4567fb..a47de5b 100644 --- a/rcutorture/configs/rcu/TREE03 +++ b/rcutorture/configs/TREE03 @@ -14,8 +14,10 @@ CONFIG_RCU_FANOUT_LEAF=4 CONFIG_RCU_FANOUT_EXACT=n CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=y CONFIG_RCU_BOOST_PRIO=2 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE04 b/rcutorture/configs/TREE04 index 0a262fb..8d839b8 100644 --- a/rcutorture/configs/rcu/TREE04 +++ b/rcutorture/configs/TREE04 @@ -18,6 +18,8 @@ CONFIG_RCU_FANOUT_LEAF=2 CONFIG_RCU_FANOUT_EXACT=n CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=y CONFIG_RCU_CPU_STALL_VERBOSE=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE04.boot b/rcutorture/configs/TREE04.boot index 0fc8a34..0fc8a34 100644 --- a/rcutorture/configs/rcu/TREE04.boot +++ b/rcutorture/configs/TREE04.boot diff --git a/rcutorture/configs/rcu/TREE05 b/rcutorture/configs/TREE05 index 3a06b97..b5ba72e 100644 --- a/rcutorture/configs/rcu/TREE05 +++ b/rcutorture/configs/TREE05 @@ -18,6 +18,8 @@ CONFIG_RCU_NOCB_CPU_NONE=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y +CONFIG_PROVE_RCU_DELAY=y CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE05.boot b/rcutorture/configs/TREE05.boot index 3b42b8b..3b42b8b 100644 --- a/rcutorture/configs/rcu/TREE05.boot +++ b/rcutorture/configs/TREE05.boot diff --git a/rcutorture/configs/rcu/TREE06 b/rcutorture/configs/TREE06 index 8f084cc..7c95ab4 100644 --- a/rcutorture/configs/rcu/TREE06 +++ b/rcutorture/configs/TREE06 @@ -19,6 +19,8 @@ CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE07 b/rcutorture/configs/TREE07 index ab62255..1467404 100644 --- a/rcutorture/configs/rcu/TREE07 +++ b/rcutorture/configs/TREE07 @@ -17,6 +17,8 @@ CONFIG_RCU_FANOUT_LEAF=2 CONFIG_RCU_FANOUT_EXACT=n CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=y CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE08 b/rcutorture/configs/TREE08 index 69a2e25..7d097a6 100644 --- a/rcutorture/configs/rcu/TREE08 +++ b/rcutorture/configs/TREE08 @@ -18,7 +18,9 @@ CONFIG_RCU_FANOUT_LEAF=2 CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_NOCB_CPU_ALL=y CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE08-T b/rcutorture/configs/TREE08-T index a0f32fb..442c4e4 100644 --- a/rcutorture/configs/rcu/TREE08-T +++ b/rcutorture/configs/TREE08-T @@ -18,7 +18,9 @@ CONFIG_RCU_FANOUT_LEAF=2 CONFIG_RCU_NOCB_CPU=y CONFIG_RCU_NOCB_CPU_ALL=y CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE09 b/rcutorture/configs/TREE09 index b7a62a5..0d1ec0d 100644 --- a/rcutorture/configs/rcu/TREE09 +++ b/rcutorture/configs/TREE09 @@ -13,7 +13,9 @@ CONFIG_SUSPEND=n CONFIG_HIBERNATION=n CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/lock/BUSTED b/rcutorture/configs/lock/BUSTED deleted file mode 100644 index 1d1da14..0000000 --- a/rcutorture/configs/lock/BUSTED +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y diff --git a/rcutorture/configs/lock/BUSTED.boot b/rcutorture/configs/lock/BUSTED.boot deleted file mode 100644 index 6386c15..0000000 --- a/rcutorture/configs/lock/BUSTED.boot +++ /dev/null @@ -1 +0,0 @@ -locktorture.torture_type=lock_busted diff --git a/rcutorture/configs/lock/CFLIST b/rcutorture/configs/lock/CFLIST deleted file mode 100644 index a061b22..0000000 --- a/rcutorture/configs/lock/CFLIST +++ /dev/null @@ -1 +0,0 @@ -LOCK01 diff --git a/rcutorture/configs/lock/CFcommon b/rcutorture/configs/lock/CFcommon deleted file mode 100644 index e372dc2..0000000 --- a/rcutorture/configs/lock/CFcommon +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_LOCK_TORTURE_TEST=y -CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/lock/LOCK01 b/rcutorture/configs/lock/LOCK01 deleted file mode 100644 index a9625e3..0000000 --- a/rcutorture/configs/lock/LOCK01 +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y diff --git a/rcutorture/configs/lock/ver_functions.sh b/rcutorture/configs/lock/ver_functions.sh deleted file mode 100644 index 9746ea1..0000000 --- a/rcutorture/configs/lock/ver_functions.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# Kernel-version-dependent shell functions for the rest of the scripts. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, you can access it online at -# http://www.gnu.org/licenses/gpl-2.0.html. -# -# Copyright (C) IBM Corporation, 2014 -# -# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> - -# locktorture_param_onoff bootparam-string config-file -# -# Adds onoff locktorture module parameters to kernels having it. -locktorture_param_onoff () { - if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" - then - echo CPU-hotplug kernel, adding locktorture onoff. 1>&2 - echo locktorture.onoff_interval=3 locktorture.onoff_holdoff=30 - fi -} - -# per_version_boot_params bootparam-string config-file seconds -# -# Adds per-version torture-module parameters to kernels supporting them. -per_version_boot_params () { - echo $1 `locktorture_param_onoff "$1" "$2"` \ - locktorture.stat_interval=15 \ - locktorture.shutdown_secs=$3 \ - locktorture.locktorture_runnable=1 \ - locktorture.verbose=1 -} diff --git a/rcutorture/configs/rcu/BUSTED b/rcutorture/configs/rcu/BUSTED deleted file mode 100644 index 48d8a24..0000000 --- a/rcutorture/configs/rcu/BUSTED +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y diff --git a/rcutorture/configs/rcu/BUSTED.boot b/rcutorture/configs/rcu/BUSTED.boot deleted file mode 100644 index 6804f9d..0000000 --- a/rcutorture/configs/rcu/BUSTED.boot +++ /dev/null @@ -1 +0,0 @@ -rcutorture.torture_type=rcu_busted diff --git a/rcutorture/configs/rcu/CFcommon b/rcutorture/configs/rcu/CFcommon deleted file mode 100644 index d2d2a86..0000000 --- a/rcutorture/configs/rcu/CFcommon +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_RCU_TORTURE_TEST=y -CONFIG_PRINTK_TIME=y diff --git a/rcutorture/configs/rcu/TREE02-T b/rcutorture/configs/rcu/TREE02-T deleted file mode 100644 index 19cf948..0000000 --- a/rcutorture/configs/rcu/TREE02-T +++ /dev/null @@ -1,24 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_FANOUT=3 -CONFIG_RCU_FANOUT_LEAF=3 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_PROVE_LOCKING=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=y -CONFIG_RCU_BOOST=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n diff --git a/rcutorture/configs/rcu/TREE08.boot b/rcutorture/configs/rcu/TREE08.boot deleted file mode 100644 index 3b42b8b..0000000 --- a/rcutorture/configs/rcu/TREE08.boot +++ /dev/null @@ -1 +0,0 @@ -rcutorture.torture_type=sched diff --git a/rcutorture/configs/rcu/v0.0/CFLIST b/rcutorture/configs/v0.0/CFLIST index 1822394..1822394 100644 --- a/rcutorture/configs/rcu/v0.0/CFLIST +++ b/rcutorture/configs/v0.0/CFLIST diff --git a/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP index d3ef873..d3ef873 100644 --- a/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp index 02e4185..02e4185 100644 --- a/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp index b3100f6..b3100f6 100644 --- a/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP index c56b445..c56b445 100644 --- a/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp index 90d924f..90d924f 100644 --- a/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v0.0/NT1-nh b/rcutorture/configs/v0.0/NT1-nh index 023f312..023f312 100644 --- a/rcutorture/configs/rcu/v0.0/NT1-nh +++ b/rcutorture/configs/v0.0/NT1-nh diff --git a/rcutorture/configs/rcu/v0.0/NT3-NH b/rcutorture/configs/v0.0/NT3-NH index 6fd0235..6fd0235 100644 --- a/rcutorture/configs/rcu/v0.0/NT3-NH +++ b/rcutorture/configs/v0.0/NT3-NH diff --git a/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP index f72402d..f72402d 100644 --- a/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp index 0f3b667..0f3b667 100644 --- a/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp index b035e14..b035e14 100644 --- a/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP index 3ccf6a9..3ccf6a9 100644 --- a/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp index a55c008..ef624ce 100644 --- a/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp @@ -13,6 +13,7 @@ CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y #CHECK#CONFIG_TREE_PREEMPT_RCU=y CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y CONFIG_DEBUG_OBJECTS=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_RT_MUTEXES=y diff --git a/rcutorture/configs/rcu/v0.0/PT1-nh b/rcutorture/configs/v0.0/PT1-nh index e3361c3..e3361c3 100644 --- a/rcutorture/configs/rcu/v0.0/PT1-nh +++ b/rcutorture/configs/v0.0/PT1-nh diff --git a/rcutorture/configs/rcu/v0.0/PT2-NH b/rcutorture/configs/v0.0/PT2-NH index 64abfc3..64abfc3 100644 --- a/rcutorture/configs/rcu/v0.0/PT2-NH +++ b/rcutorture/configs/v0.0/PT2-NH diff --git a/rcutorture/configs/rcu/v0.0/ver_functions.sh b/rcutorture/configs/v0.0/ver_functions.sh index 5ace37a..e805253 100644 --- a/rcutorture/configs/rcu/v0.0/ver_functions.sh +++ b/rcutorture/configs/v0.0/ver_functions.sh @@ -20,14 +20,16 @@ # # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> -# per_version_boot_params bootparam-string config-file seconds -# -# Adds per-version torture-module parameters to kernels supporting them. -# Which old kernels do not. -per_version_boot_params () { - echo rcutorture.stat_interval=15 \ - rcutorture.shutdown_secs=$3 \ - rcutorture.rcutorture_runnable=1 \ - rcutorture.test_no_idle_hz=1 \ - rcutorture.verbose=1 +# rcutorture_param_n_barrier_cbs bootparam-string +# +# Adds n_barrier_cbs rcutorture module parameter to kernels having it. +rcutorture_param_n_barrier_cbs () { + echo $1 +} + +# rcutorture_param_onoff bootparam-string config-file +# +# Adds onoff rcutorture module parameters to kernels having it. +rcutorture_param_onoff () { + echo $1 } diff --git a/rcutorture/configs/rcu/v3.12/CFLIST b/rcutorture/configs/v3.12/CFLIST index da4cbc6..da4cbc6 100644 --- a/rcutorture/configs/rcu/v3.12/CFLIST +++ b/rcutorture/configs/v3.12/CFLIST diff --git a/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP index d81e11d..d81e11d 100644 --- a/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp index 02e4185..02e4185 100644 --- a/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp index b3100f6..b3100f6 100644 --- a/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP index c56b445..c56b445 100644 --- a/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp index 90d924f..90d924f 100644 --- a/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp b/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp index 0ccc36d..0ccc36d 100644 --- a/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp +++ b/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp diff --git a/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP b/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP index 3f640cf..3f640cf 100644 --- a/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP b/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP index 285da2d..285da2d 100644 --- a/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/NT1-nh b/rcutorture/configs/v3.12/NT1-nh index 023f312..023f312 100644 --- a/rcutorture/configs/rcu/v3.12/NT1-nh +++ b/rcutorture/configs/v3.12/NT1-nh diff --git a/rcutorture/configs/rcu/v3.12/NT3-NH b/rcutorture/configs/v3.12/NT3-NH index 6fd0235..6fd0235 100644 --- a/rcutorture/configs/rcu/v3.12/NT3-NH +++ b/rcutorture/configs/v3.12/NT3-NH diff --git a/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP index 9647c44..9647c44 100644 --- a/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp index 0f3b667..0f3b667 100644 --- a/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp index b035e14..b035e14 100644 --- a/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP index 3ccf6a9..3ccf6a9 100644 --- a/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp index a55c008..ef624ce 100644 --- a/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp @@ -13,6 +13,7 @@ CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y #CHECK#CONFIG_TREE_PREEMPT_RCU=y CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y CONFIG_DEBUG_OBJECTS=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_RT_MUTEXES=y diff --git a/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp b/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp index f4c9175..f4c9175 100644 --- a/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp +++ b/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp diff --git a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP index 77a8c5b..77a8c5b 100644 --- a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all index 0eecebc..0eecebc 100644 --- a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all +++ b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all diff --git a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none index 0eecebc..0eecebc 100644 --- a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none +++ b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none diff --git a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp index 588bc70..588bc70 100644 --- a/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp +++ b/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.12/PT1-nh b/rcutorture/configs/v3.12/PT1-nh index e3361c3..e3361c3 100644 --- a/rcutorture/configs/rcu/v3.12/PT1-nh +++ b/rcutorture/configs/v3.12/PT1-nh diff --git a/rcutorture/configs/rcu/v3.12/PT2-NH b/rcutorture/configs/v3.12/PT2-NH index 64abfc3..64abfc3 100644 --- a/rcutorture/configs/rcu/v3.12/PT2-NH +++ b/rcutorture/configs/v3.12/PT2-NH diff --git a/rcutorture/configs/rcu/v3.3/CFLIST b/rcutorture/configs/v3.3/CFLIST index 1822394..1822394 100644 --- a/rcutorture/configs/rcu/v3.3/CFLIST +++ b/rcutorture/configs/v3.3/CFLIST diff --git a/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP index d81e11d..d81e11d 100644 --- a/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp index 02e4185..02e4185 100644 --- a/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp index b3100f6..b3100f6 100644 --- a/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP index c56b445..c56b445 100644 --- a/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp index 90d924f..90d924f 100644 --- a/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.3/NT1-nh b/rcutorture/configs/v3.3/NT1-nh index 023f312..023f312 100644 --- a/rcutorture/configs/rcu/v3.3/NT1-nh +++ b/rcutorture/configs/v3.3/NT1-nh diff --git a/rcutorture/configs/rcu/v3.3/NT3-NH b/rcutorture/configs/v3.3/NT3-NH index 6fd0235..6fd0235 100644 --- a/rcutorture/configs/rcu/v3.3/NT3-NH +++ b/rcutorture/configs/v3.3/NT3-NH diff --git a/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP index 9647c44..9647c44 100644 --- a/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp index 0f3b667..0f3b667 100644 --- a/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp index b035e14..b035e14 100644 --- a/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP index 3ccf6a9..3ccf6a9 100644 --- a/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp index a55c008..ef624ce 100644 --- a/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp @@ -13,6 +13,7 @@ CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y #CHECK#CONFIG_TREE_PREEMPT_RCU=y CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y CONFIG_DEBUG_OBJECTS=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_RT_MUTEXES=y diff --git a/rcutorture/configs/rcu/v3.3/PT1-nh b/rcutorture/configs/v3.3/PT1-nh index e3361c3..e3361c3 100644 --- a/rcutorture/configs/rcu/v3.3/PT1-nh +++ b/rcutorture/configs/v3.3/PT1-nh diff --git a/rcutorture/configs/rcu/v3.3/PT2-NH b/rcutorture/configs/v3.3/PT2-NH index 64abfc3..64abfc3 100644 --- a/rcutorture/configs/rcu/v3.3/PT2-NH +++ b/rcutorture/configs/v3.3/PT2-NH diff --git a/rcutorture/configs/rcu/v3.5/ver_functions.sh b/rcutorture/configs/v3.3/ver_functions.sh index 8977d8d..c37432f 100644 --- a/rcutorture/configs/rcu/v3.5/ver_functions.sh +++ b/rcutorture/configs/v3.3/ver_functions.sh @@ -24,12 +24,7 @@ # # Adds n_barrier_cbs rcutorture module parameter to kernels having it. rcutorture_param_n_barrier_cbs () { - if echo $1 | grep -q "rcutorture\.n_barrier_cbs" - then - : - else - echo rcutorture.n_barrier_cbs=4 - fi + echo $1 } # rcutorture_param_onoff bootparam-string config-file @@ -38,20 +33,9 @@ rcutorture_param_n_barrier_cbs () { rcutorture_param_onoff () { if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" then - echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2 - echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 + echo CPU-hotplug kernel, adding rcutorture onoff. + echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 + else + echo $1 fi } - -# per_version_boot_params bootparam-string config-file seconds -# -# Adds per-version torture-module parameters to kernels supporting them. -per_version_boot_params () { - echo $1 `rcutorture_param_onoff "$1" "$2"` \ - `rcutorture_param_n_barrier_cbs "$1"` \ - rcutorture.stat_interval=15 \ - rcutorture.shutdown_secs=$3 \ - rcutorture.rcutorture_runnable=1 \ - rcutorture.test_no_idle_hz=1 \ - rcutorture.verbose=1 -} diff --git a/rcutorture/configs/rcu/v3.5/CFLIST b/rcutorture/configs/v3.5/CFLIST index 1822394..1822394 100644 --- a/rcutorture/configs/rcu/v3.5/CFLIST +++ b/rcutorture/configs/v3.5/CFLIST diff --git a/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP index d81e11d..d81e11d 100644 --- a/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp index 02e4185..02e4185 100644 --- a/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp index b3100f6..b3100f6 100644 --- a/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP index c56b445..c56b445 100644 --- a/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp index 90d924f..90d924f 100644 --- a/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.5/NT1-nh b/rcutorture/configs/v3.5/NT1-nh index 023f312..023f312 100644 --- a/rcutorture/configs/rcu/v3.5/NT1-nh +++ b/rcutorture/configs/v3.5/NT1-nh diff --git a/rcutorture/configs/rcu/v3.5/NT3-NH b/rcutorture/configs/v3.5/NT3-NH index 6fd0235..6fd0235 100644 --- a/rcutorture/configs/rcu/v3.5/NT3-NH +++ b/rcutorture/configs/v3.5/NT3-NH diff --git a/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP b/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP index 9647c44..9647c44 100644 --- a/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP +++ b/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP diff --git a/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp b/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp index 0f3b667..0f3b667 100644 --- a/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp +++ b/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp diff --git a/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp b/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp index b035e14..b035e14 100644 --- a/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp +++ b/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp diff --git a/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP b/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP index 3ccf6a9..3ccf6a9 100644 --- a/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP +++ b/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP diff --git a/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp b/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp index a55c008..ef624ce 100644 --- a/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp +++ b/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp @@ -13,6 +13,7 @@ CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y #CHECK#CONFIG_TREE_PREEMPT_RCU=y CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y CONFIG_DEBUG_OBJECTS=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=y CONFIG_RT_MUTEXES=y diff --git a/rcutorture/configs/rcu/v3.5/PT1-nh b/rcutorture/configs/v3.5/PT1-nh index e3361c3..e3361c3 100644 --- a/rcutorture/configs/rcu/v3.5/PT1-nh +++ b/rcutorture/configs/v3.5/PT1-nh diff --git a/rcutorture/configs/rcu/v3.5/PT2-NH b/rcutorture/configs/v3.5/PT2-NH index 64abfc3..64abfc3 100644 --- a/rcutorture/configs/rcu/v3.5/PT2-NH +++ b/rcutorture/configs/v3.5/PT2-NH diff --git a/rcutorture/configs/rcu/ver_functions.sh b/rcutorture/configs/v3.5/ver_functions.sh index 8977d8d..6a5f13a 100644 --- a/rcutorture/configs/rcu/ver_functions.sh +++ b/rcutorture/configs/v3.5/ver_functions.sh @@ -26,9 +26,9 @@ rcutorture_param_n_barrier_cbs () { if echo $1 | grep -q "rcutorture\.n_barrier_cbs" then - : + echo $1 else - echo rcutorture.n_barrier_cbs=4 + echo $1 rcutorture.n_barrier_cbs=4 fi } @@ -38,20 +38,9 @@ rcutorture_param_n_barrier_cbs () { rcutorture_param_onoff () { if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" then - echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2 - echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 + echo CPU-hotplug kernel, adding rcutorture onoff. + echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 + else + echo $1 fi } - -# per_version_boot_params bootparam-string config-file seconds -# -# Adds per-version torture-module parameters to kernels supporting them. -per_version_boot_params () { - echo $1 `rcutorture_param_onoff "$1" "$2"` \ - `rcutorture_param_n_barrier_cbs "$1"` \ - rcutorture.stat_interval=15 \ - rcutorture.shutdown_secs=$3 \ - rcutorture.rcutorture_runnable=1 \ - rcutorture.test_no_idle_hz=1 \ - rcutorture.verbose=1 -} diff --git a/rcutorture/configs/rcu/v3.3/ver_functions.sh b/rcutorture/configs/ver_functions.sh index bae5569..5e40ead 100644 --- a/rcutorture/configs/rcu/v3.3/ver_functions.sh +++ b/rcutorture/configs/ver_functions.sh @@ -20,6 +20,18 @@ # # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com> +# rcutorture_param_n_barrier_cbs bootparam-string +# +# Adds n_barrier_cbs rcutorture module parameter to kernels having it. +rcutorture_param_n_barrier_cbs () { + if echo $1 | grep -q "rcutorture\.n_barrier_cbs" + then + echo $1 + else + echo $1 rcutorture.n_barrier_cbs=4 + fi +} + # rcutorture_param_onoff bootparam-string config-file # # Adds onoff rcutorture module parameters to kernels having it. @@ -27,18 +39,8 @@ rcutorture_param_onoff () { if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" then echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2 - echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 + echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 + else + echo $1 fi } - -# per_version_boot_params bootparam-string config-file seconds -# -# Adds per-version torture-module parameters to kernels supporting them. -per_version_boot_params () { - echo $1 `rcutorture_param_onoff "$1" "$2"` \ - rcutorture.stat_interval=15 \ - rcutorture.shutdown_secs=$3 \ - rcutorture.rcutorture_runnable=1 \ - rcutorture.test_no_idle_hz=1 \ - rcutorture.verbose=1 -} |