From 10d2fe7908a3192d7dfc0254f3b02c9dc48d737c Mon Sep 17 00:00:00 2001 From: Zorro Lang Date: Thu, 2 Jun 2022 13:17:16 +0800 Subject: [PATCH] generic/139: require 512 bytes to be the minimum dio size Due to generic/139 tests base on 512 bytes aligned, so skip this test if the minimum dio write size >512. This patch also change the common/rc::_require_dio helper, supports a minimum aligned size argument. Signed-off-by: Zorro Lang Reviewed-by: Darrick J. Wong --- common/rc | 14 +++++++++++--- tests/generic/139 | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index 08e36452..29781a26 100644 --- a/common/rc +++ b/common/rc @@ -2721,9 +2721,13 @@ _require_xfs_io_command() fi } -# check that kernel and filesystem support direct I/O +# check that kernel and filesystem support direct I/O, and check if "$1" size +# aligned (optional) is supported _require_odirect() { + local blocksize=$1 + local align_args=${1:+"-b $1"} + if [ $FSTYP = "ext4" ] || [ $FSTYP = "f2fs" ] ; then if echo "$MOUNT_OPTIONS" | grep -q "test_dummy_encryption"; then _notrun "$FSTYP encryption doesn't support O_DIRECT" @@ -2735,9 +2739,13 @@ _require_odirect() fi fi local testfile=$TEST_DIR/$$.direct - $XFS_IO_PROG -F -f -d -c "pwrite 0 20k" $testfile > /dev/null 2>&1 + $XFS_IO_PROG -F -f -d -c "pwrite ${align_args} 0 20k" $testfile > /dev/null 2>&1 if [ $? -ne 0 ]; then - _notrun "O_DIRECT is not supported" + if [ -n "$blocksize" ]; then + _notrun "O_DIRECT aligned to $blocksize bytes is not supported" + else + _notrun "O_DIRECT is not supported" + fi fi rm -f $testfile 2>&1 > /dev/null } diff --git a/tests/generic/139 b/tests/generic/139 index 0bbc222c..3eb1519d 100755 --- a/tests/generic/139 +++ b/tests/generic/139 @@ -26,7 +26,7 @@ _cleanup() # real QA test starts here _require_test_reflink _require_cp_reflink -_require_odirect +_require_odirect 512 testdir=$TEST_DIR/test-$seq rm -rf $testdir -- 2.39.5