diff --git a/tests/dd/direct.sh b/tests/dd/direct.sh index 55e6f32a7..99d204c9c 100755 --- a/tests/dd/direct.sh +++ b/tests/dd/direct.sh @@ -19,17 +19,28 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ dd -truncate -s 8192 in || framework_failure_ -dd if=in oflag=direct of=out 2> /dev/null \ - || skip_ '512 byte aligned O_DIRECT is not supported on this (file) system' +# dd "$1" to 'out' using Direct I/O with the current defined $block_size +dd_direct() { + dd if="$1" of=out ibs=$block_size obs=$block_size iflag=direct oflag=direct +} -truncate -s 511 short || framework_failure_ +truncate -s 8192 in || framework_failure_ + +block_size=512 +if ! dd_direct 'in' 2>/dev/null; then + # Some file systems/devices require 4 KiB alignment for direct I/O. + block_size=4096 + dd_direct 'in' 2>/dev/null || + skip_ 'neither 512B or 4KiB aligned DIRECT I/O succeeded' +fi + +truncate -s $((block_size - 1)) short || framework_failure_ truncate -s 8191 m1 || framework_failure_ truncate -s 8193 p1 || framework_failure_ for i in short m1 p1; do rm -f out - dd if=$i iflag=direct oflag=direct of=out || fail=1 + dd_direct "$i" || fail=1 done Exit $fail