This commit adds the scripting changes to add support for the shiny new waketorture kernel module.
Signed-off-by: Paul E. McKenney <[email protected]> --- .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 ++++++++++++++++++++ .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- .../selftests/rcutorture/configs/wake/CFLIST | 1 + .../selftests/rcutorture/configs/wake/CFcommon | 2 + .../testing/selftests/rcutorture/configs/wake/STI | 19 ++++++++++ .../selftests/rcutorture/configs/wake/STI.boot | 1 + .../rcutorture/configs/wake/ver_functions.sh | 43 ++++++++++++++++++++++ 8 files changed, 107 insertions(+), 2 deletions(-) create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh new file mode 100755 index 000000000000..fc9ee1920acb --- /dev/null +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# +# Analyze a given results directory for waketorture diagnostics. +# +# Usage: kvm-recheck-wake resdir +# +# 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, 2016 +# +# Authors: Paul E. McKenney <[email protected]> + +i="$1" +if test -d $i +then + : +else + echo Unreadable results directory: $i + exit 1 +fi +PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH +. tools/testing/selftests/rcutorture/bin/functions.sh + +configfile=`echo $i | sed -e 's/^.*\///'` + +sed -e 's/^\[[^]]*]//' < $i/console.log | grep -e -torture | + grep "Tardy kthreads" | tail -1 diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh index f659346d3358..060c1eec73f4 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh @@ -48,7 +48,7 @@ do cat $i/Make.oldconfig.err fi parse-build.sh $i/Make.out $configfile - if test "$TORTURE_SUITE" != rcuperf + if test "$TORTURE_SUITE" != rcuperf -a "$TORTURE_SUITE" != wake then parse-torture.sh $i/console.log $configfile fi diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh index 0aed965f0062..0109ddf7b666 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm.sh @@ -163,7 +163,7 @@ do shift ;; --torture) - checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\|rcuperf\)$' '^--' + checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\|rcuperf\|wake\)$' '^--' TORTURE_SUITE=$2 shift ;; diff --git a/tools/testing/selftests/rcutorture/configs/wake/CFLIST b/tools/testing/selftests/rcutorture/configs/wake/CFLIST new file mode 100644 index 000000000000..850c262a6226 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/wake/CFLIST @@ -0,0 +1 @@ +STI diff --git a/tools/testing/selftests/rcutorture/configs/wake/CFcommon b/tools/testing/selftests/rcutorture/configs/wake/CFcommon new file mode 100644 index 000000000000..ffba1816cb6c --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/wake/CFcommon @@ -0,0 +1,2 @@ +CONFIG_WAKE_TORTURE_TEST=y +CONFIG_PRINTK_TIME=y diff --git a/tools/testing/selftests/rcutorture/configs/wake/STI b/tools/testing/selftests/rcutorture/configs/wake/STI new file mode 100644 index 000000000000..7a17c503b382 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/wake/STI @@ -0,0 +1,19 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=16 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=y +CONFIG_NO_HZ_IDLE=n +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_TRACE=y +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_FANOUT=2 +CONFIG_RCU_FANOUT_LEAF=2 +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_RCU_BOOST=y +CONFIG_RCU_KTHREAD_PRIO=2 +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_RCU_EXPERT=y diff --git a/tools/testing/selftests/rcutorture/configs/wake/STI.boot b/tools/testing/selftests/rcutorture/configs/wake/STI.boot new file mode 100644 index 000000000000..67ac1ad46672 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/wake/STI.boot @@ -0,0 +1 @@ +rcupdate.rcu_expedited waketorture.torture_type=sti diff --git a/tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh b/tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh new file mode 100644 index 000000000000..7331a1884d99 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh @@ -0,0 +1,43 @@ +#!/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, 2016 +# +# Authors: Paul E. McKenney <[email protected]> + +# waketorture_param_onoff bootparam-string config-file +# +# Adds onoff waketorture module parameters to kernels having it. +waketorture_param_onoff () { + if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" + then + echo CPU-hotplug kernel, adding waketorture onoff. 1>&2 + echo waketorture.onoff_interval=50 waketorture.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 `waketorture_param_onoff "$1" "$2"` \ + waketorture.stat_interval=15 \ + waketorture.shutdown_secs=$3 \ + waketorture.torture_runnable=1 \ + waketorture.verbose=1 +} -- 2.5.2
