diff mbox series

[15/17] xfs: skip various tests on zoned devices

Message ID 20250312064541.664334-16-hch@lst.de (mailing list archive)
State New
Headers show
Series [01/17] xfs/177: force a small file system size | expand

Commit Message

Christoph Hellwig March 12, 2025, 6:45 a.m. UTC
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 <hch@lst.de>
---
 tests/xfs/049 | 2 ++
 tests/xfs/311 | 3 +++
 tests/xfs/438 | 7 +++++++
 3 files changed, 12 insertions(+)

Comments

Darrick J. Wong March 12, 2025, 8:27 p.m. UTC | #1
On Wed, Mar 12, 2025 at 07:45:07AM +0100, Christoph Hellwig wrote:
> 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 <hch@lst.de>
> ---
>  tests/xfs/049 | 2 ++
>  tests/xfs/311 | 3 +++
>  tests/xfs/438 | 7 +++++++
>  3 files changed, 12 insertions(+)
> 
> diff --git a/tests/xfs/049 b/tests/xfs/049
> index cdcddf76498c..07feb58c9ad6 100755
> --- a/tests/xfs/049
> +++ b/tests/xfs/049
> @@ -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
> diff --git a/tests/xfs/311 b/tests/xfs/311
> index 8b806fc29eb1..e8fc547cc4b4 100755
> --- a/tests/xfs/311
> +++ b/tests/xfs/311
> @@ -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?

> +
>  echo "Silence is golden."
>  
>  _scratch_mkfs_xfs >> $seqres.full 2>&1
> diff --git a/tests/xfs/438 b/tests/xfs/438
> index 6d1988c8b9b8..d436b583f9d1 100755
> --- a/tests/xfs/438
> +++ b/tests/xfs/438
> @@ -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

> +
>  echo "Silence is golden"
>  
>  _scratch_mkfs > $seqres.full 2>&1
> -- 
> 2.45.2
> 
>
Christoph Hellwig March 13, 2025, 7:32 a.m. UTC | #2
On Wed, Mar 12, 2025 at 01:27:59PM -0700, Darrick J. Wong wrote:
> > +# 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?

i.e. check for specific targets in _require_dm_target and reject them
on zoned?  I can see if that would work.

> > +#
> > +# 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?

I'll take a look.
diff mbox series

Patch

diff --git a/tests/xfs/049 b/tests/xfs/049
index cdcddf76498c..07feb58c9ad6 100755
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -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
diff --git a/tests/xfs/311 b/tests/xfs/311
index 8b806fc29eb1..e8fc547cc4b4 100755
--- a/tests/xfs/311
+++ b/tests/xfs/311
@@ -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
diff --git a/tests/xfs/438 b/tests/xfs/438
index 6d1988c8b9b8..d436b583f9d1 100755
--- a/tests/xfs/438
+++ b/tests/xfs/438
@@ -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