nvme/rc: fix nvme device readiness check after _nvme_connect_subsys

The helper function _nvme_connect_subsys() creates a nvme device. It may
take some time after the function call until the device gets ready for
I/O. So it is expected that the test cases call _find_nvme_dev() after
_nvme_connect_subsys() before I/O. _find_nvme_dev() returns the path of
the created device, and it also waits for uuid and wwid sysfs attributes
of the created device get ready. This wait works as the wait for the
device I/O readiness.

However, this wait by _find_nvme_dev() has two problems. The first
problem is missing call of _find_nvme_dev(). The test case nvme/047
calls _nvme_connect_subsys() twice, but _find_nvme_dev() is called only
for the first _nvme_connect_subsys() call. This causes too early I/O to
the device with tcp transport [1]. Fix this by moving the wait for the
device readiness from _find_nvme_dev() to _nvme_connect_subsys(). Also
add --no-wait option to _nvme_connect_subsys(). It allows to skip the
wait in _nvmet_passthru_target_connect() which has its own wait for
device readiness.

The second problem is wrong paths for the sysfs attributes. The paths
do not include namespace index, so the check for the attributes always
fail. Still _find_nvme_dev() does 1 second wait and allows the device
get ready for I/O in most cases, but this is not intended behavior.
Fix this by checking sysfs paths with the namespace index. Get list of
namespace indices for the sub-system and do the check for all indices.

On top of the checks for sysfs attributes, add 'udevadm settle' and a
check for the created device file. These ensures that the create device
is ready for I/O.

[1] https://lore.kernel.org/linux-block/CAHj4cs9GNohGUjohNw93jrr8JGNcRYC-ienAZz+sa7az1RK77w@mail.gmail.com/

Fixes: c766fccf3aff ("Make the NVMe tests more reliable")
Reviewed-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 0b964e99efd8051001f8ef1797f150d10b291613..10a0d6d27f026e44dad73f7dd5e61e6b4f386b6f 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -428,6 +428,8 @@ _nvme_connect_subsys() {
        local keep_alive_tmo=""
        local reconnect_delay=""
        local ctrl_loss_tmo=""
+       local no_wait=false
+       local i
 
        while [[ $# -gt 0 ]]; do
                case $1 in
@@ -483,6 +485,10 @@ _nvme_connect_subsys() {
                                ctrl_loss_tmo="$2"
                                shift 2
                                ;;
+                       --no-wait)
+                               no_wait=true
+                               shift 1
+                               ;;
                        *)
                                positional_args+=("$1")
                                shift
@@ -532,6 +538,33 @@ _nvme_connect_subsys() {
        fi
 
        nvme connect "${ARGS[@]}" 2> /dev/null
+
+       # Wait until device file and uuid/wwid sysfs attributes get ready for
+       # all namespaces.
+       if [[ ${no_wait} = false ]]; then
+               udevadm settle
+               for ((i = 0; i < 10; i++)); do
+                       _nvme_ns_ready "${subsysnqn}" && return
+                       sleep .1
+               done
+       fi
+}
+
+_nvme_ns_ready() {
+       local subsysnqn="${1}"
+       local ns_path ns_id dev
+       local cfs_path="${NVMET_CFS}/subsystems/$subsysnqn"
+
+       dev=$(_find_nvme_dev "$subsysnqn")
+       for ns_path in "${cfs_path}/namespaces/"*; do
+               ns_id=${ns_path##*/}
+               if [[ ! -b /dev/${dev}n${ns_id} ||
+                          ! -e /sys/block/${dev}n${ns_id}/uuid ||
+                          ! -e /sys/block/${dev}n${ns_id}/wwid ]]; then
+                       return 1
+               fi
+       done
+       return 0
 }
 
 _nvme_discover() {
@@ -758,13 +791,6 @@ _find_nvme_dev() {
                subsysnqn="$(cat "/sys/class/nvme/${dev}/subsysnqn")"
                if [[ "$subsysnqn" == "$subsys" ]]; then
                        echo "$dev"
-                       for ((i = 0; i < 10; i++)); do
-                               if [[ -e /sys/block/$dev/uuid &&
-                                       -e /sys/block/$dev/wwid ]]; then
-                                       return
-                               fi
-                               sleep .1
-                       done
                fi
        done
 }
@@ -794,7 +820,7 @@ _nvmet_passthru_target_connect() {
        local trtype=$1
        local subsys_name=$2
 
-       _nvme_connect_subsys "${trtype}" "${subsys_name}" || return
+       _nvme_connect_subsys "${trtype}" "${subsys_name}" --no-wait || return
        nsdev=$(_find_nvme_passthru_loop_dev "${subsys_name}")
 
        # The following tests can race with the creation