From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me
Subject: [PATCH 4/8] xfs/117: fix fragility in this fuzz test
Date: Tue, 11 May 2021 19:02:02 -0700 [thread overview]
Message-ID: <162078492228.3302755.2845906763358077143.stgit@magnolia> (raw)
In-Reply-To: <162078489963.3302755.9219127595550889655.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
This fuzz test has some fragility problems -- it doesn't do anything to
guarantee that the inodes that it checks for EFSCORRUPTED are the same
ones that it fuzzed, and it doesn't explicitly try to avoid victimizing
inodes in the same chunk as the root directory. As a result, this test
fails annoyingly frequently.
Fix both of these problems and get rid of the confusingly named TESTDIR
variable.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
tests/xfs/117 | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/tests/xfs/117 b/tests/xfs/117
index d3f4675f..32be525f 100755
--- a/tests/xfs/117
+++ b/tests/xfs/117
@@ -39,8 +39,7 @@ _require_xfs_db_blocktrash_z_command
test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3"
rm -f $seqres.full
-TESTDIR="${SCRATCH_MNT}/scratchdir"
-TESTFILE="${TESTDIR}/testfile"
+victimdir="${SCRATCH_MNT}/scratchdir"
echo "+ create scratch fs"
_scratch_mkfs_xfs > /dev/null
@@ -50,37 +49,49 @@ _scratch_mount
blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
echo "+ make some files"
-mkdir -p "${TESTDIR}"
-for x in `seq 1 1024`; do
- touch "${SCRATCH_MNT}/junk.${x}"
- inode="$(stat -c '%i' "${SCRATCH_MNT}/junk.${x}")"
- if [ "$x" -gt 512 ] && [ "$((inode % 64))" -eq 0 ]; then
- mv "${SCRATCH_MNT}/junk.${x}" "${TESTFILE}.1"
- break
- fi
+mkdir -p "$victimdir"
+
+rootdir="$(stat -c '%i' "$SCRATCH_MNT")"
+rootchunk=$(( rootdir / 64 ))
+
+# First we create some dummy file so that the victim files don't get created
+# in the same inode chunk as the root directory, because a corrupt inode in
+# the root chunk causes mount to fail.
+for ((i = 0; i < 256; i++)); do
+ fname="$SCRATCH_MNT/dummy.$i"
+ touch "$fname"
+ ino="$(stat -c '%i' "$fname")"
+ ichunk=$(( ino / 64 ))
+ test "$ichunk" -gt "$rootchunk" && break
done
-for x in `seq 2 64`; do
- touch "${TESTFILE}.${x}"
+
+# Now create some victim files
+inos=()
+for ((i = 0; i < 64; i++)); do
+ fname="$victimdir/test.$i"
+ touch "$fname"
+ inos+=("$(stat -c '%i' "$fname")")
done
-inode="$(stat -c '%i' "${TESTFILE}.1")"
+echo "First victim inode is: " >> $seqres.full
+stat -c '%i' "$fname" >> $seqres.full
umount "${SCRATCH_MNT}"
echo "+ check fs"
_scratch_xfs_repair -n >> $seqres.full 2>&1 || _fail "xfs_repair should not fail"
echo "+ corrupt image"
-seq "${inode}" "$((inode + 63))" | while read ino; do
+for ino in "${inos[@]}"; do
_scratch_xfs_db -x -c "inode ${ino}" -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full 2>&1
done
echo "+ mount image && modify files"
broken=1
if _try_scratch_mount >> $seqres.full 2>&1; then
-
- for x in `seq 1 64`; do
- stat "${TESTFILE}.${x}" >> $seqres.full 2>&1
+ for ((i = 0; i < 64; i++)); do
+ fname="$victimdir/test.$i"
+ stat "$fname" &>> $seqres.full
test $? -eq 0 && broken=0
- touch "${TESTFILE}.${x}" >> $seqres.full 2>&1
+ touch "$fname" &>> $seqres.full
test $? -eq 0 && broken=0
done
umount "${SCRATCH_MNT}"
next prev parent reply other threads:[~2021-05-12 2:02 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 2:01 [PATCHSET 0/8] fstests: miscellaneous fixes Darrick J. Wong
2021-05-12 2:01 ` [PATCH 1/8] xfs/122: add entries for structures added to 5.13 Darrick J. Wong
2021-05-12 2:01 ` [PATCH 2/8] common/xfs: refactor commands to select a particular xfs backing device Darrick J. Wong
2021-05-16 15:49 ` Eryu Guan
2021-05-16 20:34 ` Darrick J. Wong
2021-05-19 3:03 ` Eryu Guan
2021-05-19 20:46 ` Darrick J. Wong
2021-05-12 2:01 ` [PATCH 3/8] xfs: fix old fuzz test invocations of xfs_repair Darrick J. Wong
2021-05-12 2:02 ` Darrick J. Wong [this message]
2021-05-12 2:02 ` [PATCH 5/8] common: always pass -f to $DUMP_COMPRESSOR Darrick J. Wong
2021-05-12 2:02 ` [PATCH 6/8] fsx/fsstress: round blocksize properly Darrick J. Wong
2021-05-12 2:02 ` [PATCH 7/8] fsx: fix backwards parameters in complaint about overly long copy Darrick J. Wong
2021-05-12 2:02 ` [PATCH 8/8] xfs/178: fix mkfs success test Darrick J. Wong
2021-05-16 15:54 ` Eryu Guan
2021-05-19 23:20 ` Darrick J. Wong
2021-05-16 15:58 ` [PATCHSET 0/8] fstests: miscellaneous fixes Eryu Guan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162078492228.3302755.2845906763358077143.stgit@magnolia \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=guaneryu@gmail.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.