Message ID | 1559921039-7314-1-git-send-email-ice_yangxiao@163.com |
---|---|
State | Superseded |
Headers | show |
Series | [v2] rcu/rcu_torture.sh: Rewrite test | expand |
On 06/07/2019 11:23 PM, Xiao Yang wrote: > 1) Cleanup and convert to new API > 2) Update valid rcutorture types(rcu, srcu, srcud, tasks) > > Note: > Exclude valid busted* types(busted, busted_srcud) that check > the test itself and expect failures, suggested by: > https://www.spinics.net/lists/kernel/msg3045252.html > > Signed-off-by: Xiao Yang <ice_yangxiao@163.com> > > v2: > 1) Add check for invalid rcutorture types > 2) Remove unnecessary code and update descriptions > 3) Exclude busted* types Hi, Sorry, the changelog was misplaced. Please ignore it and I will resend the v2 patch. Best Regards, Xiao Yang > --- > testcases/kernel/device-drivers/rcu/rcu_torture.sh | 139 +++++++++------------ > 1 file changed, 59 insertions(+), 80 deletions(-) > > diff --git a/testcases/kernel/device-drivers/rcu/rcu_torture.sh b/testcases/kernel/device-drivers/rcu/rcu_torture.sh > index c3739f9..5549bd2 100755 > --- a/testcases/kernel/device-drivers/rcu/rcu_torture.sh > +++ b/testcases/kernel/device-drivers/rcu/rcu_torture.sh > @@ -1,20 +1,7 @@ > #!/bin/sh > +# SPDX-License-Identifier: GPL-2.0-or-later > # Copyright (c) 2014-2015 Oracle and/or its affiliates. All Rights Reserved. > -# > -# 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 would 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, write the Free Software Foundation, > -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > -# > +# Copyright (C) 2019 Xiao Yang <ice_yangxiao@163.com> > # Author: Alexey Kodanev <alexey.kodanev@oracle.com> > # > # One of the possible ways to test RCU is to use rcutorture kernel module. > @@ -23,89 +10,81 @@ > # dmesg output for module's test results. > # For more information, please read Linux Documentation: RCU/torture.txt > > -TCID="rcu_torture" > -TST_TOTAL=14 > -TST_CLEANUP=cleanup > +TST_CNT=4 > +TST_SETUP=rcutorture_setup > +TST_TESTFUNC=do_test > +TST_NEEDS_ROOT=1 > +TST_NEEDS_CMDS="modprobe rmmod dmesg sed tail" > +TST_OPTS="t:w:" > +TST_USAGE=rcutorture_usage > +TST_PARSE_ARGS=rcutorture_parse_args > > -. test.sh > +. tst_test.sh > > # default options > -test_time=60 > +test_time=30 > num_writers=5 > > -while getopts :ht:w: opt; do > - case "$opt" in > - h) > - echo "Usage:" > - echo "h help" > - echo "t x time in seconds for each test-case" > - echo "w x number of writers" > - exit 0 > - ;; > - t) test_time=$OPTARG ;; > - w) num_writers=$OPTARG ;; > - *) > - tst_brkm TBROK "unknown option: $opt" > - ;; > - esac > -done > - > -cleanup() > +rcutorture_usage() > { > - tst_resm TINFO "cleanup" > - rmmod rcutorture > /dev/null 2>&1 > + echo "Usage:" > + echo "-t x time in seconds for each test-case" > + echo "-w x number of writers" > } > > -tst_require_root > +rcutorture_parse_args() > +{ > + case $1 in > + t) test_time=$2 ;; > + w) num_writers=$2 ;; > + esac > +} > > -# check if module is present > -modprobe rcutorture > /dev/null 2>&1 || \ > - tst_brkm TCONF "Test requires rcutorture module" > -rmmod rcutorture > /dev/null 2>&1 > +rcutorture_setup() > +{ > + # do test by inserting and removing rcutorture module > + # so check if it is built-in, loaded or unbuilt > + modprobe -n --first-time rcutorture >/dev/null 2>&1 || \ > + tst_brk TCONF "built-in, loaded or unbuilt rcutorture" > +} > > -trap cleanup INT > +rcutorture_test() > +{ > + local rcu_type=$1 > > -rcu_type="rcu rcu_bh srcu sched" > + tst_res TINFO "${rcu_type}-torture: running ${test_time} sec..." > > -if tst_kvcmp -lt "3.12"; then > - rcu_type="$rcu_type rcu_sync rcu_expedited rcu_bh_sync rcu_bh_expedited \ > - srcu_sync srcu_expedited sched_sync sched_expedited" > + modprobe rcutorture nfakewriters=${num_writers} \ > + torture_type=${rcu_type} >/dev/null 2>&1 > + if [ $? -ne 0 ]; then > + dmesg | grep -q "invalid torture type: \"${rcu_type}\"" && \ > + tst_brk TCONF "invalid ${rcu_type} type" > > - if tst_kvcmp -lt "3.11"; then > - rcu_type="$rcu_type srcu_raw srcu_raw_sync" > + tst_brk TBROK "failed to load module" > fi > -fi > - > -TST_TOTAL=$(echo "$rcu_type" | wc -w) > - > -est_time=`echo "scale=2; $test_time * $TST_TOTAL / 60 " | bc` > -tst_resm TINFO "estimate time $est_time min" > - > -for type in $rcu_type; do > - > - tst_resm TINFO "$type: running $test_time sec..." > - > - modprobe rcutorture nfakewriters=$num_writers \ > - stat_interval=60 test_no_idle_hz=1 shuffle_interval=3 \ > - stutter=5 irqreader=1 fqs_duration=0 fqs_holdoff=0 \ > - fqs_stutter=3 test_boost=1 test_boost_interval=7 \ > - test_boost_duration=4 shutdown_secs=0 \ > - stall_cpu=0 stall_cpu_holdoff=10 n_barrier_cbs=0 \ > - onoff_interval=0 onoff_holdoff=0 torture_type=$type \ > - > /dev/null 2>&1 || tst_brkm TBROK "failed to load module" > > - sleep $test_time > + sleep ${test_time} > > - rmmod rcutorture > /dev/null 2>&1 || \ > - tst_brkm TBROK "failed to unload module" > + rmmod rcutorture >/dev/null 2>&1 || \ > + tst_brk TBROK "failed to unload module" > > # check module status in dmesg > - result_str=`dmesg | sed -nE '$s/.*End of test: ([A-Z]+):.*/\1/p'` > - if [ "$result_str" = "SUCCESS" ]; then > - tst_resm TPASS "$type: completed" > + local res=$(dmesg | sed -nE "s/.* ${rcu_type}-torture:.* End of test: (.*): .*/\1/p" | tail -n1) > + if [ "$res" = "SUCCESS" ]; then > + tst_res TPASS "${rcu_type}-torture: $res" > else > - tst_resm TFAIL "$type: $result_str, see dmesg" > + tst_res TFAIL "${rcu_type}-torture: $res, see dmesg" > fi > -done > +} > + > +do_test() > +{ > + case $1 in > + 1) rcutorture_test rcu;; > + 2) rcutorture_test srcu;; > + 3) rcutorture_test srcud;; > + 4) rcutorture_test tasks;; > + esac > +} > > -tst_exit > +tst_run
diff --git a/testcases/kernel/device-drivers/rcu/rcu_torture.sh b/testcases/kernel/device-drivers/rcu/rcu_torture.sh index c3739f9..5549bd2 100755 --- a/testcases/kernel/device-drivers/rcu/rcu_torture.sh +++ b/testcases/kernel/device-drivers/rcu/rcu_torture.sh @@ -1,20 +1,7 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2014-2015 Oracle and/or its affiliates. All Rights Reserved. -# -# 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 would 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, write the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# +# Copyright (C) 2019 Xiao Yang <ice_yangxiao@163.com> # Author: Alexey Kodanev <alexey.kodanev@oracle.com> # # One of the possible ways to test RCU is to use rcutorture kernel module. @@ -23,89 +10,81 @@ # dmesg output for module's test results. # For more information, please read Linux Documentation: RCU/torture.txt -TCID="rcu_torture" -TST_TOTAL=14 -TST_CLEANUP=cleanup +TST_CNT=4 +TST_SETUP=rcutorture_setup +TST_TESTFUNC=do_test +TST_NEEDS_ROOT=1 +TST_NEEDS_CMDS="modprobe rmmod dmesg sed tail" +TST_OPTS="t:w:" +TST_USAGE=rcutorture_usage +TST_PARSE_ARGS=rcutorture_parse_args -. test.sh +. tst_test.sh # default options -test_time=60 +test_time=30 num_writers=5 -while getopts :ht:w: opt; do - case "$opt" in - h) - echo "Usage:" - echo "h help" - echo "t x time in seconds for each test-case" - echo "w x number of writers" - exit 0 - ;; - t) test_time=$OPTARG ;; - w) num_writers=$OPTARG ;; - *) - tst_brkm TBROK "unknown option: $opt" - ;; - esac -done - -cleanup() +rcutorture_usage() { - tst_resm TINFO "cleanup" - rmmod rcutorture > /dev/null 2>&1 + echo "Usage:" + echo "-t x time in seconds for each test-case" + echo "-w x number of writers" } -tst_require_root +rcutorture_parse_args() +{ + case $1 in + t) test_time=$2 ;; + w) num_writers=$2 ;; + esac +} -# check if module is present -modprobe rcutorture > /dev/null 2>&1 || \ - tst_brkm TCONF "Test requires rcutorture module" -rmmod rcutorture > /dev/null 2>&1 +rcutorture_setup() +{ + # do test by inserting and removing rcutorture module + # so check if it is built-in, loaded or unbuilt + modprobe -n --first-time rcutorture >/dev/null 2>&1 || \ + tst_brk TCONF "built-in, loaded or unbuilt rcutorture" +} -trap cleanup INT +rcutorture_test() +{ + local rcu_type=$1 -rcu_type="rcu rcu_bh srcu sched" + tst_res TINFO "${rcu_type}-torture: running ${test_time} sec..." -if tst_kvcmp -lt "3.12"; then - rcu_type="$rcu_type rcu_sync rcu_expedited rcu_bh_sync rcu_bh_expedited \ - srcu_sync srcu_expedited sched_sync sched_expedited" + modprobe rcutorture nfakewriters=${num_writers} \ + torture_type=${rcu_type} >/dev/null 2>&1 + if [ $? -ne 0 ]; then + dmesg | grep -q "invalid torture type: \"${rcu_type}\"" && \ + tst_brk TCONF "invalid ${rcu_type} type" - if tst_kvcmp -lt "3.11"; then - rcu_type="$rcu_type srcu_raw srcu_raw_sync" + tst_brk TBROK "failed to load module" fi -fi - -TST_TOTAL=$(echo "$rcu_type" | wc -w) - -est_time=`echo "scale=2; $test_time * $TST_TOTAL / 60 " | bc` -tst_resm TINFO "estimate time $est_time min" - -for type in $rcu_type; do - - tst_resm TINFO "$type: running $test_time sec..." - - modprobe rcutorture nfakewriters=$num_writers \ - stat_interval=60 test_no_idle_hz=1 shuffle_interval=3 \ - stutter=5 irqreader=1 fqs_duration=0 fqs_holdoff=0 \ - fqs_stutter=3 test_boost=1 test_boost_interval=7 \ - test_boost_duration=4 shutdown_secs=0 \ - stall_cpu=0 stall_cpu_holdoff=10 n_barrier_cbs=0 \ - onoff_interval=0 onoff_holdoff=0 torture_type=$type \ - > /dev/null 2>&1 || tst_brkm TBROK "failed to load module" - sleep $test_time + sleep ${test_time} - rmmod rcutorture > /dev/null 2>&1 || \ - tst_brkm TBROK "failed to unload module" + rmmod rcutorture >/dev/null 2>&1 || \ + tst_brk TBROK "failed to unload module" # check module status in dmesg - result_str=`dmesg | sed -nE '$s/.*End of test: ([A-Z]+):.*/\1/p'` - if [ "$result_str" = "SUCCESS" ]; then - tst_resm TPASS "$type: completed" + local res=$(dmesg | sed -nE "s/.* ${rcu_type}-torture:.* End of test: (.*): .*/\1/p" | tail -n1) + if [ "$res" = "SUCCESS" ]; then + tst_res TPASS "${rcu_type}-torture: $res" else - tst_resm TFAIL "$type: $result_str, see dmesg" + tst_res TFAIL "${rcu_type}-torture: $res, see dmesg" fi -done +} + +do_test() +{ + case $1 in + 1) rcutorture_test rcu;; + 2) rcutorture_test srcu;; + 3) rcutorture_test srcud;; + 4) rcutorture_test tasks;; + esac +} -tst_exit +tst_run
1) Cleanup and convert to new API 2) Update valid rcutorture types(rcu, srcu, srcud, tasks) Note: Exclude valid busted* types(busted, busted_srcud) that check the test itself and expect failures, suggested by: https://www.spinics.net/lists/kernel/msg3045252.html Signed-off-by: Xiao Yang <ice_yangxiao@163.com> v2: 1) Add check for invalid rcutorture types 2) Remove unnecessary code and update descriptions 3) Exclude busted* types --- testcases/kernel/device-drivers/rcu/rcu_torture.sh | 139 +++++++++------------ 1 file changed, 59 insertions(+), 80 deletions(-)