Skip to contentSkip to conversation

Fix nvme block test issues

PATCH Applied Logan Gunthorpe 3 participants 27 messages Jul 17, 2019 – Jul 29, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Fix nvme block test issues

Changes since v1:
* Use second sed expression instead of another call to grep in _filter_discovery() for Patch 2 (per Omar)
* Redirect error output to $FULL in for nvme/018 in Patch 7 (Per Johannes)
* Rework _have_module_param() in Patch 11 so that it supports cases where the module is not inserted.

--

This patchset cleans up a number of issues and pain points I've had with getting the nvme blktests to pass and run cleanly.

The first three patches are meant to fix the Generation Counter issue that's been discussed before but hasn't been fixed in months. I primarily use a slightly fixed up patch posted by Michael Moese[1] but add another patch to properly test the Generation Counter that would no longer be tested otherwise.

I've also taken it a step further to filter out more of the discovery information so that we are less fragile against churn and less dependant on the version of nvme-cli in use. This should also fix the issue discussed in [2].

Patches 4 through 7 fix a number of smaller issues I've found with individual tests.

Patches 8 through 10 implement a system to ensure the nvme tests clean themselves up properly especially when ctrl-c is used to interrupt a test (working with the tests before this was a huge pain seeing, when you ctrl-c, you have to either manually clean up the nvmet configuration or reboot to get the system in a state where it's sane to run the tests again).

Patches 11 and 12 make some minor changes that allow running the tests with the nvme modules built into the kernel.

With these patches, plus a couple I've sent to the nvme list for the kernel, I can consistently pass the entire nvme suite with the exception of the lockdep false-positive with nvme/012 that still seems to be in a bit of contention[3].

[1] https://github.com/osandov/blktests/pull/34
[2] https://lore.kernel.org/linux-block/20190505150611.15776-4-minwoo.im.dev at gmail.com/
[3] https://lore.kernel.org/lkml/20190214230058.196511-22-bvanassche at acm.org/

--

Logan Gunthorpe (11):
nvme: More agressively filter the discovery output
nvme: Add new test to verify the generation counter nvme/003,004: Add missing calls to nvme disconnect nvme/005: Don't rely on modprobing to set the multipath paramater nvme/015: Ensure the namespace is flushed not the char device nvme/018: Ignore error message generated by nvme read
check: Add the ability to call a cleanup function after a test ends
nvme: Cleanup modprobe lines into helper functions
nvme: Ensure all ports and subsystems are removed on cleanup
common: Use sysfs instead of modinfo for _have_module_param()
nvme: Ignore errors when removing modules

Michael Moese (1):
Add filter function for nvme discover

 check              |    9 +
 common/rc          |   24 +
 tests/nvme/002     |   10 +-
 tests/nvme/002.out | 6003 +-------------------------------------------
 tests/nvme/003     |    6 +-
 tests/nvme/003.out |    1 +
 tests/nvme/004     |    6 +-
 tests/nvme/004.out |    1 +
 tests/nvme/005     |   16 +-
 tests/nvme/006     |    6 +-
 tests/nvme/007     |    6 +-
 tests/nvme/008     |    6 +-
 tests/nvme/009     |    5 +-
 tests/nvme/010     |    6 +-
 tests/nvme/011     |    6 +-
 tests/nvme/012     |    6 +-
 tests/nvme/013     |    6 +-
 tests/nvme/014     |    6 +-
 tests/nvme/015     |    5 +-
 tests/nvme/016     |    6 +-
 tests/nvme/016.out |    9 +-
 tests/nvme/017     |    8 +-
 tests/nvme/017.out |    9 +-
 tests/nvme/018     |    8 +-
 tests/nvme/019     |    6 +-
 tests/nvme/020     |    5 +-
 tests/nvme/021     |    6 +-
 tests/nvme/022     |    6 +-
 tests/nvme/023     |    6 +-
 tests/nvme/024     |    6 +-
 tests/nvme/025     |    6 +-
 tests/nvme/026     |    6 +-
 tests/nvme/027     |    6 +-
 tests/nvme/028     |    6 +-
 tests/nvme/029     |    6 +-
 tests/nvme/030     |   72 +
 tests/nvme/030.out |    2 +
 tests/nvme/rc      |   65 +
 38 files changed, 216 insertions(+), 6162 deletions(-)
 create mode 100755 tests/nvme/030
 create mode 100644 tests/nvme/030.out

--
2.17.1

#1 lore raw

PATCH v2 1/12 Add filter function for nvme discover

From: Michael Moese <[email protected]>

Several NVMe tests (002, 016, 017) used a pipe to a sed call filtering the output. This call is moved to a new filter function nvme/rc and the calls to sed are replaced by this function.

Additionally, the test nvme/016 failed for me due to the Generation counter being greater than 1, so the new filter function was expanded to replace the Generation counter with 'X'.

Signed-off-by Michael Moese <mmoese at suse.de>
[logang at deltatee.com: added missing changes to 002.out and 017.out]
Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/002     | 2 +-
 tests/nvme/002.out | 2 +-
 tests/nvme/016     | 2 +-
 tests/nvme/016.out | 2 +-
 tests/nvme/017     | 2 +-
 tests/nvme/017.out | 2 +-
 tests/nvme/rc      | 5 +++++
 7 files changed, 11 insertions(+), 6 deletions(-)
tests/nvme/002 +1 -1
index 106a5a8395f2..ceac1c677bd4 100755
@@ -32,7 +32,7 @@ test() {
 		_add_nvmet_subsys_to_port "${port}" "blktests-subsystem-$i"
 	done
 
-	nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+	nvme discover -t loop | _filter_discovery
 
 	for ((i = iterations - 1; i >= 0; i--)); do
 		_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-$i"
tests/nvme/002.out +1 -1
index aa71d8f5f5f8..7437a21f60a9 100644
@@ -1,6 +1,6 @@
 Running nvme/002
 
-Discovery Log Number of Records 1000, Generation counter 1000
+Discovery Log Number of Records 1000, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
 adrfam:  pci
tests/nvme/016 +1 -1
index 966d5dc0a4a2..dd1b84a16daa 100755
@@ -34,7 +34,7 @@ test() {
 	port="$(_create_nvmet_port "loop")"
 	_add_nvmet_subsys_to_port "$port" "${subsys_nqn}"
 
-	nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+	nvme discover -t loop | _filter_discovery
 	_remove_nvmet_subsystem_from_port "${port}" "${subsys_nqn}"
 	_remove_nvmet_port "${port}"
 
tests/nvme/016.out +1 -1
index 59bd2935346f..b70603144d5c 100644
@@ -1,6 +1,6 @@
 Running nvme/016
 
-Discovery Log Number of Records 1, Generation counter 1
+Discovery Log Number of Records 1, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
 adrfam:  pci
tests/nvme/017 +1 -1
index 0b86bece9520..5f8d60907293 100755
@@ -37,7 +37,7 @@ test() {
 	port="$(_create_nvmet_port "loop")"
 	_add_nvmet_subsys_to_port "${port}" "${subsys_name}"
 
-	nvme discover -t loop | sed -r -e "s/portid:  [0-9]+/portid:  X/"
+	nvme discover -t loop | _filter_discovery
 	_remove_nvmet_subsystem_from_port "${port}" "${subsys_name}"
 	_remove_nvmet_port "${port}"
 
tests/nvme/017.out +1 -1
index 4b0877aaf3ca..cf212971d180 100644
@@ -1,6 +1,6 @@
 Running nvme/017
 
-Discovery Log Number of Records 1, Generation counter 1
+Discovery Log Number of Records 1, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
 adrfam:  pci
tests/nvme/rc +5 -0
index eff1dd992460..22833d8ef9bb 100644
@@ -118,3 +118,8 @@ _find_nvme_loop_dev() {
 		fi
 	done
 }
+
+_filter_discovery() {
+	sed -r  -e "s/portid:  [0-9]+/portid:  X/" \
+		-e "s/Generation counter [0-9]+/Generation counter X/"
+}
Signature · 1 line
2.17.1
Reviewed-by on v2 1/12
#2 lore raw

Re: [PATCH blktests v2 01/12] Add filter function for nvme discover

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#3 lore raw

PATCH v2 2/12 nvme: More agressively filter the discovery output

In reply to Logan Gunthorpe

Comparing the entire output of nvme-cli for discovery is fragile and error prone as things change. There's already been the long standing issue of the generation counter mismatching and also some versions of nvme-cli print an extra "sq flow control disable supported" text[1].

Instead, filter out all but a few key values from the discovery text which should still be sufficient for this test and much less likely to be subject to churn.

[1] https://lore.kernel.org/linux-block/20190505150611.15776-4-minwoo.im.dev at gmail.com/

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/002.out | 6001 --------------------------------------------
 tests/nvme/016.out |    7 -
 tests/nvme/017.out |    7 -
 tests/nvme/rc      |    5 +-
 4 files changed, 3 insertions(+), 6017 deletions(-)
tests/nvme/002.out +0 -6001
index 7437a21f60a9..cb0fbbf3fb98 100644
@@ -1,9004 +1,3003 @@
 Running nvme/002
-
 Discovery Log Number of Records 1000, Generation counter X
 =====Discovery Log Entry 0======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-0
-traddr:  
 =====Discovery Log Entry 1======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-1
-traddr:  
 =====Discovery Log Entry 2======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-2
-traddr:  
 =====Discovery Log Entry 3======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-3
-traddr:  
 =====Discovery Log Entry 4======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-4
-traddr:  
 =====Discovery Log Entry 5======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-5
-traddr:  
 =====Discovery Log Entry 6======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-6
-traddr:  
 =====Discovery Log Entry 7======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-7
-traddr:  
 =====Discovery Log Entry 8======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-8
-traddr:  
 =====Discovery Log Entry 9======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-9
-traddr:  
 =====Discovery Log Entry 10======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-10
-traddr:  
 =====Discovery Log Entry 11======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-11
-traddr:  
 =====Discovery Log Entry 12======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-12
-traddr:  
 =====Discovery Log Entry 13======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-13
-traddr:  
 =====Discovery Log Entry 14======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-14
-traddr:  
 =====Discovery Log Entry 15======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-15
-traddr:  
 =====Discovery Log Entry 16======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-16
-traddr:  
 =====Discovery Log Entry 17======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-17
-traddr:  
 =====Discovery Log Entry 18======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-18
-traddr:  
 =====Discovery Log Entry 19======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-19
-traddr:  
 =====Discovery Log Entry 20======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-20
-traddr:  
 =====Discovery Log Entry 21======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-21
-traddr:  
 =====Discovery Log Entry 22======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-22
-traddr:  
 =====Discovery Log Entry 23======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-23
-traddr:  
 =====Discovery Log Entry 24======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-24
-traddr:  
 =====Discovery Log Entry 25======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-25
-traddr:  
 =====Discovery Log Entry 26======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-26
-traddr:  
 =====Discovery Log Entry 27======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-27
-traddr:  
 =====Discovery Log Entry 28======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-28
-traddr:  
 =====Discovery Log Entry 29======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-29
-traddr:  
 =====Discovery Log Entry 30======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-30
-traddr:  
 =====Discovery Log Entry 31======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-31
-traddr:  
 =====Discovery Log Entry 32======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-32
-traddr:  
 =====Discovery Log Entry 33======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-33
-traddr:  
 =====Discovery Log Entry 34======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-34
-traddr:  
 =====Discovery Log Entry 35======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-35
-traddr:  
 =====Discovery Log Entry 36======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-36
-traddr:  
 =====Discovery Log Entry 37======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-37
-traddr:  
 =====Discovery Log Entry 38======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-38
-traddr:  
 =====Discovery Log Entry 39======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-39
-traddr:  
 =====Discovery Log Entry 40======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-40
-traddr:  
 =====Discovery Log Entry 41======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-41
-traddr:  
 =====Discovery Log Entry 42======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-42
-traddr:  
 =====Discovery Log Entry 43======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-43
-traddr:  
 =====Discovery Log Entry 44======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-44
-traddr:  
 =====Discovery Log Entry 45======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-45
-traddr:  
 =====Discovery Log Entry 46======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-46
-traddr:  
 =====Discovery Log Entry 47======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-47
-traddr:  
 =====Discovery Log Entry 48======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-48
-traddr:  
 =====Discovery Log Entry 49======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-49
-traddr:  
 =====Discovery Log Entry 50======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-50
-traddr:  
 =====Discovery Log Entry 51======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-51
-traddr:  
 =====Discovery Log Entry 52======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-52
-traddr:  
 =====Discovery Log Entry 53======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-53
-traddr:  
 =====Discovery Log Entry 54======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-54
-traddr:  
 =====Discovery Log Entry 55======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-55
-traddr:  
 =====Discovery Log Entry 56======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-56
-traddr:  
 =====Discovery Log Entry 57======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-57
-traddr:  
 =====Discovery Log Entry 58======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-58
-traddr:  
 =====Discovery Log Entry 59======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-59
-traddr:  
 =====Discovery Log Entry 60======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-60
-traddr:  
 =====Discovery Log Entry 61======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-61
-traddr:  
 =====Discovery Log Entry 62======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-62
-traddr:  
 =====Discovery Log Entry 63======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-63
-traddr:  
 =====Discovery Log Entry 64======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-64
-traddr:  
 =====Discovery Log Entry 65======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-65
-traddr:  
 =====Discovery Log Entry 66======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-66
-traddr:  
 =====Discovery Log Entry 67======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-67
-traddr:  
 =====Discovery Log Entry 68======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-68
-traddr:  
 =====Discovery Log Entry 69======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-69
-traddr:  
 =====Discovery Log Entry 70======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-70
-traddr:  
 =====Discovery Log Entry 71======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-71
-traddr:  
 =====Discovery Log Entry 72======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-72
-traddr:  
 =====Discovery Log Entry 73======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-73
-traddr:  
 =====Discovery Log Entry 74======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-74
-traddr:  
 =====Discovery Log Entry 75======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-75
-traddr:  
 =====Discovery Log Entry 76======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-76
-traddr:  
 =====Discovery Log Entry 77======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-77
-traddr:  
 =====Discovery Log Entry 78======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-78
-traddr:  
 =====Discovery Log Entry 79======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-79
-traddr:  
 =====Discovery Log Entry 80======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-80
-traddr:  
 =====Discovery Log Entry 81======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-81
-traddr:  
 =====Discovery Log Entry 82======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-82
-traddr:  
 =====Discovery Log Entry 83======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-83
-traddr:  
 =====Discovery Log Entry 84======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-84
-traddr:  
 =====Discovery Log Entry 85======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-85
-traddr:  
 =====Discovery Log Entry 86======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-86
-traddr:  
 =====Discovery Log Entry 87======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-87
-traddr:  
 =====Discovery Log Entry 88======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-88
-traddr:  
 =====Discovery Log Entry 89======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-89
-traddr:  
 =====Discovery Log Entry 90======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-90
-traddr:  
 =====Discovery Log Entry 91======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-91
-traddr:  
 =====Discovery Log Entry 92======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-92
-traddr:  
 =====Discovery Log Entry 93======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-93
-traddr:  
 =====Discovery Log Entry 94======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-94
-traddr:  
 =====Discovery Log Entry 95======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-95
-traddr:  
 =====Discovery Log Entry 96======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-96
-traddr:  
 =====Discovery Log Entry 97======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-97
-traddr:  
 =====Discovery Log Entry 98======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-98
-traddr:  
 =====Discovery Log Entry 99======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-99
-traddr:  
 =====Discovery Log Entry 100======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-100
-traddr:  
 =====Discovery Log Entry 101======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-101
-traddr:  
 =====Discovery Log Entry 102======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-102
-traddr:  
 =====Discovery Log Entry 103======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-103
-traddr:  
 =====Discovery Log Entry 104======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-104
-traddr:  
 =====Discovery Log Entry 105======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-105
-traddr:  
 =====Discovery Log Entry 106======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-106
-traddr:  
 =====Discovery Log Entry 107======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-107
-traddr:  
 =====Discovery Log Entry 108======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-108
-traddr:  
 =====Discovery Log Entry 109======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-109
-traddr:  
 =====Discovery Log Entry 110======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-110
-traddr:  
 =====Discovery Log Entry 111======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-111
-traddr:  
 =====Discovery Log Entry 112======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-112
-traddr:  
 =====Discovery Log Entry 113======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-113
-traddr:  
 =====Discovery Log Entry 114======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-114
-traddr:  
 =====Discovery Log Entry 115======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-115
-traddr:  
 =====Discovery Log Entry 116======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-116
-traddr:  
 =====Discovery Log Entry 117======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-117
-traddr:  
 =====Discovery Log Entry 118======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-118
-traddr:  
 =====Discovery Log Entry 119======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-119
-traddr:  
 =====Discovery Log Entry 120======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-120
-traddr:  
 =====Discovery Log Entry 121======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-121
-traddr:  
 =====Discovery Log Entry 122======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-122
-traddr:  
 =====Discovery Log Entry 123======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-123
-traddr:  
 =====Discovery Log Entry 124======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-124
-traddr:  
 =====Discovery Log Entry 125======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-125
-traddr:  
 =====Discovery Log Entry 126======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-126
-traddr:  
 =====Discovery Log Entry 127======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-127
-traddr:  
 =====Discovery Log Entry 128======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-128
-traddr:  
 =====Discovery Log Entry 129======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-129
-traddr:  
 =====Discovery Log Entry 130======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-130
-traddr:  
 =====Discovery Log Entry 131======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-131
-traddr:  
 =====Discovery Log Entry 132======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-132
-traddr:  
 =====Discovery Log Entry 133======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-133
-traddr:  
 =====Discovery Log Entry 134======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-134
-traddr:  
 =====Discovery Log Entry 135======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-135
-traddr:  
 =====Discovery Log Entry 136======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-136
-traddr:  
 =====Discovery Log Entry 137======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-137
-traddr:  
 =====Discovery Log Entry 138======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-138
-traddr:  
 =====Discovery Log Entry 139======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-139
-traddr:  
 =====Discovery Log Entry 140======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-140
-traddr:  
 =====Discovery Log Entry 141======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-141
-traddr:  
 =====Discovery Log Entry 142======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-142
-traddr:  
 =====Discovery Log Entry 143======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-143
-traddr:  
 =====Discovery Log Entry 144======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-144
-traddr:  
 =====Discovery Log Entry 145======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-145
-traddr:  
 =====Discovery Log Entry 146======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-146
-traddr:  
 =====Discovery Log Entry 147======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-147
-traddr:  
 =====Discovery Log Entry 148======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-148
-traddr:  
 =====Discovery Log Entry 149======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-149
-traddr:  
 =====Discovery Log Entry 150======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-150
-traddr:  
 =====Discovery Log Entry 151======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-151
-traddr:  
 =====Discovery Log Entry 152======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-152
-traddr:  
 =====Discovery Log Entry 153======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-153
-traddr:  
 =====Discovery Log Entry 154======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-154
-traddr:  
 =====Discovery Log Entry 155======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-155
-traddr:  
 =====Discovery Log Entry 156======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-156
-traddr:  
 =====Discovery Log Entry 157======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-157
-traddr:  
 =====Discovery Log Entry 158======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-158
-traddr:  
 =====Discovery Log Entry 159======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-159
-traddr:  
 =====Discovery Log Entry 160======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-160
-traddr:  
 =====Discovery Log Entry 161======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-161
-traddr:  
 =====Discovery Log Entry 162======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-162
-traddr:  
 =====Discovery Log Entry 163======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-163
-traddr:  
 =====Discovery Log Entry 164======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-164
-traddr:  
 =====Discovery Log Entry 165======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-165
-traddr:  
 =====Discovery Log Entry 166======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-166
-traddr:  
 =====Discovery Log Entry 167======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-167
-traddr:  
 =====Discovery Log Entry 168======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-168
-traddr:  
 =====Discovery Log Entry 169======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-169
-traddr:  
 =====Discovery Log Entry 170======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-170
-traddr:  
 =====Discovery Log Entry 171======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-171
-traddr:  
 =====Discovery Log Entry 172======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-172
-traddr:  
 =====Discovery Log Entry 173======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-173
-traddr:  
 =====Discovery Log Entry 174======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-174
-traddr:  
 =====Discovery Log Entry 175======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-175
-traddr:  
 =====Discovery Log Entry 176======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-176
-traddr:  
 =====Discovery Log Entry 177======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-177
-traddr:  
 =====Discovery Log Entry 178======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-178
-traddr:  
 =====Discovery Log Entry 179======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-179
-traddr:  
 =====Discovery Log Entry 180======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-180
-traddr:  
 =====Discovery Log Entry 181======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-181
-traddr:  
 =====Discovery Log Entry 182======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-182
-traddr:  
 =====Discovery Log Entry 183======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-183
-traddr:  
 =====Discovery Log Entry 184======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-184
-traddr:  
 =====Discovery Log Entry 185======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-185
-traddr:  
 =====Discovery Log Entry 186======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-186
-traddr:  
 =====Discovery Log Entry 187======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-187
-traddr:  
 =====Discovery Log Entry 188======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-188
-traddr:  
 =====Discovery Log Entry 189======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-189
-traddr:  
 =====Discovery Log Entry 190======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-190
-traddr:  
 =====Discovery Log Entry 191======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-191
-traddr:  
 =====Discovery Log Entry 192======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-192
-traddr:  
 =====Discovery Log Entry 193======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-193
-traddr:  
 =====Discovery Log Entry 194======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-194
-traddr:  
 =====Discovery Log Entry 195======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-195
-traddr:  
 =====Discovery Log Entry 196======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-196
-traddr:  
 =====Discovery Log Entry 197======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-197
-traddr:  
 =====Discovery Log Entry 198======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-198
-traddr:  
 =====Discovery Log Entry 199======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-199
-traddr:  
 =====Discovery Log Entry 200======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-200
-traddr:  
 =====Discovery Log Entry 201======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-201
-traddr:  
 =====Discovery Log Entry 202======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-202
-traddr:  
 =====Discovery Log Entry 203======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-203
-traddr:  
 =====Discovery Log Entry 204======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-204
-traddr:  
 =====Discovery Log Entry 205======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-205
-traddr:  
 =====Discovery Log Entry 206======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-206
-traddr:  
 =====Discovery Log Entry 207======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-207
-traddr:  
 =====Discovery Log Entry 208======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-208
-traddr:  
 =====Discovery Log Entry 209======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-209
-traddr:  
 =====Discovery Log Entry 210======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-210
-traddr:  
 =====Discovery Log Entry 211======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-211
-traddr:  
 =====Discovery Log Entry 212======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-212
-traddr:  
 =====Discovery Log Entry 213======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-213
-traddr:  
 =====Discovery Log Entry 214======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-214
-traddr:  
 =====Discovery Log Entry 215======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-215
-traddr:  
 =====Discovery Log Entry 216======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-216
-traddr:  
 =====Discovery Log Entry 217======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-217
-traddr:  
 =====Discovery Log Entry 218======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-218
-traddr:  
 =====Discovery Log Entry 219======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-219
-traddr:  
 =====Discovery Log Entry 220======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-220
-traddr:  
 =====Discovery Log Entry 221======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-221
-traddr:  
 =====Discovery Log Entry 222======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-222
-traddr:  
 =====Discovery Log Entry 223======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-223
-traddr:  
 =====Discovery Log Entry 224======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-224
-traddr:  
 =====Discovery Log Entry 225======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-225
-traddr:  
 =====Discovery Log Entry 226======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-226
-traddr:  
 =====Discovery Log Entry 227======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-227
-traddr:  
 =====Discovery Log Entry 228======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-228
-traddr:  
 =====Discovery Log Entry 229======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-229
-traddr:  
 =====Discovery Log Entry 230======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-230
-traddr:  
 =====Discovery Log Entry 231======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-231
-traddr:  
 =====Discovery Log Entry 232======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-232
-traddr:  
 =====Discovery Log Entry 233======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-233
-traddr:  
 =====Discovery Log Entry 234======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-234
-traddr:  
 =====Discovery Log Entry 235======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-235
-traddr:  
 =====Discovery Log Entry 236======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-236
-traddr:  
 =====Discovery Log Entry 237======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-237
-traddr:  
 =====Discovery Log Entry 238======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-238
-traddr:  
 =====Discovery Log Entry 239======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-239
-traddr:  
 =====Discovery Log Entry 240======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-240
-traddr:  
 =====Discovery Log Entry 241======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-241
-traddr:  
 =====Discovery Log Entry 242======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-242
-traddr:  
 =====Discovery Log Entry 243======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-243
-traddr:  
 =====Discovery Log Entry 244======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-244
-traddr:  
 =====Discovery Log Entry 245======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-245
-traddr:  
 =====Discovery Log Entry 246======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-246
-traddr:  
 =====Discovery Log Entry 247======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-247
-traddr:  
 =====Discovery Log Entry 248======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-248
-traddr:  
 =====Discovery Log Entry 249======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-249
-traddr:  
 =====Discovery Log Entry 250======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-250
-traddr:  
 =====Discovery Log Entry 251======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-251
-traddr:  
 =====Discovery Log Entry 252======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-252
-traddr:  
 =====Discovery Log Entry 253======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-253
-traddr:  
 =====Discovery Log Entry 254======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-254
-traddr:  
 =====Discovery Log Entry 255======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-255
-traddr:  
 =====Discovery Log Entry 256======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-256
-traddr:  
 =====Discovery Log Entry 257======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-257
-traddr:  
 =====Discovery Log Entry 258======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-258
-traddr:  
 =====Discovery Log Entry 259======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-259
-traddr:  
 =====Discovery Log Entry 260======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-260
-traddr:  
 =====Discovery Log Entry 261======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-261
-traddr:  
 =====Discovery Log Entry 262======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-262
-traddr:  
 =====Discovery Log Entry 263======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-263
-traddr:  
 =====Discovery Log Entry 264======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-264
-traddr:  
 =====Discovery Log Entry 265======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-265
-traddr:  
 =====Discovery Log Entry 266======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-266
-traddr:  
 =====Discovery Log Entry 267======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-267
-traddr:  
 =====Discovery Log Entry 268======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-268
-traddr:  
 =====Discovery Log Entry 269======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-269
-traddr:  
 =====Discovery Log Entry 270======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-270
-traddr:  
 =====Discovery Log Entry 271======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-271
-traddr:  
 =====Discovery Log Entry 272======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-272
-traddr:  
 =====Discovery Log Entry 273======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-273
-traddr:  
 =====Discovery Log Entry 274======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-274
-traddr:  
 =====Discovery Log Entry 275======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-275
-traddr:  
 =====Discovery Log Entry 276======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-276
-traddr:  
 =====Discovery Log Entry 277======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-277
-traddr:  
 =====Discovery Log Entry 278======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-278
-traddr:  
 =====Discovery Log Entry 279======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-279
-traddr:  
 =====Discovery Log Entry 280======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-280
-traddr:  
 =====Discovery Log Entry 281======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-281
-traddr:  
 =====Discovery Log Entry 282======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-282
-traddr:  
 =====Discovery Log Entry 283======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-283
-traddr:  
 =====Discovery Log Entry 284======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-284
-traddr:  
 =====Discovery Log Entry 285======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-285
-traddr:  
 =====Discovery Log Entry 286======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-286
-traddr:  
 =====Discovery Log Entry 287======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-287
-traddr:  
 =====Discovery Log Entry 288======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-288
-traddr:  
 =====Discovery Log Entry 289======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-289
-traddr:  
 =====Discovery Log Entry 290======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-290
-traddr:  
 =====Discovery Log Entry 291======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-291
-traddr:  
 =====Discovery Log Entry 292======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-292
-traddr:  
 =====Discovery Log Entry 293======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-293
-traddr:  
 =====Discovery Log Entry 294======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-294
-traddr:  
 =====Discovery Log Entry 295======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-295
-traddr:  
 =====Discovery Log Entry 296======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-296
-traddr:  
 =====Discovery Log Entry 297======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-297
-traddr:  
 =====Discovery Log Entry 298======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-298
-traddr:  
 =====Discovery Log Entry 299======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-299
-traddr:  
 =====Discovery Log Entry 300======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-300
-traddr:  
 =====Discovery Log Entry 301======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-301
-traddr:  
 =====Discovery Log Entry 302======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-302
-traddr:  
 =====Discovery Log Entry 303======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-303
-traddr:  
 =====Discovery Log Entry 304======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-304
-traddr:  
 =====Discovery Log Entry 305======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-305
-traddr:  
 =====Discovery Log Entry 306======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-306
-traddr:  
 =====Discovery Log Entry 307======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-307
-traddr:  
 =====Discovery Log Entry 308======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-308
-traddr:  
 =====Discovery Log Entry 309======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-309
-traddr:  
 =====Discovery Log Entry 310======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-310
-traddr:  
 =====Discovery Log Entry 311======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-311
-traddr:  
 =====Discovery Log Entry 312======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-312
-traddr:  
 =====Discovery Log Entry 313======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-313
-traddr:  
 =====Discovery Log Entry 314======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-314
-traddr:  
 =====Discovery Log Entry 315======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-315
-traddr:  
 =====Discovery Log Entry 316======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-316
-traddr:  
 =====Discovery Log Entry 317======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-317
-traddr:  
 =====Discovery Log Entry 318======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-318
-traddr:  
 =====Discovery Log Entry 319======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-319
-traddr:  
 =====Discovery Log Entry 320======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-320
-traddr:  
 =====Discovery Log Entry 321======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-321
-traddr:  
 =====Discovery Log Entry 322======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-322
-traddr:  
 =====Discovery Log Entry 323======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-323
-traddr:  
 =====Discovery Log Entry 324======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-324
-traddr:  
 =====Discovery Log Entry 325======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-325
-traddr:  
 =====Discovery Log Entry 326======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-326
-traddr:  
 =====Discovery Log Entry 327======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-327
-traddr:  
 =====Discovery Log Entry 328======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-328
-traddr:  
 =====Discovery Log Entry 329======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-329
-traddr:  
 =====Discovery Log Entry 330======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-330
-traddr:  
 =====Discovery Log Entry 331======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-331
-traddr:  
 =====Discovery Log Entry 332======
 trtype:  loop
-adrfam:  pci
-subtype: nvme subsystem
-treq:    not specified
-portid:  X
-trsvcid: 
 subnqn:  blktests-subsystem-332
-traddr:  
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

tests/nvme/016.out +0 -7
index b70603144d5c..f59410e98f99 100644

Lines of this file are not shown. View the raw message.

tests/nvme/017.out +0 -7
index cf212971d180..14a31646ed79 100644

Lines of this file are not shown. View the raw message.

tests/nvme/rc +3 -2
index 22833d8ef9bb..74e316248ef5 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

Reviewed-by on v2 2/12
#4 lore raw

Re: [PATCH blktests v2 02/12] nvme: More agressively filter the discovery output

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#5 lore raw

PATCH v2 3/12 nvme: Add new test to verify the generation counter

In reply to Logan Gunthorpe

Now that the other discovery tests ignore the generation counter value, create a new test to specifically check that it increments when subsystems are added or removed from ports and when allow_any_host is set/unset.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/030     | 76 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/nvme/030.out |  2 ++
 tests/nvme/rc      |  5 +++
 3 files changed, 83 insertions(+)
 create mode 100755 tests/nvme/030
 create mode 100644 tests/nvme/030.out
tests/nvme/030 new file +76 -0
new file mode 100755
index 000000000000..963e1ad7118c
@@ -0,0 +1,76 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0+
+# Copyright (C) 2019 Logan Gunthorpe
+#
+# Test nvme discovery generation counter
+
+. tests/nvme/rc
+
+DESCRIPTION="ensure the discovery generation counter is updated appropriately"
+QUICK=1
+
+requires() {
+	_have_program nvme &&
+	_have_modules loop nvme-loop nvmet &&
+	_have_configfs
+}
+
+
+checkgenctr() {
+	local last=$1
+	local msg=$2
+	local genctr
+
+	genctr=$(_discovery_genctr)
+	if (( "${genctr}" <= "${last}" )); then
+		echo "Generation counter not incremented when ${msg} (${genctr} <= ${last})"
+	fi
+
+	echo "${genctr}"
+}
+
+test() {
+	local port
+	local genctr
+	local subsys="blktests-subsystem-"
+
+	echo "Running ${TEST_NAME}"
+
+	modprobe nvmet
+	modprobe nvme-loop
+
+	port="$(_create_nvmet_port "loop")"
+
+	_create_nvmet_subsystem "${subsys}1" "$(losetup -f)"
+	_add_nvmet_subsys_to_port "${port}" "${subsys}1"
+
+	genctr=$(_discovery_genctr)
+
+	_create_nvmet_subsystem "${subsys}2" "$(losetup -f)"
+	_add_nvmet_subsys_to_port "${port}" "${subsys}2"
+
+	genctr=$(checkgenctr "${genctr}" "adding a subsystem to a port")
+
+	echo 0 > "${NVMET_CFS}/subsystems/${subsys}2/attr_allow_any_host"
+
+	genctr=$(checkgenctr "${genctr}" "clearing attr_allow_any_host")
+
+	echo 1 > "${NVMET_CFS}/subsystems/${subsys}2/attr_allow_any_host"
+
+	genctr=$(checkgenctr "${genctr}" "setting attr_allow_any_host")
+
+	_remove_nvmet_subsystem_from_port "${port}" "${subsys}2"
+	_remove_nvmet_subsystem "${subsys}2"
+
+	genctr=$(checkgenctr "${genctr}" "removing a subsystem from a port")
+
+	_remove_nvmet_subsystem_from_port "${port}" "${subsys}1"
+	_remove_nvmet_subsystem "${subsys}1"
+
+	_remove_nvmet_port "${port}"
+
+	modprobe -r nvme-loop
+	modprobe -r nvmet
+
+	echo "Test complete"
+}
tests/nvme/030.out new file +2 -0
new file mode 100644
index 000000000000..93e51905b5d4
@@ -0,0 +1,2 @@
+Running nvme/030
+Test complete
tests/nvme/rc +5 -0
index 74e316248ef5..7be6c903611b 100644
@@ -124,3 +124,8 @@ _filter_discovery() {
 		  -e '/Discovery Log Number|Log Entry|trtype|subnqn/p'
 
 }
+
+_discovery_genctr() {
+	nvme discover -t loop |
+		sed -n -e 's/^.*Generation counter \([0-9]\+\).*$/\1/p'
+}
Signature · 1 line
2.17.1
#6 lore raw

Re: [PATCH blktests v2 03/12] nvme: Add new test to verify the generation counter

On Wed, Jul 17, 2019@11:12:50AM -0600, Logan Gunthorpe wrote:
[...]

tests/nvme/rc _filter_discovery() { · line 131

Quoted 4 lines
tests/nvme/rc +4 -0
+_discovery_genctr() {
+	nvme discover -t loop |
+		sed -n -e 's/^.*Generation counter \([0-9]\+\).*$/\1/p'
+}

Sorry for not having spotted this in v1, but do we really want to hard-core the transport type in a library function?

Maybe sth like this:

_discovery_genctr() {
	local trtype=$1
	nvme discover -t ${trtype} |
		sed -n -e 's/^.*Generation counter \([0-9]\+\).*$/\1/p'
}

I think Omar can fix it up when applying.

Byte,
Johannes

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#7 lore raw

Re: [PATCH blktests v2 03/12] nvme: Add new test to verify the generation counter

Quoted 9 lines · Johannes Thumshirn

On Wed, Jul 17, 2019@11:12:50AM -0600, Logan Gunthorpe wrote:
[...]

tests/nvme/rc _filter_discovery() { · line 131

Quoted 4 lines
tests/nvme/rc +4 -0
+_discovery_genctr() {
+	nvme discover -t loop |
+		sed -n -e 's/^.*Generation counter \([0-9]\+\).*$/\1/p'
+}

Sorry for not having spotted this in v1, but do we really want to hard-core the transport type in a library function?

My opinion is that this is unnecessary until we have users of the function that need different transport types. It's easy enough for someone to change when they need it. It's a pretty standard practice in kernel development to not add a feature that no-one uses.

Logan

#8 lore raw

PATCH v2 4/12 nvme/003,004: Add missing calls to nvme disconnect

In reply to Logan Gunthorpe

Tests 003 and 004 do not call nvme disconnect. In most cases it is cleaned up by removing the modules but it should be made explicit.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/003     | 1 +
 tests/nvme/003.out | 1 +
 tests/nvme/004     | 1 +
 tests/nvme/004.out | 1 +
 4 files changed, 4 insertions(+)
tests/nvme/003 +1 -0
index c6b3d4037aa6..374e6af0ca6f 100755
@@ -42,6 +42,7 @@ test() {
 		echo "Fail"
 	fi
 
+	nvme disconnect -n nqn.2014-08.org.nvmexpress.discovery
 	_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
 	_remove_nvmet_subsystem "blktests-subsystem-1"
 	_remove_nvmet_port "${port}"
tests/nvme/003.out +1 -0
index 01b275612159..beb356128c9d 100644
@@ -1,2 +1,3 @@
 Running nvme/003
+NQN:nqn.2014-08.org.nvmexpress.discovery disconnected 1 controller(s)
 Test complete
tests/nvme/004 +1 -0
index 0506fa220de3..767aedaa0263 100755
@@ -40,6 +40,7 @@ test() {
 	cat "/sys/block/${nvmedev}n1/uuid"
 	cat "/sys/block/${nvmedev}n1/wwid"
 
+	nvme disconnect -n "blktests-subsystem-1"
 	_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
 	_remove_nvmet_subsystem "blktests-subsystem-1"
 	_remove_nvmet_port "${port}"
tests/nvme/004.out +1 -0
index 53f911ecf329..51f605227320 100644
@@ -1,4 +1,5 @@
 Running nvme/004
 91fdba0d-f87b-4c25-b80f-db7be1418b9e
 uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e
+NQN:blktests-subsystem-1 disconnected 1 controller(s)
 Test complete
Signature · 1 line
2.17.1
Reviewed-by on v2 4/12
#9 lore raw

Re: [PATCH blktests v2 04/12] nvme/003,004: Add missing calls to nvme disconnect

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#10 lore raw

PATCH v2 5/12 nvme/005: Don't rely on modprobing to set the multipath paramater

In reply to Logan Gunthorpe

On test systems with existing nvme drives or built-in modules it may not be possible to remove nvme-core in order to re-probe it with multipath=1.

Instead, skip the test if the multipath parameter is not already set ahead of time.

Note: the multipath parameter of nvme-core is set by default if CONFIG_NVME_MULTIPATH is set so this will only affect systems that explicitly disable it via the module parameter.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 common/rc      | 18 ++++++++++++++++++
 tests/nvme/005 | 10 ++--------
 2 files changed, 20 insertions(+), 8 deletions(-)
common/rc +18 -0
index 5dd2c9512fd2..a487cc69026c 100644
@@ -55,6 +55,24 @@ _have_module_param() {
 	return 0
 }
 
+_have_module_param_value() {
+	local value
+
+	modprobe "$1"
+
+	if ! _have_module_param "$1" "$2"; then
+		return 1
+	fi
+
+	value=$(cat "/sys/module/$1/parameters/$2")
+	if [[ "${value}" != "$3" ]]; then
+		SKIP_REASON="$1 module parameter $2 must be set to $3"
+		return 1
+	fi
+
+	return 0
+}
+
 _have_program() {
 	if command -v "$1" >/dev/null 2>&1; then
 		return 0
tests/nvme/005 +2 -8
index e72fc809c936..91c164de73e6 100755
@@ -12,18 +12,13 @@ QUICK=1
 
 requires() {
 	_have_modules loop nvme-core nvme-loop nvmet && \
-		_have_module_param nvme-core multipath && _have_configfs
+		_have_module_param_value nvme_core multipath Y && \
+		_have_configfs
 }
 
 test() {
 	echo "Running ${TEST_NAME}"
 
-	# Clean up all stale modules
-	modprobe -r nvme-loop
-	modprobe -r nvme-core
-	modprobe -r nvmet
-
-	modprobe nvme-core multipath=1
 	modprobe nvmet
 	modprobe nvme-loop
 
@@ -57,7 +52,6 @@ test() {
 	rm "$TMPDIR/img"
 
 	modprobe -r nvme-loop
-	modprobe -r nvme-core
 	modprobe -r nvmet
 
 	echo "Test complete"
Signature · 1 line
2.17.1
#11 lore raw

Re: [PATCH blktests v2 05/12] nvme/005: Don't rely on modprobing to set the multipath paramater

Looks good,
eviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#12 lore raw

PATCH v2 6/12 nvme/015: Ensure the namespace is flushed not the char device

In reply to Logan Gunthorpe

Flushing the char device now results in the warning:

nvme nvme1: using deprecated NVME_IOCTL_IO_CMD ioctl on the char
device!

Instead, call the flush on the namespace.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/015 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/nvme/015 +1 -1
index 47e1b048e16d..ca1216163e16 100755
@@ -39,7 +39,7 @@ test() {
 
 	dd if=/dev/urandom of="/dev/${nvmedev}n1" count=128000 bs=4k status=none
 
-	nvme flush "/dev/${nvmedev}" -n 1
+	nvme flush "/dev/${nvmedev}n1" -n 1
 
 	nvme disconnect -n "${subsys_name}"
 
Signature · 1 line
2.17.1
Reviewed-by on v2 6/12
#13 lore raw

Re: [PATCH blktests v2 06/12] nvme/015: Ensure the namespace is flushed not the char device

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#14 lore raw

PATCH v2 7/12 nvme/018: Ignore error message generated by nvme read

In reply to Logan Gunthorpe

nvme-cli at some point started printing the error message:

NVMe status: CAP_EXCEEDED: The execution of the command has caused the

	capacity of the namespace to be exceeded(0x6081)

This was not accounted for by test 018 and caused it to fail.

This test does not need to test the error message content, it's only important that a read past the end of the file fails. Therefore, pipe stderr of nvme-cli to /dev/null.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/018 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tests/nvme/018 +2 -3
index e29fa92e8153..f5f5ecdb0989 100755
@@ -44,9 +44,8 @@ test() {
 	sectors="$(blockdev --getsz "/dev/${nvmedev}n1")"
 	bs="$(blockdev --getbsz "/dev/${nvmedev}n1")"
 
-	if nvme read "/dev/${nvmedev}n1" -s "$sectors" -c 0 -z "$bs"; then
-		echo "ERROR: Successfully read out of device lba range"
-	fi
+	nvme read "/dev/${nvmedev}n1" -s "$sectors" -c 0 -z "$bs" 2>"$FULL" \
+		&& echo "ERROR: Successfully read out of device lba range"
 
 	nvme disconnect -n "${subsys_name}"
 
Signature · 1 line
2.17.1
Reviewed-by on v2 7/12
#15 lore raw

Re: [PATCH blktests v2 07/12] nvme/018: Ignore error message generated by nvme read

Quoted 3 lines · Logan Gunthorpe

This test does not need to test the error message content, it's only important that a read past the end of the file fails. Therefore, pipe stderr of nvme-cli to /dev/null.

pipe stderr of nvme-cli to $FULL

Otherwise,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#16 lore raw

PATCH v2 8/12 check: Add the ability to call a cleanup function after a test ends

In reply to Logan Gunthorpe

In order to ensure tests properly clean themselves up, even if they are subject to interruption, add the ability to call a test specified function at cleanup time.

Any test can call _register_test_cleanup with the first argument as a function to call after the test ends or is interrupted (similar to using 'trap <func> EXIT').

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 check | 9 +++++++++
 1 file changed, 9 insertions(+)
check +9 -0
index 029095e7cf38..981058c59c12 100755
@@ -288,7 +288,15 @@ _output_test_run() {
 	) | column -t -s $'\t'
 }
 
+_register_test_cleanup() {
+	TEST_CLEANUP=$1
+}
+
 _cleanup() {
+	if [[ -v TEST_CLEANUP ]]; then
+		${TEST_CLEANUP}
+	fi
+
 	if [[ "${TMPDIR:-}" ]]; then
 		rm -rf "$TMPDIR"
 		unset TMPDIR
@@ -337,6 +345,7 @@ _call_test() {
 	fi
 	$LOGGER_PROG "run blktests $TEST_NAME"
 
+	unset TEST_CLEANUP
 	trap _cleanup EXIT
 	if ! TMPDIR="$(mktemp --tmpdir -p "$OUTPUT" -d "tmpdir.${TEST_NAME//\//.}.XXX")"; then
 		return
Signature · 1 line
2.17.1
Reviewed-by on v2 8/12
#17 lore raw

Re: [PATCH blktests v2 08/12] check: Add the ability to call a cleanup function after a test ends

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#18 lore raw

PATCH v2 9/12 nvme: Cleanup modprobe lines into helper functions

In reply to Logan Gunthorpe

Move all the lines to modprobe nvmet and nvme-loop into _setup_nvmet() and _cleanup_nvmet() helper functions and call _cleanup_nvmet() using _register_test_cleanup() to ensure it's always called after the test terminates.

This will allow us to improve the cleanup of these tests and not leave the system in an inconsistent state when tests are aborted.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/002 |  8 ++------
 tests/nvme/003 |  5 +----
 tests/nvme/004 |  5 +----
 tests/nvme/005 |  6 +-----
 tests/nvme/006 |  6 +-----
 tests/nvme/007 |  6 +-----
 tests/nvme/008 |  6 +-----
 tests/nvme/009 |  5 +----
 tests/nvme/010 |  6 +-----
 tests/nvme/011 |  6 +-----
 tests/nvme/012 |  6 +-----
 tests/nvme/013 |  6 +-----
 tests/nvme/014 |  6 +-----
 tests/nvme/015 |  3 +--
 tests/nvme/016 |  4 +---
 tests/nvme/017 |  6 +-----
 tests/nvme/018 |  3 +--
 tests/nvme/019 |  6 +-----
 tests/nvme/020 |  5 +----
 tests/nvme/021 |  6 +-----
 tests/nvme/022 |  6 +-----
 tests/nvme/023 |  6 +-----
 tests/nvme/024 |  6 +-----
 tests/nvme/025 |  6 +-----
 tests/nvme/026 |  6 +-----
 tests/nvme/027 |  6 +-----
 tests/nvme/028 |  6 +-----
 tests/nvme/029 |  6 +-----
 tests/nvme/030 |  6 +-----
 tests/nvme/rc  | 11 +++++++++++
 30 files changed, 41 insertions(+), 134 deletions(-)
tests/nvme/002 +2 -6
index ceac1c677bd4..07b7fdae2d39 100755
@@ -16,11 +16,9 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	local iterations=1000
-
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
+	local iterations=1000
 	local port
 	port="$(_create_nvmet_port "loop")"
 
@@ -41,7 +39,5 @@ test() {
 
 	_remove_nvmet_port "${port}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
 	echo "Test complete"
 }
tests/nvme/003 +1 -4
index 374e6af0ca6f..ed0feca3cac7 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	port="$(_create_nvmet_port "loop")"
@@ -47,7 +46,5 @@ test() {
 	_remove_nvmet_subsystem "blktests-subsystem-1"
 	_remove_nvmet_port "${port}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
 	echo "Test complete"
 }
tests/nvme/004 +1 -4
index 767aedaa0263..0debcd9c7049 100755
@@ -18,8 +18,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	port="$(_create_nvmet_port "loop")"
@@ -47,7 +46,5 @@ test() {
 	losetup -d "$loop_dev"
 	rm "$TMPDIR/img"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
 	echo "Test complete"
 }
tests/nvme/005 +1 -5
index 91c164de73e6..8c79d234bb1d 100755
@@ -19,8 +19,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	port="$(_create_nvmet_port "loop")"
@@ -51,8 +50,5 @@ test() {
 	losetup -d "$loop_dev"
 	rm "$TMPDIR/img"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/006 +1 -5
index d12d66bc5a8d..6c8e18560264 100755
@@ -21,8 +21,7 @@ test() {
 	local loop_dev
 	local subsys_name="blktests-subsystem-1"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	truncate -s 1G "$TMPDIR/img"
 
@@ -41,8 +40,5 @@ test() {
 
 	rm "$TMPDIR/img"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/007 +1 -5
index 6a57b7bf7e0d..58f4bf8808a1 100755
@@ -20,8 +20,7 @@ test() {
 	local file_path
 	local subsys_name="blktests-subsystem-1"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	file_path="${TMPDIR}/img"
 
@@ -38,8 +37,5 @@ test() {
 
 	rm "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/008 +1 -5
index 04ff0bda42e3..71ff4d962b00 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -53,8 +52,5 @@ test() {
 
 	rm "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/009 +1 -4
index 81e61f99aba5..25c7da2ab854 100755
@@ -16,8 +16,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -47,7 +46,5 @@ test() {
 
 	rm "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
 	echo "Test complete"
 }
tests/nvme/010 +1 -5
index ed7c95af2853..2ed0f4871a30 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -54,8 +53,5 @@ test() {
 	rm "${file_path}"
 	rm -f local*verify*state
 
-	modprobe -r nvme_loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/011 +1 -5
index fa638a193bad..974b33745b99 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -50,8 +49,5 @@ test() {
 	rm "${file_path}"
 	rm -f local-write-and-verify*state
 
-	modprobe -r nvme_loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/012 +1 -5
index d7a8751ec752..27981e903c58 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -66,8 +65,5 @@ test() {
 	rm "${file_path}"
 	rm -fr "${mount_dir}"
 
-	modprobe -r nvme_loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/013 +1 -5
index 131855298f0f..af5f3730a2fc 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -62,8 +61,5 @@ test() {
 	rm "${file_path}"
 	rm -fr "${mount_dir}"
 
-	modprobe -r nvme_loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/014 +1 -5
index 7de568faeff2..c255d5f12205 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -55,8 +54,5 @@ test() {
 
 	rm "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/015 +1 -2
index ca1216163e16..a8497a2ba400 100755
@@ -16,8 +16,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
tests/nvme/016 +1 -3
index dd1b84a16daa..9e670e7f6bcd 100755
@@ -20,8 +20,7 @@ test() {
 	local loop_dev
 	local subsys_nqn="blktests-subsystem-1"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	loop_dev="$(losetup -f)"
 
@@ -44,6 +43,5 @@ test() {
 
 	_remove_nvmet_subsystem "${subsys_nqn}"
 
-	modprobe -r nvme-loop nvmet
 	echo "Test complete"
 }
tests/nvme/017 +1 -5
index 5f8d60907293..ef27de65cf2e 100755
@@ -20,8 +20,7 @@ test() {
 	local iterations=1000
 	local subsys_name="blktests-subsystem-1"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	file_path="${TMPDIR}/img"
 
@@ -49,8 +48,5 @@ test() {
 
 	rm "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/018 +1 -2
index f5f5ecdb0989..0a5b4c2ab019 100755
@@ -18,8 +18,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
tests/nvme/019 +1 -5
index 4a167361c42c..a8b0204ec0eb 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -55,8 +54,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/020 +1 -4
index 6bd8075b1f4d..b480ee1b92d0 100755
@@ -16,8 +16,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -49,7 +48,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
 	echo "Test complete"
 }
tests/nvme/021 +1 -5
index fef31b080c99..bbee54d16ff1 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -50,8 +49,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/022 +1 -5
index 8f7492c0ff15..9ba07c1cc50f 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -50,8 +49,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/023 +1 -5
index de1a6bc0f975..ed2a5ad7653f 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -55,8 +54,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/024 +1 -5
index c88fbd8a3663..538580947c5c 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -49,8 +48,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/025 +1 -5
index 6468f59d9dd9..0039fefa5007 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -50,8 +49,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/026 +1 -5
index 2e9655bdd40f..7e89d840529c 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -50,8 +49,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/027 +1 -5
index db732425db21..4d293beb8b47 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -49,8 +48,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/028 +1 -5
index 10be8fb4ba9c..1280107ed5df 100755
@@ -17,8 +17,7 @@ requires() {
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -49,8 +48,5 @@ test() {
 
 	rm -f "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/029 +1 -5
index e63dfc166f26..65eb40031888 100755
@@ -50,8 +50,7 @@ test_user_io()
 test() {
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+	_setup_nvmet
 
 	local port
 	local nvmedev
@@ -92,8 +91,5 @@ test() {
 
 	rm "${file_path}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/030 +1 -5
index 963e1ad7118c..94020f47411e 100755
@@ -36,8 +36,7 @@ test() {
 
 	echo "Running ${TEST_NAME}"
 
-	modprobe nvmet
-	modprobe nvme-loop
+    _setup_nvmet
 
 	port="$(_create_nvmet_port "loop")"
 
@@ -69,8 +68,5 @@ test() {
 
 	_remove_nvmet_port "${port}"
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
-
 	echo "Test complete"
 }
tests/nvme/rc +11 -0
index 7be6c903611b..16bdb7f0c083 100644
@@ -24,6 +24,17 @@ _test_dev_is_nvme() {
 	return 0
 }
 
+_cleanup_nvmet() {
+	modprobe -r nvme-loop
+	modprobe -r nvmet
+}
+
+_setup_nvmet() {
+	_register_test_cleanup _cleanup_nvmet
+	modprobe nvmet
+	modprobe nvme-loop
+}
+
 _create_nvmet_port() {
 	local trtype="$1"
 
Signature · 1 line
2.17.1
Reviewed-by on v2 9/12
#19 lore raw

Re: [PATCH blktests v2 09/12] nvme: Cleanup modprobe lines into helper functions

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#20 lore raw

PATCH v2 10/12 nvme: Ensure all ports and subsystems are removed on cleanup

In reply to Logan Gunthorpe

This ensures any test that fails or is interrupted will cleanup their subsystems. This will prevent the system from being left in an inconsistent state that will fail subsequent tests.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/rc | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
tests/nvme/rc +43 -0
index 16bdb7f0c083..a6b4d5938680 100644
@@ -25,6 +25,49 @@ _test_dev_is_nvme() {
 }
 
 _cleanup_nvmet() {
+	local dev
+	local port
+	local subsys
+	local transport
+	local name
+
+	if [[ ! -d "${NVMET_CFS}" ]]; then
+		return 0
+	fi
+
+	# Don't let successive Ctrl-Cs interrupt the cleanup processes
+	stty -isig
+
+	shopt -s nullglob
+
+	for dev in /sys/class/nvme/nvme*; do
+		dev="$(basename "$dev")"
+		transport="$(cat "/sys/class/nvme/${dev}/transport")"
+		if [[ "$transport" == "loop" ]]; then
+			echo "WARNING: Test did not clean up loop device: ${dev}"
+			nvme disconnect -d "${dev}"
+		fi
+	done
+
+	for port in "${NVMET_CFS}"/ports/*; do
+		name=$(basename "${port}")
+		echo "WARNING: Test did not clean up port: ${name}"
+		rm -f "${port}"/subsystems/*
+		rmdir "${port}"
+	done
+
+	for subsys in "${NVMET_CFS}"/subsystems/*; do
+		name=$(basename "${subsys}")
+		echo "WARNING: Test did not clean up subsystem: ${name}"
+		for ns in "${subsys}"/namespaces/*; do
+			rmdir "${ns}"
+		done
+		rmdir "${subsys}"
+	done
+
+	shopt -u nullglob
+	stty isig
+
 	modprobe -r nvme-loop
 	modprobe -r nvmet
 }
Signature · 1 line
2.17.1
Reviewed-by on v2 10/12
#21 lore raw

Re: [PATCH blktests v2 10/12] nvme: Ensure all ports and subsystems are removed on cleanup

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#22 lore raw

PATCH v2 11/12 common: Use sysfs instead of modinfo for _have_module_param()

In reply to Logan Gunthorpe

Using modinfo fails if the given module is built-in.

Instead, if the module is already in the kernel, check for the parameter in sysfs.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 common/rc | 6 ++++++
 1 file changed, 6 insertions(+)
common/rc +6 -0
index a487cc69026c..41aee3aaa735 100644
@@ -48,6 +48,12 @@ _have_modules() {
 }
 
 _have_module_param() {
+	if [ -d "/sys/module/$1" ]; then
+		if [ -e "/sys/module/$1/parameters/$2" ]; then
+			return 0
+		fi
+	fi
+
 	if ! modinfo -F parm -0 "$1" | grep -q -z "^$2:"; then
 		SKIP_REASON="$1 module does not have parameter $2"
 		return 1
Signature · 1 line
2.17.1
Reviewed-by on v2 11/12
#23 lore raw

Re: [PATCH blktests v2 11/12] common: Use sysfs instead of modinfo for _have_module_param()

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#24 lore raw

PATCH v2 12/12 nvme: Ignore errors when removing modules

In reply to Logan Gunthorpe

It is no longer important for correct test functionality to remove the modules between tests. Therefore, we ignore errors if the modules are not removed (ie. if they are builtin).

With this patch, it is now safe to run the tests with the nvmet modules built-in. This will be more convienent for developers that want to run the tests in a simple VM.

Signed-off-by Logan Gunthorpe <logang at deltatee.com>
---
 tests/nvme/rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/nvme/rc +2 -2
index a6b4d5938680..348b4a3c2cbc 100644
@@ -68,8 +68,8 @@ _cleanup_nvmet() {
 	shopt -u nullglob
 	stty isig
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
+	modprobe -r nvme-loop 2>/dev/null
+	modprobe -r nvmet 2>/dev/null
 }
 
 _setup_nvmet() {
Signature · 1 line
2.17.1
Reviewed-by on v2 12/12
#25 lore raw

Re: [PATCH blktests v2 12/12] nvme: Ignore errors when removing modules

Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de>

Signature · 6 lines
Johannes Thumshirn                            SUSE Labs Filesystems
jthumshirn at suse.de                                +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#26 lore raw
In reply to Logan Gunthorpe
Quoted 37 lines · Logan Gunthorpe

Changes since v1:
* Use second sed expression instead of another call to grep in _filter_discovery() for Patch 2 (per Omar)
* Redirect error output to $FULL in for nvme/018 in Patch 7 (Per Johannes)
* Rework _have_module_param() in Patch 11 so that it supports cases where the module is not inserted.

--

This patchset cleans up a number of issues and pain points I've had with getting the nvme blktests to pass and run cleanly.

The first three patches are meant to fix the Generation Counter issue that's been discussed before but hasn't been fixed in months. I primarily use a slightly fixed up patch posted by Michael Moese[1] but add another patch to properly test the Generation Counter that would no longer be tested otherwise.

I've also taken it a step further to filter out more of the discovery information so that we are less fragile against churn and less dependant on the version of nvme-cli in use. This should also fix the issue discussed in [2].

Patches 4 through 7 fix a number of smaller issues I've found with individual tests.

Patches 8 through 10 implement a system to ensure the nvme tests clean themselves up properly especially when ctrl-c is used to interrupt a test (working with the tests before this was a huge pain seeing, when you ctrl-c, you have to either manually clean up the nvmet configuration or reboot to get the system in a state where it's sane to run the tests again).

Patches 11 and 12 make some minor changes that allow running the tests with the nvme modules built into the kernel.

Quoted 8 lines

With these patches, plus a couple I've sent to the nvme list for the kernel, I can consistently pass the entire nvme suite with the exception of the lockdep false-positive with nvme/012 that still seems to be in a bit of contention[3].

[1] https://github.com/osandov/blktests/pull/34
[2] https://lore.kernel.org/linux-block/20190505150611.15776-4-minwoo.im.dev at gmail.com/
[3] https://lore.kernel.org/lkml/20190214230058.196511-22-bvanassche at acm.org/

Merged, thanks, Logan!