initial xfstests support for zoned XFS
Hi all,
this series adds initial support for the zoned XFS code merge into the xfs tree to xfstests. It does not include several newly developed test cases which will be sent separately.
PATCH 1/17 xfs/177: force a small file system size
This test make assumptions about the number of metadata inodes. When using small realtime group size (e.g. the customary 256MB for SMR hard drives) this assumption gets violated even with modest file system size. Force a small file system size to side-step this issue.
--- tests/xfs/177 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tests/xfs/177 +3 -1
@@ -77,7 +77,9 @@ delay_centisecs="$(cat "$xfs_centisecs_file")" sleep_seconds=$(( ( (99 + (delay_centisecs / 6) ) / 100) + 1)) echo "Will sleep $sleep_seconds seconds to expire inodes" >> $seqres.full -_scratch_mkfs >> $seqres.full +# Force a relatively small file system size to keep the number of rtgroups +# and thus metadata inodes low +_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full _scratch_mount >> $seqres.full junkdir=$SCRATCH_MNT/$seq.junk
Signature · 1 line
2.45.2
Re: [PATCH 01/17] xfs/177: force a small file system size
Quoted 15 lines · Christoph Hellwig
This test make assumptions about the number of metadata inodes. When using small realtime group size (e.g. the customary 256MB for SMR hard drives) this assumption gets violated even with modest file system size. Force a small file system size to side-step this issue.
Signed-off-by Christoph Hellwig <[email protected]>--- tests/xfs/177 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)tests/xfs/177 +0
-0
tests/xfs/177 delay_centisecs="$(cat "$xfs_centisecs_file")" · line 82
Quoted 7 lines
tests/xfs/177 +3
-1@@ -77,7 +77,9 @@ delay_centisecs="$(cat "$xfs_centisecs_file")" sleep_seconds=$(( ( (99 + (delay_centisecs / 6) ) / 100) + 1)) echo "Will sleep $sleep_seconds seconds to expire inodes" >> $seqres.full -_scratch_mkfs >> $seqres.full +# Force a relatively small file system size to keep the number of rtgroups +# and thus metadata inodes low +_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full
I guess that works... will try it out overnight and see what happens.
--D
Quoted 7 lines
tests/xfs/177 +0
-0_scratch_mount >> $seqres.full junkdir=$SCRATCH_MNT/$seq.junkSignature · 1 line
2.45.2
PATCH 2/17 xfs/419: use _scratch_mkfs_xfs
In reply to Christoph HellwigSo that the test is _notrun instead of failed for conflicting options.
--- tests/xfs/419 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/419 +1 -1
@@ -39,7 +39,7 @@ $MKFS_XFS_PROG -d rtinherit=0 "${mkfs_args[@]}" &>> $seqres.full || \ echo "mkfs should succeed with uninheritable rtext-unaligned extent hint" # Move on to checking the kernel's behavior -_scratch_mkfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs cat $tmp.mkfs >> $seqres.full . $tmp.mkfs _scratch_mount
Signature · 1 line
2.45.2
Re: [PATCH 02/17] xfs/419: use _scratch_mkfs_xfs
Quoted 1 line · Christoph Hellwig
So that the test is
_notruninstead of failed for conflicting options.
Which options are those? I'm assuming that you're forcing -r zoned=1?
Quoted 10 lines
Signed-off-by Christoph Hellwig <[email protected]>--- tests/xfs/419 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/xfs/419 +0
-0
tests/xfs/419 $MKFS_XFS_PROG -d rtinherit=0 "${mkfs_args[@]}" &>> $seqres.full || \ · line 42
Quoted 5 lines
tests/xfs/419 +1
-1@@ -39,7 +39,7 @@ $MKFS_XFS_PROG -d rtinherit=0 "${mkfs_args[@]}" &>> $seqres.full || \ echo "mkfs should succeed with uninheritable rtext-unaligned extent hint" # Move on to checking the kernel's behavior -_scratch_mkfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs
Yeah, seems fine to me -- if we didn't get the extsize=7b then the test would have aborted anyway.
--D
Quoted 7 lines
tests/xfs/419 +0
-0cat $tmp.mkfs >> $seqres.full . $tmp.mkfs _scratch_mountSignature · 1 line
2.45.2
Re: [PATCH 02/17] xfs/419: use _scratch_mkfs_xfs
Quoted 4 lines · Darrick J. Wong
Quoted 1 line · Christoph Hellwig
So that the test is
_notruninstead of failed for conflicting options.Which options are those? I'm assuming that you're forcing -r zoned=1?
Yes.
PATCH 3/17 xfs/540: use _scratch_mkfs_xfs
In reply to Christoph HellwigSo that the test is _notrun instead of failed for conflicting options.
--- tests/xfs/540 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/xfs/540 +1 -1
@@ -26,7 +26,7 @@ _begin_fstest auto repair fuzzers _require_scratch echo "Format and mount" -_scratch_mkfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full . $tmp.mkfs
Signature · 1 line
2.45.2
Re: [PATCH 03/17] xfs/540: use _scratch_mkfs_xfs
Quoted 3 lines · Christoph Hellwig
So that the test is
_notruninstead of failed for conflicting options.Signed-off-by Christoph Hellwig <[email protected]>
Looks good to me,
--D
Quoted 21 lines
--- tests/xfs/540 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/xfs/540 +1
-1@@ -26,7 +26,7 @@ _begin_fstest auto repair fuzzers _require_scratch echo "Format and mount" -_scratch_mkfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs > $seqres.full 2>$tmp.mkfs cat $tmp.mkfs >> $seqres.full . $tmp.mkfsSignature · 1 line
2.45.2
PATCH 4/17 common: extend the zoned device checks in _require_dm_target
In reply to Christoph HellwigAlso check for zoned log and rt devices in _require_dm_target
--- common/rc | 6 ++++++ 1 file changed, 6 insertions(+)
common/rc +6 -0
@@ -2501,6 +2501,12 @@ _require_dm_target() case $target in snapshot|thin-pool) _require_non_zoned_device ${SCRATCH_DEV} + if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_RTDEV" ]; then + _require_non_zoned_device ${SCRATCH_RTDEV} + fi + if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_LOGDEV" ]; then + _require_non_zoned_device ${SCRATCH_LOGDEV} + fi ;; esac }
Signature · 1 line
2.45.2
Re: [PATCH 04/17] common: extend the zoned device checks in _require_dm_target
Quoted 12 lines · Christoph Hellwig
Also check for zoned log and rt devices in
_require_dm_targetSigned-off-by Christoph Hellwig <[email protected]>--- common/rc | 6 ++++++ 1 file changed, 6 insertions(+)common/rc +0
-0
common/rc _require_dm_target() · line 2504
Quoted 4 lines
common/rc +1
-0@@ -2501,6 +2501,12 @@ _require_dm_target() case $target in snapshot|thin-pool) _require_non_zoned_device ${SCRATCH_DEV} + if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_RTDEV" ]; then
Silly nit: -n not -b, to be consistent with the codebase?
(Doesn't really matter since _require_non_zoned_device never aborts the test if it's fed something that isn't a block device)
--D
Quoted 12 lines
common/rc +5
-0+ _require_non_zoned_device ${SCRATCH_RTDEV} + fi + if [ "$FSTYP" = "xfs" ] && [ -b "$SCRATCH_LOGDEV" ]; then + _require_non_zoned_device ${SCRATCH_LOGDEV} + fi ;; esac }Signature · 1 line
2.45.2
PATCH 5/17 common: allow _require_non_zoned_device without an argument
In reply to Christoph HellwigThat way it can also be used for RT and log devices.
--- common/rc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
common/rc +1 -2
@@ -2545,8 +2545,7 @@ _require_non_zoned_device() { local target=$1 if [ -z $target ]; then - echo "Usage: _require_non_zoned_device <device>" - exit 1 + return fi local type=`_zone_type ${target}`
Signature · 1 line
2.45.2
Re: [PATCH 05/17] common: allow _require_non_zoned_device without an argument
Quoted 1 line · Christoph Hellwig
That way it can also be used for RT and log devices.
Do you mean "That way callers can pass SCRATCH_RTDEV directly without needing to check for zero-length themselves"?
--D
Quoted 24 lines
Signed-off-by Christoph Hellwig <[email protected]>--- common/rc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)common/rc +1
-2@@ -2545,8 +2545,7 @@ _require_non_zoned_device() { local target=$1 if [ -z $target ]; then - echo "Usage: _require_non_zoned_device <device>" - exit 1 + return fi local type=`_zone_type ${target}`Signature · 1 line
2.45.2
Re: [PATCH 05/17] common: allow _require_non_zoned_device without an argument
Quoted 5 lines · Darrick J. Wong
Quoted 1 line · Christoph Hellwig
That way it can also be used for RT and log devices.
Do you mean "That way callers can pass
SCRATCH_RTDEVdirectly without needing to check for zero-length themselves"?
Yes.
PATCH 6/17 common: support internal RT device in _require_realtime
In reply to Christoph HellwigIf SCRATCH_DEV is a zoned device it implies an internal zoned RT device and should not be skipped in _require_realtime.
--- common/rc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
common/rc +9 -4
@@ -2354,10 +2354,15 @@ _require_no_large_scratch_dev() # _require_realtime() { - [ "$USE_EXTERNAL" = yes ] || \ - _notrun "External volumes not in use, skipped this test" - [ "$SCRATCH_RTDEV" = "" ] && \ - _notrun "Realtime device required, skipped this test" + 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 + fi } # This test requires that a realtime subvolume is not in use
Signature · 1 line
2.45.2
Re: [PATCH 06/17] common: support internal RT device in _require_realtime
Quoted 2 lines · Christoph Hellwig
If
SCRATCH_DEVis a zoned device it implies an internal zoned RT device and should not be skipped in_require_realtime.
/methinks that should be a comment in the code itself.
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>
With that changed,
--D
Quoted 32 lines
--- common/rc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)common/rc +9
-4@@ -2354,10 +2354,15 @@ _require_no_large_scratch_dev() # _require_realtime() { - [ "$USE_EXTERNAL" = yes ] || \ - _notrun "External volumes not in use, skipped this test" - [ "$SCRATCH_RTDEV" = "" ] && \ - _notrun "Realtime device required, skipped this test" + 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 + fi } # This test requires that a realtime subvolume is not in useSignature · 1 line
2.45.2
Re: [PATCH 06/17] common: support internal RT device in _require_realtime
Quoted 5 lines · Darrick J. Wong
Quoted 2 lines · Christoph Hellwig
If
SCRATCH_DEVis a zoned device it implies an internal zoned RT device and should not be skipped in_require_realtime./methinks that should be a comment in the code itself.
Sure.
PATCH 7/17 common: support internal RT devices in scratch_mkfs_sized
In reply to Christoph Hellwig--- common/rc | 7 +++++++ 1 file changed, 7 insertions(+)
common/rc +7 -0
@@ -1268,6 +1268,7 @@ _try_scratch_mkfs_sized() case $FSTYP in xfs) local rt_ops + local zone_type=`_zone_type $SCRATCH_DEV` if [ -b "$SCRATCH_RTDEV" ]; then local rtdevsize=`blockdev --getsize64 $SCRATCH_RTDEV`
@@ -1275,6 +1276,12 @@ _try_scratch_mkfs_sized() _notrun "Scratch rt device too small" fi rt_ops="-r size=$fssize" + elif [ "${zone_type}" != "none" ] || + [[ $MKFS_OPTIONS =~ "zoned=1" ]]; then + # Maybe also add back the size check, but it'll require + # somewhat complicated arithmetics for the size of the + # conventional zones + rt_ops="-r size=$fssize" fi # don't override MKFS_OPTIONS that set a block size.
Signature · 1 line
2.45.2
Re: [PATCH 07/17] common: support internal RT devices in scratch_mkfs_sized
Quoted 18 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <[email protected]>--- common/rc | 7 +++++++ 1 file changed, 7 insertions(+)common/rc +1
-0@@ -1268,6 +1268,7 @@ _try_scratch_mkfs_sized() case $FSTYP in xfs) local rt_ops + local zone_type=`_zone_type $SCRATCH_DEV` if [ -b "$SCRATCH_RTDEV" ]; then local rtdevsize=`blockdev --getsize64 $SCRATCH_RTDEV`
common/rc _try_scratch_mkfs_sized() · line 1284
Quoted 9 lines
common/rc +6
-0@@ -1275,6 +1276,12 @@ _try_scratch_mkfs_sized() _notrun "Scratch rt device too small" fi rt_ops="-r size=$fssize" + elif [ "${zone_type}" != "none" ] || + [[ $MKFS_OPTIONS =~ "zoned=1" ]]; then + # Maybe also add back the size check, but it'll require + # somewhat complicated arithmetics for the size of the + # conventional zones + rt_ops="-r size=$fssize"
Hmm, what happens if you pass -dsize=X and -rzoned=1,size=X?
Oh, you get a data section of size X followed by an internal zoned section also of size X.
Might want to mention that in the commit message...
--D
Quoted 7 lines
common/rc +0
-0fi # don't override MKFS_OPTIONS that set a block size.Signature · 1 line
2.45.2
PATCH 8/17 xfs: check for zoned-specific errors in _try_scratch_mkfs_xfs
In reply to Christoph HellwigCheck for a few errors issued for unsupported zoned configurations in _try_scratch_mkfs_xfs so that the test is not run instead of failed.
--- common/xfs | 5 +++++ 1 file changed, 5 insertions(+)
common/xfs +5 -0
@@ -160,6 +160,11 @@ _try_scratch_mkfs_xfs() grep -q crc=0 $tmp.mkfsstd && _force_xfsv4_mount_options + grep -q "zoned file systems do not support" $tmp.mkfserr && \ + _notrun "Not supported on zoned file systems" + grep -q "must be greater than the minimum" $tmp.mkfserr && \ + _notrun "Zone count too small" + if [ $mkfs_status -eq 0 -a "$LARGE_SCRATCH_DEV" = yes ]; then # manually parse the mkfs output to get the fs size in bytes local fs_size
Signature · 1 line
2.45.2
Re: [PATCH 08/17] xfs: check for zoned-specific errors in _try_scratch_mkfs_xfs
Quoted 13 lines · Christoph Hellwig
Check for a few errors issued for unsupported zoned configurations in
_try_scratch_mkfs_xfsso that the test is not run instead of failed.Signed-off-by Christoph Hellwig <[email protected]>--- common/xfs | 5 +++++ 1 file changed, 5 insertions(+)common/xfs +0
-0
common/xfs _try_scratch_mkfs_xfs() · line 165
Quoted 6 lines
common/xfs +3
-0@@ -160,6 +160,11 @@ _try_scratch_mkfs_xfs() grep -q crc=0 $tmp.mkfsstd && _force_xfsv4_mount_options + grep -q "zoned file systems do not support" $tmp.mkfserr && \ + _notrun "Not supported on zoned file systems" + grep -q "must be greater than the minimum" $tmp.mkfserr && \
Hmmm... this doesn't mention the word "zone" at all.
Maybe that error message in calculate_zone_geometry should read:
"realtime group count (%llu) must be greater than the minimum (%u) zone count" ?
and I think you should post the xfsprogs zoned patches.
--D
Quoted 9 lines
common/xfs +2
-0+ _notrun "Zone count too small" + if [ $mkfs_status -eq 0 -a "$LARGE_SCRATCH_DEV" = yes ]; then # manually parse the mkfs output to get the fs size in bytes local fs_sizeSignature · 1 line
2.45.2
Re: [PATCH 08/17] xfs: check for zoned-specific errors in _try_scratch_mkfs_xfs
Quoted 9 lines · Darrick J. Wong
common/xfs _try_scratch_mkfs_xfs() · line 165
Quoted 3 lines
common/xfs +3
-0+ grep -q "zoned file systems do not support" $tmp.mkfserr && \ + _notrun "Not supported on zoned file systems" + grep -q "must be greater than the minimum" $tmp.mkfserr && \Hmmm... this doesn't mention the word "zone" at all.
Maybe that error message in
calculate_zone_geometryshould read:"realtime group count (%llu) must be greater than the minimum (%u) zone count" ?
Yeah.
Quoted 1 line
and I think you should post the xfsprogs zoned patches.
Still waiting for a baseline to post against, i.e. rtrmap and rtreflink being merged.
Re: [PATCH 08/17] xfs: check for zoned-specific errors in _try_scratch_mkfs_xfs
Quoted 9 lines · Christoph Hellwig
Quoted 8 lines · Darrick J. Wong
common/xfs _try_scratch_mkfs_xfs() · line 165
Quoted 3 lines
common/xfs +3
-0+ grep -q "zoned file systems do not support" $tmp.mkfserr && \ + _notrun "Not supported on zoned file systems" + grep -q "must be greater than the minimum" $tmp.mkfserr && \Hmmm... this doesn't mention the word "zone" at all.
Maybe that error message in
calculate_zone_geometryshould read:
Quoted 8 lines
Quoted 1 line
"realtime group count (%llu) must be greater than the minimum (%u) zone count" ?
Yeah.
Quoted 1 line
and I think you should post the xfsprogs zoned patches.
Still waiting for a baseline to post against, i.e. rtrmap and rtreflink being merged.
That's all in for-next now, though I don't think there's going to be a xfsprogs release until the kernel does it.
--D
PATCH 9/17 common: notrun in mkfs_dev for too small zoned file systems
In reply to Christoph HellwigSimilar to the regular scratch_mkfs, skip the test if the file system would be so small that there's not enough zones.
--- common/rc | 4 ++++ 1 file changed, 4 insertions(+)
common/rc +4 -0
@@ -910,6 +910,10 @@ _mkfs_dev() { local tmp=`mktemp -u` if ! _try_mkfs_dev "$@" 2>$tmp.mkfserr 1>$tmp.mkfsstd; then + grep -q "must be greater than the minimum" $tmp.mkfserr && \ + _notrun "Zone count too small" + grep -q "too small for zoned allocator" $tmp.mkfserr && \ + _notrun "Zone count too small" # output stored mkfs output cat $tmp.mkfserr >&2 cat $tmp.mkfsstd
Signature · 1 line
2.45.2
Re: [PATCH 09/17] common: notrun in mkfs_dev for too small zoned file systems
Quoted 13 lines · Christoph Hellwig
Similar to the regular
scratch_mkfs, skip the test if the file system would be so small that there's not enough zones.Signed-off-by Christoph Hellwig <[email protected]>--- common/rc | 4 ++++ 1 file changed, 4 insertions(+)common/rc +0
-0
common/rc _mkfs_dev() · line 913
Quoted 4 lines
common/rc +1
-0@@ -910,6 +910,10 @@ _mkfs_dev() { local tmp=`mktemp -u` if ! _try_mkfs_dev "$@" 2>$tmp.mkfserr 1>$tmp.mkfsstd; then + grep -q "must be greater than the minimum" $tmp.mkfserr && \
/methinks this also should look for the word "zone" somewhere so that it doesn't trip on some other validation message for which we might want to emit a different error.
--D
Quoted 10 lines
common/rc +3
-0+ _notrun "Zone count too small" + grep -q "too small for zoned allocator" $tmp.mkfserr && \ + _notrun "Zone count too small" # output stored mkfs output cat $tmp.mkfserr >&2 cat $tmp.mkfsstdSignature · 1 line
2.45.2
PATCH 10/17 xfs: add helpers to require zoned/non-zoned file systems
In reply to Christoph HellwigLooking at the max_open_zones sysfs attribute to see if a file system is zoned or not, as various tests depend on that.
--- common/xfs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
common/xfs +27 -0
@@ -2076,6 +2076,33 @@ _scratch_xfs_force_no_metadir() fi } +# do not run on zoned file systems +_require_xfs_scratch_non_zoned() +{ + if _has_fs_sysfs_attr $SCRATCH_DEV "zoned/max_open_zones"; then + _notrun "Not supported on zoned file systems" + fi +} + +# only run on zoned file systems +_require_xfs_scratch_zoned() +{ + local attr="zoned/max_open_zones" + local min_open_zones=$1 + + if ! _has_fs_sysfs_attr $SCRATCH_DEV $attr; then + _notrun "Requires zoned file system" + fi + + if [ -n "${min_open_zones}" ]; then + local has_open_zones=`_get_fs_sysfs_attr $SCRATCH_DEV $attr` + + if [ "${min_open_zones}" -gt "${has_open_zones}" ]; then + _notrun "Requires at least ${min_open_zones} open zones" + fi + fi +} + # Decide if a mount filesystem has metadata directory trees. _xfs_mount_has_metadir() { local mount="$1"
Signature · 1 line
2.45.2
Re: [PATCH 10/17] xfs: add helpers to require zoned/non-zoned file systems
Quoted 4 lines · Christoph Hellwig
Looking at the
max_open_zonessysfs attribute to see if a file system is zoned or not, as various tests depend on that.Signed-off-by Christoph Hellwig <[email protected]>
Looks fine to me,
--D
Quoted 46 lines
--- common/xfs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)common/xfs +27
-0@@ -2076,6 +2076,33 @@ _scratch_xfs_force_no_metadir() fi } +# do not run on zoned file systems +_require_xfs_scratch_non_zoned() +{ + if _has_fs_sysfs_attr $SCRATCH_DEV "zoned/max_open_zones"; then + _notrun "Not supported on zoned file systems" + fi +} + +# only run on zoned file systems +_require_xfs_scratch_zoned() +{ + local attr="zoned/max_open_zones" + local min_open_zones=$1 + + if ! _has_fs_sysfs_attr $SCRATCH_DEV $attr; then + _notrun "Requires zoned file system" + fi + + if [ -n "${min_open_zones}" ]; then + local has_open_zones=`_get_fs_sysfs_attr $SCRATCH_DEV $attr` + + if [ "${min_open_zones}" -gt "${has_open_zones}" ]; then + _notrun "Requires at least ${min_open_zones} open zones" + fi + fi +} + # Decide if a mount filesystem has metadata directory trees. _xfs_mount_has_metadir() { local mount="$1"Signature · 1 line
2.45.2
PATCH 11/17 xfs: handle zoned file systems in _scratch_xfs_force_no_metadir
In reply to Christoph HellwigZoned file systems required the metadir feature. If the tests are run on a conventional block device as the RT device, we can simply remove the zoned flag an run the test, but if the file systems sits on a zoned block device there is no way to run a test that wants a non-metadir file system.
--- common/xfs | 11 +++++++++++ 1 file changed, 11 insertions(+)
common/xfs +11 -0
@@ -2054,6 +2054,12 @@ _scratch_xfs_find_metafile() # Force metadata directories off. _scratch_xfs_force_no_metadir() { + _require_non_zoned_device $SCRATCH_DEV + # metadir is required for when the rt device is on a zoned device + if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ]; then + _require_non_zoned_device $SCRATCH_RTDEV + fi + # Remove any mkfs-time quota options because those are only supported # with metadir=1 for opt in uquota gquota pquota; do
@@ -2074,6 +2080,11 @@ _scratch_xfs_force_no_metadir() if grep -q 'metadir=' $MKFS_XFS_PROG; then MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS" fi + + # zoned requires metadir + if grep -q 'zoned=' $MKFS_XFS_PROG; then + MKFS_OPTIONS="-m zoned=0 $MKFS_OPTIONS" + fi } # do not run on zoned file systems
Signature · 1 line
2.45.2
Re: [PATCH 11/17] xfs: handle zoned file systems in _scratch_xfs_force_no_metadir
Quoted 29 lines · Christoph Hellwig
Zoned file systems required the metadir feature. If the tests are run on a conventional block device as the RT device, we can simply remove the zoned flag an run the test, but if the file systems sits on a zoned block device there is no way to run a test that wants a non-metadir file system.
Signed-off-by Christoph Hellwig <[email protected]>--- common/xfs | 11 +++++++++++ 1 file changed, 11 insertions(+)common/xfs +6
-0@@ -2054,6 +2054,12 @@ _scratch_xfs_find_metafile() # Force metadata directories off. _scratch_xfs_force_no_metadir() { + _require_non_zoned_device $SCRATCH_DEV + # metadir is required for when the rt device is on a zoned device + if [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ]; then + _require_non_zoned_device $SCRATCH_RTDEV + fi + # Remove any mkfs-time quota options because those are only supported # with metadir=1 for opt in uquota gquota pquota; do
common/xfs _scratch_xfs_force_no_metadir() · line 2086
Quoted 7 lines
common/xfs +4
-0@@ -2074,6 +2080,11 @@ _scratch_xfs_force_no_metadir() if grep -q 'metadir=' $MKFS_XFS_PROG; then MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS" fi + + # zoned requires metadir + if grep -q 'zoned=' $MKFS_XFS_PROG; then + MKFS_OPTIONS="-m zoned=0 $MKFS_OPTIONS"
I think this cause mkfs to fail due to the respecification of -mzoned if MKFS_OPTIONS originally had -mzoned= in it?
--D
Quoted 8 lines
common/xfs +1
-0+ fi } # do not run on zoned file systemsSignature · 1 line
2.45.2
Re: [PATCH 11/17] xfs: handle zoned file systems in _scratch_xfs_force_no_metadir
Quoted 4 lines · Darrick J. Wong
Quoted 4 lines
common/xfs +0
-0for opt in uquota gquota pquota; do@@ -2074,6 +2080,11 @@ _scratch_xfs_force_no_metadir() if grep -q 'metadir=' $MKFS_XFS_PROG; then MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS"
Quoted 8 lines
common/xfs _scratch_xfs_force_no_metadir() · line 2086
Quoted 5 lines
common/xfs +4
-0fi + + # zoned requires metadir + if grep -q 'zoned=' $MKFS_XFS_PROG; then + MKFS_OPTIONS="-m zoned=0 $MKFS_OPTIONS"I think this cause mkfs to fail due to the respecification of -mzoned if
MKFS_OPTIONSoriginally had -mzoned= in it?
Hmm, don't we allow respecification to override earlier settings? Let me double check the _scratch_xfs_force_no_metadir tests on zoned on conventional runs.
Re: [PATCH 11/17] xfs: handle zoned file systems in _scratch_xfs_force_no_metadir
Quoted 14 lines · Christoph Hellwig
Quoted 4 lines · Darrick J. Wong
Quoted 4 lines
common/xfs +0
-0for opt in uquota gquota pquota; do@@ -2074,6 +2080,11 @@ _scratch_xfs_force_no_metadir() if grep -q 'metadir=' $MKFS_XFS_PROG; then MKFS_OPTIONS="-m metadir=0 $MKFS_OPTIONS"Quoted 8 lines
common/xfs _scratch_xfs_force_no_metadir() · line 2086
Quoted 5 lines
common/xfs +4
-0fi + + # zoned requires metadir + if grep -q 'zoned=' $MKFS_XFS_PROG; then + MKFS_OPTIONS="-m zoned=0 $MKFS_OPTIONS"I think this cause mkfs to fail due to the respecification of -mzoned if
MKFS_OPTIONSoriginally had -mzoned= in it?
Quoted 1 line
Hmm, don't we allow respecification to override earlier settings?
Nope:
$ mkfs.xfs -f -m rmapbt=0 -m rmapbt=1 /tmp/a -m rmapbt option respecified <snip>
You can't even override the options specified in a config file:
$ mkfs.xfs -f -c options=/usr/share/xfsprogs/mkfs/lts_5.4.conf -m rmapbt=1 /tmp/a -m rmapbt option respecified
Quoted 2 lines
Let me double check the
_scratch_xfs_force_no_metadirtests on zoned on conventional runs.
--D
PATCH 12/17 xfs: no quota support with internal rtdev
In reply to Christoph HellwigSame as regular zoned, but the previous check didn't work.
--- common/xfs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
common/xfs +4 -1
@@ -2210,7 +2210,10 @@ _xfs_scratch_supports_rtquota() { # can check that quickly, and we make the bold assumption that the same will # apply to any scratch fs that might be created. _require_xfs_rtquota_if_rtdev() { - test "$USE_EXTERNAL" = "yes" || return + if [ "$USE_EXTERNAL" != "yes" ]; then + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' && + _notrun "Quota on internal rt device not supported" + fi if [ -n "$TEST_RTDEV$SCRATCH_RTDEV" ]; then _xfs_kmod_supports_rtquota || \
Signature · 1 line
2.45.2
Re: [PATCH 12/17] xfs: no quota support with internal rtdev
Quoted 12 lines · Christoph Hellwig
Same as regular zoned, but the previous check didn't work.
Signed-off-by Christoph Hellwig <[email protected]>--- common/xfs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)common/xfs +0
-0
common/xfs _xfs_scratch_supports_rtquota() { · line 2215
Quoted 7 lines
common/xfs +3
-1@@ -2210,7 +2210,10 @@ _xfs_scratch_supports_rtquota() { # can check that quickly, and we make the bold assumption that the same will # apply to any scratch fs that might be created. _require_xfs_rtquota_if_rtdev() { - test "$USE_EXTERNAL" = "yes" || return + if [ "$USE_EXTERNAL" != "yes" ]; then + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' && + _notrun "Quota on internal rt device not supported"
Huh, I wonder if we should've allowed internal non-zoned rt devices. It might've made the whole "we want 2MB blocksize on pmem" mess a little less unpalatable.
--D
Quoted 8 lines
common/xfs +1
-0+ fi if [ -n "$TEST_RTDEV$SCRATCH_RTDEV" ]; then _xfs_kmod_supports_rtquota || \Signature · 1 line
2.45.2
Re: [PATCH 12/17] xfs: no quota support with internal rtdev
Quoted 10 lines · Darrick J. Wong
common/xfs _xfs_scratch_supports_rtquota() { · line 2215
Quoted 6 lines
# apply to any scratch fs that might be created. _require_xfs_rtquota_if_rtdev() {common/xfs +3
-1- test "$USE_EXTERNAL" = "yes" || return + if [ "$USE_EXTERNAL" != "yes" ]; then + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' && + _notrun "Quota on internal rt device not supported"Huh, I wonder if we should've allowed internal non-zoned rt devices. It might've made the whole "we want 2MB blocksize on pmem" mess a little less unpalatable.
The code should be able to easily support it, but we'd need a new
feature flag to look for the rtstart value. We can probably just add
that feature the next time we add a somewhat relevant feature flag.
Hopefuly until then we'll support quotas on zoned so this check can go away. Of maybe we just need to find a better way to probe for quota support in general as the checks in xfstests are a bit of a mess.
PATCH 13/17 xfs: xfs_copy doesn't like RT sections
In reply to Christoph Hellwiginternal or external..
--- common/xfs | 3 +++ 1 file changed, 3 insertions(+)
common/xfs +3 -0
@@ -1561,6 +1561,9 @@ _require_xfs_copy() [ "$USE_EXTERNAL" = yes ] && \ _notrun "Cannot xfs_copy with external devices" + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' && + _notrun "Cannot xfs_copy with internal rt device" + # xfs_copy on v5 filesystems do not require the "-d" option if xfs_db # can change the UUID on v5 filesystems touch /tmp/$$.img
Signature · 1 line
2.45.2
Re: [PATCH 13/17] xfs: xfs_copy doesn't like RT sections
Quoted 12 lines · Christoph Hellwig
internal or external..
Signed-off-by Christoph Hellwig <[email protected]>--- common/xfs | 3 +++ 1 file changed, 3 insertions(+)common/xfs +0
-0
common/xfs _require_xfs_copy() · line 1564
Quoted 4 lines
common/xfs +1
-0@@ -1561,6 +1561,9 @@ _require_xfs_copy() [ "$USE_EXTERNAL" = yes ] && \ _notrun "Cannot xfs_copy with external devices" + xfs_info "$TEST_DIR" | grep -q 'realtime.*internal' &&
$XFS_INFO_PROG
(here and in the surrounding patches)
--D
Quoted 9 lines
common/xfs +2
-0+ _notrun "Cannot xfs_copy with internal rt device" + # xfs_copy on v5 filesystems do not require the "-d" option if xfs_db # can change the UUID on v5 filesystems touch /tmp/$$.imgSignature · 1 line
2.45.2
PATCH 14/17 xfs: skip filestreams tests on internal RT devices
In reply to Christoph HellwigThe filestreams tests using _test_streams force a run on the data section, but for internal RT zoned devices the data section can be tiny and might not provide enough space. Skip these tests as they aren't really useful when testing a zoned config anyway.
--- common/filestreams | 5 +++++ 1 file changed, 5 insertions(+)
common/filestreams +5 -0
@@ -108,6 +108,11 @@ _test_streams() { _scratch_mount fi + # Skip these tests on zoned file systems as filestreams don't work + # with the zoned allocator, and the above would force it into the + # tiny data section only used for metadata anyway. + _require_xfs_scratch_non_zoned + cd $SCRATCH_MNT # start $stream_count streams
Signature · 1 line
2.45.2
Re: [PATCH 14/17] xfs: skip filestreams tests on internal RT devices
Quoted 6 lines · Christoph Hellwig
The filestreams tests using
_test_streamsforce a run on the data section, but for internal RT zoned devices the data section can be tiny and might not provide enough space. Skip these tests as they aren't really useful when testing a zoned config anyway.Signed-off-by Christoph Hellwig <[email protected]>
Looks ok, assuming you don't just want to kill filestreams entirely :)
--D
Quoted 24 lines
--- common/filestreams | 5 +++++ 1 file changed, 5 insertions(+)common/filestreams +5
-0@@ -108,6 +108,11 @@ _test_streams() { _scratch_mount fi + # Skip these tests on zoned file systems as filestreams don't work + # with the zoned allocator, and the above would force it into the + # tiny data section only used for metadata anyway. + _require_xfs_scratch_non_zoned + cd $SCRATCH_MNT # start $stream_count streamsSignature · 1 line
2.45.2
Re: [PATCH 14/17] xfs: skip filestreams tests on internal RT devices
Quoted 9 lines · Darrick J. Wong
Quoted 6 lines · Christoph Hellwig
The filestreams tests using
_test_streamsforce a run on the data section, but for internal RT zoned devices the data section can be tiny and might not provide enough space. Skip these tests as they aren't really useful when testing a zoned config anyway.Signed-off-by Christoph Hellwig <[email protected]>Looks ok, assuming you don't just want to kill filestreams entirely :)
Hans and I are in fact looking into ways to repurpose it for zone placement. But that might just end up reusing the mru cache and look a bit different to the user.
PATCH 15/17 xfs: skip various tests on zoned devices
In reply to Christoph HellwigVarious tests don't work with underlying zoned devices because either the device mapper maps don't align to zone boundaries, or in one case the test creates an ext2 file system that doesn't support zoned devices.
--- tests/xfs/049 | 2 ++ tests/xfs/311 | 3 +++ tests/xfs/438 | 7 +++++++ 3 files changed, 12 insertions(+)
tests/xfs/049 +2 -0
@@ -40,6 +40,8 @@ _require_scratch_nocheck _require_no_large_scratch_dev _require_loop _require_extra_fs ext2 +# this test actually runs ext2 on the scratch device +_require_non_zoned_device $SCRATCH_DEV echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full echo "" >> $seqres.full
tests/xfs/311 +3 -0
@@ -30,6 +30,9 @@ _cleanup() _require_scratch _require_dm_target delay +# The dm-delay map added by this test doesn't work on zoned devices +_require_non_zoned_device $SCRATCH_DEV + echo "Silence is golden." _scratch_mkfs_xfs >> $seqres.full 2>&1
tests/xfs/438 +7 -0
@@ -96,6 +96,13 @@ _require_user _require_xfs_quota _require_freeze +# +# The dm-flakey map added by this test doesn't work on zoned devices +# because table sizes need to be aligned to the zone size. +# +_require_non_zoned_device $SCRATCH_DEV +_require_non_zoned_device $SCRATCH_RTDEV + echo "Silence is golden" _scratch_mkfs > $seqres.full 2>&1
Signature · 1 line
2.45.2
Re: [PATCH 15/17] xfs: skip various tests on zoned devices
Quoted 29 lines · Christoph Hellwig
Various tests don't work with underlying zoned devices because either the device mapper maps don't align to zone boundaries, or in one case the test creates an ext2 file system that doesn't support zoned devices.
Signed-off-by Christoph Hellwig <[email protected]>--- tests/xfs/049 | 2 ++ tests/xfs/311 | 3 +++ tests/xfs/438 | 7 +++++++ 3 files changed, 12 insertions(+)tests/xfs/049 +2
-0@@ -40,6 +40,8 @@ _require_scratch_nocheck _require_no_large_scratch_dev _require_loop _require_extra_fs ext2 +# this test actually runs ext2 on the scratch device +_require_non_zoned_device $SCRATCH_DEV echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full echo "" >> $seqres.fulltests/xfs/311 +0
-0
tests/xfs/311 _cleanup() · line 34
Quoted 5 lines
tests/xfs/311 +2
-0@@ -30,6 +30,9 @@ _cleanup() _require_scratch _require_dm_target delay +# The dm-delay map added by this test doesn't work on zoned devices +_require_non_zoned_device $SCRATCH_DEV
Should this kind of check become a part of _require_dm_target? Or does dm-delay support zoned targets, just not for this test?
Quoted 9 lines
tests/xfs/311 +1
-0+ echo "Silence is golden." _scratch_mkfs_xfs >> $seqres.full 2>&1tests/xfs/438 +0
-0
tests/xfs/438 _require_user · line 104
Quoted 9 lines
tests/xfs/438 +6
-0@@ -96,6 +96,13 @@ _require_user _require_xfs_quota _require_freeze +# +# The dm-flakey map added by this test doesn't work on zoned devices +# because table sizes need to be aligned to the zone size. +# +_require_non_zoned_device $SCRATCH_DEV +_require_non_zoned_device $SCRATCH_RTDEV
Can we fix the table sizes?
--D
Quoted 8 lines
tests/xfs/438 +1
-0+ echo "Silence is golden" _scratch_mkfs > $seqres.full 2>&1Signature · 1 line
2.45.2
Re: [PATCH 15/17] xfs: skip various tests on zoned devices
Quoted 5 lines · Darrick J. Wong
tests/xfs/311 _cleanup() · line 34
Quoted 2 lines
tests/xfs/311 +2
-0+# The dm-delay map added by this test doesn't work on zoned devices +_require_non_zoned_device $SCRATCH_DEVShould this kind of check become a part of
_require_dm_target? Or does dm-delay support zoned targets, just not for this test?
i.e. check for specific targets in _require_dm_target and reject them on zoned? I can see if that would work.
Quoted 8 lines
tests/xfs/438 _require_user · line 104
Quoted 6 lines
tests/xfs/438 +6
-0+# +# The dm-flakey map added by this test doesn't work on zoned devices +# because table sizes need to be aligned to the zone size. +# +_require_non_zoned_device $SCRATCH_DEV +_require_non_zoned_device $SCRATCH_RTDEVCan we fix the table sizes?
I'll take a look.
Re: [PATCH 15/17] xfs: skip various tests on zoned devices
Quoted 9 lines · Christoph Hellwig
Quoted 5 lines · Darrick J. Wong
tests/xfs/311 _cleanup() · line 34
Quoted 2 lines
tests/xfs/311 +2
-0+# The dm-delay map added by this test doesn't work on zoned devices +_require_non_zoned_device $SCRATCH_DEVShould this kind of check become a part of
_require_dm_target? Or does dm-delay support zoned targets, just not for this test?i.e. check for specific targets in
_require_dm_targetand reject them on zoned? I can see if that would work.
Yeah, since it already switches on which target you ask for, and applies per-target requirements checking.
--D
Quoted 12 lines
Quoted 8 lines
tests/xfs/438 _require_user · line 104
Quoted 6 lines
tests/xfs/438 +6
-0+# +# The dm-flakey map added by this test doesn't work on zoned devices +# because table sizes need to be aligned to the zone size. +# +_require_non_zoned_device $SCRATCH_DEV +_require_non_zoned_device $SCRATCH_RTDEVCan we fix the table sizes?
I'll take a look.
PATCH 16/17 xfs: skip various tests when using the zoned allocator
In reply to Christoph HellwigVarious file system features tested are incompatible with the zoned allocator. Add a _require_xfs_scratch_non_zoned to guard them.
--- tests/xfs/015 | 7 +++++++ tests/xfs/041 | 5 +++++ tests/xfs/272 | 5 +++++ tests/xfs/276 | 5 +++++ tests/xfs/306 | 4 ++++ tests/xfs/419 | 3 +++ tests/xfs/449 | 3 +++ tests/xfs/521 | 3 +++ tests/xfs/524 | 4 ++++ tests/xfs/540 | 3 +++ tests/xfs/541 | 3 +++ tests/xfs/556 | 13 +++++++++++++ tests/xfs/596 | 3 +++ 13 files changed, 61 insertions(+)
tests/xfs/015 +7 -0
@@ -38,6 +38,13 @@ _require_scratch # need 128M space, don't make any assumption _scratch_mkfs >/dev/null 2>&1 _scratch_mount + +# This test tries to grow the data device, which doesn't work for internal +# zoned RT devices +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + _require_fs_space $SCRATCH_MNT 196608 _scratch_unmount
tests/xfs/041 +5 -0
@@ -44,6 +44,11 @@ bsize=`_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 | _filter_mkfs 2>&1 \ onemeginblocks=`expr 1048576 / $bsize` _scratch_mount +# Growing the data device doesn't work with an internal RT volume directly +# following the data device. But even without that this test forces data +# to the data device, which often is tiny on zoned file systems. +_require_xfs_scratch_non_zoned + # We're growing the data device, so force new file creation there _xfs_force_bdev data $SCRATCH_MNT
tests/xfs/272 +5 -0
@@ -29,6 +29,11 @@ echo "Format and mount" _scratch_mkfs > "$seqres.full" 2>&1 _scratch_mount +# The synthetic devices for internal zoned rt devices confuse the parser +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + # Make sure everything is on the data device _xfs_force_bdev data $SCRATCH_MNT
tests/xfs/276 +5 -0
@@ -32,6 +32,11 @@ _scratch_mkfs | _filter_mkfs 2> "$tmp.mkfs" >/dev/null cat "$tmp.mkfs" > $seqres.full _scratch_mount +# The synthetic devices for internal zoned rt devices confuse the parser +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + # Don't let the rt extent size perturb the fsmap output with unwritten # extents in places we don't expect them test $rtextsz -eq $dbsize || _notrun "Skipping test due to rtextsize > 1 fsb"
tests/xfs/306 +4 -0
@@ -33,6 +33,10 @@ unset SCRATCH_RTDEV _scratch_mkfs_xfs -d size=100m -n size=64k >> $seqres.full 2>&1 _scratch_mount +# When using the zone allotator, mkfs still creates an internal RT ѕection by +# default and the above unsetting SCRATCH_RTDEV of doesn't work. +_require_xfs_scratch_non_zoned + # Fill a source directory with many largish-named files. 1k uuid-named entries # sufficiently populates a 64k directory block. mkdir $SCRATCH_MNT/src
tests/xfs/419 +3 -0
@@ -44,6 +44,9 @@ cat $tmp.mkfs >> $seqres.full . $tmp.mkfs _scratch_mount +# no support for rtextsize > 1 on zoned file systems +_require_xfs_scratch_non_zoned + test $rtextsz -ne $dbsize || \ _notrun "cannot set rt extent size ($rtextsz) larger than fs block size ($dbsize)"
tests/xfs/449 +3 -0
@@ -38,6 +38,9 @@ fi _scratch_mount +# can't grow data volume on mixed configs +_require_xfs_scratch_non_zoned + $XFS_SPACEMAN_PROG -c "info" $SCRATCH_MNT > $tmp.spaceman echo SPACEMAN >> $seqres.full cat $tmp.spaceman >> $seqres.full
tests/xfs/521 +3 -0
@@ -43,6 +43,9 @@ export SCRATCH_RTDEV=$rtdev _scratch_mkfs -r size=100m > $seqres.full _try_scratch_mount || _notrun "Could not mount scratch with synthetic rt volume" +# zoned file systems only support zoned size-rounded RT device sizes +_require_xfs_scratch_non_zoned + testdir=$SCRATCH_MNT/test-$seq mkdir $testdir
tests/xfs/524 +4 -0
@@ -25,6 +25,10 @@ _require_test _require_scratch_nocheck _require_xfs_mkfs_cfgfile +# reflink is currently not supported for zoned devices, and the normal support +# checks for it don't work at mkfs time. +_require_non_zoned_device $SCRATCH_DEV + echo "Silence is golden" def_cfgfile=$TEST_DIR/a
tests/xfs/540 +3 -0
@@ -34,6 +34,9 @@ test $rtextsz -ne $dbsize || \ _notrun "cannot set rt extent size ($rtextsz) larger than fs block size ($dbsize)" _scratch_mount >> $seqres.full 2>&1 +# no support for rtextsize > 1 on zoned file systems +_require_xfs_scratch_non_zoned + rootino=$(stat -c '%i' $SCRATCH_MNT) _scratch_unmount
tests/xfs/541 +3 -0
@@ -30,6 +30,9 @@ _require_scratch SCRATCH_RTDEV="" _scratch_mkfs | _filter_mkfs 2> $tmp.mkfs >> $seqres.full _try_scratch_mount || _notrun "Can't mount file system" +# Zoned file systems don't support rtextsize > 1 +_require_xfs_scratch_non_zoned + # Check that there's no realtime section. source $tmp.mkfs test $rtblocks -eq 0 || echo "expected 0 rtblocks, got $rtblocks"
tests/xfs/556 +13 -0
@@ -35,6 +35,19 @@ filter_scrub_errors() { } _scratch_mkfs >> $seqres.full + +# +# The dm-error map added by this test doesn't work on zoned devices because +# table sizes need to be aligned to the zone size, and even for zoned on +# conventional this test will get confused because of the internal RT device. +# +# That check requires a mounted file system, so do a dummy mount before setting +# up DM. +# +_scratch_mount +_require_xfs_scratch_non_zoned +_scratch_unmount + _dmerror_init _dmerror_mount >> $seqres.full 2>&1
tests/xfs/596 +3 -0
@@ -44,6 +44,9 @@ _scratch_mkfs_xfs -rsize=${rtsize}m | _filter_mkfs 2> "$tmp.mkfs" >> $seqres.ful onemeginblocks=`expr 1048576 / $dbsize` _scratch_mount +# growfs on zoned file systems only works on zone boundaries +_require_xfs_scratch_non_zoned + # We're growing the realtime device, so force new file creation there _xfs_force_bdev realtime $SCRATCH_MNT
Signature · 1 line
2.45.2
Re: [PATCH 16/17] xfs: skip various tests when using the zoned allocator
Quoted 25 lines · Christoph Hellwig
Various file system features tested are incompatible with the zoned allocator. Add a
_require_xfs_scratch_non_zonedto guard them.Signed-off-by Christoph Hellwig <[email protected]>--- tests/xfs/015 | 7 +++++++ tests/xfs/041 | 5 +++++ tests/xfs/272 | 5 +++++ tests/xfs/276 | 5 +++++ tests/xfs/306 | 4 ++++ tests/xfs/419 | 3 +++ tests/xfs/449 | 3 +++ tests/xfs/521 | 3 +++ tests/xfs/524 | 4 ++++ tests/xfs/540 | 3 +++ tests/xfs/541 | 3 +++ tests/xfs/556 | 13 +++++++++++++ tests/xfs/596 | 3 +++ 13 files changed, 61 insertions(+)tests/xfs/015 +0
-0
tests/xfs/015 _require_scratch · line 46
Quoted 9 lines
tests/xfs/015 +6
-0@@ -38,6 +38,13 @@ _require_scratch # need 128M space, don't make any assumption _scratch_mkfs >/dev/null 2>&1 _scratch_mount + +# This test tries to grow the data device, which doesn't work for internal +# zoned RT devices +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi
Does growfs work for external zoned rt devices?
Quoted 57 lines
tests/xfs/015 +1
-0+ _require_fs_space $SCRATCH_MNT 196608 _scratch_unmounttests/xfs/041 +5
-0@@ -44,6 +44,11 @@ bsize=`_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 | _filter_mkfs 2>&1 \ onemeginblocks=`expr 1048576 / $bsize` _scratch_mount +# Growing the data device doesn't work with an internal RT volume directly +# following the data device. But even without that this test forces data +# to the data device, which often is tiny on zoned file systems. +_require_xfs_scratch_non_zoned + # We're growing the data device, so force new file creation there _xfs_force_bdev data $SCRATCH_MNTtests/xfs/272 +5
-0@@ -29,6 +29,11 @@ echo "Format and mount" _scratch_mkfs > "$seqres.full" 2>&1 _scratch_mount +# The synthetic devices for internal zoned rt devices confuse the parser +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + # Make sure everything is on the data device _xfs_force_bdev data $SCRATCH_MNTtests/xfs/276 +5
-0@@ -32,6 +32,11 @@ _scratch_mkfs | _filter_mkfs 2> "$tmp.mkfs" >/dev/null cat "$tmp.mkfs" > $seqres.full _scratch_mount +# The synthetic devices for internal zoned rt devices confuse the parser +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fi + # Don't let the rt extent size perturb the fsmap output with unwritten # extents in places we don't expect them test $rtextsz -eq $dbsize || _notrun "Skipping test due to rtextsize > 1 fsb"tests/xfs/306 +0
-0
tests/xfs/306 unset SCRATCH_RTDEV · line 36
Quoted 4 lines
tests/xfs/306 +1
-0@@ -33,6 +33,10 @@ unset SCRATCH_RTDEV _scratch_mkfs_xfs -d size=100m -n size=64k >> $seqres.full 2>&1 _scratch_mount +# When using the zone allotator, mkfs still creates an internal RT ѕection by
allocator
Now you have me craving tator tots.
--D
Quoted 133 lines
tests/xfs/306 +3
-0+# default and the above unsetting SCRATCH_RTDEV of doesn't work. +_require_xfs_scratch_non_zoned + # Fill a source directory with many largish-named files. 1k uuid-named entries # sufficiently populates a 64k directory block. mkdir $SCRATCH_MNT/srctests/xfs/419 +3
-0@@ -44,6 +44,9 @@ cat $tmp.mkfs >> $seqres.full . $tmp.mkfs _scratch_mount +# no support for rtextsize > 1 on zoned file systems +_require_xfs_scratch_non_zoned + test $rtextsz -ne $dbsize || \ _notrun "cannot set rt extent size ($rtextsz) larger than fs block size ($dbsize)"tests/xfs/449 +3
-0@@ -38,6 +38,9 @@ fi _scratch_mount +# can't grow data volume on mixed configs +_require_xfs_scratch_non_zoned + $XFS_SPACEMAN_PROG -c "info" $SCRATCH_MNT > $tmp.spaceman echo SPACEMAN >> $seqres.full cat $tmp.spaceman >> $seqres.fulltests/xfs/521 +3
-0@@ -43,6 +43,9 @@ export SCRATCH_RTDEV=$rtdev _scratch_mkfs -r size=100m > $seqres.full _try_scratch_mount || _notrun "Could not mount scratch with synthetic rt volume" +# zoned file systems only support zoned size-rounded RT device sizes +_require_xfs_scratch_non_zoned + testdir=$SCRATCH_MNT/test-$seq mkdir $testdirtests/xfs/524 +4
-0@@ -25,6 +25,10 @@ _require_test _require_scratch_nocheck _require_xfs_mkfs_cfgfile +# reflink is currently not supported for zoned devices, and the normal support +# checks for it don't work at mkfs time. +_require_non_zoned_device $SCRATCH_DEV + echo "Silence is golden" def_cfgfile=$TEST_DIR/atests/xfs/540 +3
-0@@ -34,6 +34,9 @@ test $rtextsz -ne $dbsize || \ _notrun "cannot set rt extent size ($rtextsz) larger than fs block size ($dbsize)" _scratch_mount >> $seqres.full 2>&1 +# no support for rtextsize > 1 on zoned file systems +_require_xfs_scratch_non_zoned + rootino=$(stat -c '%i' $SCRATCH_MNT) _scratch_unmounttests/xfs/541 +3
-0@@ -30,6 +30,9 @@ _require_scratch SCRATCH_RTDEV="" _scratch_mkfs | _filter_mkfs 2> $tmp.mkfs >> $seqres.full _try_scratch_mount || _notrun "Can't mount file system" +# Zoned file systems don't support rtextsize > 1 +_require_xfs_scratch_non_zoned + # Check that there's no realtime section. source $tmp.mkfs test $rtblocks -eq 0 || echo "expected 0 rtblocks, got $rtblocks"tests/xfs/556 +13
-0@@ -35,6 +35,19 @@ filter_scrub_errors() { } _scratch_mkfs >> $seqres.full + +# +# The dm-error map added by this test doesn't work on zoned devices because +# table sizes need to be aligned to the zone size, and even for zoned on +# conventional this test will get confused because of the internal RT device. +# +# That check requires a mounted file system, so do a dummy mount before setting +# up DM. +# +_scratch_mount +_require_xfs_scratch_non_zoned +_scratch_unmount + _dmerror_init _dmerror_mount >> $seqres.full 2>&1tests/xfs/596 +3
-0@@ -44,6 +44,9 @@ _scratch_mkfs_xfs -rsize=${rtsize}m | _filter_mkfs 2> "$tmp.mkfs" >> $seqres.ful onemeginblocks=`expr 1048576 / $dbsize` _scratch_mount +# growfs on zoned file systems only works on zone boundaries +_require_xfs_scratch_non_zoned + # We're growing the realtime device, so force new file creation there _xfs_force_bdev realtime $SCRATCH_MNTSignature · 1 line
2.45.2
Re: [PATCH 16/17] xfs: skip various tests when using the zoned allocator
Quoted 8 lines · Darrick J. Wong
tests/xfs/015 _require_scratch · line 46
Quoted 6 lines
tests/xfs/015 +6
-0+ +# This test tries to grow the data device, which doesn't work for internal +# zoned RT devices +if [ -z "$SCRATCH_RTDEV" ]; then + _require_xfs_scratch_non_zoned +fiDoes growfs work for external zoned rt devices?
It works, but the amount grown needs to be aligned to the zone size. So this test won't work either and the above comment needs to be correct. A test based on this one that tests zoned grows will follow in the next series.
PATCH 17/17 xfs/206: filter out the zoned line from mkfs output
In reply to Christoph HellwigSo that the test still passes with a zone enabled mkfs.
--- tests/xfs/206 | 1 + 1 file changed, 1 insertion(+)
tests/xfs/206 +1 -0
@@ -66,6 +66,7 @@ mkfs_filter() -e '/metadir=.*/d' \ -e 's/, parent=[01]//' \ -e '/rgcount=/d' \ + -e '/zoned=/d' \ -e "/^Default configuration/d" }
Signature · 1 line
2.45.2
Re: [PATCH 17/17] xfs/206: filter out the zoned line from mkfs output
Quoted 3 lines · Christoph Hellwig
So that the test still passes with a zone enabled mkfs.
Signed-off-by Christoph Hellwig <[email protected]>
Same patch that I had!
--D
Quoted 20 lines
--- tests/xfs/206 | 1 + 1 file changed, 1 insertion(+)tests/xfs/206 +1
-0@@ -66,6 +66,7 @@ mkfs_filter() -e '/metadir=.*/d' \ -e 's/, parent=[01]//' \ -e '/rgcount=/d' \ + -e '/zoned=/d' \ -e "/^Default configuration/d" }Signature · 1 line
2.45.2
Quoted 5 lines · Christoph Hellwig
Hi all,
this series adds initial support for the zoned XFS code merge into the xfs tree to xfstests. It does not include several newly developed test cases which will be sent separately.
Heh, looking forward to that. I'll give this latest version a spin on my qa fleet and report back...
--D