From: Logan Gunthorpe <logang@deltatee.com>
To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
Omar Sandoval <osandov@fb.com>
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
Michael Moese <mmoese@suse.de>, Theodore Ts'o <tytso@mit.edu>,
Johannes Thumshirn <jthumshirn@suse.de>,
Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH blktests 05/12] nvme/005: Don't rely on modprobing to set the multipath paramater
Date: Fri, 12 Jul 2019 17:57:35 -0600 [thread overview]
Message-ID: <20190712235742.22646-6-logang@deltatee.com> (raw)
In-Reply-To: <20190712235742.22646-1-logang@deltatee.com>
On test systems with existing nvme drives or built-in modules it may not
be possible to remove nvme-core in order to re-probe it with
multipath=1.
Instead, skip the test if the multipath parameter is not already set
ahead of time.
Note: the multipath parameter of nvme-core is set by default if
CONFIG_NVME_MULTIPATH is set so this will only affect systems
that explicitly disable it via the module parameter.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
common/rc | 16 ++++++++++++++++
tests/nvme/005 | 10 ++--------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/common/rc b/common/rc
index 5dd2c9512fd2..49050c71dabf 100644
--- a/common/rc
+++ b/common/rc
@@ -55,6 +55,22 @@ _have_module_param() {
return 0
}
+_have_module_param_value() {
+ local value
+
+ if ! _have_module_param "$1" "$2"; then
+ return 1
+ fi
+
+ value=$(cat "/sys/module/$1/parameters/$2")
+ if [[ "${value}" != "$3" ]]; then
+ SKIP_REASON="$1 module parameter $2 must be set to $3"
+ return 1
+ fi
+
+ return 0
+}
+
_have_program() {
if command -v "$1" >/dev/null 2>&1; then
return 0
diff --git a/tests/nvme/005 b/tests/nvme/005
index e72fc809c936..91c164de73e6 100755
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -12,18 +12,13 @@ QUICK=1
requires() {
_have_modules loop nvme-core nvme-loop nvmet && \
- _have_module_param nvme-core multipath && _have_configfs
+ _have_module_param_value nvme_core multipath Y && \
+ _have_configfs
}
test() {
echo "Running ${TEST_NAME}"
- # Clean up all stale modules
- modprobe -r nvme-loop
- modprobe -r nvme-core
- modprobe -r nvmet
-
- modprobe nvme-core multipath=1
modprobe nvmet
modprobe nvme-loop
@@ -57,7 +52,6 @@ test() {
rm "$TMPDIR/img"
modprobe -r nvme-loop
- modprobe -r nvme-core
modprobe -r nvmet
echo "Test complete"
--
2.17.1
next prev parent reply other threads:[~2019-07-12 23:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 23:57 [PATCH blktests 00/12] Fix nvme block test issues Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 01/12] Add filter function for nvme discover Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 03/12] nvme: Add new test to verify the generation counter Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 04/12] nvme/003,004: Add missing calls to nvme disconnect Logan Gunthorpe
2019-07-12 23:57 ` Logan Gunthorpe [this message]
2019-07-12 23:57 ` [PATCH blktests 06/12] nvme/015: Ensure the namespace is flushed not the char device Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 07/12] nvme/018: Ignore error message generated by nvme read Logan Gunthorpe
2019-07-15 7:15 ` [PATCH blktests 07/12] nvme/018: Ignore error message generated by nvme read] Johannes Thumshirn
2019-07-15 15:40 ` Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 08/12] check: Add the ability to call a cleanup function after a test ends Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 09/12] nvme: Cleanup modprobe lines into helper functions Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 10/12] nvme: Ensure all ports and subsystems are removed on cleanup Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 11/12] common: Use sysfs instead of modinfo for _have_module_param() Logan Gunthorpe
2019-07-15 7:21 ` Johannes Thumshirn
2019-07-15 15:41 ` Logan Gunthorpe
2019-07-12 23:57 ` [PATCH blktests 12/12] nvme: Ignore errors when removing modules Logan Gunthorpe
2019-07-13 0:01 ` [PATCH blktests 00/12] Fix nvme block test issues Logan Gunthorpe
2019-07-15 17:14 ` Chaitanya Kulkarni
[not found] ` <20190712235742.22646-3-logang@deltatee.com>
2019-07-15 23:07 ` [PATCH blktests 02/12] nvme: More agressively filter the discovery output Omar Sandoval
2019-07-15 23:14 ` [PATCH blktests 00/12] Fix nvme block test issues Omar Sandoval
2019-07-15 23:16 ` Logan Gunthorpe
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=20190712235742.22646-6-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=chaitanya.kulkarni@wdc.com \
--cc=jthumshirn@suse.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mmoese@suse.de \
--cc=osandov@fb.com \
--cc=sbates@raithlin.com \
--cc=tytso@mit.edu \
/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;
as well as URLs for NNTP newsgroup(s).