On Mon, Dec 16, 2024 at 06:08:28PM -0800, Catherine Hoang wrote:
> Add a test to validate the new atomic writes feature.
>
> Signed-off-by: Catherine Hoang <catherine.hoang@xxxxxxxxxx>
> ---
> common/rc | 14 ++++++++
> tests/xfs/611 | 81 +++++++++++++++++++++++++++++++++++++++++++++++
> tests/xfs/611.out | 2 ++
> 3 files changed, 97 insertions(+)
> create mode 100755 tests/xfs/611
> create mode 100644 tests/xfs/611.out
>
> diff --git a/common/rc b/common/rc
> index 2ee46e51..b9da749e 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -5148,6 +5148,20 @@ _require_scratch_btime()
> _scratch_unmount
> }
>
> +_require_scratch_write_atomic()
> +{
> + _require_scratch
> + _scratch_mkfs > /dev/null 2>&1
> + _scratch_mount
> +
> + export STATX_WRITE_ATOMIC=0x10000
> + $XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $SCRATCH_MNT \
> + | grep atomic >>$seqres.full 2>&1 || \
> + _notrun "write atomic not supported by this filesystem"
> +
> + _scratch_unmount
> +}
> +
> _require_inode_limits()
> {
> if [ $(_get_free_inode $TEST_DIR) -eq 0 ]; then
> diff --git a/tests/xfs/611 b/tests/xfs/611
> new file mode 100755
> index 00000000..a26ec143
> --- /dev/null
> +++ b/tests/xfs/611
> @@ -0,0 +1,81 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (c) 2024 Oracle. All Rights Reserved.
> +#
> +# FS QA Test 611
> +#
> +# Validate atomic write support
> +#
> +. ./common/preamble
> +_begin_fstest auto quick rw
> +
> +_supported_fs xfs
> +_require_scratch
> +_require_scratch_write_atomic
You can omit the _require_scratch since _require_scratch_write_atomic
does it for you.
> +
> +test_atomic_writes()
> +{
> + local bsize=$1
> +
> + _scratch_mkfs_xfs -b size=$bsize >> $seqres.full
> + _scratch_mount
> + _xfs_force_bdev data $SCRATCH_MNT
> +
> + testfile=$SCRATCH_MNT/testfile
> + touch $testfile
> +
> + file_min_write=$($XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $testfile | \
> + grep atomic_write_unit_min | cut -d ' ' -f 3)
> + file_max_write=$($XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $testfile | \
> + grep atomic_write_unit_max | cut -d ' ' -f 3)
> + file_max_segments=$($XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $testfile | \
> + grep atomic_write_segments_max | cut -d ' ' -f 3)
> +
> + # Check that atomic min/max = FS block size
> + test $file_min_write -eq $bsize || \
> + echo "atomic write min $file_min_write, should be fs block size $bsize"
> + test $file_min_write -eq $bsize || \
> + echo "atomic write max $file_max_write, should be fs block size $bsize"
> + test $file_max_segments -eq 1 || \
> + echo "atomic write max segments $file_max_segments, should be 1"
> +
> + # Check that we can perform an atomic write of len = FS block size
> + bytes_written=$($XFS_IO_PROG -dc "pwrite -A -D 0 $bsize" $testfile | \
> + grep wrote | awk -F'[/ ]' '{print $2}')
> + test $bytes_written -eq $bsize || echo "atomic write len=$bsize failed"
Hmm, ok, so that's an extending write, good...
> + # Check that we can perform an atomic write on an unwritten block
> + $XFS_IO_PROG -c "falloc $bsize $bsize" $testfile
> + bytes_written=$($XFS_IO_PROG -dc "pwrite -A -D $bsize $bsize" $testfile | \
> + grep wrote | awk -F'[/ ]' '{print $2}')
> + test $bytes_written -eq $bsize || echo "atomic write to unwritten block failed"
> +
> + # Check that we can perform an atomic write on a sparse hole
> + $XFS_IO_PROG -c "fpunch 0 $bsize" $testfile
> + bytes_written=$($XFS_IO_PROG -dc "pwrite -A -D 0 $bsize" $testfile | \
> + grep wrote | awk -F'[/ ]' '{print $2}')
> + test $bytes_written -eq $bsize || echo "atomic write to sparse hole failed"
...and those check unwritten and non-mapped ranges.
Now that the the file range has been filled with a written block, should
there be a second atomic pwrite here to check that it works for a fully
mapped block?
If reflink is supported, could you also cp --reflink $testfile to make
sure that atomic single-block cow writes work?
Other than that, everything looks good.
--D
> + # Reject atomic write if len is out of bounds
> + $XFS_IO_PROG -dc "pwrite -A -D 0 $((bsize - 1))" $testfile 2>> $seqres.full && \
> + echo "atomic write len=$((bsize - 1)) should fail"
> + $XFS_IO_PROG -dc "pwrite -A -D 0 $((bsize + 1))" $testfile 2>> $seqres.full && \
> + echo "atomic write len=$((bsize + 1)) should fail"
> +
> + _scratch_unmount
> +}
> +
> +bdev_min_write=$($XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $SCRATCH_DEV | \
> + grep atomic_write_unit_min | cut -d ' ' -f 3)
> +bdev_max_write=$($XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $SCRATCH_DEV | \
> + grep atomic_write_unit_max | cut -d ' ' -f 3)
> +
> +for ((bsize=$bdev_min_write; bsize<=bdev_max_write; bsize*=2)); do
> + _scratch_mkfs_xfs_supported -b size=$bsize >> $seqres.full 2>&1 && \
> + test_atomic_writes $bsize
> +done;
> +
> +# success, all done
> +echo Silence is golden
> +status=0
> +exit
> diff --git a/tests/xfs/611.out b/tests/xfs/611.out
> new file mode 100644
> index 00000000..b8a44164
> --- /dev/null
> +++ b/tests/xfs/611.out
> @@ -0,0 +1,2 @@
> +QA output created by 611
> +Silence is golden
> --
> 2.34.1
>
>
