loop/002: check physical block size and minimum io size as well

Signed-off-by: Omar Sandoval <osandov@fb.com>

diff --git a/tests/loop/002 b/tests/loop/002
index be9965c602429c2f7779f63c3f3da8413b1f6b81..cb1a11e0046da3072073bba660ed6119ccfa431a 100755 (executable)
--- a/tests/loop/002
+++ b/tests/loop/002
@@ -2,9 +2,10 @@
 #
 # Tests the LO_FLAGS_BLOCKSIZE flag for LOOP_{GET,SET}_STATUS, introduced in
 # commit f2c6df7dbf9a ("loop: support 4k physical blocksize"). Also a
-# regression test for patches "loop: always return block size in
-# LOOP_GET_STATUS" and "loop: fix hang if LOOP_SET_STATUS gets invalid
-# blocksize or encrypt type".
+# regression test for patches "loop: fix hang if LOOP_SET_STATUS gets invalid
+# blocksize or encrypt type", "loop: use queue limit instead of private
+# lo_logical_blocksize", and "loop: always return block size in
+# LOOP_GET_STATUS".
 #
 # Copyright (C) 2017 Omar Sandoval
 #
@@ -65,6 +66,7 @@ test() {
                return 1
        fi
 
+       local sysfs="/sys/block/${loop_dev#/dev/}"
        for blksize in "" 4096 2048 1234 1024 512; do
                if [[ -z $blksize ]]; then
                        echo "Checking default block size"
@@ -74,8 +76,11 @@ test() {
                                dd if=/dev/zero of="$loop_dev" oflag=direct bs="$blksize" count=1 status=none
                        fi
                fi
-               echo "LOOP_GET_STATUS says" "$(src/loblksize "$loop_dev")"
-               echo "sysfs says" "$(cat "/sys/block/${loop_dev#/dev/}/queue/logical_block_size")"
+               local loop_get_status="$(src/loblksize "$loop_dev")"
+               local logical_block_size="$(cat "$sysfs/queue/logical_block_size")"
+               local physical_block_size="$(cat "$sysfs/queue/physical_block_size")"
+               local minimum_io_size="$(cat "$sysfs/queue/minimum_io_size")"
+               echo "LOOP_GET_STATUS=$loop_get_status queue/logical_block_size=$logical_block_size queue/physical_block_size=$physical_block_size queue/minimum_io_size=$minimum_io_size"
        done
 
        losetup -d "$loop_dev"

diff --git a/tests/loop/002.out b/tests/loop/002.out
index f7f9605bca92d767c71c05c62a5c0a08974983ed..5cee7ac314755cc37ce57580cd05f7536688d3a2 100644 (file)
--- a/tests/loop/002.out
+++ b/tests/loop/002.out
@@ -1,21 +1,15 @@
 Running loop/002
 Checking default block size
-LOOP_GET_STATUS says 512
-sysfs says 512
+LOOP_GET_STATUS=512 queue/logical_block_size=512 queue/physical_block_size=512 queue/minimum_io_size=512
 Setting block size to 4096
-LOOP_GET_STATUS says 4096
-sysfs says 4096
+LOOP_GET_STATUS=4096 queue/logical_block_size=4096 queue/physical_block_size=4096 queue/minimum_io_size=4096
 Setting block size to 2048
-LOOP_GET_STATUS says 2048
-sysfs says 2048
+LOOP_GET_STATUS=2048 queue/logical_block_size=2048 queue/physical_block_size=2048 queue/minimum_io_size=2048
 Setting block size to 1234
 LOOP_SET_STATUS64: Invalid argument
-LOOP_GET_STATUS says 2048
-sysfs says 2048
+LOOP_GET_STATUS=2048 queue/logical_block_size=2048 queue/physical_block_size=2048 queue/minimum_io_size=2048
 Setting block size to 1024
-LOOP_GET_STATUS says 1024
-sysfs says 1024
+LOOP_GET_STATUS=1024 queue/logical_block_size=1024 queue/physical_block_size=1024 queue/minimum_io_size=1024
 Setting block size to 512
-LOOP_GET_STATUS says 512
-sysfs says 512
+LOOP_GET_STATUS=512 queue/logical_block_size=512 queue/physical_block_size=512 queue/minimum_io_size=512
 Test complete