From: Bart Van Assche <bvanassche@acm.org>
To: Omar Sandoval <osandov@fb.com>
Cc: linux-block@vger.kernel.org, Yi Zhang <yi.zhang@redhat.com>,
Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH blktests 2/3] tests/srp/rc: Improve reliability of stop_lio_srpt()
Date: Mon, 25 Jan 2021 20:45:18 -0800 [thread overview]
Message-ID: <20210126044519.6366-3-bvanassche@acm.org> (raw)
In-Reply-To: <20210126044519.6366-1-bvanassche@acm.org>
Remove the 'np' directory if it exists. Unload the iscsi_target_mod kernel
module if it has been loaded.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
tests/srp/rc | 43 +++++++++++++++----------------------------
1 file changed, 15 insertions(+), 28 deletions(-)
diff --git a/tests/srp/rc b/tests/srp/rc
index 1f665a28db66..700cd71ea155 100755
--- a/tests/srp/rc
+++ b/tests/srp/rc
@@ -545,34 +545,21 @@ stop_lio_srpt() {
fi
done
- if [ -e /sys/kernel/config/target/srpt ]; then
- (
- cd /sys/kernel/config/target/srpt && (
- for d in */*/acls/*/*/lun*; do [ -L "$d" ] && rm "$d"; done
- for d in */*/acls/*/lun*; do [ -d "$d" ] && rmdir "$d"; done
- for d in */*/acls/*; do [ -d "$d" ] && rmdir "$d"; done
- for d in */*/lun/lun*/*; do [ -L "$d" ] && rm "$d"; done
- for d in */*/lun/lun*; do [ -d "$d" ] && rmdir "$d"; done
- for d in */*; do [ -e "$d/lun" ] && rmdir "$d"; done
- for d in *; do [ -e "$d/fabric_statistics" ] && rmdir "$d"; done
- true
- ) &&
- cd .. &&
- for ((i=0;i<10;i++)); do
- rmdir srpt
- [ -e srpt ] || break
- sleep .1
- done &&
- [ ! -e srpt ] &&
- unload_module ib_srpt 10
- ) || return $?
- fi
-
- rmdir /sys/kernel/config/target/core/*/* >&/dev/null
- rmdir /sys/kernel/config/target/core/* >&/dev/null
-
- for m in ib_srpt target_core_pscsi target_core_iblock target_core_file \
- target_core_stgt target_core_user target_core_mod
+ rmdir /sys/kernel/config/target/*/*/*/np/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/*/*/np >&/dev/null
+ rm -f /sys/kernel/config/target/*/*/*/acls/*/*/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/*/*/acls/*/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/*/*/acls/* >&/dev/null
+ rm -f /sys/kernel/config/target/*/*/*/lun/*/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/*/*/lun/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/*/*/*/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/*/* >&/dev/null
+ rmdir /sys/kernel/config/target/*/* >&/dev/null
+ rmdir /sys/kernel/config/target/* >&/dev/null
+
+ for m in ib_srpt iscsi_target_mod target_core_pscsi target_core_iblock \
+ target_core_file target_core_stgt target_core_user \
+ target_core_mod
do
unload_module $m 10 || return $?
done
next prev parent reply other threads:[~2021-01-26 21:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 4:45 [PATCH blktests 0/3] Three SRP patches Bart Van Assche
2021-01-26 4:45 ` [PATCH blktests 1/3] tests/block/030: Make this test less noisy Bart Van Assche
2021-01-26 4:45 ` Bart Van Assche [this message]
2021-01-26 4:45 ` [PATCH blktests 3/3] rdma: Use rdma link instead of /sys/class/infiniband/*/parent Bart Van Assche
2021-02-03 16:40 ` Omar Sandoval
2021-02-04 3:58 ` Bart Van Assche
2021-02-28 14:45 ` Yi Zhang
2021-02-28 22:34 ` Bart Van Assche
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=20210126044519.6366-3-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=linux-block@vger.kernel.org \
--cc=osandov@fb.com \
--cc=yi.zhang@redhat.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).