[PATCH] generic/366: check minimum dio size correctly

[PATCH] generic/366: check minimum dio size correctly

[Christoph Hellwig]

min_dio_alignment requires the file system to be checked to be mounted,
so move the call into the main loop.  Drop the pointless blocksize
argument to _require_odirect, which is only tested on the test device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/generic/366 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/generic/366 b/tests/generic/366
index 271a01bc2eac..ef69bf09d6ff 100755
--- a/tests/generic/366
+++ b/tests/generic/366
@@ -20,7 +20,7 @@ _begin_fstest auto quick rw
 . ./common/filter
 
 _require_scratch
-_require_odirect 512	# see fio job1 config below
+_require_odirect
 _require_aio
 
 _fixed_by_fs_commit btrfs xxxxxxxxxxxx \
@@ -30,7 +30,7 @@ iterations=$((32 * LOAD_FACTOR))
 
 fio_config=$tmp.fio
 fio_out=$tmp.fio.out
-blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
+
 cat >$fio_config <<EOF
 [global]
 bs=8k
@@ -60,6 +60,12 @@ _require_fio $fio_config
 for (( i = 0; i < $iterations; i++)); do
 	_scratch_mkfs >>$seqres.full 2>&1
 	_scratch_mount
+
+	blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
+	if [[ $blksz -gt 512 ]]; then
+		_notrun "512 byte dio alignment required"
+	fi
+
 	# There's a known EIO failure to report collisions between directio and buffered
 	# writes to userspace, refer to upstream linux 5a9d929d6e13. So ignore EIO error
 	# at here.
-- 
2.53.0

Re: [PATCH] generic/366: check minimum dio size correctly

[Zorro Lang]

On Mon, Jun 08, 2026 at 09:00:10AM +0200, Christoph Hellwig wrote:
> min_dio_alignment requires the file system to be checked to be mounted,
> so move the call into the main loop.  Drop the pointless blocksize
> argument to _require_odirect, which is only tested on the test device.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/generic/366 | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/generic/366 b/tests/generic/366
> index 271a01bc2eac..ef69bf09d6ff 100755
> --- a/tests/generic/366
> +++ b/tests/generic/366
> @@ -20,7 +20,7 @@ _begin_fstest auto quick rw
>  . ./common/filter
>  
>  _require_scratch
> -_require_odirect 512	# see fio job1 config below
> +_require_odirect
>  _require_aio
>  
>  _fixed_by_fs_commit btrfs xxxxxxxxxxxx \
> @@ -30,7 +30,7 @@ iterations=$((32 * LOAD_FACTOR))
>  
>  fio_config=$tmp.fio
>  fio_out=$tmp.fio.out
> -blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
> +
>  cat >$fio_config <<EOF
>  [global]
>  bs=8k
> @@ -60,6 +60,12 @@ _require_fio $fio_config
>  for (( i = 0; i < $iterations; i++)); do
>  	_scratch_mkfs >>$seqres.full 2>&1
>  	_scratch_mount
> +
> +	blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
> +	if [[ $blksz -gt 512 ]]; then
> +		_notrun "512 byte dio alignment required"
> +	fi

Do we need to check this in every iteration?

> +
>  	# There's a known EIO failure to report collisions between directio and buffered
>  	# writes to userspace, refer to upstream linux 5a9d929d6e13. So ignore EIO error
>  	# at here.
> -- 
> 2.53.0
> 

Re: [PATCH] generic/366: check minimum dio size correctly

[Christoph Hellwig]

On Mon, Jun 15, 2026 at 02:58:11AM +0800, Zorro Lang wrote:
> > +	blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
> > +	if [[ $blksz -gt 512 ]]; then
> > +		_notrun "512 byte dio alignment required"
> > +	fi
> 
> Do we need to check this in every iteration?

We don't, but we also don't want to do an extra mount just to check
the feature.

Re: [PATCH] generic/366: check minimum dio size correctly

[Zorro Lang]

On Mon, Jun 15, 2026 at 03:33:31PM +0200, Christoph Hellwig wrote:
> On Mon, Jun 15, 2026 at 02:58:11AM +0800, Zorro Lang wrote:
> > > +	blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
> > > +	if [[ $blksz -gt 512 ]]; then
> > > +		_notrun "512 byte dio alignment required"
> > > +	fi
> > 
> > Do we need to check this in every iteration?
> 
> We don't, but we also don't want to do an extra mount just to check
> the feature.

Oh, if we only need to run it once, how about:

blksz=""
for (( i = 0; i < $iterations; i++)); do
    ...
    if [ -z "$blksz" ];then
	    blksz=`$here/src/min_dio_alignment $SCRATCH_MNT $SCRATCH_DEV`
        if [[ $blksz -gt 512 ]]; then
            _notrun "512 byte dio alignment required"
        fi
    fi
...


Thanks,
Zorro

> 
>