Skip to contentSkip to conversation

fstests: generic/352 should accomodate other pwrite behaviors

PATCH In review Bill O'Donnell 2 participants 2 messages Aug 28, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 fstests: generic/352 should accomodate other pwrite behaviors

xfs_io pwrite issues a series of block size writes, but there is no guarantee that the resulting extent(s) will be singular or contiguous. This behavior is acceptable, but the test is flawed in that it expects a single extent for a pwrite.

Modify test to limit pwrite and reflink to a single block.

---
 tests/generic/352     | 10 ++++++----
 tests/generic/352.out |  6 ++----
 2 files changed, 8 insertions(+), 8 deletions(-)
tests/generic/352 +6 -4
index 52ec4850..acc17dac 100755
@@ -28,14 +28,16 @@ _require_xfs_io_command "fiemap"
 _scratch_mkfs > /dev/null 2>&1
 _scratch_mount
 
-blocksize=$((128 * 1024))
+blocksize=$(_get_file_block_size $SCRATCH_MNT)
 _require_congruent_file_oplen $SCRATCH_MNT $blocksize
 file="$SCRATCH_MNT/tmp"
 
 # Golden output is for $LOAD_FACTOR == 1 case
+# and assumes a normal blocksize of 4K
 orig_nr=8192
-orig_last_extent=$(($orig_nr * $blocksize / 512))
-orig_end=$(($orig_last_extent + $blocksize / 512 - 1))
+orig_blocksize=4096
+orig_last_extent=$(($orig_nr * $orig_blocksize / 512))
+orig_end=$(($orig_last_extent + $orig_blocksize / 512 - 1))
 
 # Real output
 nr=$(($orig_nr * $LOAD_FACTOR))
@@ -43,7 +45,7 @@ last_extent=$(($nr * $blocksize / 512))
 end=$(($last_extent + $blocksize / 512 - 1))
 
 # write the initial block for later reflink
-_pwrite_byte 0xcdcdcdcd 0 $blocksize $file | _filter_xfs_io
+_pwrite_byte 0xcdcdcdcd 0 $blocksize $file > /dev/null
 
 # use reflink to create the rest of the file, whose all extents are all
 # pointing to the first extent
tests/generic/352.out +2 -4
index 4ff66c21..454ff52f 100644
@@ -1,5 +1,3 @@
 QA output created by 352
-wrote 131072/131072 bytes at offset 0
-XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-0: [0..2097151]: shared
-1: [2097152..2097407]: shared|last
+0: [0..65535]: shared
+1: [65536..65543]: shared|last
Signature · 1 line
2.41.0
Reviewed-by on v3 1/1
#1 lore raw
Quoted 8 lines · Bill O'Donnell

xfs_io pwrite issues a series of block size writes, but there is no guarantee that the resulting extent(s) will be singular or contiguous. This behavior is acceptable, but the test is flawed in that it expects a single extent for a pwrite.

Modify test to limit pwrite and reflink to a single block.

This looks good to me, thanks.

Quoted 50 lines
---
 tests/generic/352     | 10 ++++++----
 tests/generic/352.out |  6 ++----
 2 files changed, 8 insertions(+), 8 deletions(-)
tests/generic/352 +6 -4
index 52ec4850..acc17dac 100755
@@ -28,14 +28,16 @@ _require_xfs_io_command "fiemap"
 _scratch_mkfs > /dev/null 2>&1
 _scratch_mount
 
-blocksize=$((128 * 1024))
+blocksize=$(_get_file_block_size $SCRATCH_MNT)
 _require_congruent_file_oplen $SCRATCH_MNT $blocksize
 file="$SCRATCH_MNT/tmp"
 
 # Golden output is for $LOAD_FACTOR == 1 case
+# and assumes a normal blocksize of 4K
 orig_nr=8192
-orig_last_extent=$(($orig_nr * $blocksize / 512))
-orig_end=$(($orig_last_extent + $blocksize / 512 - 1))
+orig_blocksize=4096
+orig_last_extent=$(($orig_nr * $orig_blocksize / 512))
+orig_end=$(($orig_last_extent + $orig_blocksize / 512 - 1))
 
 # Real output
 nr=$(($orig_nr * $LOAD_FACTOR))
@@ -43,7 +45,7 @@ last_extent=$(($nr * $blocksize / 512))
 end=$(($last_extent + $blocksize / 512 - 1))
 
 # write the initial block for later reflink
-_pwrite_byte 0xcdcdcdcd 0 $blocksize $file | _filter_xfs_io
+_pwrite_byte 0xcdcdcdcd 0 $blocksize $file > /dev/null
 
 # use reflink to create the rest of the file, whose all extents are all
 # pointing to the first extent
tests/generic/352.out +2 -4
index 4ff66c21..454ff52f 100644
@@ -1,5 +1,3 @@
 QA output created by 352
-wrote 131072/131072 bytes at offset 0
-XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-0: [0..2097151]: shared
-1: [2097152..2097407]: shared|last
+0: [0..65535]: shared
+1: [65536..65543]: shared|last