lkml.org 
[lkml]   [2023]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH blktests v4 03/11] common/xfs: Make size argument optional for _xfs_run_fio_verify_io
    Date
    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>
    ---
    common/xfs | 14 +++++++++++++-
    tests/nvme/012 | 2 +-
    tests/nvme/013 | 2 +-
    3 files changed, 15 insertions(+), 3 deletions(-)

    diff --git a/common/xfs b/common/xfs
    index 2c5d96164ac1..413c2820ffaf 100644
    --- 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 e60082c2e751..c9d24388306d 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" "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 9d60a7df4577..265b6968fd34 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" "900m"
    + _xfs_run_fio_verify_io "/dev/${nvmedev}n1"

    _nvme_disconnect_subsys "${subsys_name}"

    --
    2.40.0
    \
     
     \ /
      Last update: 2023-05-11 16:11    [W:4.063 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site