On Sat, Aug 02, 2025 at 02:53:15AM +0800, Zorro Lang wrote:
> On Tue, Jul 29, 2025 at 01:10:04PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@xxxxxxxxxx>
> >
> > In this predicate, we should test an atomic write of the minimum
> > supported size, not just 4k. This fixes a problem where none of the
> > atomic write tests actually run on a 32k-fsblock xfs because you can't
> > do a sub-fsblock atomic write.
> >
> > Cc: <fstests@xxxxxxxxxxxxxxx> # v2025.04.13
> > Fixes: d90ee3b6496346 ("generic: add a test for atomic writes")
> > Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
> > ---
> > common/rc | 14 +++++++++++---
> > 1 file changed, 11 insertions(+), 3 deletions(-)
> >
> >
> > diff --git a/common/rc b/common/rc
> > index 96578d152dafb9..177e7748f4bb89 100644
> > --- a/common/rc
> > +++ b/common/rc
> > @@ -3027,16 +3027,24 @@ _require_xfs_io_command()
> > "pwrite")
> > # -N (RWF_NOWAIT) only works with direct vectored I/O writes
> > local pwrite_opts=" "
> > + local write_size="4k"
> > if [ "$param" == "-N" ]; then
> > opts+=" -d"
> > - pwrite_opts+="-V 1 -b 4k"
> > + pwrite_opts+="-V 1 -b $write_size"
> > fi
> > if [ "$param" == "-A" ]; then
> > opts+=" -d"
> > - pwrite_opts+="-V 1 -b 4k"
> > + # try to write the minimum supported atomic write size
> > + write_size="$($XFS_IO_PROG -f -c "statx -r -m $STATX_WRITE_ATOMIC" $testfile 2>/dev/null | \
> > + grep atomic_write_unit_min | \
> > + grep -o '[0-9]\+')"
> > + if [ -z "$write_size" ] || [ "$write_size" = "0" ]; then
> > + write_size="0 --not-supported"
> ^^^^^^^^^^^^^^^
>
> What is this "--not-supported" for? If write_size="0 --not-supported", will we get...
>
>
> > + fi
> > + pwrite_opts+="-V 1 -b $write_size"
> > fi
> > testio=`$XFS_IO_PROG -f $opts -c \
> > - "pwrite $pwrite_opts $param 0 4k" $testfile 2>&1`
> > + "pwrite $pwrite_opts $param 0 $write_size" $testfile 2>&1`
>
> "pwrite -V 1 -b 0 --not-supported 0 0 --not-supported" at here?
Yes, this is correct. "--not-supported" is not a valid flag to the
pwrite subcommand. I'm injecting it here intentionally when we don't
detect any atomic write capability so that the _require checks will
behave as if xfs_io doesn't support the -A flag, and _notrun the test.
--D
> Thanks,
> Zorro
>
> > param_checked="$pwrite_opts $param"
> > ;;
> > "scrub"|"repair")
> >
>
>
