From: "Paul E. McKenney" <paulmck@kernel.org>
To: rcu@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
rostedt@goodmis.org, "Paul E. McKenney" <paulmck@kernel.org>
Subject: [PATCH rcu 03/12] torture: Permit running of experimental torture types
Date: Mon, 18 Apr 2022 17:15:16 -0700 [thread overview]
Message-ID: <20220419001525.3950505-3-paulmck@kernel.org> (raw)
In-Reply-To: <20220419001519.GA3950405@paulmck-ThinkPad-P17-Gen-1>
This commit weakens the checks of the kvm.sh script's --torture parameter
and the kvm-recheck.sh script's parsing so that experimental torture tests
may be created without updating these two scripts. The changes required
are to the appropriate Makefile and Kconfig file, plus a directory
whose name begins with "X" must be added to the rcutorture/configs file.
This new directory's name can then be passed in via the kvm.sh script's
--torture parameter.
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
---
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 7 ++++++-
tools/testing/selftests/rcutorture/bin/kvm.sh | 4 ++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
index 0a5419982ab3..0789c5606d2a 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh
@@ -33,7 +33,12 @@ do
TORTURE_SUITE="`cat $i/../torture_suite`"
configfile=`echo $i | sed -e 's,^.*/,,'`
rm -f $i/console.log.*.diags
- kvm-recheck-${TORTURE_SUITE}.sh $i
+ case "${TORTURE_SUITE}" in
+ X*)
+ ;;
+ *)
+ kvm-recheck-${TORTURE_SUITE}.sh $i
+ esac
if test -f "$i/qemu-retval" && test "`cat $i/qemu-retval`" -ne 0 && test "`cat $i/qemu-retval`" -ne 137
then
echo QEMU error, output:
diff --git a/tools/testing/selftests/rcutorture/bin/kvm.sh b/tools/testing/selftests/rcutorture/bin/kvm.sh
index 55b2c1533282..af58b86a503a 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm.sh
@@ -86,7 +86,7 @@ usage () {
echo " --remote"
echo " --results absolute-pathname"
echo " --shutdown-grace seconds"
- echo " --torture lock|rcu|rcuscale|refscale|scf"
+ echo " --torture lock|rcu|rcuscale|refscale|scf|X*"
echo " --trust-make"
exit 1
}
@@ -231,7 +231,7 @@ do
shift
;;
--torture)
- checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\|rcuscale\|refscale\|scf\)$' '^--'
+ checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\|rcuscale\|refscale\|scf\|X.*\)$' '^--'
TORTURE_SUITE=$2
TORTURE_MOD="`echo $TORTURE_SUITE | sed -e 's/^\(lock\|rcu\|scf\)$/\1torture/'`"
shift
--
2.31.1.189.g2e36527f23
next prev parent reply other threads:[~2022-04-19 0:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 0:15 [PATCH rcu 0/12] Torture-test scripting updates for v5.19 Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 01/12] torture: Reposition so that $? collects ssh code in torture.sh Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 02/12] torture: Use "-o Batchmode=yes" to disable ssh password requests Paul E. McKenney
2022-04-19 0:15 ` Paul E. McKenney [this message]
2022-04-19 0:15 ` [PATCH rcu 04/12] torture: Make thread detection more robust by using lspcu Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 05/12] torture: Skip vmlinux check for kvm-again.sh runs Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 06/12] torture: Enable CSD-lock stall reports for scftorture Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 07/12] rcutorture: Adjust scenarios' Kconfig options for CONFIG_PREEMPT_DYNAMIC Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 08/12] scftorture: Remove extraneous "scf" from per_version_boot_params Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 09/12] torture: Save "make allmodconfig" .config file Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 10/12] rcutorture: Make kvm.sh allow more memory for --kasan runs Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 11/12] rcutorture: Make torture.sh refscale and rcuscale specify Tasks Trace RCU Paul E. McKenney
2022-04-19 0:15 ` [PATCH rcu 12/12] rcutorture: Make torture.sh allow for --kasan Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220419001525.3950505-3-paulmck@kernel.org \
--to=paulmck@kernel.org \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rcu@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®