Messages in this thread Patch in this message | | | Date | Fri, 21 Apr 2023 08:27:35 +0200 | Subject | Re: [PATCH REPOST blktests v2 3/9] common-xfs: Make size argument optional for _xfs_run_fio_verify_io | From | Hannes Reinecke <> |
| |
On 4/21/23 08:04, 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> > --- > common/xfs | 6 ++++++ > tests/nvme/012 | 2 +- > tests/nvme/013 | 2 +- > tests/nvme/035 | 2 +- > 4 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/common/xfs b/common/xfs > index 2c5d96164ac1..ec35599e017b 100644 > --- a/common/xfs > +++ b/common/xfs > @@ -27,6 +27,12 @@ _xfs_run_fio_verify_io() { > > _xfs_mkfs_and_mount "${bdev}" "${mount_dir}" >> "${FULL}" 2>&1 > > + if [[ -z "${sz}" ]]; then > + local avail > + avail="$(df --output=avail "${mount_dir}" | awk 'NR==2 {print $1}')"
df --output=avail "${mount_dir}" | tail -1
> + sz="$(printf "%d" $((avail / 1024 - 1 )))m"
sz=$((avail / 1024 - 1))
> + fi > + > _run_fio_verify_io --size="$sz" --directory="${mount_dir}/"
_run_fio_verify_io --size="${sz}m" --directory="${mount_dir}/"
> > umount "${mount_dir}" >> "${FULL}" 2>&1 > 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}" > > diff --git a/tests/nvme/035 b/tests/nvme/035 > index eb1024edddbf..8b485bc8e682 100755 > --- 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}" "900m" > + _xfs_run_fio_verify_io "${nsdev}" > > _nvme_disconnect_subsys "${subsys}" > _nvmet_passthru_target_cleanup "${port}" "${subsys}"
Otherwise looks good.
Cheers,
Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
| |