Commit 4275be83 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Add per-version default Kconfig fragments and module parameters 



Different Kconfig parameters apply to different kernel versions, as
do different rcutorture module parameters.  This commit allows the
rcutorture test scripts to adjust for different kernel versions.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
parent bb918535

tools/testing/selftests/rcutorture/bin/functions.sh

+3 −4
Original line number Diff line number Diff line
@@ -32,11 +32,10 @@ bootparam_hotplug_cpu () { 
#

# Returns 1 if the config fragment specifies hotplug CPU.

configfrag_hotplug_cpu () {

	cf=$1

	if test ! -r $cf

	if test ! -r "$1"

	then

		echo Unreadable config fragment $cf 1>&2

		echo Unreadable config fragment "$1" 1>&2

		exit -1

	fi

	grep -q '^CONFIG_HOTPLUG_CPU=y$' $cf

	grep -q '^CONFIG_HOTPLUG_CPU=y$' "$1"

}

tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh

+4 −8
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ T=/tmp/kvm-test-1-rcu.sh.$$ 
trap 'rm -rf $T' 0



. $KVM/bin/functions.sh

. $KVPATH/ver_functions.sh



config_template=${1}

title=`echo $config_template | sed -e 's/^.*\///'`
@@ -133,14 +134,9 @@ else 
fi



# Generate CPU-hotplug boot parameters

if ! bootparam_hotplug_cpu "$bootargs"

then

	if configfrag_hotplug_cpu $builddir/.config

	then

		echo Kernel configured for CPU hotplug, adding rcutorture.

		bootargs="$bootargs rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30"

	fi

fi

boot_args="`rcutorture_param_onoff "$boot_args" $builddir/.config`"

# Generate rcu_barrier() boot parameter

boot_args="`rcutorture_param_n_barrier_cbs "$boot_args"`"



echo $QEMU -name rcu-test -serial file:$builddir/console.log $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"noapic selinux=0 console=ttyS0 initcall_debug debug rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 $boot_args\" > $resdir/qemu-cmd

$QEMU -name rcu-test -serial file:$builddir/console.log $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append "noapic selinux=0 console=ttyS0 initcall_debug debug rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 $boot_args" &

tools/testing/selftests/rcutorture/bin/kvm.sh

+8 −18
Original line number Diff line number Diff line
@@ -33,23 +33,7 @@ dur=30 
KVM=`pwd`/tools/testing/selftests/rcutorture; export KVM

builddir=${KVM}/b1

resdir=""

configs=" sysidleY.2013.06.19a \

	  sysidleN.2013.06.19a \

	  P1-S-T-NH-SD-SMP-HP \

	  P2-2-t-nh-sd-SMP-hp \

	  P3-3-T-nh-SD-SMP-hp \

	  P4-A-t-NH-sd-SMP-HP \

	  P5-U-T-NH-sd-SMP-hp \

	  P6---t-nh-SD-smp-hp \

	  N1-S-T-NH-SD-SMP-HP \

	  N2-2-t-nh-sd-SMP-hp \

	  N3-3-T-nh-SD-SMP-hp \

	  N4-A-t-NH-sd-SMP-HP \

	  N5-U-T-NH-sd-SMP-hp \

	  PT1-nh \

	  PT2-NH \

	  NT1-nh \

	  NT3-NH"

configs=""

ds=`date +%Y.%m.%d-%H:%M:%S`

kversion=""
@@ -156,6 +140,12 @@ echo "resdir=$resdir" 


PATH=${KVM}/bin:$PATH; export PATH

CONFIGFRAG=${KVM}/configs; export CONFIGFRAG

KVPATH=${CONFIGFRAG}/$kversion; export KVPATH



if test -z "$configs"

then

	configs="`cat $CONFIGFRAG/$kversion/CFLIST`"

fi



if test -z "$resdir"

then
@@ -181,6 +171,6 @@ do 
	rd=$resdir/$ds/$CF

	mkdir $rd || :

	echo Results directory: $rd

	kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic" "rcutorture.test_no_idle_hz=1 rcutorture.n_barrier_cbs=4 rcutorture.verbose=1"

	kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic" "rcutorture.test_no_idle_hz=1 rcutorture.verbose=1"

done

# Tracing: trace_event=rcu:rcu_nocb_grace_period,rcu:rcu_grace_period,rcu:rcu_grace_period_init,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_torture_read,rcu:rcu_invoke_callback,rcu:rcu_fqs,rcu:rcu_dyntick,rcu:rcu_unlock_preempted_task

tools/testing/selftests/rcutorture/configs/CFLIST

0 → 100644
+17 −0
Original line number Diff line number Diff line 
sysidleY.2013.06.19a

sysidleN.2013.06.19a

P1-S-T-NH-SD-SMP-HP

P2-2-t-nh-sd-SMP-hp

P3-3-T-nh-SD-SMP-hp

P4-A-t-NH-sd-SMP-HP

P5-U-T-NH-sd-SMP-hp

P6---t-nh-SD-smp-hp

N1-S-T-NH-SD-SMP-HP

N2-2-t-nh-sd-SMP-hp

N3-3-T-nh-SD-SMP-hp

N4-A-t-NH-sd-SMP-HP

N5-U-T-NH-sd-SMP-hp

PT1-nh

PT2-NH

NT1-nh

NT3-NH

tools/testing/selftests/rcutorture/configs/v0.0/CFLIST

0 → 100644
+14 −0
Original line number Diff line number Diff line 
P1-S-T-NH-SD-SMP-HP

P2-2-t-nh-sd-SMP-hp

P3-3-T-nh-SD-SMP-hp

P4-A-t-NH-sd-SMP-HP

P5-U-T-NH-sd-SMP-hp

N1-S-T-NH-SD-SMP-HP

N2-2-t-nh-sd-SMP-hp

N3-3-T-nh-SD-SMP-hp

N4-A-t-NH-sd-SMP-HP

N5-U-T-NH-sd-SMP-hp

PT1-nh

PT2-NH

NT1-nh

NT3-NH