linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yi Zhang <yi.zhang@redhat.com>
To: shinichiro.kawasaki@wdc.com, chaitanyak@nvidia.com
Cc: linux-block@vger.kernel.org
Subject: [PATCH blktests 3/3] common/xfs: update _xfs_run_fio_verify_io to accept the size parameter
Date: Mon, 24 Oct 2022 14:13:19 +0800	[thread overview]
Message-ID: <20221024061319.1133470-4-yi.zhang@redhat.com> (raw)
In-Reply-To: <20221024061319.1133470-1-yi.zhang@redhat.com>

This commit alo updated nvme/012 nvme/013 nvme/035 to pass the size
parameter to _xfs_run_fio_verify_io

Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
---
 common/xfs     | 3 ++-
 tests/nvme/012 | 2 +-
 tests/nvme/013 | 2 +-
 tests/nvme/035 | 9 ++++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/xfs b/common/xfs
index 846a5ef..2c5d961 100644
--- a/common/xfs
+++ b/common/xfs
@@ -23,10 +23,11 @@ _xfs_mkfs_and_mount() {
 _xfs_run_fio_verify_io() {
 	local mount_dir="/mnt/blktests"
 	local bdev=$1
+	local sz=$2
 
 	_xfs_mkfs_and_mount "${bdev}" "${mount_dir}" >> "${FULL}" 2>&1
 
-	_run_fio_verify_io --size=950m --directory="${mount_dir}/"
+	_run_fio_verify_io --size="$sz" --directory="${mount_dir}/"
 
 	umount "${mount_dir}" >> "${FULL}" 2>&1
 	rm -fr "${mount_dir}"
diff --git a/tests/nvme/012 b/tests/nvme/012
index c9d2438..e60082c 100755
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -44,7 +44,7 @@ test() {
 	cat "/sys/block/${nvmedev}n1/uuid"
 	cat "/sys/block/${nvmedev}n1/wwid"
 
-	_xfs_run_fio_verify_io "/dev/${nvmedev}n1"
+	_xfs_run_fio_verify_io "/dev/${nvmedev}n1" "900m"
 
 	_nvme_disconnect_subsys "${subsys_name}"
 
diff --git a/tests/nvme/013 b/tests/nvme/013
index 265b696..9d60a7d 100755
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -41,7 +41,7 @@ test() {
 	cat "/sys/block/${nvmedev}n1/uuid"
 	cat "/sys/block/${nvmedev}n1/wwid"
 
-	_xfs_run_fio_verify_io "/dev/${nvmedev}n1"
+	_xfs_run_fio_verify_io "/dev/${nvmedev}n1" "900m"
 
 	_nvme_disconnect_subsys "${subsys_name}"
 
diff --git a/tests/nvme/035 b/tests/nvme/035
index ee78a75..31de0d1 100755
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -21,14 +21,21 @@ test_device() {
 	local ctrldev
 	local nsdev
 	local port
+	local test_dev_sz
 
 	echo "Running ${TEST_NAME}"
 
 	_setup_nvmet
 	port=$(_nvmet_passthru_target_setup "${subsys}")
 	nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
+	test_dev_sz=$(_get_test_dev_size_mb)
 
-	_xfs_run_fio_verify_io "${nsdev}"
+	if (( "$test_dev_sz" < 1024 )); then
+		echo "Test dev: $TEST_DEV should at leat 1024m"
+		return 1
+
+	fi
+	_xfs_run_fio_verify_io "${nsdev}" "900m"
 
 	_nvme_disconnect_subsys "${subsys}"
 	_nvmet_passthru_target_cleanup "${port}" "${subsys}"
-- 
2.34.1


  parent reply	other threads:[~2022-10-24  6:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-24  6:13 [PATCH blktests 0/3] fix for xfs log size change from new version of xfsprogs Yi Zhang
2022-10-24  6:13 ` [PATCH blktests 1/3] common/xfs: set the minimal log size 64m during mkfs.xfs Yi Zhang
2022-10-24  6:13 ` [PATCH blktests 2/3] common/rc: add one function to get test dev size in mb Yi Zhang
2022-10-25  2:29   ` Shinichiro Kawasaki
2022-11-02  3:01     ` Yi Zhang
2022-10-24  6:13 ` Yi Zhang [this message]
2022-10-25  2:49   ` [PATCH blktests 3/3] common/xfs: update _xfs_run_fio_verify_io to accept the size parameter Shinichiro Kawasaki
2022-11-02  3:04     ` Yi Zhang

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=20221024061319.1133470-4-yi.zhang@redhat.com \
    --to=yi.zhang@redhat.com \
    --cc=chaitanyak@nvidia.com \
    --cc=linux-block@vger.kernel.org \
    --cc=shinichiro.kawasaki@wdc.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).