* [PATCH 1/3] populate: create leafn dir when populating xfs filesystem
@ 2018-10-30 18:03 Darrick J. Wong
2018-10-30 18:03 ` [PATCH 2/3] xfs: test repair regression of dir w/ single leafn block Darrick J. Wong
2018-10-30 18:03 ` [PATCH 3/3] xfs: fuzz directories containing single leafn blocks Darrick J. Wong
0 siblings, 2 replies; 3+ messages in thread
From: Darrick J. Wong @ 2018-10-30 18:03 UTC (permalink / raw)
To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests
From: Darrick J. Wong <darrick.wong@oracle.com>
We've had some problems lately with directories containing a single
leafn directory. It turns out that the populate script doesn't create
these, so teach it to do so.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
common/populate | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/common/populate b/common/populate
index 8c08f516..610425f9 100644
--- a/common/populate
+++ b/common/populate
@@ -136,6 +136,12 @@ _scratch_xfs_populate() {
_scratch_mount
blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
+ crc="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep crc= | sed -e 's/^.*crc=//g' -e 's/\([0-9]*\).*$/\1/g')"
+ if [ $crc -eq 1 ]; then
+ leaf_hdr_size=64
+ else
+ leaf_hdr_size=16
+ fi
leaf_lblk="$((32 * 1073741824 / blksz))"
node_lblk="$((64 * 1073741824 / blksz))"
@@ -171,6 +177,10 @@ _scratch_xfs_populate() {
echo "+ leaf dir"
__populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_LEAF" "$((dblksz / 12))"
+ # - LEAFN
+ echo "+ leafn dir"
+ __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_LEAFN" "$(( ((dblksz - leaf_hdr_size) / 8) - 3 ))"
+
# - NODE
echo "+ node dir"
__populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_NODE" "$((16 * dblksz / 40))" true
@@ -433,6 +443,9 @@ __populate_check_xfs_dir() {
"leaf")
(test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 0) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
;;
+ "leafn")
+ _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "p lhdr.info.hdr.magic" | egrep -q '(0x3dff|0xd2ff)' || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
+ ;;
"node"|"btree")
(test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 1) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
;;
@@ -508,6 +521,7 @@ _scratch_xfs_populate_check() {
inline_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_INLINE")"
block_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_BLOCK")"
leaf_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_LEAF")"
+ leafn_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_LEAFN")"
node_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_NODE")"
btree_dir="$(__populate_find_inode "${SCRATCH_MNT}/S_IFDIR.FMT_BTREE")"
local_slink="$(__populate_find_inode "${SCRATCH_MNT}/S_IFLNK.FMT_LOCAL")"
@@ -533,6 +547,7 @@ _scratch_xfs_populate_check() {
__populate_check_xfs_dir "${inline_dir}" "inline"
__populate_check_xfs_dir "${block_dir}" "block"
__populate_check_xfs_dir "${leaf_dir}" "leaf"
+ __populate_check_xfs_dir "${leafn_dir}" "leafn"
__populate_check_xfs_dir "${node_dir}" "node"
__populate_check_xfs_dir "${btree_dir}" "btree"
__populate_check_xfs_dformat "${btree_dir}" "btree"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] xfs: test repair regression of dir w/ single leafn block
2018-10-30 18:03 [PATCH 1/3] populate: create leafn dir when populating xfs filesystem Darrick J. Wong
@ 2018-10-30 18:03 ` Darrick J. Wong
2018-10-30 18:03 ` [PATCH 3/3] xfs: fuzz directories containing single leafn blocks Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2018-10-30 18:03 UTC (permalink / raw)
To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests
From: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/xfs/1421 | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/1421.out | 7 +++++
tests/xfs/group | 1 +
3 files changed, 78 insertions(+)
create mode 100644 tests/xfs/1421
create mode 100644 tests/xfs/1421.out
diff --git a/tests/xfs/1421 b/tests/xfs/1421
new file mode 100644
index 00000000..a63705bb
--- /dev/null
+++ b/tests/xfs/1421
@@ -0,0 +1,70 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc. All Rights Reserved.
+#
+# FS QA Test No. 1421
+#
+# Test for two related regressions -- first, check that repair doesn't
+# repeatedly rebuild directories with a single leafn block; and check that
+# repair also doesn't crash when it hits a corrupt da btree with a zero before
+# pointer.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+ cd /
+ rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/populate
+. ./common/fuzzy
+
+# real QA test starts here
+_supported_os Linux
+_supported_fs xfs
+_require_scratch_xfs_fuzz_fields
+
+echo "Format and populate"
+_scratch_populate_cached nofill > $seqres.full 2>&1
+
+filter_nbrepair() {
+ grep rebuilding | sed -e 's/directory inode [0-9]*/directory inode XXX/g'
+}
+
+run_repair() {
+ _scratch_xfs_repair > $tmp.repair 2>&1
+ cat $tmp.repair >> $seqres.full
+ cat $tmp.repair | filter_nbrepair
+}
+
+echo "Check leafn rebuilds"
+run_repair
+run_repair
+
+echo "Fuzz nbtree[0].before to zero"
+_scratch_mount
+inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_NODE)
+blk_sz=$(_get_block_size $SCRATCH_MNT)
+_scratch_unmount
+leaf_offset=$(( (2 ** 35) / blk_sz ))
+_scratch_xfs_fuzz_metadata_field "nbtree[0].before" "zeroes" "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full
+
+echo "Check nbtree[0].before repair"
+run_repair
+run_repair
+
+# success, all done
+echo Done
+status=0
+exit
diff --git a/tests/xfs/1421.out b/tests/xfs/1421.out
new file mode 100644
index 00000000..69711ab0
--- /dev/null
+++ b/tests/xfs/1421.out
@@ -0,0 +1,7 @@
+QA output created by 1421
+Format and populate
+Check leafn rebuilds
+Fuzz nbtree[0].before to zero
+Check nbtree[0].before repair
+rebuilding directory inode XXX
+Done
diff --git a/tests/xfs/group b/tests/xfs/group
index de66378f..4b0552b9 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -492,3 +492,4 @@
492 auto quick fuzz
493 auto quick fuzz
734 auto quick
+1421 auto quick repair
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] xfs: fuzz directories containing single leafn blocks
2018-10-30 18:03 [PATCH 1/3] populate: create leafn dir when populating xfs filesystem Darrick J. Wong
2018-10-30 18:03 ` [PATCH 2/3] xfs: test repair regression of dir w/ single leafn block Darrick J. Wong
@ 2018-10-30 18:03 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2018-10-30 18:03 UTC (permalink / raw)
To: guaneryu, darrick.wong; +Cc: linux-xfs, fstests
From: Darrick J. Wong <darrick.wong@oracle.com>
Test scrub, repair, and metadata verifiers on directories containing
fuzzed single-leafn blocks.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
tests/xfs/1422 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/1422.out | 5 +++++
tests/xfs/1423 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/1423.out | 5 +++++
tests/xfs/1424 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/xfs/1424.out | 5 +++++
tests/xfs/group | 3 +++
7 files changed, 174 insertions(+)
create mode 100755 tests/xfs/1422
create mode 100644 tests/xfs/1422.out
create mode 100755 tests/xfs/1423
create mode 100644 tests/xfs/1423.out
create mode 100755 tests/xfs/1424
create mode 100644 tests/xfs/1424.out
diff --git a/tests/xfs/1422 b/tests/xfs/1422
new file mode 100755
index 00000000..cd2cbc2a
--- /dev/null
+++ b/tests/xfs/1422
@@ -0,0 +1,52 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc. All Rights Reserved.
+#
+# FS QA Test No. 1422
+#
+# Populate a XFS filesystem and fuzz every single-leafn-format dir block field.
+# Use xfs_repair to fix the corruption.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+ cd /
+ rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/populate
+. ./common/fuzzy
+
+# real QA test starts here
+_supported_os Linux
+_supported_fs xfs
+_require_scratch_xfs_fuzz_fields
+
+echo "Format and populate"
+_scratch_populate_cached nofill > $seqres.full 2>&1
+
+echo "Find single-leafn-format dir block"
+_scratch_mount
+inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_LEAFN)
+blk_sz=$(_get_block_size $SCRATCH_MNT)
+_scratch_unmount
+
+leaf_offset=$(( (2 ** 35) / blk_sz ))
+echo "Fuzz single-leafn-format dir block"
+_scratch_xfs_fuzz_metadata '' 'offline' "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full
+echo "Done fuzzing single-leafn-format dir block"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/1422.out b/tests/xfs/1422.out
new file mode 100644
index 00000000..76cb50a5
--- /dev/null
+++ b/tests/xfs/1422.out
@@ -0,0 +1,5 @@
+QA output created by 1422
+Format and populate
+Find single-leafn-format dir block
+Fuzz single-leafn-format dir block
+Done fuzzing single-leafn-format dir block
diff --git a/tests/xfs/1423 b/tests/xfs/1423
new file mode 100755
index 00000000..3220264f
--- /dev/null
+++ b/tests/xfs/1423
@@ -0,0 +1,52 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc. All Rights Reserved.
+#
+# FS QA Test No. 1423
+#
+# Populate a XFS filesystem and fuzz every single-leafn-format dir block field.
+# Use xfs_scrub to fix the corruption.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+ cd /
+ rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/populate
+. ./common/fuzzy
+
+# real QA test starts here
+_supported_os Linux
+_supported_fs xfs
+_require_scratch_xfs_fuzz_fields
+
+echo "Format and populate"
+_scratch_populate_cached nofill > $seqres.full 2>&1
+
+echo "Find single-leafn-format dir block"
+_scratch_mount
+inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_LEAFN)
+blk_sz=$(_get_block_size $SCRATCH_MNT)
+_scratch_unmount
+
+leaf_offset=$(( (2 ** 35) / blk_sz ))
+echo "Fuzz single-leafn-format dir block"
+_scratch_xfs_fuzz_metadata '' 'online' "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full
+echo "Done fuzzing single-leafn-format dir block"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/1423.out b/tests/xfs/1423.out
new file mode 100644
index 00000000..bca6d99d
--- /dev/null
+++ b/tests/xfs/1423.out
@@ -0,0 +1,5 @@
+QA output created by 1423
+Format and populate
+Find single-leafn-format dir block
+Fuzz single-leafn-format dir block
+Done fuzzing single-leafn-format dir block
diff --git a/tests/xfs/1424 b/tests/xfs/1424
new file mode 100755
index 00000000..c8666f5d
--- /dev/null
+++ b/tests/xfs/1424
@@ -0,0 +1,52 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2018 Oracle, Inc. All Rights Reserved.
+#
+# FS QA Test No. 1424
+#
+# Populate a XFS filesystem and fuzz every single-leafn-format dir block field.
+# Do not fix the filesystem, to test metadata verifiers.
+#
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+ cd /
+ rm -rf $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/populate
+. ./common/fuzzy
+
+# real QA test starts here
+_supported_os Linux
+_supported_fs xfs
+_require_scratch_xfs_fuzz_fields
+
+echo "Format and populate"
+_scratch_populate_cached nofill > $seqres.full 2>&1
+
+echo "Find single-leafn-format dir block"
+_scratch_mount
+inum=$(stat -c '%i' $SCRATCH_MNT/S_IFDIR.FMT_LEAFN)
+blk_sz=$(_get_block_size $SCRATCH_MNT)
+_scratch_unmount
+
+leaf_offset=$(( (2 ** 35) / blk_sz ))
+echo "Fuzz single-leafn-format dir block"
+_scratch_xfs_fuzz_metadata '' 'none' "inode ${inum}" "dblock ${leaf_offset}" >> $seqres.full
+echo "Done fuzzing single-leafn-format dir block"
+
+# success, all done
+status=0
+exit
diff --git a/tests/xfs/1424.out b/tests/xfs/1424.out
new file mode 100644
index 00000000..50d09f48
--- /dev/null
+++ b/tests/xfs/1424.out
@@ -0,0 +1,5 @@
+QA output created by 1424
+Format and populate
+Find single-leafn-format dir block
+Fuzz single-leafn-format dir block
+Done fuzzing single-leafn-format dir block
diff --git a/tests/xfs/group b/tests/xfs/group
index 4b0552b9..b3afe31a 100644
--- a/tests/xfs/group
+++ b/tests/xfs/group
@@ -493,3 +493,6 @@
493 auto quick fuzz
734 auto quick
1421 auto quick repair
+1422 dangerous_fuzzers dangerous_scrub dangerous_repair
+1423 dangerous_fuzzers dangerous_scrub dangerous_online_repair
+1424 dangerous_fuzzers dangerous_norepair
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-31 2:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-30 18:03 [PATCH 1/3] populate: create leafn dir when populating xfs filesystem Darrick J. Wong
2018-10-30 18:03 ` [PATCH 2/3] xfs: test repair regression of dir w/ single leafn block Darrick J. Wong
2018-10-30 18:03 ` [PATCH 3/3] xfs: fuzz directories containing single leafn blocks Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).