From: Yi Zhang <yi.zhang@redhat.com>
To: bvanassche@acm.org, osandov@osandov.com
Cc: linux-block@vger.kernel.org
Subject: [PATCH blktests] common/multipath-over-rdma: update is_rdma_device
Date: Thu, 21 Jan 2021 07:18:39 +0800 [thread overview]
Message-ID: <20210120231839.10267-1-yi.zhang@redhat.com> (raw)
Below patch make the siw/rxe device virtual in the device tree, update
is_rdma_device to match it.
a9d2e9ae953f RDMA/siw,rxe: Make emulated devices virtual in the device tree
Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
---
common/multipath-over-rdma | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/common/multipath-over-rdma b/common/multipath-over-rdma
index 355b169..e4269f6 100644
--- a/common/multipath-over-rdma
+++ b/common/multipath-over-rdma
@@ -79,17 +79,24 @@ is_number() {
# Check whether a device is an RDMA device. An example argument:
# /sys/devices/pci0000:00/0000:00:03.0/0000:04:00.0
is_rdma_device() {
- local d i inode1 inode2
+ local d i f inode1 inode2
- inode1=$(stat -c %i "$1")
- # echo "inode1 = $inode1"
+ f=$1
+ inode1=$(stat -c %i "$f")
for i in /sys/class/infiniband/*; do
d=/sys/class/infiniband/"$(readlink "$i")"
- d=$(dirname "$(dirname "$d")")
- inode2=$(stat -c %i "$d")
- # echo "inode2 = $inode2"
- if [ "$inode1" = "$inode2" ]; then
- return
+ if [[ "$d" == *"virtual"* ]]; then
+ if [[ -e "$d/parent" && "${f%%/*}" == "$(<"$d"/parent)" ]] || \
+ [[ "${f%%/*}_siw" == "$(basename "$d")" ]]; then
+ return
+ fi
+ else
+ d1=$(dirname "$(dirname "$d")")
+ inode2=$(stat -c %i "$d1")
+ # echo "inode2 = $inode2"
+ if [ "$inode1" = "$inode2" ]; then
+ return
+ fi
fi
done
false
--
2.21.0
next reply other threads:[~2021-01-21 0:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 23:18 Yi Zhang [this message]
2021-01-21 4:01 ` [PATCH blktests] common/multipath-over-rdma: update is_rdma_device 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=20210120231839.10267-1-yi.zhang@redhat.com \
--to=yi.zhang@redhat.com \
--cc=bvanassche@acm.org \
--cc=linux-block@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.