Skip to contentSkip to conversation

Misceillaneous ext4 test fix ups

PATCH In review Theodore Ts'o 2 participants 13 messages Jun 25, 2022 – Jun 28, 2022

lore
Share & tools
lore
#0 lore raw

cover Misceillaneous ext4 test fix ups

The first patch has been in my tree for a long time, but I had forgotten to send it upstream.

The last two patches are a rewrite (in response to comments) of "ext4/054,ext4/055: don't run when using DAX" which I had sent in late April.

Theodore Ts'o (5):
ext4/050: support indirect as well as extent mapped journals ext4/044: skip test if the file system does not have a journal ext4/045: clean up unnecessary arguments to _require_e2fsprogs ext4/054: skip test if the dax mount option is enabled ext4/055: skip test if dax mount option is used

 common/rc      |  3 +++
 tests/ext4/044 |  6 ++++++
 tests/ext4/045 |  2 +-
 tests/ext4/050 | 58 +++++---------------------------------------------
 tests/ext4/054 |  5 ++---
 tests/ext4/055 |  1 +
 6 files changed, 18 insertions(+), 57 deletions(-)
Signature · 1 line
2.31.0
#1 lore raw

PATCH 1/5 ext4/050: support indirect as well as extent mapped journals

Simplify the test and fix ext4/050 failures when running ext4 without extents enabled (e.g., in ext3 emulation mode).

Instead of relying on parsing debugfs output's (which varies depending on whether the journal inode is extent mapped or indirect block mapped), use debugfs's "cat" command to get the contents of the journal.

---
 tests/ext4/050 | 58 +++++---------------------------------------------
 1 file changed, 5 insertions(+), 53 deletions(-)
tests/ext4/050 +5 -53
index 79961957..6f93b86d 100755
@@ -22,55 +22,6 @@ _require_command "$DEBUGFS_PROG" debugfs
 checkpoint_journal=$here/src/checkpoint_journal
 _require_test_program "checkpoint_journal"
 
-# convert output from stat<journal_inode> to list of block numbers
-get_journal_extents() {
-	inode_info=$($DEBUGFS_PROG $SCRATCH_DEV -R "stat <8>" 2>> $seqres.full)
-	echo -e "\nJournal info:" >> $seqres.full
-	echo "$inode_info" >> $seqres.full
-
-	extents_line=$(echo "$inode_info" | awk '/EXTENTS:/{ print NR; exit }')
-	get_extents=$(echo "$inode_info" | sed -n "$(($extents_line + 1))"p)
-
-	# get just the physical block numbers
-	get_extents=$(echo "$get_extents" |  perl -pe 's|\(.*?\):||g' | sed -e 's/, /\n/g' | perl -pe 's|(\d+)-(\d+)|\1 \2|g')
-
-	echo "$get_extents"
-}
-
-# checks all extents are zero'd out except for the superblock
-# arg 1: extents (output of get_journal_extents())
-check_extents() {
-	echo -e "\nChecking extents:" >> $seqres.full
-	echo "$1" >> $seqres.full
-
-	super_block="true"
-	echo "$1" | while IFS= read line; do
-		start_block=$(echo $line | cut -f1 -d' ')
-		end_block=$(echo $line | cut -f2 -d' ' -s)
-
-		# if first block of journal, shouldn't be wiped
-		if [ "$super_block" == "true" ]; then
-			super_block="false"
-
-			#if super block only block in this extent, skip extent
-			if [ -z "$end_block" ]; then
-				continue;
-			fi
-			start_block=$(($start_block + 1))
-		fi
-
-		if [ ! -z "$end_block" ]; then
-			blocks=$(($end_block - $start_block + 1))
-		else
-			blocks=1
-		fi
-
-		check=$(od $SCRATCH_DEV --skip-bytes=$(($start_block * $blocksize)) --read-bytes=$(($blocks * $blocksize)) -An -v | sed -e 's/[0 \t\n\r]//g')
-
-		[ ! -z "$check" ] && echo "error" && break
-	done
-}
-
 testdir="${SCRATCH_MNT}/testdir"
 
 _scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seqres.full 2>&1
@@ -93,11 +44,12 @@ sync --file-system $testdir/1
 # call ioctl to checkpoint and zero-fill journal blocks
 $checkpoint_journal $SCRATCH_MNT --erase=zeroout || _fail "ioctl returned error"
 
-extents=$(get_journal_extents)
-
 # check journal blocks zeroed out
-ret=$(check_extents "$extents")
-[ "$ret" = "error" ] && _fail "Journal was not zero-filled"
+$DEBUGFS_PROG $SCRATCH_DEV -R "cat <8>" 2> /dev/null | od >> $seqres.full
+check=$($DEBUGFS_PROG $SCRATCH_DEV -R "cat <8>" 2> /dev/null | \
+	    od --skip-bytes="$blocksize" -An -v | sed -e '/^[0 \t]*$/d')
+
+[ ! -z "$check" ] && _fail "Journal was not zeroed"
 
 _scratch_unmount >> $seqres.full 2>&1
 
Signature · 1 line
2.31.0
Reviewed-by on v1 1/5
#2 lore raw

Re: [PATCH 1/5] ext4/050: support indirect as well as extent mapped journals

Quoted 10 lines · Theodore Ts'o

Simplify the test and fix ext4/050 failures when running ext4 without extents enabled (e.g., in ext3 emulation mode).

Instead of relying on parsing debugfs output's (which varies depending on whether the journal inode is extent mapped or indirect block mapped), use debugfs's "cat" command to get the contents of the journal.

---

It looks good to me,

But as it contains many ext4 specific format things, so I hope to get one more reviewing from ext4 mail list, before I merge it.

Thanks,
Zorro

Quoted 83 lines
 tests/ext4/050 | 58 +++++---------------------------------------------
 1 file changed, 5 insertions(+), 53 deletions(-)
tests/ext4/050 +5 -53
index 79961957..6f93b86d 100755
@@ -22,55 +22,6 @@ _require_command "$DEBUGFS_PROG" debugfs
 checkpoint_journal=$here/src/checkpoint_journal
 _require_test_program "checkpoint_journal"
 
-# convert output from stat<journal_inode> to list of block numbers
-get_journal_extents() {
-	inode_info=$($DEBUGFS_PROG $SCRATCH_DEV -R "stat <8>" 2>> $seqres.full)
-	echo -e "\nJournal info:" >> $seqres.full
-	echo "$inode_info" >> $seqres.full
-
-	extents_line=$(echo "$inode_info" | awk '/EXTENTS:/{ print NR; exit }')
-	get_extents=$(echo "$inode_info" | sed -n "$(($extents_line + 1))"p)
-
-	# get just the physical block numbers
-	get_extents=$(echo "$get_extents" |  perl -pe 's|\(.*?\):||g' | sed -e 's/, /\n/g' | perl -pe 's|(\d+)-(\d+)|\1 \2|g')
-
-	echo "$get_extents"
-}
-
-# checks all extents are zero'd out except for the superblock
-# arg 1: extents (output of get_journal_extents())
-check_extents() {
-	echo -e "\nChecking extents:" >> $seqres.full
-	echo "$1" >> $seqres.full
-
-	super_block="true"
-	echo "$1" | while IFS= read line; do
-		start_block=$(echo $line | cut -f1 -d' ')
-		end_block=$(echo $line | cut -f2 -d' ' -s)
-
-		# if first block of journal, shouldn't be wiped
-		if [ "$super_block" == "true" ]; then
-			super_block="false"
-
-			#if super block only block in this extent, skip extent
-			if [ -z "$end_block" ]; then
-				continue;
-			fi
-			start_block=$(($start_block + 1))
-		fi
-
-		if [ ! -z "$end_block" ]; then
-			blocks=$(($end_block - $start_block + 1))
-		else
-			blocks=1
-		fi
-
-		check=$(od $SCRATCH_DEV --skip-bytes=$(($start_block * $blocksize)) --read-bytes=$(($blocks * $blocksize)) -An -v | sed -e 's/[0 \t\n\r]//g')
-
-		[ ! -z "$check" ] && echo "error" && break
-	done
-}
-
 testdir="${SCRATCH_MNT}/testdir"
 
 _scratch_mkfs_sized $((64 * 1024 * 1024)) >> $seqres.full 2>&1
@@ -93,11 +44,12 @@ sync --file-system $testdir/1
 # call ioctl to checkpoint and zero-fill journal blocks
 $checkpoint_journal $SCRATCH_MNT --erase=zeroout || _fail "ioctl returned error"
 
-extents=$(get_journal_extents)
-
 # check journal blocks zeroed out
-ret=$(check_extents "$extents")
-[ "$ret" = "error" ] && _fail "Journal was not zero-filled"
+$DEBUGFS_PROG $SCRATCH_DEV -R "cat <8>" 2> /dev/null | od >> $seqres.full
+check=$($DEBUGFS_PROG $SCRATCH_DEV -R "cat <8>" 2> /dev/null | \
+	    od --skip-bytes="$blocksize" -An -v | sed -e '/^[0 \t]*$/d')
+
+[ ! -z "$check" ] && _fail "Journal was not zeroed"
 
 _scratch_unmount >> $seqres.full 2>&1
 
Signature · 1 line
2.31.0
#3 lore raw

PATCH 2/5 ext4/044: skip test if the file system does not have a journal

In reply to Theodore Ts'o

This test mounts the file system using "mount -t ext3"; if the file system config creates the file system without the jbd2 journal, the "mount -t ext3" will fail. So skip this test in that case.

---
 tests/ext4/044 | 6 ++++++
 1 file changed, 6 insertions(+)
tests/ext4/044 +6 -0
index 46e44053..fd27ae2d 100755
@@ -16,11 +16,17 @@ _begin_fstest auto quick
 _supported_fs ext4
 _require_scratch
 _require_test_program "t_get_file_time"
+_require_dumpe2fs
 
 echo "Silence is golden"
 
 echo "Test timestamps with 256 inode size one device $SCRATCH_DEV" >$seqres.full
 _scratch_mkfs -t ext3 -I 256 >> $seqres.full 2>&1
+
+$DUMPE2FS_PROG -h $SCRATCH_DEV 2>> $seqres.full | grep '^Filesystem features' | grep -q has_journal
+if [ $? -ne 0 ]; then
+    _notrun "ext4 file system formatted without a journal"
+fi
 _scratch_mount
 
 # Create file
Signature · 1 line
2.31.0
#4 lore raw

Re: [PATCH 2/5] ext4/044: skip test if the file system does not have a journal

Quoted 18 lines · Theodore Ts'o

This test mounts the file system using "mount -t ext3"; if the file system config creates the file system without the jbd2 journal, the "mount -t ext3" will fail. So skip this test in that case.

---
 tests/ext4/044 | 6 ++++++
 1 file changed, 6 insertions(+)
tests/ext4/044 +1 -0
index 46e44053..fd27ae2d 100755
@@ -16,11 +16,17 @@ _begin_fstest auto quick
 _supported_fs ext4
 _require_scratch
 _require_test_program "t_get_file_time"
+_require_dumpe2fs

tests/ext4/044 _begin_fstest auto quick · line 29

Quoted 10 lines
tests/ext4/044 +5 -0
 
 echo "Silence is golden"
 
 echo "Test timestamps with 256 inode size one device $SCRATCH_DEV" >$seqres.full
 _scratch_mkfs -t ext3 -I 256 >> $seqres.full 2>&1
+
+$DUMPE2FS_PROG -h $SCRATCH_DEV 2>> $seqres.full | grep '^Filesystem features' | grep -q has_journal
+if [ $? -ne 0 ]; then
+    _notrun "ext4 file system formatted without a journal"
+fi

Can _has_metadata_journaling help that?

Thanks,
Zorro

Quoted 6 lines
tests/ext4/044 +0 -0
 _scratch_mount
 
 # Create file
Signature · 1 line
2.31.0
#5 lore raw

Re: [PATCH 2/5] ext4/044: skip test if the file system does not have a journal

Quoted 22 lines · Zorro Lang
Quoted 21 lines · Theodore Ts'o

This test mounts the file system using "mount -t ext3"; if the file system config creates the file system without the jbd2 journal, the "mount -t ext3" will fail. So skip this test in that case.

---
 tests/ext4/044 | 6 ++++++
 1 file changed, 6 insertions(+)
tests/ext4/044 +1 -0
index 46e44053..fd27ae2d 100755
@@ -16,11 +16,17 @@ _begin_fstest auto quick
 _supported_fs ext4
 _require_scratch
 _require_test_program "t_get_file_time"
+_require_dumpe2fs
 
 echo "Silence is golden"
 
Quoted 9 lines

tests/ext4/044 _begin_fstest auto quick · line 29

Quoted 7 lines
tests/ext4/044 +5 -0
 echo "Test timestamps with 256 inode size one device $SCRATCH_DEV" >$seqres.full
 _scratch_mkfs -t ext3 -I 256 >> $seqres.full 2>&1
+
+$DUMPE2FS_PROG -h $SCRATCH_DEV 2>> $seqres.full | grep '^Filesystem features' | grep -q has_journal
+if [ $? -ne 0 ]; then
+    _notrun "ext4 file system formatted without a journal"
+fi

Can _has_metadata_journaling help that?

Or use _require_metadata_journaling directly?

Quoted 10 lines

Thanks,
Zorro

Quoted 6 lines
tests/ext4/044 +0 -0
 _scratch_mount
 
 # Create file
Signature · 1 line
2.31.0
#6 lore raw

Re: [PATCH 2/5] ext4/044: skip test if the file system does not have a journal

Quoted 4 lines · Zorro Lang
Quoted 2 lines

Can _has_metadata_journaling help that?

Or use _require_metadata_journaling directly?

Yep, that's just what we need. I'll fix this in the next version of these patches.

- Ted

#7 lore raw

PATCH 3/5 ext4/045: clean up unnecessary arguments to _require_e2fsprogs

In reply to Theodore Ts'o
---
 tests/ext4/045 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/ext4/045 +1 -1
index ee7c0de3..4f0ad4aa 100755
@@ -22,7 +22,7 @@ _supported_fs ext4
 _require_scratch
 _require_test_program "t_create_short_dirs"
 _require_test_program "t_create_long_dirs"
-_require_dumpe2fs "$DUMPE2FS_PROG" dumpe2fs
+_require_dumpe2fs
 
 echo "Silence is golden"
 
Signature · 1 line
2.31.0
#8 lore raw

Re: [PATCH 3/5] ext4/045: clean up unnecessary arguments to _require_e2fsprogs

Quoted 10 lines · Theodore Ts'o
---
 tests/ext4/045 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/ext4/045 +0 -0
index ee7c0de3..4f0ad4aa 100755

tests/ext4/045 _supported_fs ext4 · line 25

Quoted 5 lines
tests/ext4/045 +1 -1
@@ -22,7 +22,7 @@ _supported_fs ext4
 _require_scratch
 _require_test_program "t_create_short_dirs"
 _require_test_program "t_create_long_dirs"
-_require_dumpe2fs "$DUMPE2FS_PROG" dumpe2fs
+_require_dumpe2fs

Thanks, I think it planned to write "_require_command" :)

This change is good, but the patch subject:
"ext4/045: clean up unnecessary arguments to _require_e2fsprogs"
is a little weird, dut to it's not changing "_require_e2fsprogs" (and there's not _require_e2fsprogs).

Thanks,
Zorro

Quoted 6 lines
tests/ext4/045 +0 -0
 echo "Silence is golden"
 
Signature · 1 line
2.31.0
#9 lore raw

Re: [PATCH 3/5] ext4/045: clean up unnecessary arguments to _require_e2fsprogs

Quoted 5 lines · Zorro Lang

This change is good, but the patch subject:
"ext4/045: clean up unnecessary arguments to _require_e2fsprogs"
is a little weird, dut to it's not changing "_require_e2fsprogs" (and there's not _require_e2fsprogs).

I've replaced the commit description with:

ext4/045: _require_dumpe2fs doesn't take any arguments so remove them

- Ted

#10 lore raw

PATCH 4/5 ext4/054: skip test if the dax mount option is enabled

In reply to Theodore Ts'o

The ext4/054 test explicitly creates a file system with a 1k blocksize. This can't possibly work on if the dax mount option is enabled, so change ext4/054 to use _scratch_mkfs_blocksized, and and a check to _scratch_mkfs_blocksized to _notrun the test if the block size is less than the page size.

Also remove an unnecessary _require_test declaration since this test does not use the test device.

---
 common/rc      | 3 +++
 tests/ext4/054 | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
common/rc +3 -0
index 9378ff26..3014f5fc 100644
@@ -1220,6 +1220,9 @@ _scratch_mkfs_blocksized()
 	if ! [[ $blocksize =~ $re ]] ; then
 		_notrun "error: _scratch_mkfs_sized: block size \"$blocksize\" not an integer."
 	fi
+	if [ $blocksize -lt $(get_page_size) ]; then
+		_exclude_scratch_mount_option dax
+	fi
 
 	case $FSTYP in
 	btrfs)
tests/ext4/054 +2 -3
index 9a11719f..e23acbb1 100755
@@ -19,7 +19,6 @@ _begin_fstest auto quick dangerous_fuzzers
 
 # real QA test starts here
 _supported_fs ext4
-_require_test
 _require_scratch_nocheck
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "pwrite"
@@ -28,8 +27,8 @@ _require_xfs_io_command "fpunch"
 _require_command "$DEBUGFS_PROG" debugfs
 
 # In order to accurately construct the damaged extent in the following
-# test steps, the blocksize is set to 1024 here
-_scratch_mkfs "-b 1024" > $seqres.full 2>&1
+# test steps, the block size is set to 1024 here
+_scratch_mkfs_blocksized 1024 >> $seqres.full 2>&1
 _scratch_mount
 
 TEST_FILE="${SCRATCH_MNT}/testfile"
Signature · 1 line
2.31.0
Reviewed-by on v1 4/5
#11 lore raw

Re: [PATCH 4/5] ext4/054: skip test if the dax mount option is enabled

Quoted 11 lines · Theodore Ts'o

The ext4/054 test explicitly creates a file system with a 1k blocksize. This can't possibly work on if the dax mount option is enabled, so change ext4/054 to use _scratch_mkfs_blocksized, and and a check to _scratch_mkfs_blocksized to _notrun the test if the block size is less than the page size.

Also remove an unnecessary _require_test declaration since this test does not use the test device.

---

Looks good to me.

Quoted 44 lines
 common/rc      | 3 +++
 tests/ext4/054 | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
common/rc +3 -0
index 9378ff26..3014f5fc 100644
@@ -1220,6 +1220,9 @@ _scratch_mkfs_blocksized()
 	if ! [[ $blocksize =~ $re ]] ; then
 		_notrun "error: _scratch_mkfs_sized: block size \"$blocksize\" not an integer."
 	fi
+	if [ $blocksize -lt $(get_page_size) ]; then
+		_exclude_scratch_mount_option dax
+	fi
 
 	case $FSTYP in
 	btrfs)
tests/ext4/054 +2 -3
index 9a11719f..e23acbb1 100755
@@ -19,7 +19,6 @@ _begin_fstest auto quick dangerous_fuzzers
 
 # real QA test starts here
 _supported_fs ext4
-_require_test
 _require_scratch_nocheck
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "pwrite"
@@ -28,8 +27,8 @@ _require_xfs_io_command "fpunch"
 _require_command "$DEBUGFS_PROG" debugfs
 
 # In order to accurately construct the damaged extent in the following
-# test steps, the blocksize is set to 1024 here
-_scratch_mkfs "-b 1024" > $seqres.full 2>&1
+# test steps, the block size is set to 1024 here
+_scratch_mkfs_blocksized 1024 >> $seqres.full 2>&1
 _scratch_mount
 
 TEST_FILE="${SCRATCH_MNT}/testfile"
Signature · 1 line
2.31.0
#12 lore raw

PATCH 5/5 ext4/055: skip test if dax mount option is used

In reply to Theodore Ts'o

This test creates a 1k block file system with the quota feature
enabled. As such, it is incompatible with DAX.

---
 tests/ext4/055 | 1 +
 1 file changed, 1 insertion(+)
tests/ext4/055 +1 -0
index 8f466f1b..aa15cfe9 100755
@@ -26,6 +26,7 @@ _require_command "$DEBUGFS_PROG" debugfs
 echo "Silence is golden"
 
 # The 1K blocksize is designed for debugfs.
+_exclude_scratch_mount_option dax
 _scratch_mkfs "-F -O quota -b 1024" > $seqres.full 2>&1
 
 # Start from 0, fill block 1 with 6,replace the original 2.
Signature · 1 line
2.31.0