nvme: Search for specific subsysnqn in _find_nvme_loop_dev

This ensures we find the correct nvme loop device if others exist on a
given system (which is generally not expected on test systems).

Additionally, this will be required in the upcomming test nvme/037 which
will have controllers racing with ones being destroyed.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>

diff --git a/tests/nvme/004 b/tests/nvme/004
index dfca79aab20c2210e4ee787aede04b38cde4a081..4b0b7ae50a5e93ec9353f6e52af4de1abbcac7ab 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -37,7 +37,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
 
        local nvmedev
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/005 b/tests/nvme/005
index 0d5801868bc0a31f8b31db0283272b8c71f0a7f9..9f3e388dc695a64af3fe78695c05ee5db3baa630 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -37,7 +37,7 @@ test() {
        _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1
 
        local nvmedev
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "blktests-subsystem-1")
 
        udevadm settle
 

diff --git a/tests/nvme/008 b/tests/nvme/008
index 8616617ad3981b45fbf0b3f23f24835dc310762f..219fe9b0ca6ad04bc6e213c6e6b99ca8def9859e 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -37,7 +37,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/009 b/tests/nvme/009
index e91d79065cb125090d6de139bd534dd0156bc26d..2814c79164eece33e72d9c94866b3db7b27e5a85 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -33,7 +33,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/010 b/tests/nvme/010
index 0188e842213e8b512c76fdb5473ed5d0970a00bb..150a4e540f3eaed36f609cc84cb0849f8ce963a9 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -37,7 +37,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/011 b/tests/nvme/011
index 543dbe840874f1d105c4f2dfd20e380099b1c3ca..4bfe9af084e44f2bc6223715522d1d588726cb62 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -35,7 +35,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/012 b/tests/nvme/012
index a13cd08ce6bf33c70b51f843d79680c5b3886e0e..c4e75b09796a4061707e9598d3af5aa8065821ec 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -40,7 +40,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/013 b/tests/nvme/013
index 1ac725ea83f28ff3899772c7707f10da3c42cbee..265b6968fd348439d1fb814097952dd963123ae1 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -37,7 +37,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/014 b/tests/nvme/014
index e3c70364e3325bb06241d313ee8192c7dea47b39..48f8caaec0b3e6d7fd1156ed3859fd9874ad0359 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -37,7 +37,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/015 b/tests/nvme/015
index 46fa4f605749d747c5e98aedd16082207f090044..e33cfde5d72e6c6c53cc8a8dbb0b013a41812bd0 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/018 b/tests/nvme/018
index 6d7934d09d9996175be7036ee4ff321359411500..7f407da2ce1950510c3bf8b5dafeb8c9ca1fd473 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -35,7 +35,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/019 b/tests/nvme/019
index 486b5acff713a3fcf3945dde26162d6e9f065bb0..8259e2e0c1573afaf9926641a75f7c686bd56a69 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -39,7 +39,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/020 b/tests/nvme/020
index c8053f440e2e27ed71cce96489cc34657048b8fa..16fdfcc94918a842634c6633a042e3d6d675a997 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -35,7 +35,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/021 b/tests/nvme/021
index f543a1d8fd92c1aba4fc246f8a256e0656c5b1c7..fb77f9cbd99f5dfbaed3d3772c8624d7aa885717 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/022 b/tests/nvme/022
index e824ed31f6f0350b4d1131fafbae90b1969ae35a..62c4690e35fed4690959527db4b6d8beb87901f4 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/023 b/tests/nvme/023
index bdef3dc8abca89e43755efed21c789823a82d0df..bce21b56c9f1f9adf788b696d43313a782bfb83e 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -37,7 +37,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/024 b/tests/nvme/024
index 78f779e8a08a09180844a6ea1a8cb8c1da9d219b..ffec36cf3333015d9fd45b467a6e83adeadcdf78 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/025 b/tests/nvme/025
index 223430965d7eaa3d8a3d99bba1d175dbde32f6fa..3d3f01bc45fd8a53264896dd1b286f72dbbd0eee 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/026 b/tests/nvme/026
index 7f82284d9c57fda39b9b1e061f4cb306eac2f423..2f5607793cd3b21ebbc2aeff324669b821d7be82 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/027 b/tests/nvme/027
index da96e6c5008d3600646696cd63be5f2628992e73..53f06646a3d0b1a01746fde1269081ab7e711307 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/028 b/tests/nvme/028
index f826b67623f1e1de06bf9c497b164377f6d31c5c..3d9084f186364940c133eb5b75b2ae73f2aff6b6 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -34,7 +34,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/029 b/tests/nvme/029
index 5bed9b8e70aecaeba9f8b461d066c5649a98a647..960e5f5a63bf33746a6adbd45e2a640d4332142f 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -70,7 +70,7 @@ test() {
 
        _nvme_connect_subsys "${nvme_trtype}" "${subsys_name}"
 
-       nvmedev="$(_find_nvme_dev)"
+       nvmedev=$(_find_nvme_dev "${subsys_name}")
        cat "/sys/block/${nvmedev}n1/uuid"
        cat "/sys/block/${nvmedev}n1/wwid"
 

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 4c5b2e8edf0d085b21c0b2b73b706ca5a5a9077a..dfa57a2996251da06f0dc3e8a9deb52c86ba9e24 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -273,12 +273,13 @@ _remove_nvmet_subsystem_from_port() {
 }
 
 _find_nvme_dev() {
+       local subsys=$1
+       local subsysnqn
        local dev
-       local transport
        for dev in /sys/class/nvme/nvme*; do
                dev="$(basename "$dev")"
-               transport="$(cat "/sys/class/nvme/${dev}/transport")"
-               if [[ "$transport" == "${nvme_trtype}" ]]; then
+               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 &&