[blktests,v3,03/12] common/xfs: Make size argument optional for _xfs_run_fio_verify_io
Commit Message
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.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
common/xfs | 14 +++++++++++++-
tests/nvme/012 | 2 +-
tests/nvme/013 | 2 +-
3 files changed, 15 insertions(+), 3 deletions(-)
Comments
On 5/3/23 01:02, Daniel Wagner wrote:
> 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.
>
> Signed-off-by: Daniel Wagner <dwagner@suse.de>
> ---
>
Looks good.
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
-ck
@@ -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}"
@@ -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}"
@@ -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}"