check: Add TEST_DEV_PART_SYSFS variable

When partition devices are specified in TEST_DEV, TEST_DEV_SYSFS
variable points to the sysfs paths of holder devices of the partition
devices (e.g., /sys/block/sda). This sysfs path is different from the
sysfs path of the partition devices (e.g., /sys/block/sda/sda1). For
example, size parameters exist in both the holder device sysfs and
the partition device sysfs with different values.

To allow test cases to access sysfs path of the partition devices,
add TEST_DEV_PART_SYSFS variable. TEST_DEV_SYSFS is set as is to refer
the sysfs path of the holder devices. If the TEST_DEV is not a partition
device, an empty string is set to the TEST_DEV_PART_SYSFS variable.

Rename _find_sysfs_dir() function to _find_sysfs_dirs() and make it find
holder device sysfs as well as the partition device sysfs. The function
obtains the canonical sysfs path, and if the device is a partition
device, the function cuts the last device name in the canonical sysfs
path to obtain the holder device sysfs path.

Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/check b/check
index 819d8f31f14e2e8b2dbb785f6656668b93c4dcfd..6d44bfb14e2abbcbf641f53b8cca9a5d66fa2759 100755 (executable)
--- a/check
+++ b/check
@@ -443,13 +443,13 @@ _run_test() {
                                _warning "$TEST_NAME: fallback_device call failure"
                                return 0
                        fi
-                       if ! sysfs_dir="$(_find_sysfs_dir "$test_dev")"; then
+
+                       if ! _find_sysfs_dirs "$test_dev"; then
                                _warning "$TEST_NAME: could not find sysfs directory for ${test_dev}"
                                cleanup_fallback_device
                                return 0
                        fi
                        TEST_DEVS=( "${test_dev}" )
-                       TEST_DEV_SYSFS_DIRS["$test_dev"]="$sysfs_dir"
                        FALLBACK_DEVICE=1
                fi
 
@@ -465,6 +465,7 @@ _run_test() {
                local ret=0
                for TEST_DEV in "${TEST_DEVS[@]}"; do
                        TEST_DEV_SYSFS="${TEST_DEV_SYSFS_DIRS["$TEST_DEV"]}"
+                       TEST_DEV_PART_SYSFS="${TEST_DEV_PART_SYSFS_DIRS["$TEST_DEV"]}"
                        if (( !CAN_BE_ZONED )) && _test_dev_is_zoned; then
                                SKIP_REASON="${TEST_DEV} is a zoned block device"
                                _output_notrun "$TEST_NAME => $(basename "$TEST_DEV")"
@@ -484,6 +485,7 @@ _run_test() {
                if (( FALLBACK_DEVICE )); then
                        cleanup_fallback_device
                        unset TEST_DEV_SYSFS_DIRS["${TEST_DEVS[0]}"]
+                       unset TEST_DEV_PART_SYSFS_DIRS["${TEST_DEVS[0]}"]
                        TEST_DEVS=()
                fi
 
@@ -508,6 +510,8 @@ _run_group() {
                for i in "${!TEST_DEVS[@]}"; do
                        TEST_DEV="${TEST_DEVS[$i]}"
                        TEST_DEV_SYSFS="${TEST_DEV_SYSFS_DIRS["$TEST_DEV"]}"
+                       # shellcheck disable=SC2034
+                       TEST_DEV_PART_SYSFS="${TEST_DEV_PART_SYSFS_DIRS["$TEST_DEV"]}"
                        if ! group_device_requires; then
                                _output_notrun "${group}/*** => $(basename "$TEST_DEV")"
                                unset TEST_DEVS["$i"]
@@ -528,30 +532,32 @@ _run_group() {
        return $ret
 }
 
-_find_sysfs_dir() {
+_find_sysfs_dirs() {
        local test_dev="$1"
+       local sysfs_path
        local major=$((0x$(stat -L -c '%t' "$test_dev")))
        local minor=$((0x$(stat -L -c '%T' "$test_dev")))
-       local dev="$major:$minor"
 
-       local block_dir part_dir
-       for block_dir in /sys/block/*; do
-               if [[ $(cat "${block_dir}/dev") = "$dev" ]]; then
-                       echo "$block_dir"
-                       return
-               fi
-               for part_dir in "$block_dir"/*; do
-                       if [[ -r ${part_dir}/dev && $(cat "${part_dir}/dev") = "$dev" ]]; then
-                               echo "$block_dir"
-                               return
-                       fi
-               done
-       done
+       # Get the canonical sysfs path
+       if ! sysfs_path="$(realpath "/sys/dev/block/${major}:${minor}")"; then
+               return 1
+       fi
 
-       return 1
+       if [[ -r "${sysfs_path}"/partition ]]; then
+               # If the device is a partition device, cut the last device name
+               # of the canonical sysfs path to access to the sysfs of its
+               # holder device.
+               #   e.g.   .../block/sda/sda1  ->  ...block/sda
+               TEST_DEV_SYSFS_DIRS["$test_dev"]="${sysfs_path%/*}"
+               TEST_DEV_PART_SYSFS_DIRS["$test_dev"]="${sysfs_path}"
+       else
+               TEST_DEV_SYSFS_DIRS["$test_dev"]="${sysfs_path}"
+               TEST_DEV_PART_SYSFS_DIRS["$test_dev"]=""
+       fi
 }
 
 declare -A TEST_DEV_SYSFS_DIRS
+declare -A TEST_DEV_PART_SYSFS_DIRS
 _check() {
        # shellcheck disable=SC2034
        SRCDIR="$(realpath src)"
@@ -564,11 +570,9 @@ _check() {
                        _error "${test_dev} is not a block device"
                fi
 
-               local sysfs_dir
-               if ! sysfs_dir="$(_find_sysfs_dir "$test_dev")"; then
+               if ! _find_sysfs_dirs "$test_dev"; then
                        _error "could not find sysfs directory for ${test_dev}"
                fi
-               TEST_DEV_SYSFS_DIRS["$test_dev"]="$sysfs_dir"
        done
 
        local test_name group prev_group

diff --git a/new b/new
index d7d5f7ce6d387cac8861ad2eb7254dd0101a2039..5f6e1c01a273cf214a5b46329f53de742b374aaf 100755 (executable)
--- a/new
+++ b/new
@@ -80,7 +80,10 @@ group_requires() {
 # should return non-zero and set the \$SKIP_REASON variable. \$TEST_DEV is the
 # full path of the block device (e.g., /dev/nvme0n1 or /dev/sda1), and
 # \$TEST_DEV_SYSFS is the sysfs path of the disk (not the partition, e.g.,
-# /sys/block/nvme0n1 or /sys/block/sda).
+# /sys/block/nvme0n1 or /sys/block/sda). If the target device is a partition
+# device, \$TEST_DEV_PART_SYSFS is the sysfs path of the partition device
+# (e.g., /sys/block/nvme0n1/nvme0n1p1 or /sys/block/sda/sda1). Otherwise,
+# \$TEST_DEV_PART_SYSFS is an empty string.
 #
 # Usually, group_device_requires() just needs to check that the test device is
 # the right type of hardware or supports any necessary features using the
@@ -165,7 +168,10 @@ DESCRIPTION=""
 # set the \$SKIP_REASON variable. \$TEST_DEV is the full path of the block
 # device (e.g., /dev/nvme0n1 or /dev/sda1), and \$TEST_DEV_SYSFS is the sysfs
 # path of the disk (not the partition, e.g., /sys/block/nvme0n1 or
-# /sys/block/sda).
+# /sys/block/sda). If the target device is a partition device,
+# \$TEST_DEV_PART_SYSFS is the sysfs path of the partition device (e.g.,
+# /sys/block/nvme0n1/nvme0n1p1 or /sys/block/sda/sda1). Otherwise,
+# \$TEST_DEV_PART_SYSFS is an empty string.
 #
 # Usually, device_requires() just needs to check that the test device is the
 # right type of hardware or supports any necessary features using the
@@ -206,7 +212,13 @@ DESCRIPTION=""
 #    - \$TEST_DEV -- the block device to run the test on (e.g., /dev/sda1).
 #    - \$TEST_DEV_SYSFS -- the sysfs directory of the device (e.g.,
 #                         /sys/block/sda). In general, you should use the
-#                         _test_dev_queue_{get,set} helpers.
+#                         _test_dev_queue_{get,set} helpers. If the device is a
+#                         partition, this is the directory of its holder
+#                         device.
+#    - \$TEST_DEV_PART_SYSFS -- the sysfs directory of the device if the device
+#                               is a partition device (e.g.,
+#                               /sys/block/sda/sda1). If the device is not a
+#                               partition, this is an empty string.
 test() {
        echo "Running \${TEST_NAME}"