nvme: move _find_nvme_loop_dev to common code

Signed-off-by Johannes Thumshirn <jthumshirn at suse.de>

---
 tests/nvme/005     | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/nvme/005.out |  2 ++
 2 files changed, 79 insertions(+)
 create mode 100755 tests/nvme/005
 create mode 100644 tests/nvme/005.out

tests/nvme/005 new file +77 -0

new file mode 100755
index 000000000000..77f843fed692
@@ -0,0 +1,77 @@
+#!/bin/bash
+#
+# Regression test for patch "nvmet: switch loopback target state to connecting
+# when resetting"
+#
+# Copyright (C) 2018 Johannes Thumshirn
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+DESCRIPTION="reset local loopback target"
+
+QUICK=1
+
+requires() {
+       _have_module nvme-loop && _have_module nvmet && _have_module loop && \
+               _have_configfs && _have_module nvme-core && \
+               _have_module_param nvme-core multipath
+}
+
+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
+
+       local port
+       port=$(_create_nvmet_port "loop")
+
+       truncate -s 1G "$TMPDIR/img"
+
+       local loop_dev
+       loop_dev="$(losetup -f --show "$TMPDIR/img")"
+
+       _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \
+               "91fdba0d-f87b-4c25-b80f-db7be1418b9e"
+       _add_nvmet_subsys_to_port "${port}" "blktests-subsystem-1"
+
+       nvme connect -t loop -n blktests-subsystem-1
+
+       local nvmedev
+       nvmedev="$(_find_nvme_loop_dev)"
+
+       udevadm settle
+
+       echo 1 > "/sys/class/nvme/${nvmedev}/reset_controller"
+
+       nvme disconnect -d "${nvmedev}"
+       _remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
+       _remove_nvmet_port "${port}"
+
+       _remove_nvmet_subsystem "blktests-subsystem-1"
+       losetup -d "$loop_dev"
+       rm "$TMPDIR/img"
+
+       modprobe -r nvme-loop
+       modprobe -r nvme-core
+       modprobe -r nvmet
+
+       echo "Test complete"
+}

tests/nvme/005.out new file +2 -1

new file mode 100644
index 000000000000..6146a7b8b1a7
@@ -0,0 +1,2 @@
+Running nvme/005
+Test complete
--

2.16.3

_______________________________________________
Linux-nvme mailing list
Linux-nvme at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Hi Johannes,

Thanks for submitting the test.

I was wondering if we can move the generic setup and clean up functionality to the helpers for reference:-

tests/nvme/005 new file +7 -0

+pre()
+{
+      # Clean up all stale modules
+       modprobe -r nvme-loop
+       modprobe -r nvme-core
+       modprobe -r nvmet
+

}

_find_nvme_loop_dev is quite useful for all nvme test, so move it over to common code.

Signed-off-by Johannes Thumshirn <jthumshirn at suse.de>

---
 common/nvme    | 10 ++++++++++
 tests/nvme/004 | 14 ++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

common/nvme +10 -0

index c6718f04811b..c4a44065cd9f 100644
@@ -93,3 +93,13 @@ _remove_nvmet_subsystem_from_port() {
 
 	rm "${nvmet_cfs}/ports/${port}/subsystems/${nvmet_subsystem}"
 }
+
+_find_nvme_loop_dev() {
+	for dev in /sys/class/nvme/nvme*; do
+		dev="$(basename "$dev")"
+		transport="$(cat "/sys/class/nvme/${dev}/transport")"
+		if [[ "$transport" == "loop" ]]; then
+			echo "$dev"
+		fi
+	done
+}

tests/nvme/004 +2 -12

index 65bcd40d86d1..2f970b366d41 100755
@@ -27,16 +27,6 @@ requires() {
 		_have_configfs
 }
 
-_find_nvme_loop_dev() {
-	for dev in /sys/block/nvme*; do
-		dev="$(basename "$dev")"
-		transport="$(cat "/sys/block/${dev}/device/transport")"
-		if [[ "$transport" == "loop" ]]; then
-			echo "$dev"
-		fi
-	done
-}
-
 test() {
 	echo "Running ${TEST_NAME}"
 

@@ -59,8 +49,8 @@ test() {
 
 	local nvmedev
 	nvmedev="$(_find_nvme_loop_dev)"
-	cat "/sys/block/${nvmedev}/uuid"
-	cat "/sys/block/${nvmedev}/wwid"
+	cat "/sys/block/${nvmedev}n1/uuid"
+	cat "/sys/block/${nvmedev}n1/wwid"
 
 	_remove_nvmet_subsystem_from_port "${port}" "blktests-subsystem-1"
 	_remove_nvmet_subsystem "blktests-subsystem-1"

Signature · 1 line

2.16.3

Thanks, Johannes, applied. I split patch 1 into two, though; one fixing the test, and one just moving the function.