From: Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>
To: Logan Gunthorpe <logang@deltatee.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
"linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
Omar Sandoval <osandov@osandov.com>
Cc: Sagi Grimberg <sagi@grimberg.me>, Stephen Bates <sbates@raithlin.com>
Subject: Re: [PATCH blktests v2 03/11] common/xfs: Create common helper to verify block device with xfs
Date: Tue, 6 Oct 2020 23:50:37 +0000 [thread overview]
Message-ID: <BYAPR04MB4965C2DDD4A5FBD86A128FE9860D0@BYAPR04MB4965.namprd04.prod.outlook.com> (raw)
In-Reply-To: 20200930185422.11494-4-logang@deltatee.com
On 9/30/20 11:54, Logan Gunthorpe wrote:
> Make a common helper from the code in tests nvme/012 and nvme/013
> to run an fio verify on a XFS file system backed by the
> specified block device.
>
> While we are at it, all the output is redirected to $FULL instead of
> /dev/null.
>
> Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
> ---
> common/xfs | 22 ++++++++++++++++++++++
> tests/nvme/012 | 14 +-------------
> tests/nvme/013 | 14 +-------------
> 3 files changed, 24 insertions(+), 26 deletions(-)
The common namespace is getting cluttered. Can you please create
a subdirectory common/fs/xfs ?
>
> diff --git a/common/xfs b/common/xfs
> index d1a603b8c7b5..210c924cdd41 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -9,3 +9,25 @@
> _have_xfs() {
> _have_fs xfs && _have_program mkfs.xfs
> }
> +
> +_xfs_mkfs_and_mount() {
> + local bdev=$1
> + local mount_dir=$2
> +
> + mkdir -p "${mount_dir}"
> + umount "${mount_dir}"
> + mkfs.xfs -l size=32m -f "${bdev}"
> + mount "${bdev}" "${mount_dir}"
> +}
> +
> +_xfs_run_fio_verify_io() {
> + local mount_dir="/mnt/blktests"
The mount dir should be a parameter and not the hardcode value
to make it reusable.
> + local bdev=$1
> +
> + _xfs_mkfs_and_mount "${bdev}" "${mount_dir}" >> "${FULL}" 2>&1
> +
> + _run_fio_verify_io --size=950m --directory="${mount_dir}/"
> +
> + umount "${mount_dir}" >> "${FULL}" 2>&1
> + rm -fr "${mount_dir}"
> +}
> diff --git a/tests/nvme/012 b/tests/nvme/012
> index 1d8d8e3cc271..a13cd08ce6bf 100755
> --- a/tests/nvme/012
> +++ b/tests/nvme/012
> @@ -26,12 +26,9 @@ test() {
> local port
> local nvmedev
> local loop_dev
> - local mount_dir="/mnt/blktests"
> local file_path="${TMPDIR}/img"
> local subsys_name="blktests-subsystem-1"
>
> - mkdir -p "${mount_dir}" > /dev/null 2>&1
> -
> truncate -s 1G "${file_path}"
>
> loop_dev="$(losetup -f --show "${file_path}")"
> @@ -47,15 +44,7 @@ test() {
> cat "/sys/block/${nvmedev}n1/uuid"
> cat "/sys/block/${nvmedev}n1/wwid"
>
> - umount ${mount_dir} > /dev/null 2>&1
> -
> - mkfs.xfs -l size=32m -f /dev/"${nvmedev}n1" > /dev/null 2>&1
> -
> - mount /dev/"${nvmedev}n1" "${mount_dir}"
> -
> - _run_fio_verify_io --size=950m --directory="${mount_dir}/"
> -
> - umount "${mount_dir}" > /dev/null 2>&1
> + _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
>
> _nvme_disconnect_subsys "${subsys_name}"
>
> @@ -66,7 +55,6 @@ test() {
> losetup -d "${loop_dev}"
>
> rm "${file_path}"
> - rm -fr "${mount_dir}"
>
> echo "Test complete"
> }
> diff --git a/tests/nvme/013 b/tests/nvme/013
> index 3819a2730d9b..1ac725ea83f2 100755
> --- a/tests/nvme/013
> +++ b/tests/nvme/013
> @@ -24,13 +24,10 @@ test() {
>
> local port
> local nvmedev
> - local mount_dir="/mnt/blktests/"
> local file_path="${TMPDIR}/img"
>
> local subsys_name="blktests-subsystem-1"
>
> - mkdir -p "${mount_dir}" > /dev/null 2>&1
> -
> truncate -s 1G "${file_path}"
>
> _create_nvmet_subsystem "${subsys_name}" "${file_path}" \
> @@ -44,15 +41,7 @@ test() {
> cat "/sys/block/${nvmedev}n1/uuid"
> cat "/sys/block/${nvmedev}n1/wwid"
>
> - umount ${mount_dir} > /dev/null 2>&1
> -
> - mkfs.xfs -l size=32m -f /dev/"${nvmedev}n1" > /dev/null 2>&1
> -
> - mount /dev/"${nvmedev}n1" "${mount_dir}"
> -
> - _run_fio_verify_io --size=800m --directory="${mount_dir}/"
> -
> - umount "${mount_dir}" > /dev/null 2>&1
> + _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
>
> _nvme_disconnect_subsys "${subsys_name}"
>
> @@ -61,7 +50,6 @@ test() {
> _remove_nvmet_port "${port}"
>
> rm "${file_path}"
> - rm -fr "${mount_dir}"
>
> echo "Test complete"
> }
rest looks good
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-10-06 23:50 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 ` [PATCH blktests v2 02/11] common/xfs: Create common helper to check for XFS support Logan Gunthorpe
2020-10-06 23:44 ` 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 [this message]
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=BYAPR04MB4965C2DDD4A5FBD86A128FE9860D0@BYAPR04MB4965.namprd04.prod.outlook.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=logang@deltatee.com \
--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).