Re: [PATCH 11/12] xfs/530: require a real SCRATCH_RTDEV

["Darrick J. Wong" <djwong@kernel.org>]

On Wed, Dec 10, 2025 at 06:46:57AM +0100, Christoph Hellwig wrote:
> Require a real SCRATCH_RTDEV instead of faking one up using a loop
> device, as otherwise the options specified in MKFS_OPTIONS might
> not actually work the configuration.
> 
> Note that specifying a rtextsize doesn't work for zoned file systems,
> so _notrun when mkfs fails.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/xfs/530     | 42 +++++++++++++-----------------------------
>  tests/xfs/530.out |  1 -
>  2 files changed, 13 insertions(+), 30 deletions(-)
> 
> diff --git a/tests/xfs/530 b/tests/xfs/530
> index 4a41127e3b82..ffc9e902e1b7 100755
> --- a/tests/xfs/530
> +++ b/tests/xfs/530
> @@ -10,36 +10,22 @@
>  . ./common/preamble
>  _begin_fstest auto quick realtime growfs
>  
> -# Override the default cleanup function.
> -_cleanup()
> -{
> -	cd /
> -	_scratch_unmount >> $seqres.full 2>&1
> -	[ -n "$rt_loop_dev" ] && _destroy_loop_device $rt_loop_dev
> -	rm -f $tmp.* $TEST_DIR/$seq.rtvol
> -}
> -
> -# Import common functions.
>  . ./common/filter
>  . ./common/inject
>  . ./common/populate
>  
> -
> -# Note that we don't _require_realtime because we synthesize a rt volume
> -# below.
> -_require_test
> +_require_scratch
> +_require_realtime
>  _require_xfs_debug
>  _require_test_program "punch-alternating"
>  _require_xfs_io_error_injection "reduce_max_iextents"
>  _require_xfs_io_error_injection "bmap_alloc_minlen_extent"
> -_require_scratch_nocheck
>  
>  echo "* Test extending rt inodes"
>  
>  _scratch_mkfs | _filter_mkfs >> $seqres.full 2> $tmp.mkfs
>  . $tmp.mkfs
>  
> -echo "Create fake rt volume"
>  nr_bitmap_blks=25
>  nr_bits=$((nr_bitmap_blks * dbsize * 8))
>  
> @@ -50,17 +36,12 @@ else
>  	rtextsz=$dbsize
>  fi
>  
> -rtdevsz=$((nr_bits * rtextsz))
> -truncate -s $rtdevsz $TEST_DIR/$seq.rtvol
> -rt_loop_dev=$(_create_loop_device $TEST_DIR/$seq.rtvol)
> -
>  echo "Format and mount rt volume"
> -
> -export USE_EXTERNAL=yes
> -export SCRATCH_RTDEV=$rt_loop_dev
> -_scratch_mkfs -d size=$((1024 * 1024 * 1024)) \
> -	      -r size=${rtextsz},extsize=${rtextsz} >> $seqres.full
> -_try_scratch_mount || _notrun "Couldn't mount fs with synthetic rt volume"
> +_try_scratch_mkfs_xfs \
> +	-d size=$((1024 * 1024 * 1024)) \
> +	-r size=${rtextsz},extsize=${rtextsz} >> $seqres.full 2>&1 || \
> +	_notrun "Couldn't created crafted fs (zoned?)"
> +_try_scratch_mount || _notrun "Couldn't mount crafted fs"
>  
>  # If we didn't get the desired realtime volume and the same blocksize as the
>  # first format (which we used to compute a specific rt geometry), skip the
> @@ -92,7 +73,12 @@ echo "Inject bmap_alloc_minlen_extent error tag"
>  _scratch_inject_error bmap_alloc_minlen_extent 1
>  
>  echo "Grow realtime volume"
> -$XFS_GROWFS_PROG -r $SCRATCH_MNT >> $seqres.full 2>&1
> +# growfs expects sizes in FSB units
> +fsbsize=$(_get_block_size $SCRATCH_MNT)
> +rtdevsz=$((nr_bits * rtextsz))
> +
> +$XFS_GROWFS_PROG -R $((rtdevsize / fsbsize)) $SCRATCH_MNT \

Why doesn't growfs -r still work here?

--D

> +	>> $seqres.full 2>&1
>  if [[ $? == 0 ]]; then
>  	echo "Growfs succeeded; should have failed."
>  	exit 1
> @@ -115,8 +101,6 @@ echo "Check filesystem"
>  _check_scratch_fs
>  
>  _scratch_unmount &> /dev/null
> -_destroy_loop_device $rt_loop_dev
> -unset rt_loop_dev
>  
>  # success, all done
>  status=0
> diff --git a/tests/xfs/530.out b/tests/xfs/530.out
> index 6ddb572f9435..3c508b4564f7 100644
> --- a/tests/xfs/530.out
> +++ b/tests/xfs/530.out
> @@ -1,6 +1,5 @@
>  QA output created by 530
>  * Test extending rt inodes
> -Create fake rt volume
>  Format and mount rt volume
>  Consume free space
>  Create fragmented filesystem
> -- 
> 2.47.3
> 
>