[PATCH 4/6] xfs/532: Fix test to execute in multi-block directory config

Chandan Babu R
2021-03-25T14:10:15Z

xfs/532 attempts to create $testfile after reduce_max_iextents error tag is
injected. Creation of $testfile fails when using a multi-block directory test
configuration because,
1. A directory can have a pseudo maximum extent count of 10.
2. In the worst case a directory entry creation operation can consume
(XFS_DA_NODE_MAXDEPTH + 1 + 1) * (Nr fs blocks in a single directory block)
extents.
With 1k fs block size and 4k directory block size, this evaluates to,
(5 + 1 + 1) * 4
= 7 * 4
= 28
> 10 (Pseudo maximum inode extent count).

This commit fixes the issue by creating $testfile before injecting
reduce_max_iextents error tag.

Reported-by: Darrick J. Wong <djwong@kernel.org>
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
---
tests/xfs/532 | 17 ++++++++++-------
tests/xfs/532.out | 6 +++---
2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/xfs/532 b/tests/xfs/532
index 1c789217..2bed574a 100755
--- a/tests/xfs/532
+++ b/tests/xfs/532
@@ -63,9 +63,6 @@ for dentry in $(ls -1 $fillerdir/); do
$here/src/punch-alternating $fillerdir/$dentry >> $seqres.full
done

-echo "Inject reduce_max_iextents error tag"
-_scratch_inject_error reduce_max_iextents 1
-
echo "Inject bmap_alloc_minlen_extent error tag"
_scratch_inject_error bmap_alloc_minlen_extent 1

@@ -74,6 +71,9 @@ echo "* Set xattrs"
echo "Create \$testfile"
touch $testfile

+echo "Inject reduce_max_iextents error tag"
+_scratch_inject_error reduce_max_iextents 1
+
echo "Create xattrs"
nr_attrs=$((bsize * 20 / attr_len))
for i in $(seq 1 $nr_attrs); do
@@ -90,6 +90,9 @@ if (( $naextents > 10 )); then
exit 1
fi

+echo "Disable reduce_max_iextents error tag"
+_scratch_inject_error reduce_max_iextents 0
+
echo "Remove \$testfile"
rm $testfile

@@ -98,9 +101,6 @@ echo "* Remove xattrs"
echo "Create \$testfile"
touch $testfile

-echo "Disable reduce_max_iextents error tag"
-_scratch_inject_error reduce_max_iextents 0
-
echo "Create initial xattr extents"

naextents=0
@@ -132,7 +132,10 @@ if [[ $? == 0 ]]; then
exit 1
fi

-rm $testfile && echo "Successfully removed \$testfile"
+echo "Disable reduce_max_iextents error tag"
+_scratch_inject_error reduce_max_iextents 0
+
+rm $testfile

# success, all done
status=0
diff --git a/tests/xfs/532.out b/tests/xfs/532.out
index 8e19d7bc..db52108f 100644
--- a/tests/xfs/532.out
+++ b/tests/xfs/532.out
@@ -2,17 +2,17 @@ QA output created by 532
Format and mount fs
Consume free space
Create fragmented filesystem
-Inject reduce_max_iextents error tag
Inject bmap_alloc_minlen_extent error tag
* Set xattrs
Create $testfile
+Inject reduce_max_iextents error tag
Create xattrs
Verify $testfile's naextent count
+Disable reduce_max_iextents error tag
Remove $testfile
* Remove xattrs
Create $testfile
-Disable reduce_max_iextents error tag
Create initial xattr extents
Inject reduce_max_iextents error tag
Remove xattr to trigger -EFBIG
-Successfully removed $testfile
+Disable reduce_max_iextents error tag
--
2.29.2