From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-block@vger.kernel.org, Omar Sandoval <osandov@osandov.com>
Cc: Sagi Grimberg <sagi@grimberg.me>,
Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH blktests v2 02/11] common/xfs: Create common helper to check for XFS support
Date: Wed, 30 Sep 2020 12:54:13 -0600 [thread overview]
Message-ID: <20200930185422.11494-3-logang@deltatee.com> (raw)
In-Reply-To: <20200930185422.11494-1-logang@deltatee.com>
Two nvme tests create and mount XFS filesystems and check for mkfs.xfs.
They should also check for XFS support in the kernel so create a common
helper for this.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
common/rc | 8 ++++++++
common/xfs | 11 +++++++++++
tests/nvme/012 | 6 ++++--
tests/nvme/013 | 4 +++-
4 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 common/xfs
diff --git a/common/rc b/common/rc
index cdc0150ea5ea..44cb218c2fac 100644
--- a/common/rc
+++ b/common/rc
@@ -181,6 +181,14 @@ _have_tracepoint() {
return 0
}
+_have_fs() {
+ modprobe "$1" >/dev/null 2>&1
+ if [[ ! -d "/sys/fs/$1" ]]; then
+ SKIP_REASON="kernel does not support filesystem $1"
+ return 1
+ fi
+}
+
_test_dev_is_rotational() {
[[ $(cat "${TEST_DEV_SYSFS}/queue/rotational") -ne 0 ]]
}
diff --git a/common/xfs b/common/xfs
new file mode 100644
index 000000000000..d1a603b8c7b5
--- /dev/null
+++ b/common/xfs
@@ -0,0 +1,11 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0+
+# Copyright (C) 2017 Omar Sandoval
+#
+# fio helper functions.
+
+. common/shellcheck
+
+_have_xfs() {
+ _have_fs xfs && _have_program mkfs.xfs
+}
diff --git a/tests/nvme/012 b/tests/nvme/012
index 1dbd59804ed7..1d8d8e3cc271 100755
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -5,14 +5,16 @@
# Test mkfs with data verification for block device backed ns.
. tests/nvme/rc
+. common/xfs
DESCRIPTION="run mkfs and data verification fio job on NVMeOF block device-backed ns"
TIMED=1
requires() {
_nvme_requires
- _have_program mkfs.xfs && _have_program fio && \
- _have_modules loop
+ _have_xfs
+ _have_program fio
+ _have_modules loop
_require_nvme_trtype_is_fabrics
}
diff --git a/tests/nvme/013 b/tests/nvme/013
index df7f23e69252..3819a2730d9b 100755
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -5,13 +5,15 @@
# Test mkfs with data verification for file backed ns.
. tests/nvme/rc
+. common/xfs
DESCRIPTION="run mkfs and data verification fio job on NVMeOF file-backed ns"
TIMED=1
requires() {
_nvme_requires
- _have_program mkfs.xfs && _have_fio
+ _have_xfs
+ _have_fio
_require_nvme_trtype_is_fabrics
}
--
2.20.1
next prev parent reply other threads:[~2020-09-30 19:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 18:54 [PATCH blktests v2 00/11] NVMe Target Passthru Block Tests Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 01/11] common/fio: Remove state file in common helper Logan Gunthorpe
2020-09-30 18:54 ` Logan Gunthorpe [this message]
2020-10-06 23:44 ` [PATCH blktests v2 02/11] common/xfs: Create common helper to check for XFS support Chaitanya Kulkarni
2020-10-06 23:51 ` Logan Gunthorpe
2020-10-07 0:58 ` Chaitanya Kulkarni
2020-09-30 18:54 ` [PATCH blktests v2 03/11] common/xfs: Create common helper to verify block device with xfs Logan Gunthorpe
2020-10-06 23:50 ` Chaitanya Kulkarni
2020-10-06 23:59 ` Logan Gunthorpe
[not found] ` <BYAPR04MB49652338A4FE3805F9394A88860A0@BYAPR04MB4965.namprd04.prod.outlook.com>
2020-10-07 15:53 ` Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 04/11] nvme: Search for specific subsysnqn in _find_nvme_loop_dev Logan Gunthorpe
2020-10-06 23:55 ` Chaitanya Kulkarni
2020-10-07 0:10 ` Logan Gunthorpe
[not found] ` <BYAPR04MB49650C6419A84705D04FFE63860A0@BYAPR04MB4965.namprd04.prod.outlook.com>
2020-10-07 15:55 ` Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 05/11] nvme: Add common helpers for passthru tests Logan Gunthorpe
2020-10-07 0:02 ` Chaitanya Kulkarni
2020-10-07 0:13 ` Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 06/11] nvme/033: Simple test to create and connect to a passthru target Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 07/11] nvme/034: Add test for passthru data verification Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 08/11] nvme/035: Add test to verify passthru controller with a filesystem Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 09/11] nvme/036: Add test for testing reset command on nvme-passthru Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 10/11] nvme/037: Add test which loops passthru connect and disconnect Logan Gunthorpe
2020-09-30 18:54 ` [PATCH blktests v2 11/11] nvme/038: Test removal of un-enabled subsystem and ports 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=20200930185422.11494-3-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=osandov@osandov.com \
--cc=sagi@grimberg.me \
--cc=sbates@raithlin.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).