nvme/012,013,035: change fio I/O size and move size definition place

Change fio I/O size of nvme/012,013,035 from 950m to 900m, since recent change
increased the xfs log size and it caused fio failure with I/O size 950m.

Also add size parameter to _run_fio_verify_io. This allows to move the fio I/O
size definition from common/xfs to the test case, so that device size and fio
I/O size are both defined at single place.

Link: https://lore.kernel.org/linux-block/20221019051244.810755-1-yi.zhang@redhat.com/
Signed-off-by: Yi Zhang <yi.zhang@redhat.com>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/common/xfs b/common/xfs
index 846a5ef4a2f7ed9ca17f4232aa6742710627cc41..2c5d96164ac179d177474ddf770c406196f2989d 100644 (file)
--- 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 c9d24388306df6a36d3c05f7294e0a4d5746e3d1..e60082c2e751381a654e80bd105663185684182b 100755 (executable)
--- 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 265b6968fd348439d1fb814097952dd963123ae1..9d60a7df4577ed459c26eae9765ea6b5043da0d9 100755 (executable)
--- 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 e8581ef30f2565c7fd723b81b9e8ed38418ff208..d169e351e3d0560f8e48187a095b80c82f606587 100755 (executable)
--- a/tests/nvme/035
+++ b/tests/nvme/035
@@ -32,7 +32,7 @@ test_device() {
        port=$(_nvmet_passthru_target_setup "${subsys}")
        nsdev=$(_nvmet_passthru_target_connect "${nvme_trtype}" "${subsys}")
 
-       _xfs_run_fio_verify_io "${nsdev}"
+       _xfs_run_fio_verify_io "${nsdev}" "900m"
 
        _nvme_disconnect_subsys "${subsys}"
        _nvmet_passthru_target_cleanup "${port}" "${subsys}"