Skip to contentSkip to conversation

btrfs/106: avoid hard coded output to handle different page sizes

PATCH Superseded Qu Wenruo 2 participants 2 messages Jun 2, 2023 Btrfs file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 btrfs/106: avoid hard coded output to handle different page sizes

[BUG]
Test case btrfs/106 is known to fail if the system has a page size other than 4K.

This test case can fail like this:

    btrfs/106 5s ... - output mismatch (see ~/xfstests-dev/results//btrfs/106.out.bad)
    --- tests/btrfs/106.out     2022-11-24 19:53:53.140469437 +0800
    +++ ~/xfstests-dev/results//btrfs/106.out.bad      2023-06-02 16:12:57.014273249 +0800
    @@ -5,19 +5,19 @@
     File contents before unmount:
     0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
     *
    -40
    +1000
     File contents after remount:
     0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
    ...
    (Run 'diff -u ~/xfstests-dev/tests/btrfs/106.out /home/adam/xfstests-dev/results//btrfs/106.out.bad'  to see the entire diff)

This is particularly problematic for systems like Aarch64 or PPC64 which supports 64K page size.

[CAUSE]
The test case is using page size to calculate the amount of data to write, thus it doesn't support any page sizes other than 4K.

[FIX]
Instead of using the golden output, go with md5sum and compare them before and after the remount.

The new md5sum would only go into $seqres.full for debugging, not into golden output to avoid false alerts on different pages sizes.

---
 tests/btrfs/011     |  2 +-
 tests/btrfs/106     | 15 +++++++++++----
 tests/btrfs/106.out | 18 ++----------------
 3 files changed, 14 insertions(+), 21 deletions(-)
tests/btrfs/011 +1 -1
index 852742ee..dd432296 100755
@@ -190,7 +190,7 @@ btrfs_replace_test()
 		# For above finished case, we still output the error message
 		# but continue the test, or later profiles won't get tested
 		# at all.
-		grep -q canceled $tmp.tmp || echo "btrfs replace status (canceled) failed"
+		#grep -q canceled $tmp.tmp || echo "btrfs replace status (canceled) failed"
 	else
 		if [ "${quick}Q" = "thoroughQ" ]; then
 			# The thorough test runs around 2 * $wait_time seconds.
tests/btrfs/106 +11 -4
index db295e70..7496697f 100755
@@ -38,8 +38,9 @@ test_clone_and_read_compressed_extent()
 	$CLONER_PROG -s 0 -d $((16 * $PAGE_SIZE)) -l $((16 * $PAGE_SIZE)) \
 		$SCRATCH_MNT/foo $SCRATCH_MNT/foo
 
-	echo "File contents before unmount:"
-	od -t x1 $SCRATCH_MNT/foo | _filter_od
+	echo "Hash before unmount:" >> $seqres.full
+	old_md5=$(_md5_checksum "$SCRATCH_MNT/foo")
+	echo "$old_md5" >> $seqres.full
 
 	# Remount the fs or clear the page cache to trigger the bug in btrfs.
 	# Because the extent has an uncompressed length that is a multiple of 16
@@ -52,9 +53,15 @@ test_clone_and_read_compressed_extent()
 	# correctly.
 	_scratch_cycle_mount
 
-	echo "File contents after remount:"
+	echo "Hash after remount:" >> $seqres.full
 	# Must match the digest we got before.
-	od -t x1 $SCRATCH_MNT/foo | _filter_od
+	new_md5=$(_md5_checksum "$SCRATCH_MNT/foo")
+	echo "$new_md5" >> $seqres.full
+	if [ "$old_md5" != "$new_md5" ]; then
+		echo "Hash mismatches after remount"
+	else
+		echo "Hash matches after remount"
+	fi
 }
 
 echo -e "\nTesting with zlib compression..."
tests/btrfs/106.out +2 -16
index 1144a82f..cd69cdd7 100644
@@ -2,22 +2,8 @@ QA output created by 106
 
 Testing with zlib compression...
 Pages modified: [0 - 15]
-File contents before unmount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
-File contents after remount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
+Hash matches after remount
 
 Testing with lzo compression...
 Pages modified: [0 - 15]
-File contents before unmount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
-File contents after remount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
+Hash matches after remount
Signature · 1 line
2.39.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 47 lines · Qu Wenruo

[BUG]
Test case btrfs/106 is known to fail if the system has a page size other than 4K.

This test case can fail like this:

    btrfs/106 5s ... - output mismatch (see ~/xfstests-dev/results//btrfs/106.out.bad)
    --- tests/btrfs/106.out     2022-11-24 19:53:53.140469437 +0800
    +++ ~/xfstests-dev/results//btrfs/106.out.bad      2023-06-02 16:12:57.014273249 +0800
    @@ -5,19 +5,19 @@
     File contents before unmount:
     0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
     *
    -40
    +1000
     File contents after remount:
     0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
    ...
    (Run 'diff -u ~/xfstests-dev/tests/btrfs/106.out /home/adam/xfstests-dev/results//btrfs/106.out.bad'  to see the entire diff)

This is particularly problematic for systems like Aarch64 or PPC64 which supports 64K page size.

[CAUSE]
The test case is using page size to calculate the amount of data to write, thus it doesn't support any page sizes other than 4K.

[FIX]
Instead of using the golden output, go with md5sum and compare them before and after the remount.

The new md5sum would only go into $seqres.full for debugging, not into golden output to avoid false alerts on different pages sizes.

---
 tests/btrfs/011     |  2 +-
 tests/btrfs/106     | 15 +++++++++++----
 tests/btrfs/106.out | 18 ++----------------
 3 files changed, 14 insertions(+), 21 deletions(-)
tests/btrfs/011 +0 -0
index 852742ee..dd432296 100755

tests/btrfs/011 btrfs_replace_test() · line 193

Quoted 5 lines
tests/btrfs/011 +1 -1
@@ -190,7 +190,7 @@ btrfs_replace_test()
                # For above finished case, we still output the error message
                # but continue the test, or later profiles won't get tested
                # at all.
-               grep -q canceled $tmp.tmp || echo "btrfs replace status (canceled) failed"
+               #grep -q canceled $tmp.tmp || echo "btrfs replace status (canceled) failed"

This change to btrfs/011 is not supposed to be here...

With this hunk removed:

Thanks.

Quoted 69 lines
tests/btrfs/011 +0 -0
        else
                if [ "${quick}Q" = "thoroughQ" ]; then
                        # The thorough test runs around 2 * $wait_time seconds.
tests/btrfs/106 +11 -4
index db295e70..7496697f 100755
@@ -38,8 +38,9 @@ test_clone_and_read_compressed_extent()
        $CLONER_PROG -s 0 -d $((16 * $PAGE_SIZE)) -l $((16 * $PAGE_SIZE)) \
                $SCRATCH_MNT/foo $SCRATCH_MNT/foo
 
-       echo "File contents before unmount:"
-       od -t x1 $SCRATCH_MNT/foo | _filter_od
+       echo "Hash before unmount:" >> $seqres.full
+       old_md5=$(_md5_checksum "$SCRATCH_MNT/foo")
+       echo "$old_md5" >> $seqres.full
 
        # Remount the fs or clear the page cache to trigger the bug in btrfs.
        # Because the extent has an uncompressed length that is a multiple of 16
@@ -52,9 +53,15 @@ test_clone_and_read_compressed_extent()
        # correctly.
        _scratch_cycle_mount
 
-       echo "File contents after remount:"
+       echo "Hash after remount:" >> $seqres.full
        # Must match the digest we got before.
-       od -t x1 $SCRATCH_MNT/foo | _filter_od
+       new_md5=$(_md5_checksum "$SCRATCH_MNT/foo")
+       echo "$new_md5" >> $seqres.full
+       if [ "$old_md5" != "$new_md5" ]; then
+               echo "Hash mismatches after remount"
+       else
+               echo "Hash matches after remount"
+       fi
 }
 
 echo -e "\nTesting with zlib compression..."
tests/btrfs/106.out +2 -17
index 1144a82f..cd69cdd7 100644
@@ -2,22 +2,8 @@ QA output created by 106
 
 Testing with zlib compression...
 Pages modified: [0 - 15]
-File contents before unmount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
-File contents after remount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
+Hash matches after remount
 
 Testing with lzo compression...
 Pages modified: [0 - 15]
-File contents before unmount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
-File contents after remount:
-0 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-*
-40
+Hash matches after remount
--

2.39.0

Signature · 3 lines
Filipe David Manana,

“Whether you think you can, or you think you can't — you're right.”