From: Daniel Wagner Date: Tue, 26 Mar 2024 13:13:55 +0000 (+0100) Subject: nvme: drop default trtype argument for _nvmet_connect_subsys X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf45654b19d19f06a060e8cdc828101e7c2fa737;p=users%2Fsagi%2Fblktests.git nvme: drop default trtype argument for _nvmet_connect_subsys Every invocation of _nvmet_connect_subsys passes in the default nvme_trtype argument. nvme/rc also assumes the test is always using nvme_trtype for trtype (e.g. cleanup code paths), thus just drop this argument. Signed-off-by: Daniel Wagner Signed-off-by: Shin'ichiro Kawasaki --- diff --git a/tests/nvme/003 b/tests/nvme/003 index b5ea272..9a7c41f 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -25,7 +25,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" nqn.2014-08.org.nvmexpress.discovery + _nvme_connect_subsys nqn.2014-08.org.nvmexpress.discovery # This is ugly but checking for the absence of error messages is ... sleep 10 diff --git a/tests/nvme/004 b/tests/nvme/004 index cc5310e..024ac98 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -22,10 +22,9 @@ test() { _setup_nvmet - _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" local nvmedev nvmedev=$(_find_nvme_dev "${def_subsysnqn}") diff --git a/tests/nvme/005 b/tests/nvme/005 index f9956e9..80a5359 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -25,7 +25,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") diff --git a/tests/nvme/008 b/tests/nvme/008 index 6ff3362..fb17267 100755 --- a/tests/nvme/008 +++ b/tests/nvme/008 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/009 b/tests/nvme/009 index 4ea0063..a9d83b6 100755 --- a/tests/nvme/009 +++ b/tests/nvme/009 @@ -23,7 +23,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/010 b/tests/nvme/010 index 5ed6cb5..496f6e5 100755 --- a/tests/nvme/010 +++ b/tests/nvme/010 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/011 b/tests/nvme/011 index f9150e0..14a17a7 100755 --- a/tests/nvme/011 +++ b/tests/nvme/011 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/012 b/tests/nvme/012 index f0914ce..8dbf8eb 100755 --- a/tests/nvme/012 +++ b/tests/nvme/012 @@ -28,7 +28,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/013 b/tests/nvme/013 index 3cef009..eb22933 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -27,7 +27,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/014 b/tests/nvme/014 index c021671..20ff691 100755 --- a/tests/nvme/014 +++ b/tests/nvme/014 @@ -27,7 +27,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/015 b/tests/nvme/015 index 8ea90f1..634c42c 100755 --- a/tests/nvme/015 +++ b/tests/nvme/015 @@ -27,7 +27,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/018 b/tests/nvme/018 index e631434..9225f7d 100755 --- a/tests/nvme/018 +++ b/tests/nvme/018 @@ -25,7 +25,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/019 b/tests/nvme/019 index 3ab22e2..9cf9f52 100755 --- a/tests/nvme/019 +++ b/tests/nvme/019 @@ -26,7 +26,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/020 b/tests/nvme/020 index 10de114..f6a204e 100755 --- a/tests/nvme/020 +++ b/tests/nvme/020 @@ -25,7 +25,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/021 b/tests/nvme/021 index 7dc6a41..73e414e 100755 --- a/tests/nvme/021 +++ b/tests/nvme/021 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/022 b/tests/nvme/022 index c70fbba..31435cd 100755 --- a/tests/nvme/022 +++ b/tests/nvme/022 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/023 b/tests/nvme/023 index 58f03e8..c4c2928 100755 --- a/tests/nvme/023 +++ b/tests/nvme/023 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/024 b/tests/nvme/024 index 4608f01..b0d6f5a 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/025 b/tests/nvme/025 index 46f6197..107eb38 100755 --- a/tests/nvme/025 +++ b/tests/nvme/025 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/026 b/tests/nvme/026 index d5e13db..ff4ff91 100755 --- a/tests/nvme/026 +++ b/tests/nvme/026 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/027 b/tests/nvme/027 index 82b77a9..a15e6d6 100755 --- a/tests/nvme/027 +++ b/tests/nvme/027 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/028 b/tests/nvme/028 index 0b49e20..41dcb6e 100755 --- a/tests/nvme/028 +++ b/tests/nvme/028 @@ -24,7 +24,7 @@ test() { _nvmet_target_setup --blkdev file - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/029 b/tests/nvme/029 index a4f0cb1..7bde556 100755 --- a/tests/nvme/029 +++ b/tests/nvme/029 @@ -58,7 +58,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") _check_uuid "${nvmedev}" diff --git a/tests/nvme/031 b/tests/nvme/031 index 204ba7d..19854cc 100755 --- a/tests/nvme/031 +++ b/tests/nvme/031 @@ -43,7 +43,7 @@ test() { _nvmet_target_setup --subsysnqn "${subsys}$i" \ --blkdev "${loop_dev}" - _nvme_connect_subsys "${nvme_trtype}" "${subsys}$i" + _nvme_connect_subsys "${subsys}$i" _nvme_disconnect_subsys "${subsys}$i" >> "${FULL}" 2>&1 _nvmet_target_cleanup --subsysnqn "${subsys}$i" \ diff --git a/tests/nvme/040 b/tests/nvme/040 index 7759bac..06d0d0d 100755 --- a/tests/nvme/040 +++ b/tests/nvme/040 @@ -26,7 +26,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" + _nvme_connect_subsys "${def_subsysnqn}" nvmedev=$(_find_nvme_dev "${def_subsysnqn}") # start fio job diff --git a/tests/nvme/041 b/tests/nvme/041 index c4588d7..02452fd 100755 --- a/tests/nvme/041 +++ b/tests/nvme/041 @@ -38,7 +38,7 @@ test() { # Test unauthenticated connection (should fail) echo "Test unauthenticated connection (should fail)" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" @@ -46,7 +46,7 @@ test() { # Test authenticated connection echo "Test authenticated connection" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" diff --git a/tests/nvme/042 b/tests/nvme/042 index 815d65e..961301f 100755 --- a/tests/nvme/042 +++ b/tests/nvme/042 @@ -41,7 +41,7 @@ test() { fi _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" @@ -58,7 +58,7 @@ test() { fi _set_nvmet_hostkey "${def_hostnqn}" "${hostkey}" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" diff --git a/tests/nvme/043 b/tests/nvme/043 index e65abb0..ed18869 100755 --- a/tests/nvme/043 +++ b/tests/nvme/043 @@ -45,7 +45,7 @@ test() { _set_nvmet_hash "${def_hostnqn}" "${hash}" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" @@ -59,7 +59,7 @@ test() { _set_nvmet_dhgroup "${def_hostnqn}" "${dhgroup}" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" diff --git a/tests/nvme/044 b/tests/nvme/044 index 9ee0747..8e2b413 100755 --- a/tests/nvme/044 +++ b/tests/nvme/044 @@ -49,7 +49,7 @@ test() { # Step 1: Connect with host authentication only echo "Test host authentication" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" @@ -59,7 +59,7 @@ test() { # Step 2: Connect with host authentication # and invalid ctrl authentication echo "Test invalid ctrl authentication (should fail)" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ @@ -70,7 +70,7 @@ test() { # Step 3: Connect with host authentication # and valid ctrl authentication echo "Test valid ctrl authentication" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ @@ -82,7 +82,7 @@ test() { # and invalid ctrl key echo "Test invalid ctrl key (should fail)" invkey="DHHC-1:00:Jc/My1o0qtLCWRp+sHhAVafdfaS7YQOMYhk9zSmlatobqB8C:" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ diff --git a/tests/nvme/045 b/tests/nvme/045 index 9e5cb54..f893788 100755 --- a/tests/nvme/045 +++ b/tests/nvme/045 @@ -51,7 +51,7 @@ test() { _set_nvmet_dhgroup "${def_hostnqn}" "ffdhe2048" - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --dhchap-secret "${hostkey}" \ diff --git a/tests/nvme/047 b/tests/nvme/047 index 94d7d50..162bd3b 100755 --- a/tests/nvme/047 +++ b/tests/nvme/047 @@ -27,7 +27,7 @@ test() { _nvmet_target_setup - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys \ --nr-write-queues 1 || echo FAIL nvmedev=$(_find_nvme_dev "${def_subsysnqn}") @@ -37,7 +37,7 @@ test() { _nvme_disconnect_subsys "${def_subsysnqn}" >> "$FULL" 2>&1 - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --nr-write-queues 1 \ --nr-poll-queues 1 || echo FAIL diff --git a/tests/nvme/048 b/tests/nvme/048 index f76cfed..44fdffe 100755 --- a/tests/nvme/048 +++ b/tests/nvme/048 @@ -99,7 +99,7 @@ test() { _nvmet_target_setup --blkdev file if [[ -f "${cfs_path}/attr_qid_max" ]] ; then - _nvme_connect_subsys "${nvme_trtype}" "${def_subsysnqn}" \ + _nvme_connect_subsys "${def_subsysnqn}" \ --hostnqn "${def_hostnqn}" \ --hostid "${def_hostid}" \ --keep-alive-tmo 1 \ diff --git a/tests/nvme/rc b/tests/nvme/rc index 9d47c73..9ce2fd7 100644 --- a/tests/nvme/rc +++ b/tests/nvme/rc @@ -408,7 +408,6 @@ _nvme_disconnect_subsys() { _nvme_connect_subsys() { local positional_args=() - local trtype="" local subsysnqn="" local hostnqn="$def_hostnqn" local hostid="$def_hostid" @@ -478,13 +477,12 @@ _nvme_connect_subsys() { set -- "${positional_args[@]}" - trtype="$1" - subsysnqn="$2" + subsysnqn="$1" - ARGS=(--transport "${trtype}" --nqn "${subsysnqn}") - if [[ "${trtype}" == "fc" ]] ; then + ARGS=(--transport "${nvme_trtype}" --nqn "${subsysnqn}") + if [[ "${nvme_trtype}" == "fc" ]] ; then ARGS+=(--traddr "${def_traddr}" --host-traddr "${def_host_traddr}") - elif [[ "${trtype}" != "loop" ]]; then + elif [[ "${nvme_trtype}" != "loop" ]]; then ARGS+=(--traddr "${def_traddr}" --trsvcid "${def_trsvcid}") fi ARGS+=(--hostnqn="${hostnqn}") @@ -902,7 +900,7 @@ _nvmet_passthru_target_connect() { local trtype=$1 local subsys_name=$2 - _nvme_connect_subsys "${trtype}" "${subsys_name}" --no-wait || return + _nvme_connect_subsys "${subsys_name}" --no-wait || return nsdev=$(_find_nvme_passthru_loop_dev "${subsys_name}") # The following tests can race with the creation