From: Sagi Grimberg <sagi@grimberg.me>
To: linux-block@vger.kernel.org, Omar Sandoval <osandov@osandov.com>
Cc: linux-nvme@lists.infradead.org,
Logan Gunthorpe <logang@deltatee.com>,
Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
Keith Busch <kbusch@kernel.org>, Christoph Hellwig <hch@lst.de>
Subject: [PATCH v6 6/7] common: move module_unload to common
Date: Thu, 3 Sep 2020 14:26:33 -0700 [thread overview]
Message-ID: <20200903212634.503227-7-sagi@grimberg.me> (raw)
In-Reply-To: <20200903212634.503227-1-sagi@grimberg.me>
It creates a dependency between multipath-over-rdma and test/nvmeof/rc
(and test/srp/rc) which is not a natural home for it.
Move it to common helpers.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
common/rc | 13 +++++++++++++
tests/nvmeof-mp/rc | 13 -------------
tests/srp/rc | 13 -------------
3 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/common/rc b/common/rc
index 7f02103dc786..cdc0150ea5ea 100644
--- a/common/rc
+++ b/common/rc
@@ -291,3 +291,16 @@ _filter_xfs_io_error() {
_uptime_s() {
awk '{ print int($1) }' /proc/uptime
}
+
+# Arguments: module to unload ($1) and retry count ($2).
+unload_module() {
+ local i m=$1 rc=${2:-1}
+
+ [ ! -e "/sys/module/$m" ] && return 0
+ for ((i=rc;i>0;i--)); do
+ modprobe -r "$m"
+ [ ! -e "/sys/module/$m" ] && return 0
+ sleep .1
+ done
+ return 1
+}
diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index b95adf047a2f..d7a7c878fb19 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -149,19 +149,6 @@ remove_mpath_devs() {
} &>> "$FULL"
}
-# Arguments: module to unload ($1) and retry count ($2).
-unload_module() {
- local i m=$1 rc=${2:-1}
-
- [ ! -e "/sys/module/$m" ] && return 0
- for ((i=rc;i>0;i--)); do
- modprobe -r "$m"
- [ ! -e "/sys/module/$m" ] && return 0
- sleep .1
- done
- return 1
-}
-
start_nvme_client() {
modprobe nvme-core dyndbg=+pmf &&
modprobe nvme dyndbg=+pmf &&
diff --git a/tests/srp/rc b/tests/srp/rc
index 72a3bca3b44d..7fc094b8267f 100755
--- a/tests/srp/rc
+++ b/tests/srp/rc
@@ -321,19 +321,6 @@ remove_mpath_devs() {
} &>> "$FULL"
}
-# Arguments: module to unload ($1) and retry count ($2).
-unload_module() {
- local i m=$1 rc=${2:-1}
-
- [ ! -e "/sys/module/$m" ] && return 0
- for ((i=rc;i>0;i--)); do
- modprobe -r "$m"
- [ ! -e "/sys/module/$m" ] && return 0
- sleep .1
- done
- return 1
-}
-
# Load the SRP initiator driver with kernel module parameters $1..$n.
start_srp_ini() {
modprobe scsi_transport_srp || return $?
--
2.25.1
next prev parent reply other threads:[~2020-09-03 21:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-03 21:26 [PATCH v6 0/7] blktests: Add support to run nvme tests with tcp/rdma transports Sagi Grimberg
2020-09-03 21:26 ` [PATCH v6 1/7] nvme: consolidate nvme requirements based on transport type Sagi Grimberg
2020-09-03 21:26 ` [PATCH v6 2/7] nvme: consolidate some nvme-cli utility functions Sagi Grimberg
2020-09-03 21:26 ` [PATCH v6 3/7] nvme: make tests transport type agnostic Sagi Grimberg
2020-09-03 21:35 ` Logan Gunthorpe
2020-09-03 21:59 ` Sagi Grimberg
2020-09-03 21:26 ` [PATCH v6 4/7] tests/nvme: restrict tests to specific transports Sagi Grimberg
2020-09-03 21:26 ` [PATCH v6 5/7] nvme: support nvme-tcp when runinng tests Sagi Grimberg
2020-09-03 21:26 ` Sagi Grimberg [this message]
2020-09-03 21:26 ` [PATCH v6 7/7] nvme: support rdma transport type Sagi Grimberg
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=20200903212634.503227-7-sagi@grimberg.me \
--to=sagi@grimberg.me \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=logang@deltatee.com \
--cc=osandov@osandov.com \
/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).