aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPankaj Raghav <p.raghav@samsung.com>2024-03-13 21:38:18 +0100
committerZorro Lang <zlang@kernel.org>2024-03-27 22:05:18 +0800
commit8d61144d281c49ba22581a16ac1010a38d3cc824 (patch)
tree28296ca2dbef7838c9eca7f45f1da41d18f6f609
parentf8fbdbe233090b999a7c1e4f2e2a89d47194b719 (diff)
downloadxfstests-dev-8d61144d281c49ba22581a16ac1010a38d3cc824.tar.gz
xfs/558: scale blk IO size based on the filesystem blksz
This test fails for 64k filesystem block size on a 4k PAGE_SIZE system. Scale the `blksz` based on the filesystem block size instead of fixing it as 64k so that we do get some iomap invalidations while doing concurrent writes. Cap the blksz to be at least 64k to retain the same behaviour as before for smaller filesystem blocksizes. This fixes the "Expected to hear about writeback iomap invalidations?" message for 64k filesystems. Signed-off-by: Pankaj Raghav <p.raghav@samsung.com> Tested-by: "Darrick J. Wong" <djwong@kernel.org> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-xtests/xfs/5587
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/xfs/558 b/tests/xfs/558
index 9e9b3be867..270f458cb9 100755
--- a/tests/xfs/558
+++ b/tests/xfs/558
@@ -127,7 +127,12 @@ _scratch_mount >> $seqres.full
$XFS_IO_PROG -c 'chattr -x' $SCRATCH_MNT &> $seqres.full
_require_pagecache_access $SCRATCH_MNT
-blksz=65536
+min_blksz=65536
+file_blksz=$(_get_file_block_size "$SCRATCH_MNT")
+blksz=$(( 8 * $file_blksz ))
+
+blksz=$(( blksz > min_blksz ? blksz : min_blksz ))
+
_require_congruent_file_oplen $SCRATCH_MNT $blksz
# Make sure we have sufficient extent size to create speculative CoW