fstests: random fixes
cover fstests: random fixes
Hi all,
Fix various bugs in the test suite that cause test failures XFS in DAX mode.
If you're going to start using this mess, you probably ought to just pull from my git trees, which are linked below.
This is an extraordinary way to destroy everything. Enjoy! Comments and questions are, as always, welcome.
--D
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=random-fixes
PATCH 1/4 xfs/196: check for delalloc blocks after pwrite
From: Darrick J. Wong <[email protected]>
This test depends on the pwrite creating delalloc blocks, which doesn't happen if the scratch fs is mounted in dax mode (or has an extent size hint applied). Therefore, check for delalloc blocks and _notrun if we didn't get any.
--- tests/xfs/196 | 2 ++ 1 file changed, 2 insertions(+)
tests/xfs/196 +2 -0
@@ -50,6 +50,8 @@ bytes=$((64 * 1024)) # create sequential delayed allocation $XFS_IO_PROG -f -c "pwrite 0 $bytes" $file >> $seqres.full 2>&1 +$XFS_IO_PROG -c "bmap -elpv" $file | grep -q delalloc || \ + _notrun "Unable to create delayed allocations" # Enable write drops. All buffered writes are dropped from this point on. _scratch_inject_error "drop_writes" 1
Re: [PATCH 1/4] xfs/196: check for delalloc blocks after pwrite
Quoted 8 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
This test depends on the pwrite creating delalloc blocks, which doesn't happen if the scratch fs is mounted in dax mode (or has an extent size hint applied). Therefore, check for delalloc blocks and
_notrunif we didn't get any.Signed-off-by Darrick J. Wong <[email protected]>
Looks good,
PATCH 2/4 xfs/{088, 089, 091}: redirect stderr when writing to corrupt fs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
These tests primarily check that writes to a corrupt fs don't take down the system, and that running repair will fix them. Therefore, redirect stderr to seqres.full so that we don't fail these tests in DAX mode.
--- tests/xfs/088 | 2 +- tests/xfs/089 | 2 +- tests/xfs/091 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
tests/xfs/088 +1 -1
@@ -80,7 +80,7 @@ echo "+ mount image && modify files" if _try_scratch_mount >> $seqres.full 2>&1; then for x in `seq 1 64`; do - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full + $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full 2>> $seqres.full done umount "${SCRATCH_MNT}" fi
tests/xfs/089 +1 -1
@@ -80,7 +80,7 @@ echo "+ mount image && modify files" if _try_scratch_mount >> $seqres.full 2>&1; then for x in `seq 1 64`; do - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full + $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full 2>> $seqres.full done umount "${SCRATCH_MNT}" fi
tests/xfs/091 +1 -1
@@ -80,7 +80,7 @@ echo "+ mount image && modify files" if _try_scratch_mount >> $seqres.full 2>&1; then for x in `seq 1 64`; do - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full + $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full 2>> $seqres.full done umount "${SCRATCH_MNT}" fi
Re: [PATCH 2/4] xfs/{088, 089, 091}: redirect stderr when writing to corrupt fs
Quoted 7 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
These tests primarily check that writes to a corrupt fs don't take down the system, and that running repair will fix them. Therefore, redirect stderr to seqres.full so that we don't fail these tests in DAX mode.
Signed-off-by Darrick J. Wong <[email protected]>
Looks good,
PATCH 3/4 xfs/263: use _scratch_mkfs_xfs instead of open-coded mkfs call
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Fix this test to use _scratch_mkfs_xfs instead of the open-coded mkfs call. This is needed to make the test succeed when XFS DAX is enabled and mkfs enables reflink by default.
--- tests/xfs/263 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/xfs/263 +2 -2
@@ -75,11 +75,11 @@ function test_all_state() echo "==== NO CRC ====" # Control size to control inode numbers -$MKFS_XFS_PROG -f -m crc=0 -n ftype=0 -d size=512m $SCRATCH_DEV >>$seqres.full +_scratch_mkfs_xfs "-m crc=0 -n ftype=0 -d size=512m" >> $seqres.full test_all_state echo "==== CRC ====" -$MKFS_XFS_PROG -f -m crc=1 -d size=512m $SCRATCH_DEV >>$seqres.full +_scratch_mkfs_xfs "-m crc=1 -d size=512m" >>$seqres.full test_all_state status=0
Re: [PATCH 3/4] xfs/263: use _scratch_mkfs_xfs instead of open-coded mkfs call
Quoted 5 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Fix this test to use
_scratch_mkfs_xfsinstead of the open-coded mkfs call. This is needed to make the test succeed when XFS DAX is enabled and mkfs enables reflink by default.
Looks good,
PATCH 4/4 populate: punch files after writing to fragment free space properly
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
The filesystem population code frequently allocates a large file and punches out every other block ("swiss-cheese files") in an attempt to cause the creation of a lot of metadata to fill out the btrees. This pattern, however, has a subtle bug if the writes to the swiss-cheese file are not allocated in batches and we're trying to fragment the free space records in order to achieve a certain metadata btree shape.
This is exactly what happens on a DAX filesystem, since we no longer have the page cache to stage delalloc writes. Each xfs_io pwrite call to the multi-megabyte swiss-chese file turns into multiple 4k pwrites, which means that file data blocks are allocated 4k at a time. This can be fatal to our goal of fragmenting the free space btrees because the allocator sees a 4k allocation request and uses 4k blocks from the fragmented parts of the free space to satisfy the "small" request. When this happens, the XFS populate function cannot fill out the free space btree to sufficient height and tests fail.
(In regular delalloc mode we'd cache all those small write() in memory and try for a single large allocation, which we'd generally get.)
To fix this, we need to force the filesystem to allocate all blocks before freeing any blocks. Split the creation of swiss-cheese files into two parts: (a) writing data to the file to force allocation, and
(b) punching the holes to fragment free space. It's a little hokey for helpers to be modifying variables in the caller's scope, but there's not really a better way to do that in bash.
This bug affects only XFS but we convert the one ext4 usage anyway.
--- common/populate | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 12 deletions(-)
common/populate +42 -12
@@ -120,6 +120,32 @@ _populate_xfs_qmount_option() fi } +# Set up a file that we'll later use to fragment metadata and free space. +# Our strategy here is to force the fs to allocate large contiguous extents +# to a file and then punch every other block to force the fs to suffer the +# worst allocation outcome possible. +# +# NOTE: In order to prevent *subsequent* allocations from using the holes we +# punch, we must store the relevant filenames for later. This function +# deliberately adds each file name to the @punch_files array, which must be +# declared by the caller and will be picked up by __force_fragmentation. +function __setup_fragmentation() { + local sz="$1" + local fname="$2" + + $XFS_IO_PROG -f -c "pwrite -S 0x62 -W -b 1m 0 $sz" "${fname}" + punch_files+=("${fname}") +} + +# Actually punch holes in the file. Call this /after/ you're done calling +# __setup_fragmentation. +__force_fragmentation() { + for file in "${punch_files[@]}"; do + ./src/punch-alternating "${file}" + done + punch_files=() +} + # Populate an XFS on the scratch device with (we hope) all known # types of metadata block _scratch_xfs_populate() {
@@ -132,6 +158,8 @@ _scratch_xfs_populate() { esac done + local punch_files=() + _populate_xfs_qmount_option _scratch_mount blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
@@ -161,8 +189,7 @@ _scratch_xfs_populate() { # - FMT_BTREE echo "+ btree extents file" nr="$((blksz * 2 / 16))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" - ./src/punch-alternating "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" + __setup_fragmentation $((blksz * nr)) "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" # Directories # - INLINE
@@ -257,8 +284,7 @@ _scratch_xfs_populate() { # Free space btree echo "+ freesp btree" nr="$((blksz * 2 / 8))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/BNOBT" - ./src/punch-alternating "${SCRATCH_MNT}/BNOBT" + __setup_fragmentation $((blksz * nr)) "${SCRATCH_MNT}/BNOBT" # Inode btree echo "+ inobt btree"
@@ -280,8 +306,7 @@ _scratch_xfs_populate() { if [ $is_rmapbt -gt 0 ]; then echo "+ rmapbt btree" nr="$((blksz * 2 / 24))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/RMAPBT" - ./src/punch-alternating "${SCRATCH_MNT}/RMAPBT" + __setup_fragmentation $((blksz * nr)) "${SCRATCH_MNT}/RMAPBT" fi # Realtime Reverse-mapping btree
@@ -289,8 +314,7 @@ _scratch_xfs_populate() { if [ $is_rmapbt -gt 0 ] && [ $is_rt -gt 0 ]; then echo "+ rtrmapbt btree" nr="$((blksz * 2 / 32))" - $XFS_IO_PROG -f -R -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/RTRMAPBT" - ./src/punch-alternating "${SCRATCH_MNT}/RTRMAPBT" + __setup_fragmentation $((blksz * nr)) "${SCRATCH_MNT}/RTRMAPBT" fi # Reference-count btree
@@ -298,15 +322,17 @@ _scratch_xfs_populate() { if [ $is_reflink -gt 0 ]; then echo "+ reflink btree" nr="$((blksz * 2 / 12))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/REFCOUNTBT" + __setup_fragmentation $((blksz * nr)) "${SCRATCH_MNT}/REFCOUNTBT" cp --reflink=always "${SCRATCH_MNT}/REFCOUNTBT" "${SCRATCH_MNT}/REFCOUNTBT2" - ./src/punch-alternating "${SCRATCH_MNT}/REFCOUNTBT" fi # Copy some real files (xfs tests, I guess...) echo "+ real files" test $fill -ne 0 && __populate_fill_fs "${SCRATCH_MNT}" 5 + # Make sure we get all the fragmentation we asked for + __force_fragmentation + umount "${SCRATCH_MNT}" }
@@ -322,6 +348,8 @@ _scratch_ext4_populate() { esac done + local punch_files=() + _scratch_mount blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")" dblksz="${blksz}"
@@ -342,8 +370,7 @@ _scratch_ext4_populate() { # - FMT_ETREE echo "+ extent tree file" nr="$((blksz * 2 / 12))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" - ./src/punch-alternating "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" + __setup_fragmentation $((blksz * nr)) "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" # Directories # - INLINE
@@ -406,6 +433,9 @@ _scratch_ext4_populate() { echo "+ real files" test $fill -ne 0 && __populate_fill_fs "${SCRATCH_MNT}" 5 + # Make sure we get all the fragmentation we asked for + __force_fragmentation + umount "${SCRATCH_MNT}" }
Re: [PATCH 4/4] populate: punch files after writing to fragment free space properly
Quoted 6 lines · Darrick J. Wong
To fix this, we need to force the filesystem to allocate all blocks before freeing any blocks. Split the creation of swiss-cheese files into two parts: (a) writing data to the file to force allocation, and
(b) punching the holes to fragment free space. It's a little hokey for helpers to be modifying variables in the caller's scope, but there's not really a better way to do that in bash.
Why can't we just split the operations into creating a large contigous file and then fragment them?
create_large_file foocreate_large_file barcreate_large_file baz
fragment_large_file foofragment_large_file barfragment_large_file baz
Re: [PATCH 4/4] populate: punch files after writing to fragment free space properly
Quoted 12 lines · Christoph Hellwig
Quoted 6 lines · Darrick J. Wong
To fix this, we need to force the filesystem to allocate all blocks before freeing any blocks. Split the creation of swiss-cheese files into two parts: (a) writing data to the file to force allocation, and
(b) punching the holes to fragment free space. It's a little hokey for helpers to be modifying variables in the caller's scope, but there's not really a better way to do that in bash.Why can't we just split the operations into creating a large contigous file and then fragment them?
Quoted 7 lines
create_large_filefoocreate_large_filebarcreate_large_filebaz
fragment_large_filefoofragment_large_filebarfragment_large_filebaz
Yeah, that would also work, and without the clumsy side effects. I'll do that instead.
--D
PATCH v2 4/4 populate: punch files after writing to fragment free space properly
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
The filesystem population code frequently allocates a large file and punches out every other block ("swiss-cheese files") in an attempt to cause the creation of a lot of metadata to fill out the btrees. This pattern, however, has a subtle bug if the writes to the swiss-cheese file are not allocated in batches and we're trying to fragment the free space records in order to achieve a certain metadata btree shape.
This is exactly what happens on a DAX filesystem, since we no longer have the page cache to stage delalloc writes. Each xfs_io pwrite call to the multi-megabyte swiss-chese file turns into multiple 4k pwrites, which means that file data blocks are allocated 4k at a time. This can be fatal to our goal of fragmenting the free space btrees because the allocator sees a 4k allocation request and uses 4k blocks from the fragmented parts of the free space to satisfy the "small" request. When this happens, the XFS populate function cannot fill out the free space btree to sufficient height and tests fail.
(In regular delalloc mode we'd cache all those small write() in memory and try for a single large allocation, which we'd generally get.)
To fix this, we need to force the filesystem to allocate all blocks before freeing any blocks. Split the creation of swiss-cheese files into two parts: (a) writing data to the file to force allocation, and
(b) punching the holes to fragment free space.
This bug affects only XFS but we convert the one ext4 usage anyway.
---
v2: don't do the weird array side effect thing per hch suggestion
--- common/populate | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 15 deletions(-)
common/populate +39 -15
@@ -22,6 +22,26 @@ _require_xfs_db_blocktrash_z_command() { # Attempt to make files of "every" format for data, dirs, attrs etc. # (with apologies to Eric Sandeen for mutating xfser.sh) +# Create a file of a given size. +__populate_create_file() { + local sz="$1" + local fname="$2" + + $XFS_IO_PROG -f -c "pwrite -S 0x62 -W -b 1m 0 $sz" "${fname}" +} + +# Punch out every other hole in this file, if it exists. +# +# The goal here is to force the creation of a large number of metadata records +# by creating a lot of tiny extent mappings in a file. Callers should ensure +# that fragmenting the file actually causes record creation. Call this +# function /after/ creating all other metadata structures. +__populate_fragment_file() { + local fname="$1" + + test -f "${fname}" && ./src/punch-alternating "${fname}" +} + # Create a large directory __populate_create_dir() { name="$1"
@@ -156,13 +176,12 @@ _scratch_xfs_populate() { # Regular files # - FMT_EXTENTS echo "+ extents file" - $XFS_IO_PROG -f -c "pwrite -S 0x61 0 ${blksz}" "${SCRATCH_MNT}/S_IFREG.FMT_EXTENTS" + __populate_create_file $blksz "${SCRATCH_MNT}/S_IFREG.FMT_EXTENTS" # - FMT_BTREE echo "+ btree extents file" nr="$((blksz * 2 / 16))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" - ./src/punch-alternating "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" + __populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" # Directories # - INLINE
@@ -257,8 +276,7 @@ _scratch_xfs_populate() { # Free space btree echo "+ freesp btree" nr="$((blksz * 2 / 8))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/BNOBT" - ./src/punch-alternating "${SCRATCH_MNT}/BNOBT" + __populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/BNOBT" # Inode btree echo "+ inobt btree"
@@ -280,8 +298,7 @@ _scratch_xfs_populate() { if [ $is_rmapbt -gt 0 ]; then echo "+ rmapbt btree" nr="$((blksz * 2 / 24))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/RMAPBT" - ./src/punch-alternating "${SCRATCH_MNT}/RMAPBT" + __populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/RMAPBT" fi # Realtime Reverse-mapping btree
@@ -289,8 +306,7 @@ _scratch_xfs_populate() { if [ $is_rmapbt -gt 0 ] && [ $is_rt -gt 0 ]; then echo "+ rtrmapbt btree" nr="$((blksz * 2 / 32))" - $XFS_IO_PROG -f -R -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/RTRMAPBT" - ./src/punch-alternating "${SCRATCH_MNT}/RTRMAPBT" + __populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/RTRMAPBT" fi # Reference-count btree
@@ -298,15 +314,21 @@ _scratch_xfs_populate() { if [ $is_reflink -gt 0 ]; then echo "+ reflink btree" nr="$((blksz * 2 / 12))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/REFCOUNTBT" + __populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/REFCOUNTBT" cp --reflink=always "${SCRATCH_MNT}/REFCOUNTBT" "${SCRATCH_MNT}/REFCOUNTBT2" - ./src/punch-alternating "${SCRATCH_MNT}/REFCOUNTBT" fi # Copy some real files (xfs tests, I guess...) echo "+ real files" test $fill -ne 0 && __populate_fill_fs "${SCRATCH_MNT}" 5 + # Make sure we get all the fragmentation we asked for + __populate_fragment_file "${SCRATCH_MNT}/S_IFREG.FMT_BTREE" + __populate_fragment_file "${SCRATCH_MNT}/BNOBT" + __populate_fragment_file "${SCRATCH_MNT}/RMAPBT" + __populate_fragment_file "${SCRATCH_MNT}/RTRMAPBT" + __populate_fragment_file "${SCRATCH_MNT}/REFCOUNTBT" + umount "${SCRATCH_MNT}" }
@@ -333,17 +355,16 @@ _scratch_ext4_populate() { # Regular files # - FMT_INLINE echo "+ inline file" - $XFS_IO_PROG -f -c "pwrite -S 0x61 0 1" "${SCRATCH_MNT}/S_IFREG.FMT_INLINE" + __populate_create_file 1 "${SCRATCH_MNT}/S_IFREG.FMT_INLINE" # - FMT_EXTENTS echo "+ extents file" - $XFS_IO_PROG -f -c "pwrite -S 0x61 0 ${blksz}" "${SCRATCH_MNT}/S_IFREG.FMT_EXTENTS" + __populate_create_file $blksz "${SCRATCH_MNT}/S_IFREG.FMT_EXTENTS" # - FMT_ETREE echo "+ extent tree file" nr="$((blksz * 2 / 12))" - $XFS_IO_PROG -f -c "pwrite -S 0x62 0 $((blksz * nr))" "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" - ./src/punch-alternating "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" + __populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" # Directories # - INLINE
@@ -406,6 +427,9 @@ _scratch_ext4_populate() { echo "+ real files" test $fill -ne 0 && __populate_fill_fs "${SCRATCH_MNT}" 5 + # Make sure we get all the fragmentation we asked for + __populate_fragment_file "${SCRATCH_MNT}/S_IFREG.FMT_ETREE" + umount "${SCRATCH_MNT}" }
Re: [PATCH v2 4/4] populate: punch files after writing to fragment free space properly
Thanks, this looks much better: