diff mbox series

[v1] xfs: add a test for atomic writes

Message ID 20241212230123.36325-1-catherine.hoang@oracle.com (mailing list archive)
State New
Headers show
Series [v1] xfs: add a test for atomic writes | expand

Commit Message

Catherine Hoang Dec. 12, 2024, 11:01 p.m. UTC 
Add a test to validate the new atomic writes feature.

Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
---
 common/rc         | 14 ++++++++++++++
 tests/xfs/611     | 48 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/xfs/611.out | 17 +++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100755 tests/xfs/611
 create mode 100644 tests/xfs/611.out

Comments

Darrick J. Wong Dec. 12, 2024, 11:16 p.m. UTC | #1 
On Thu, Dec 12, 2024 at 03:01:23PM -0800, Catherine Hoang wrote:
> Add a test to validate the new atomic writes feature.
> 
> Signed-off-by: Catherine Hoang <catherine.hoang@oracle.com>
> ---
>  common/rc         | 14 ++++++++++++++
>  tests/xfs/611     | 48 +++++++++++++++++++++++++++++++++++++++++++++++
>  tests/xfs/611.out | 17 +++++++++++++++++
>  3 files changed, 79 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..d193de86
> --- /dev/null
> +++ b/tests/xfs/611
> @@ -0,0 +1,48 @@
> +#! /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
> +
> +test_atomic_writes()
> +{
> +    bsize=$1

local bsize=$1

(don't pollute the global namespace)

> +
> +    echo ""
> +    echo "Block size: $bsize"
> +
> +    _scratch_mkfs_xfs -b size=$bsize >> $seqres.full
> +    _scratch_mount

You probably want:
_xfs_force_bdev data $SCRATCH_MNT

to force the data/rt status of $testfile to match whichever block device
supports untorn writes.

> +
> +    testfile=$SCRATCH_MNT/testfile
> +    touch $testfile
> +
> +    # Check that atomic min/max = FS block size
> +    $XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $testfile \
> +        | grep atomic
> +
> +    # Check that we can perform an atomic write of len = FS block size
> +    $XFS_IO_PROG -dc "pwrite -A -D 0 $bsize" $testfile | grep wrote
> +
> +    # Reject atomic write if len is out of bounds
> +    $XFS_IO_PROG -dc "pwrite -A -D 0 $((bsize - 1))" $testfile
> +    $XFS_IO_PROG -dc "pwrite -A -D 0 $((bsize + 1))" $testfile

Can you also check that untorn writes to an unwritten block and a sparse
hole also work?

> +    _scratch_unmount
> +}
> +
> +test_atomic_writes 4096
> +test_atomic_writes 16384

Shouldn't this be testing every fsblock size between the untorn write
unit min and max of the underlying block device?

--D

> +# success, all done
> +status=0
> +exit
> diff --git a/tests/xfs/611.out b/tests/xfs/611.out
> new file mode 100644
> index 00000000..ea28b971
> --- /dev/null
> +++ b/tests/xfs/611.out
> @@ -0,0 +1,17 @@
> +QA output created by 611
> +
> +Block size: 4096
> +stat.atomic_write_unit_min = 4096
> +stat.atomic_write_unit_max = 4096
> +stat.atomic_write_segments_max = 1
> +wrote 4096/4096 bytes at offset 0
> +pwrite: Invalid argument
> +pwrite: Invalid argument
> +
> +Block size: 16384
> +stat.atomic_write_unit_min = 16384
> +stat.atomic_write_unit_max = 16384
> +stat.atomic_write_segments_max = 1
> +wrote 16384/16384 bytes at offset 0
> +pwrite: Invalid argument
> +pwrite: Invalid argument
> -- 
> 2.34.1
> 
>
diff mbox series

Patch

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..d193de86
--- /dev/null
+++ b/tests/xfs/611
@@ -0,0 +1,48 @@ 
+#! /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
+
+test_atomic_writes()
+{
+    bsize=$1
+
+    echo ""
+    echo "Block size: $bsize"
+
+    _scratch_mkfs_xfs -b size=$bsize >> $seqres.full
+    _scratch_mount
+
+    testfile=$SCRATCH_MNT/testfile
+    touch $testfile
+
+    # Check that atomic min/max = FS block size
+    $XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $testfile \
+        | grep atomic
+
+    # Check that we can perform an atomic write of len = FS block size
+    $XFS_IO_PROG -dc "pwrite -A -D 0 $bsize" $testfile | grep wrote
+
+    # Reject atomic write if len is out of bounds
+    $XFS_IO_PROG -dc "pwrite -A -D 0 $((bsize - 1))" $testfile
+    $XFS_IO_PROG -dc "pwrite -A -D 0 $((bsize + 1))" $testfile
+
+    _scratch_unmount
+}
+
+test_atomic_writes 4096
+test_atomic_writes 16384
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/611.out b/tests/xfs/611.out
new file mode 100644
index 00000000..ea28b971
--- /dev/null
+++ b/tests/xfs/611.out
@@ -0,0 +1,17 @@ 
+QA output created by 611
+
+Block size: 4096
+stat.atomic_write_unit_min = 4096
+stat.atomic_write_unit_max = 4096
+stat.atomic_write_segments_max = 1
+wrote 4096/4096 bytes at offset 0
+pwrite: Invalid argument
+pwrite: Invalid argument
+
+Block size: 16384
+stat.atomic_write_unit_min = 16384
+stat.atomic_write_unit_max = 16384
+stat.atomic_write_segments_max = 1
+wrote 16384/16384 bytes at offset 0
+pwrite: Invalid argument
+pwrite: Invalid argument