misc: fix test that fail formatting with 64k blocksize
PATCH 1/1 misc: fix test that fail formatting with 64k blocksize
From: "Darrick J. Wong" <[email protected]>
There's a bunch of tests that fail the formatting step when the test run is configured to use XFS with a 64k blocksize. This happens because XFS doesn't really support that combination due to minimum log size constraints. Fix the test to format larger devices in that case.
---
@Darrick I added more tests that were failing, and increased 512m to 600m as generic/081 and generic/108 were still failing with 512m with the following on 64k page size system:
MKFS_OPTIONS='-f -m reflink=1,rmapbt=1, -i sparse=1, -b size=64k,'
common/rc | 29 +++++++++++++++++++++++++++++ tests/generic/042 | 9 +-------- tests/generic/081 | 7 +++++-- tests/generic/108 | 6 ++++-- tests/generic/455 | 3 ++- tests/generic/457 | 3 ++- tests/generic/482 | 3 ++- tests/generic/704 | 3 ++- tests/generic/730 | 3 ++- tests/generic/731 | 3 ++- tests/shared/298 | 2 +- tests/xfs/279 | 7 ++++--- 12 files changed, 56 insertions(+), 22 deletions(-)
common/rc +29 -0
@@ -923,6 +923,35 @@ _check_minimal_fs_size() fi } +# Round a proposed filesystem size up to the minimium supported size. The +# input is in MB and so is the output. +_small_fs_size_mb() +{ + local size="$1" + local runner_min_size=0 + local fs_min_size=0 + + case "$FSTYP" in + xfs) + # xfs no longer supports filesystems smaller than 600m + fs_min_size=600 + ;; + f2fs) + # f2fs-utils 1.9.0 needs at least 38 MB space for f2fs image. + # However, f2fs-utils 1.14.0 needs at least 52 MB. Not sure if + # it will change again. So just set it 128M. + fs_min_size=128 + ;; + esac + (( size < fs_min_size )) && size="$fs_min_size" + + # If the test runner wanted a minimum size, enforce that here. + test -n "$MIN_FSSIZE" && runner_min_size=$((MIN_FSSIZE / 1048576)) + (( size < runner_min_size)) && size="$runner_min_size" + + echo "$size" +} + # Create fs of certain size on scratch device # _scratch_mkfs_sized <size in bytes> [optional blocksize] _scratch_mkfs_sized()
tests/generic/042 +1 -8
@@ -27,14 +27,7 @@ _crashtest() img=$SCRATCH_MNT/$seq.img mnt=$SCRATCH_MNT/$seq.mnt file=$mnt/file - size=25M - - # f2fs-utils 1.9.0 needs at least 38 MB space for f2fs image. However, - # f2fs-utils 1.14.0 needs at least 52 MB. Not sure if it will change - # again. So just set it 128M. - if [ $FSTYP == "f2fs" ]; then - size=128M - fi + size=$(_small_fs_size_mb 25)M # Create an fs on a small, initialized image. The pattern is written to # the image to detect stale data exposure.
tests/generic/081 +5 -2
@@ -62,13 +62,16 @@ snapname=snap_$seq mnt=$TEST_DIR/mnt_$seq mkdir -p $mnt +size=$(_small_fs_size_mb 300) +lvsize=$((size * 85 / 100)) # ~256M + # make sure there's enough disk space for 256M lv, test for 300M here in case # lvm uses some space for metadata -_scratch_mkfs_sized $((300 * 1024 * 1024)) >>$seqres.full 2>&1 +_scratch_mkfs_sized $((size * 1024 * 1024)) >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCRATCH_DEV >>$seqres.full 2>&1 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm # (like 2.02.95 in RHEL6) don't support --yes option -yes | $LVM_PROG lvcreate -L 256M -n $lvname $vgname >>$seqres.full 2>&1 +yes | $LVM_PROG lvcreate -L ${lvsize}M -n $lvname $vgname >>$seqres.full 2>&1 # wait for lvcreation to fully complete $UDEV_SETTLE_PROG >>$seqres.full 2>&1
tests/generic/108 +4 -2
@@ -44,9 +44,11 @@ vgname=vg_$seq physical=`blockdev --getpbsz $SCRATCH_DEV` logical=`blockdev --getss $SCRATCH_DEV` +size=$(_small_fs_size_mb 300) +lvsize=$((size * 91 / 100)) # _get_scsi_debug_dev returns a scsi debug device with 128M in size by default -SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
@@ -55,7 +57,7 @@ $LVM_PROG pvcreate -f $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm # (like 2.02.95 in RHEL6) don't support --yes option -yes | $LVM_PROG lvcreate -i 2 -I 4m -L 275m -n $lvname $vgname \ +yes | $LVM_PROG lvcreate -i 2 -I 4m -L ${lvsize}m -n $lvname $vgname \ >>$seqres.full 2>&1 # wait for lv creation to fully complete $UDEV_SETTLE_PROG >>$seqres.full 2>&1
tests/generic/455 +2 -1
@@ -51,7 +51,8 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space threshold
tests/generic/457 +2 -1
@@ -55,7 +55,8 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space threshold
tests/generic/482 +2 -1
@@ -65,7 +65,8 @@ fi fsstress_args=$(_scale_fsstress_args -w -d $SCRATCH_MNT -n 512 -p $nr_cpus \ $FSSTRESS_AVOID) -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space threshold
tests/generic/704 +2 -1
@@ -30,8 +30,9 @@ _require_scsi_debug _require_test _require_block_device $TEST_DEV +size=$(_small_fs_size_mb 256) echo "Get a device with 4096 physical sector size and 512 logical sector size" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 256` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 $size` blockdev --getpbsz --getss $SCSI_DEBUG_DEV echo "mkfs and mount"
tests/generic/730 +2 -1
@@ -27,7 +27,8 @@ _require_test _require_block_device $TEST_DEV _require_scsi_debug -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256` +size=$(_small_fs_size_mb 256) +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
tests/generic/731 +2 -1
@@ -27,7 +27,8 @@ _require_block_device $TEST_DEV _supported_fs generic _require_scsi_debug -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256` +size=$(_small_fs_size_mb 256) +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full
tests/shared/298 +1 -1
@@ -20,7 +20,7 @@ if [ "$FSTYP" = "btrfs" ]; then fssize=3000 else _require_fs_space $TEST_DIR 307200 - fssize=300 + fssize=$(_small_fs_size_mb 300) # 200m phys/virt size fi [ "$FSTYP" = "ext4" ] && _require_dumpe2fs
tests/xfs/279 +4 -3
@@ -26,6 +26,7 @@ _cleanup() _supported_fs xfs _require_scsi_debug +size=$(_small_fs_size_mb 128) # Remove xfs signature so -f isn't needed to re-mkfs _wipe_device()
@@ -55,7 +56,7 @@ _check_mkfs() ( echo "===================" echo "4k physical 512b logical aligned" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # sector size should default to 4k _check_mkfs $SCSI_DEBUG_DEV
@@ -68,7 +69,7 @@ _put_scsi_debug_dev ( echo "===================" echo "4k physical 512b logical unaligned" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 1 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 1 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # should fail on misalignment _check_mkfs $SCSI_DEBUG_DEV
@@ -85,7 +86,7 @@ _put_scsi_debug_dev ( echo "===================" echo "hard 4k physical / 4k logical" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # block size smaller than sector size should fail _check_mkfs -b size=2048 $SCSI_DEBUG_DEV
base-commit: 386c7b6aa69ebe8017a4728a994f80d55c660de4
Signature · 1 line
2.43.0
Quoted 11 lines · Pankaj Raghav (Samsung)
From: "Darrick J. Wong" <[email protected]>
There's a bunch of tests that fail the formatting step when the test run is configured to use XFS with a 64k blocksize. This happens because XFS doesn't really support that combination due to minimum log size constraints. Fix the test to format larger devices in that case.
Signed-off-by Darrick J. Wong <[email protected]>Co-developed-by Pankaj Raghav <[email protected]>Signed-off-by Pankaj Raghav <[email protected]>---
This change looks good to me, and it really fixes some testing failures.
BTW, I tested 64k blocksize xfs with this patch, there're still some failed test cases. If you're still interested in it, I'd like to list some of them as below (diff *.out *.out.bad output).
Thanks,
Zorro
*generic/209 failed as:*
219.out.bad renamed from dev/fd/63 +2 -2
@@ -16,7 +16,7 @@ Size: 49152 Filetype: Regular File File: "SCRATCH_MNT/mmap" Size: 49152 Filetype: Regular File -Usage OK (type=u) +Too many blocks used (type=u) ### test group accounting
@@ -34,4 +34,4 @@ Size: 49152 Filetype: Regular File File: "SCRATCH_MNT/mmap" Size: 49152 Filetype: Regular File -Usage OK (type=g) +Too many blocks used (type=g)
*generic/305 failed as:*
305.out.bad renamed from dev/fd/63 +1 -1
@@ -11,7 +11,7 @@ CoW one of the files root 0 0 0 nobody 0 0 0 -fsgqa 3072 0 0 +fsgqa 3584 0 0 Remount the FS to see if accounting changes root 0 0 0 nobody 0 0 0
*generic/326 failed as:*
326.out.bad renamed from dev/fd/63 +1 -1
@@ -11,7 +11,7 @@ CoW one of the files root 0 0 0 nobody 0 0 0 -fsgqa 3072 0 0 +fsgqa 3584 0 0 Remount the FS to see if accounting changes root 0 0 0 nobody 0 0 0
*generic/619 failed as:*
619.out.bad renamed from dev/fd/63 +5 -1
@@ -1,2 +1,6 @@ QA output created by 619 -Silence is golden +FAIL: ENOSPC BUS faliure +Small-file-ftruncate-test failed at iteration count: 2 +Filesystem Type Size Used Avail Use% Mounted on +/dev/vda3 xfs 208M 140M 69M 68% /mnt/xfstests/scratch +Allocated: 70.0% Used: 68%
*generic/645 failed as:*
645.out.bad renamed from dev/fd/63 +2 -0
@@ -1,2 +1,4 @@ QA output created by 645 Silence is golden +idmapped-mounts.c: 6671: nested_userns - Invalid argument - failure: sys_mount_setattr +vfstest.c: 2418: run_test - Invalid argument - failure: test that nested user namespaces behave correctly when attached to idmapped mounts
*xfs/435 failed as:*
435.out.bad renamed from dev/fd/63 +1 -0
@@ -3,3 +3,4 @@ Create a many-block file Remount to check recovery See if we leak +custom patient module removal for xfs timed out waiting for refcnt to become 0 using timeout of 50
*xfs/508 failed as:*
508.out.bad renamed from dev/fd/63 +6 -3
@@ -1,12 +1,15 @@ QA output created by 508 == The parent directory has Project inheritance bit by default == +touch: cannot touch '/mnt/xfstests/scratch/dir/foo': No space left on device +mkdir: cannot create directory '/mnt/xfstests/scratch/dir/dir_inherit': No space left on device +touch: cannot touch '/mnt/xfstests/scratch/dir/dir_inherit/foo': No such file or directory Checking project test (path [SCR_MNT]/dir)... Processed 1 ([PROJECTS_FILE] and cmdline) paths for project test with recursion depth infinite (-1). Write SCRATCH_MNT/dir/foo, expect ENOSPC: -pwrite: No space left on device +/mnt/xfstests/scratch/dir/foo: No space left on device Write SCRATCH_MNT/dir/dir_inherit/foo, expect ENOSPC: -pwrite: No space left on device +/mnt/xfstests/scratch/dir/dir_inherit/foo: No such file or directory == After removing parent directory has Project inheritance bit == Checking project test (path [SCR_MNT]/dir)...
@@ -19,5 +22,5 @@ Write SCRATCH_MNT/dir/foo, expect Success: Write SCRATCH_MNT/dir/dir_inherit/foo, expect ENOSPC: -pwrite: No space left on device +/mnt/xfstests/scratch/dir/dir_inherit/foo: No such file or directory Write SCRATCH_MNT/dir/dir_uninherit/foo, expect Success:
*xfs/558 failed as:*
558.out.bad renamed from dev/fd/63 +1 -0
@@ -1,2 +1,3 @@ QA output created by 558 +Expected to hear about writeback iomap invalidations? Silence is golden
Quoted 271 lines
@Darrick I added more tests that were failing, and increased 512m to 600m as generic/081 and generic/108 were still failing with 512m with the following on 64k page size system:
MKFS_OPTIONS='-f -m reflink=1,rmapbt=1, -i sparse=1, -b size=64k,'common/rc | 29 +++++++++++++++++++++++++++++ tests/generic/042 | 9 +-------- tests/generic/081 | 7 +++++-- tests/generic/108 | 6 ++++-- tests/generic/455 | 3 ++- tests/generic/457 | 3 ++- tests/generic/482 | 3 ++- tests/generic/704 | 3 ++- tests/generic/730 | 3 ++- tests/generic/731 | 3 ++- tests/shared/298 | 2 +- tests/xfs/279 | 7 ++++--- 12 files changed, 56 insertions(+), 22 deletions(-)common/rc +29
-0@@ -923,6 +923,35 @@ _check_minimal_fs_size() fi } +# Round a proposed filesystem size up to the minimium supported size. The +# input is in MB and so is the output. +_small_fs_size_mb() +{ + local size="$1" + local runner_min_size=0 + local fs_min_size=0 + + case "$FSTYP" in + xfs) + # xfs no longer supports filesystems smaller than 600m + fs_min_size=600 + ;; + f2fs) + # f2fs-utils 1.9.0 needs at least 38 MB space for f2fs image. + # However, f2fs-utils 1.14.0 needs at least 52 MB. Not sure if + # it will change again. So just set it 128M. + fs_min_size=128 + ;; + esac + (( size < fs_min_size )) && size="$fs_min_size" + + # If the test runner wanted a minimum size, enforce that here. + test -n "$MIN_FSSIZE" && runner_min_size=$((MIN_FSSIZE / 1048576)) + (( size < runner_min_size)) && size="$runner_min_size" + + echo "$size" +} + # Create fs of certain size on scratch device # _scratch_mkfs_sized <size in bytes> [optional blocksize] _scratch_mkfs_sized()tests/generic/042 +1
-8@@ -27,14 +27,7 @@ _crashtest() img=$SCRATCH_MNT/$seq.img mnt=$SCRATCH_MNT/$seq.mnt file=$mnt/file - size=25M - - # f2fs-utils 1.9.0 needs at least 38 MB space for f2fs image. However, - # f2fs-utils 1.14.0 needs at least 52 MB. Not sure if it will change - # again. So just set it 128M. - if [ $FSTYP == "f2fs" ]; then - size=128M - fi + size=$(_small_fs_size_mb 25)M # Create an fs on a small, initialized image. The pattern is written to # the image to detect stale data exposure.tests/generic/081 +5
-2@@ -62,13 +62,16 @@ snapname=snap_$seq mnt=$TEST_DIR/mnt_$seq mkdir -p $mnt +size=$(_small_fs_size_mb 300) +lvsize=$((size * 85 / 100)) # ~256M + # make sure there's enough disk space for 256M lv, test for 300M here in case # lvm uses some space for metadata -_scratch_mkfs_sized $((300 * 1024 * 1024)) >>$seqres.full 2>&1 +_scratch_mkfs_sized $((size * 1024 * 1024)) >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCRATCH_DEV >>$seqres.full 2>&1 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm # (like 2.02.95 in RHEL6) don't support --yes option -yes | $LVM_PROG lvcreate -L 256M -n $lvname $vgname >>$seqres.full 2>&1 +yes | $LVM_PROG lvcreate -L ${lvsize}M -n $lvname $vgname >>$seqres.full 2>&1 # wait for lvcreation to fully complete $UDEV_SETTLE_PROG >>$seqres.full 2>&1tests/generic/108 +4
-2@@ -44,9 +44,11 @@ vgname=vg_$seq physical=`blockdev --getpbsz $SCRATCH_DEV` logical=`blockdev --getss $SCRATCH_DEV` +size=$(_small_fs_size_mb 300) +lvsize=$((size * 91 / 100)) # _get_scsi_debug_dev returns a scsi debug device with 128M in size by default -SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full@@ -55,7 +57,7 @@ $LVM_PROG pvcreate -f $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm # (like 2.02.95 in RHEL6) don't support --yes option -yes | $LVM_PROG lvcreate -i 2 -I 4m -L 275m -n $lvname $vgname \ +yes | $LVM_PROG lvcreate -i 2 -I 4m -L ${lvsize}m -n $lvname $vgname \ >>$seqres.full 2>&1 # wait for lv creation to fully complete $UDEV_SETTLE_PROG >>$seqres.full 2>&1tests/generic/455 +2
-1@@ -51,7 +51,8 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space thresholdtests/generic/457 +2
-1@@ -55,7 +55,8 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space thresholdtests/generic/482 +2
-1@@ -65,7 +65,8 @@ fi fsstress_args=$(_scale_fsstress_args -w -d $SCRATCH_MNT -n 512 -p $nr_cpus \ $FSSTRESS_AVOID) -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space thresholdtests/generic/704 +2
-1@@ -30,8 +30,9 @@ _require_scsi_debug _require_test _require_block_device $TEST_DEV +size=$(_small_fs_size_mb 256) echo "Get a device with 4096 physical sector size and 512 logical sector size" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 256` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 $size` blockdev --getpbsz --getss $SCSI_DEBUG_DEV echo "mkfs and mount"tests/generic/730 +2
-1@@ -27,7 +27,8 @@ _require_test _require_block_device $TEST_DEV _require_scsi_debug -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256` +size=$(_small_fs_size_mb 256) +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.fulltests/generic/731 +2
-1@@ -27,7 +27,8 @@ _require_block_device $TEST_DEV _supported_fs generic _require_scsi_debug -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256` +size=$(_small_fs_size_mb 256) +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.fulltests/shared/298 +1
-1@@ -20,7 +20,7 @@ if [ "$FSTYP" = "btrfs" ]; then fssize=3000 else _require_fs_space $TEST_DIR 307200 - fssize=300 + fssize=$(_small_fs_size_mb 300) # 200m phys/virt size fi [ "$FSTYP" = "ext4" ] && _require_dumpe2fstests/xfs/279 +4
-3@@ -26,6 +26,7 @@ _cleanup() _supported_fs xfs _require_scsi_debug +size=$(_small_fs_size_mb 128) # Remove xfs signature so -f isn't needed to re-mkfs _wipe_device()@@ -55,7 +56,7 @@ _check_mkfs() ( echo "===================" echo "4k physical 512b logical aligned" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # sector size should default to 4k _check_mkfs $SCSI_DEBUG_DEV@@ -68,7 +69,7 @@ _put_scsi_debug_dev ( echo "===================" echo "4k physical 512b logical unaligned" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 1 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 1 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # should fail on misalignment _check_mkfs $SCSI_DEBUG_DEV@@ -85,7 +86,7 @@ _put_scsi_debug_dev ( echo "===================" echo "hard 4k physical / 4k logical" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # block size smaller than sector size should fail _check_mkfs -b size=2048 $SCSI_DEBUG_DEVbase-commit:
386c7b6aa69ebe8017a4728a994f80d55c660de4Signature · 1 line
2.43.0
Quoted 140 lines · Zorro Lang
Quoted 11 lines · Pankaj Raghav (Samsung)
From: "Darrick J. Wong" <[email protected]>
There's a bunch of tests that fail the formatting step when the test run is configured to use XFS with a 64k blocksize. This happens because XFS doesn't really support that combination due to minimum log size constraints. Fix the test to format larger devices in that case.
Signed-off-by Darrick J. Wong <[email protected]>Co-developed-by Pankaj Raghav <[email protected]>Signed-off-by Pankaj Raghav <[email protected]>---
This change looks good to me, and it really fixes some testing failures.
Reviewed-by Zorro Lang <[email protected]>BTW, I tested 64k blocksize xfs with this patch, there're still some failed test cases. If you're still interested in it, I'd like to list some of them as below (diff *.out *.out.bad output).
Thanks,
Zorro*generic/209 failed as:*
219.out.bad renamed from dev/fd/63 +2
-2@@ -16,7 +16,7 @@ Size: 49152 Filetype: Regular File File: "SCRATCH_MNT/mmap" Size: 49152 Filetype: Regular File -Usage OK (type=u) +Too many blocks used (type=u) ### test group accounting@@ -34,4 +34,4 @@ Size: 49152 Filetype: Regular File File: "SCRATCH_MNT/mmap" Size: 49152 Filetype: Regular File -Usage OK (type=g) +Too many blocks used (type=g)*generic/305 failed as:*
305.out.bad renamed from dev/fd/63 +1
-1@@ -11,7 +11,7 @@ CoW one of the files root 0 0 0 nobody 0 0 0 -fsgqa 3072 0 0 +fsgqa 3584 0 0 Remount the FS to see if accounting changes root 0 0 0 nobody 0 0 0*generic/326 failed as:*
326.out.bad renamed from dev/fd/63 +1
-1@@ -11,7 +11,7 @@ CoW one of the files root 0 0 0 nobody 0 0 0 -fsgqa 3072 0 0 +fsgqa 3584 0 0 Remount the FS to see if accounting changes root 0 0 0 nobody 0 0 0*generic/619 failed as:*
619.out.bad renamed from dev/fd/63 +5
-1@@ -1,2 +1,6 @@ QA output created by 619 -Silence is golden +FAIL: ENOSPC BUS faliure +Small-file-ftruncate-test failed at iteration count: 2 +Filesystem Type Size Used Avail Use% Mounted on +/dev/vda3 xfs 208M 140M 69M 68% /mnt/xfstests/scratch +Allocated: 70.0% Used: 68%*generic/645 failed as:*
645.out.bad renamed from dev/fd/63 +2
-0@@ -1,2 +1,4 @@ QA output created by 645 Silence is golden +idmapped-mounts.c: 6671: nested_userns - Invalid argument - failure: sys_mount_setattr +vfstest.c: 2418: run_test - Invalid argument - failure: test that nested user namespaces behave correctly when attached to idmapped mounts*xfs/435 failed as:*
435.out.bad renamed from dev/fd/63 +1
-0@@ -3,3 +3,4 @@ Create a many-block file Remount to check recovery See if we leak +custom patient module removal for xfs timed out waiting for refcnt to become 0 using timeout of 50*xfs/508 failed as:*
508.out.bad renamed from dev/fd/63 +6
-3@@ -1,12 +1,15 @@ QA output created by 508 == The parent directory has Project inheritance bit by default == +touch: cannot touch '/mnt/xfstests/scratch/dir/foo': No space left on device +mkdir: cannot create directory '/mnt/xfstests/scratch/dir/dir_inherit': No space left on device +touch: cannot touch '/mnt/xfstests/scratch/dir/dir_inherit/foo': No such file or directory Checking project test (path [SCR_MNT]/dir)... Processed 1 ([PROJECTS_FILE] and cmdline) paths for project test with recursion depth infinite (-1). Write SCRATCH_MNT/dir/foo, expect ENOSPC: -pwrite: No space left on device +/mnt/xfstests/scratch/dir/foo: No space left on device Write SCRATCH_MNT/dir/dir_inherit/foo, expect ENOSPC: -pwrite: No space left on device +/mnt/xfstests/scratch/dir/dir_inherit/foo: No such file or directory == After removing parent directory has Project inheritance bit == Checking project test (path [SCR_MNT]/dir)...@@ -19,5 +22,5 @@ Write SCRATCH_MNT/dir/foo, expect Success: Write SCRATCH_MNT/dir/dir_inherit/foo, expect ENOSPC: -pwrite: No space left on device +/mnt/xfstests/scratch/dir/dir_inherit/foo: No such file or directory Write SCRATCH_MNT/dir/dir_uninherit/foo, expect Success:*xfs/558 failed as:*
558.out.bad line 3
Quoted 3 lines
558.out.bad renamed from dev/fd/63 +1
-0@@ -1,2 +1,3 @@ QA output created by 558 +Expected to hear about writeback iomap invalidations? Silence is golden
Except for generic/645, those are all familiar failures to me. :/
--D
Quoted 275 lines
Quoted 274 lines
@Darrick I added more tests that were failing, and increased 512m to 600m as generic/081 and generic/108 were still failing with 512m with the following on 64k page size system:
MKFS_OPTIONS='-f -m reflink=1,rmapbt=1, -i sparse=1, -b size=64k,'common/rc | 29 +++++++++++++++++++++++++++++ tests/generic/042 | 9 +-------- tests/generic/081 | 7 +++++-- tests/generic/108 | 6 ++++-- tests/generic/455 | 3 ++- tests/generic/457 | 3 ++- tests/generic/482 | 3 ++- tests/generic/704 | 3 ++- tests/generic/730 | 3 ++- tests/generic/731 | 3 ++- tests/shared/298 | 2 +- tests/xfs/279 | 7 ++++--- 12 files changed, 56 insertions(+), 22 deletions(-)common/rc +29
-0@@ -923,6 +923,35 @@ _check_minimal_fs_size() fi } +# Round a proposed filesystem size up to the minimium supported size. The +# input is in MB and so is the output. +_small_fs_size_mb() +{ + local size="$1" + local runner_min_size=0 + local fs_min_size=0 + + case "$FSTYP" in + xfs) + # xfs no longer supports filesystems smaller than 600m + fs_min_size=600 + ;; + f2fs) + # f2fs-utils 1.9.0 needs at least 38 MB space for f2fs image. + # However, f2fs-utils 1.14.0 needs at least 52 MB. Not sure if + # it will change again. So just set it 128M. + fs_min_size=128 + ;; + esac + (( size < fs_min_size )) && size="$fs_min_size" + + # If the test runner wanted a minimum size, enforce that here. + test -n "$MIN_FSSIZE" && runner_min_size=$((MIN_FSSIZE / 1048576)) + (( size < runner_min_size)) && size="$runner_min_size" + + echo "$size" +} + # Create fs of certain size on scratch device # _scratch_mkfs_sized <size in bytes> [optional blocksize] _scratch_mkfs_sized()tests/generic/042 +1
-8@@ -27,14 +27,7 @@ _crashtest() img=$SCRATCH_MNT/$seq.img mnt=$SCRATCH_MNT/$seq.mnt file=$mnt/file - size=25M - - # f2fs-utils 1.9.0 needs at least 38 MB space for f2fs image. However, - # f2fs-utils 1.14.0 needs at least 52 MB. Not sure if it will change - # again. So just set it 128M. - if [ $FSTYP == "f2fs" ]; then - size=128M - fi + size=$(_small_fs_size_mb 25)M # Create an fs on a small, initialized image. The pattern is written to # the image to detect stale data exposure.tests/generic/081 +5
-2@@ -62,13 +62,16 @@ snapname=snap_$seq mnt=$TEST_DIR/mnt_$seq mkdir -p $mnt +size=$(_small_fs_size_mb 300) +lvsize=$((size * 85 / 100)) # ~256M + # make sure there's enough disk space for 256M lv, test for 300M here in case # lvm uses some space for metadata -_scratch_mkfs_sized $((300 * 1024 * 1024)) >>$seqres.full 2>&1 +_scratch_mkfs_sized $((size * 1024 * 1024)) >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCRATCH_DEV >>$seqres.full 2>&1 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm # (like 2.02.95 in RHEL6) don't support --yes option -yes | $LVM_PROG lvcreate -L 256M -n $lvname $vgname >>$seqres.full 2>&1 +yes | $LVM_PROG lvcreate -L ${lvsize}M -n $lvname $vgname >>$seqres.full 2>&1 # wait for lvcreation to fully complete $UDEV_SETTLE_PROG >>$seqres.full 2>&1tests/generic/108 +4
-2@@ -44,9 +44,11 @@ vgname=vg_$seq physical=`blockdev --getpbsz $SCRATCH_DEV` logical=`blockdev --getss $SCRATCH_DEV` +size=$(_small_fs_size_mb 300) +lvsize=$((size * 91 / 100)) # _get_scsi_debug_dev returns a scsi debug device with 128M in size by default -SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 300` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev ${physical:-512} ${logical:-512} 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.full@@ -55,7 +57,7 @@ $LVM_PROG pvcreate -f $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1 $LVM_PROG vgcreate -f $vgname $SCSI_DEBUG_DEV $SCRATCH_DEV >>$seqres.full 2>&1 # We use yes pipe instead of 'lvcreate --yes' because old version of lvm # (like 2.02.95 in RHEL6) don't support --yes option -yes | $LVM_PROG lvcreate -i 2 -I 4m -L 275m -n $lvname $vgname \ +yes | $LVM_PROG lvcreate -i 2 -I 4m -L ${lvsize}m -n $lvname $vgname \ >>$seqres.full 2>&1 # wait for lv creation to fully complete $UDEV_SETTLE_PROG >>$seqres.full 2>&1tests/generic/455 +2
-1@@ -51,7 +51,8 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space thresholdtests/generic/457 +2
-1@@ -55,7 +55,8 @@ SANITY_DIR=$TEST_DIR/fsxtests rm -rf $SANITY_DIR mkdir $SANITY_DIR -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space thresholdtests/generic/482 +2
-1@@ -65,7 +65,8 @@ fi fsstress_args=$(_scale_fsstress_args -w -d $SCRATCH_MNT -n 512 -p $nr_cpus \ $FSSTRESS_AVOID) -devsize=$((1024*1024*200 / 512)) # 200m phys/virt size +size=$(_small_fs_size_mb 200) # 200m phys/virt size +devsize=$((1024*1024*size / 512)) csize=$((1024*64 / 512)) # 64k cluster size lowspace=$((1024*1024 / 512)) # 1m low space thresholdtests/generic/704 +2
-1@@ -30,8 +30,9 @@ _require_scsi_debug _require_test _require_block_device $TEST_DEV +size=$(_small_fs_size_mb 256) echo "Get a device with 4096 physical sector size and 512 logical sector size" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 256` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 $size` blockdev --getpbsz --getss $SCSI_DEBUG_DEV echo "mkfs and mount"tests/generic/730 +2
-1@@ -27,7 +27,8 @@ _require_test _require_block_device $TEST_DEV _require_scsi_debug -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256` +size=$(_small_fs_size_mb 256) +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.fulltests/generic/731 +2
-1@@ -27,7 +27,8 @@ _require_block_device $TEST_DEV _supported_fs generic _require_scsi_debug -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 256` +size=$(_small_fs_size_mb 256) +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 512 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Failed to initialize scsi debug device" echo "SCSI debug device $SCSI_DEBUG_DEV" >>$seqres.fulltests/shared/298 +1
-1@@ -20,7 +20,7 @@ if [ "$FSTYP" = "btrfs" ]; then fssize=3000 else _require_fs_space $TEST_DIR 307200 - fssize=300 + fssize=$(_small_fs_size_mb 300) # 200m phys/virt size fi [ "$FSTYP" = "ext4" ] && _require_dumpe2fstests/xfs/279 +4
-3@@ -26,6 +26,7 @@ _cleanup() _supported_fs xfs _require_scsi_debug +size=$(_small_fs_size_mb 128) # Remove xfs signature so -f isn't needed to re-mkfs _wipe_device()@@ -55,7 +56,7 @@ _check_mkfs() ( echo "===================" echo "4k physical 512b logical aligned" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # sector size should default to 4k _check_mkfs $SCSI_DEBUG_DEV@@ -68,7 +69,7 @@ _put_scsi_debug_dev ( echo "===================" echo "4k physical 512b logical unaligned" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 1 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 512 1 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # should fail on misalignment _check_mkfs $SCSI_DEBUG_DEV@@ -85,7 +86,7 @@ _put_scsi_debug_dev ( echo "===================" echo "hard 4k physical / 4k logical" -SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 128` +SCSI_DEBUG_DEV=`_get_scsi_debug_dev 4096 4096 0 $size` test -b "$SCSI_DEBUG_DEV" || _notrun "Could not get scsi_debug device" # block size smaller than sector size should fail _check_mkfs -b size=2048 $SCSI_DEBUG_DEVbase-commit:
386c7b6aa69ebe8017a4728a994f80d55c660de4Signature · 1 line
2.43.0
Quoted 8 lines · Zorro Lang
Quoted 7 lines · Pankaj Raghav (Samsung)
From: "Darrick J. Wong" <[email protected]>
There's a bunch of tests that fail the formatting step when the test run is configured to use XFS with a 64k blocksize. This happens because XFS doesn't really support that combination due to minimum log size constraints. Fix the test to format larger devices in that case.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Darrick J. Wong <[email protected]>Co-developed-by Pankaj Raghav <[email protected]>Signed-off-by Pankaj Raghav <[email protected]>---
This change looks good to me, and it really fixes some testing failures.
Reviewed-by Zorro Lang <[email protected]>
Thanks.
Quoted 5 lines
BTW, I tested 64k blocksize xfs with this patch, there're still some failed test cases. If you're still interested in it, I'd like to list some of them as below (diff *.out *.out.bad output).
I have some more test fixes but it is happening only when we have LBS, i.e, 64k bs on a 4k system.
But I had a fix for xfs/558 [1]. Can you see if it fixes it?
[1] https://lore.kernel.org/linux-xfs/[email protected]/
Quoted 9 lines
*xfs/558 failed as:*
558.out.bad renamed from dev/fd/63 +1
-0@@ -1,2 +1,3 @@ QA output created by 558 +Expected to hear about writeback iomap invalidations? Silence is golden