common/xfs: Make size argument optional for _xfs_run_fio_verify_io

Make the size argument optional by reading the filesystem info. The
caller doesn't have to guess (or calculate) how big the max IO size.
The log data structure of XFS is reducing the capacity.

Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/common/xfs b/common/xfs
index 2c5d96164ac179d177474ddf770c406196f2989d..413c2820ffaf32b850958bd162ee3834b9f38dff 100644 (file)
--- a/common/xfs
+++ b/common/xfs
@@ -24,10 +24,22 @@ _xfs_run_fio_verify_io() {
        local mount_dir="/mnt/blktests"
        local bdev=$1
        local sz=$2
+       local sz_mb
+       local avail
+       local avail_mb
 
        _xfs_mkfs_and_mount "${bdev}" "${mount_dir}" >> "${FULL}" 2>&1
 
-       _run_fio_verify_io --size="$sz" --directory="${mount_dir}/"
+       avail="$(df --output=avail "${mount_dir}" | tail -1)"
+       avail_mb="$((avail / 1024))"
+
+       if [[ -z "${sz}" ]]; then
+               sz_mb="${avail_mb}"
+       else
+               sz_mb="$(convert_to_mb "${sz}")"
+       fi
+
+       _run_fio_verify_io --size="${sz_mb}m" --directory="${mount_dir}/"
 
        umount "${mount_dir}" >> "${FULL}" 2>&1
        rm -fr "${mount_dir}"

diff --git a/tests/nvme/012 b/tests/nvme/012
index e60082c2e751381a654e80bd105663185684182b..c9d24388306df6a36d3c05f7294e0a4d5746e3d1 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" "900m"
+       _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
 
        _nvme_disconnect_subsys "${subsys_name}"
 

diff --git a/tests/nvme/013 b/tests/nvme/013
index 9d60a7df4577ed459c26eae9765ea6b5043da0d9..265b6968fd348439d1fb814097952dd963123ae1 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" "900m"
+       _xfs_run_fio_verify_io "/dev/${nvmedev}n1"
 
        _nvme_disconnect_subsys "${subsys_name}"