add another RT growfs test
Hi all,
this adds a test that actually tries to use the newly added space after a RT growfs, and reproduces the currently terminally broken zoned growfs. It includes a special check for zoned file systems, so that it does not hang on unfixed kernels with zoned RT devices.
PATCH 1/2 common: add a _require_external_realtime_device helper
Factor out the check for an RT device on an external section.
--- common/rc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
common/rc +12 -6
@@ -2405,6 +2405,17 @@ _require_no_large_scratch_dev() _notrun "Large filesystem testing in progress, skipped this test" } +# require an external realtime device (excludes the internal RT device) +_require_external_realtime_device() +{ + if [ "$USE_EXTERNAL" != "yes" ]; then + _notrun "External volumes not in use, skipped this test" + fi + if [ "$SCRATCH_RTDEV" = "" ]; then + _notrun "Realtime device required, skipped this test" + fi +} + # this test requires that a realtime subvolume is in use, and # that the kernel supports realtime as well. #
@@ -2412,12 +2423,7 @@ _require_realtime() { local zone_type=`_zone_type $SCRATCH_DEV` if [ "${zone_type}" = "none" ]; then - if [ "$USE_EXTERNAL" != "yes" ]; then - _notrun "External volumes not in use, skipped this test" - fi - if [ "$SCRATCH_RTDEV" = "" ]; then - _notrun "Realtime device required, skipped this test" - fi + _require_external_realtime_device fi }
Signature · 1 line
2.53.0
Re: [PATCH 1/2] common: add a _require_external_realtime_device helper
Quoted 3 lines · Christoph Hellwig
Factor out the check for an RT device on an external section.
Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me
--D
Quoted 44 lines
--- common/rc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)common/rc +12
-6@@ -2405,6 +2405,17 @@ _require_no_large_scratch_dev() _notrun "Large filesystem testing in progress, skipped this test" } +# require an external realtime device (excludes the internal RT device) +_require_external_realtime_device() +{ + if [ "$USE_EXTERNAL" != "yes" ]; then + _notrun "External volumes not in use, skipped this test" + fi + if [ "$SCRATCH_RTDEV" = "" ]; then + _notrun "Realtime device required, skipped this test" + fi +} + # this test requires that a realtime subvolume is in use, and # that the kernel supports realtime as well. #@@ -2412,12 +2423,7 @@ _require_realtime() { local zone_type=`_zone_type $SCRATCH_DEV` if [ "${zone_type}" = "none" ]; then - if [ "$USE_EXTERNAL" != "yes" ]; then - _notrun "External volumes not in use, skipped this test" - fi - if [ "$SCRATCH_RTDEV" = "" ]; then - _notrun "Realtime device required, skipped this test" - fi + _require_external_realtime_device fi }Signature · 1 line
2.53.0
Re: [PATCH 1/2] common: add a _require_external_realtime_device helper
In reply to Christoph HellwigQuoted 3 lines · Christoph Hellwig
Factor out the check for an RT device on an external section.
Signed-off-by Christoph Hellwig <[email protected]>
Nice,
Quoted 40 lines
--- common/rc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)common/rc +12
-6@@ -2405,6 +2405,17 @@ _require_no_large_scratch_dev() _notrun "Large filesystem testing in progress, skipped this test" } +# require an external realtime device (excludes the internal RT device) +_require_external_realtime_device() +{ + if [ "$USE_EXTERNAL" != "yes" ]; then + _notrun "External volumes not in use, skipped this test" + fi + if [ "$SCRATCH_RTDEV" = "" ]; then + _notrun "Realtime device required, skipped this test" + fi +} + # this test requires that a realtime subvolume is in use, and # that the kernel supports realtime as well. #@@ -2412,12 +2423,7 @@ _require_realtime() { local zone_type=`_zone_type $SCRATCH_DEV` if [ "${zone_type}" = "none" ]; then - if [ "$USE_EXTERNAL" != "yes" ]; then - _notrun "External volumes not in use, skipped this test" - fi - if [ "$SCRATCH_RTDEV" = "" ]; then - _notrun "Realtime device required, skipped this test" - fi + _require_external_realtime_device fi }
PATCH 2/2 xfs: test that a grown RT section can be filled
In reply to Christoph HellwigThis reproduces issues with zoned growfs.
--- tests/xfs/4201 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/4201.out | 3 +++ 2 files changed, 61 insertions(+) create mode 100755 tests/xfs/4201 create mode 100644 tests/xfs/4201.out
tests/xfs/4201 new file +58 -0
@@ -0,0 +1,58 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2026 Christoph Hellwig. +# +# FS QA Test No. 4201 +# +# Test that the entire device capacity can be used after resizing a realtime +# device. +# +. ./common/preamble +_begin_fstest auto quick realtime growfs zone + +. ./common/filter +. ./common/zoned + +_require_scratch +_require_external_realtime_device + +minrtdevsize=$((5 * 1024 * 1024)) #kB +rtdevsize=`_get_device_size $SCRATCH_RTDEV` +if [ $rtdevsize -lt $minrtdevsize ]; then + _notrun "SCRATCH_RTDEV device too small, $rtdevsize < $minrtdevsize" +fi + +_scratch_mkfs -r size=1g >> $seqres.full 2>&1 +rblocks=`_scratch_xfs_get_sb_field rblocks` + +_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT +free_zones_pre=$(_xfs_get_mountstat $SCRATCH_MNT "free zones:") + +echo "Growing file system" +$XFS_GROWFS_PROG $SCRATCH_MNT -R $((2 * rblocks)) >> $seqres.full 2>&1 || \ + _fail "growfs failed" + +# For zoned file systems, check that the growfs did increase the available free +# zones. This avoids a hang on unfixed kernels when filling later. +free_zones_post=$(_xfs_get_mountstat $SCRATCH_MNT "free zones:") +if _has_fs_sysfs_attr $SCRATCH_DEV "zoned/max_open_zones"; then + if [ "$free_zones_pre" == "$free_zones_post" ]; then + _fail "growfs did not increase free zones" + fi +fi + +echo "Filling grown file system" +writesize_mb=32 +dd if=/dev/zero of=$SCRATCH_MNT/fill bs=${writesize_mb}M oflag=direct \ + >> $seqres.full 2>&1 + +blocksize=$(_get_block_size $SCRATCH_MNT) +free_blocks=$(stat -f $SCRATCH_MNT -c '%f') + +# check that we really mostly filled the file system +_within_tolerance "free space after fill" \ + $free_blocks $((writesize_mb * 1024 * 1024 / blocksize)) 100% + +status=0 +exit
tests/xfs/4201.out new file +3 -0
@@ -0,0 +1,3 @@ +QA output created by 4201 +Growing file system +Filling grown file system
Signature · 1 line
2.53.0
Re: [PATCH 2/2] xfs: test that a grown RT section can be filled
Quoted 3 lines · Christoph Hellwig
This reproduces issues with zoned growfs.
Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me
--D
Quoted 84 lines
--- tests/xfs/4201 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/4201.out | 3 +++ 2 files changed, 61 insertions(+) create mode 100755 tests/xfs/4201 create mode 100644 tests/xfs/4201.outtests/xfs/4201 new file +58
-0@@ -0,0 +1,58 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2026 Christoph Hellwig. +# +# FS QA Test No. 4201 +# +# Test that the entire device capacity can be used after resizing a realtime +# device. +# +. ./common/preamble +_begin_fstest auto quick realtime growfs zone + +. ./common/filter +. ./common/zoned + +_require_scratch +_require_external_realtime_device + +minrtdevsize=$((5 * 1024 * 1024)) #kB +rtdevsize=`_get_device_size $SCRATCH_RTDEV` +if [ $rtdevsize -lt $minrtdevsize ]; then + _notrun "SCRATCH_RTDEV device too small, $rtdevsize < $minrtdevsize" +fi + +_scratch_mkfs -r size=1g >> $seqres.full 2>&1 +rblocks=`_scratch_xfs_get_sb_field rblocks` + +_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT +free_zones_pre=$(_xfs_get_mountstat $SCRATCH_MNT "free zones:") + +echo "Growing file system" +$XFS_GROWFS_PROG $SCRATCH_MNT -R $((2 * rblocks)) >> $seqres.full 2>&1 || \ + _fail "growfs failed" + +# For zoned file systems, check that the growfs did increase the available free +# zones. This avoids a hang on unfixed kernels when filling later. +free_zones_post=$(_xfs_get_mountstat $SCRATCH_MNT "free zones:") +if _has_fs_sysfs_attr $SCRATCH_DEV "zoned/max_open_zones"; then + if [ "$free_zones_pre" == "$free_zones_post" ]; then + _fail "growfs did not increase free zones" + fi +fi + +echo "Filling grown file system" +writesize_mb=32 +dd if=/dev/zero of=$SCRATCH_MNT/fill bs=${writesize_mb}M oflag=direct \ + >> $seqres.full 2>&1 + +blocksize=$(_get_block_size $SCRATCH_MNT) +free_blocks=$(stat -f $SCRATCH_MNT -c '%f') + +# check that we really mostly filled the file system +_within_tolerance "free space after fill" \ + $free_blocks $((writesize_mb * 1024 * 1024 / blocksize)) 100% + +status=0 +exittests/xfs/4201.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 4201 +Growing file system +Filling grown file systemSignature · 1 line
2.53.0
Re: [PATCH 2/2] xfs: test that a grown RT section can be filled
In reply to Christoph HellwigQuoted 3 lines · Christoph Hellwig
This reproduces issues with zoned growfs.
Signed-off-by Christoph Hellwig <[email protected]>
Great!
Quoted 80 lines
--- tests/xfs/4201 | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/4201.out | 3 +++ 2 files changed, 61 insertions(+) create mode 100755 tests/xfs/4201 create mode 100644 tests/xfs/4201.outtests/xfs/4201 new file +58
-0@@ -0,0 +1,58 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2026 Christoph Hellwig. +# +# FS QA Test No. 4201 +# +# Test that the entire device capacity can be used after resizing a realtime +# device. +# +. ./common/preamble +_begin_fstest auto quick realtime growfs zone + +. ./common/filter +. ./common/zoned + +_require_scratch +_require_external_realtime_device + +minrtdevsize=$((5 * 1024 * 1024)) #kB +rtdevsize=`_get_device_size $SCRATCH_RTDEV` +if [ $rtdevsize -lt $minrtdevsize ]; then + _notrun "SCRATCH_RTDEV device too small, $rtdevsize < $minrtdevsize" +fi + +_scratch_mkfs -r size=1g >> $seqres.full 2>&1 +rblocks=`_scratch_xfs_get_sb_field rblocks` + +_scratch_mount +_xfs_force_bdev realtime $SCRATCH_MNT +free_zones_pre=$(_xfs_get_mountstat $SCRATCH_MNT "free zones:") + +echo "Growing file system" +$XFS_GROWFS_PROG $SCRATCH_MNT -R $((2 * rblocks)) >> $seqres.full 2>&1 || \ + _fail "growfs failed" + +# For zoned file systems, check that the growfs did increase the available free +# zones. This avoids a hang on unfixed kernels when filling later. +free_zones_post=$(_xfs_get_mountstat $SCRATCH_MNT "free zones:") +if _has_fs_sysfs_attr $SCRATCH_DEV "zoned/max_open_zones"; then + if [ "$free_zones_pre" == "$free_zones_post" ]; then + _fail "growfs did not increase free zones" + fi +fi + +echo "Filling grown file system" +writesize_mb=32 +dd if=/dev/zero of=$SCRATCH_MNT/fill bs=${writesize_mb}M oflag=direct \ + >> $seqres.full 2>&1 + +blocksize=$(_get_block_size $SCRATCH_MNT) +free_blocks=$(stat -f $SCRATCH_MNT -c '%f') + +# check that we really mostly filled the file system +_within_tolerance "free space after fill" \ + $free_blocks $((writesize_mb * 1024 * 1024 / blocksize)) 100% + +status=0 +exittests/xfs/4201.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 4201 +Growing file system +Filling grown file system