nvme: Cleanup modprobe lines into helper functions

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.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>

diff --git a/tests/nvme/002 b/tests/nvme/002
index ceac1c677bd4851948834a43bcabe383a234f8fc..07b7fdae2d395599792a3fc18849202c25800b9b 100755 (executable)
--- a/tests/nvme/002
+++ b/tests/nvme/002
@@ -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"
 }

diff --git a/tests/nvme/003 b/tests/nvme/003
index 374e6af0ca6fb5a06afd7e2b980be2ff406c17ce..ed0feca3cac70ef3c2d88adf7bf832601fa14544 100755 (executable)
--- a/tests/nvme/003
+++ b/tests/nvme/003
@@ -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"
 }

diff --git a/tests/nvme/004 b/tests/nvme/004
index 767aedaa0263fd948eaee5fd78eb7ff20abef515..0debcd9c7049df0e5df32351c8b38673b0595ef4 100755 (executable)
--- a/tests/nvme/004
+++ b/tests/nvme/004
@@ -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"
 }

diff --git a/tests/nvme/005 b/tests/nvme/005
index 91c164de73e614bc2cb6f3ce9066552faac2870d..8c79d234bb1d6ab2aaaee4de19578367092fb847 100755 (executable)
--- a/tests/nvme/005
+++ b/tests/nvme/005
@@ -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"
 }

diff --git a/tests/nvme/006 b/tests/nvme/006
index d12d66bc5a8d000728d23a44dce0507523f4d165..6c8e1856026426fd3d52adb6968e1eb2adecff08 100755 (executable)
--- a/tests/nvme/006
+++ b/tests/nvme/006
@@ -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"
 }

diff --git a/tests/nvme/007 b/tests/nvme/007
index 6a57b7bf7e0dfce4e3aabde686f81e2e0fca879e..58f4bf8808a13a30d0a4b2a4b11ae86191baf4d3 100755 (executable)
--- a/tests/nvme/007
+++ b/tests/nvme/007
@@ -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"
 }

diff --git a/tests/nvme/008 b/tests/nvme/008
index 04ff0bda42e3ea421e9136e7e16af5ac26726271..71ff4d962b0088472e09390bb9467534fb62b488 100755 (executable)
--- a/tests/nvme/008
+++ b/tests/nvme/008
@@ -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"
 }

diff --git a/tests/nvme/009 b/tests/nvme/009
index 81e61f99aba5707dd778154391e6950c9551dbaf..25c7da2ab854b32de9f972f62dc69ba97bdfda74 100755 (executable)
--- a/tests/nvme/009
+++ b/tests/nvme/009
@@ -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"
 }

diff --git a/tests/nvme/010 b/tests/nvme/010
index ed7c95af28538945cd70b5bc3bbe3d9c2c6cf8b0..2ed0f4871a30891fddc0ab01a8857ae1e5eb677f 100755 (executable)
--- a/tests/nvme/010
+++ b/tests/nvme/010
@@ -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"
 }

diff --git a/tests/nvme/011 b/tests/nvme/011
index fa638a193bad363b517e4e516ca220116d98ae06..974b33745b99c39ac1e1d928dce5850988304969 100755 (executable)
--- a/tests/nvme/011
+++ b/tests/nvme/011
@@ -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"
 }

diff --git a/tests/nvme/012 b/tests/nvme/012
index d7a8751ec75211894f503cd36b84e5195250154d..27981e903c587f1493bc9bd27cafc980809cf196 100755 (executable)
--- a/tests/nvme/012
+++ b/tests/nvme/012
@@ -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"
 }

diff --git a/tests/nvme/013 b/tests/nvme/013
index 131855298f0f035f1de0ceb9a9b9d84bb64ebdad..af5f3730a2fc1800bffdfbbcc32a9c29148ffbe3 100755 (executable)
--- a/tests/nvme/013
+++ b/tests/nvme/013
@@ -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"
 }

diff --git a/tests/nvme/014 b/tests/nvme/014
index 7de568faeff25dd29f798dd9abf0e2cbd7fc9ac7..c255d5f12205a74a51691770a60208bdf72c66e6 100755 (executable)
--- a/tests/nvme/014
+++ b/tests/nvme/014
@@ -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"
 }

diff --git a/tests/nvme/015 b/tests/nvme/015
index ca1216163e16e1e2d704839084f45335fe275b9f..a8497a2ba400c690bb165a71fbd1f9ba6ed0481e 100755 (executable)
--- a/tests/nvme/015
+++ b/tests/nvme/015
@@ -16,8 +16,7 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       modprobe nvmet
-       modprobe nvme-loop
+       _setup_nvmet
 
        local port
        local nvmedev

diff --git a/tests/nvme/016 b/tests/nvme/016
index dd1b84a16daa453b7007a880ac076a3c3aa0081d..9e670e7f6bcdd69d0e86038db01017ac2f15cca2 100755 (executable)
--- a/tests/nvme/016
+++ b/tests/nvme/016
@@ -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"
 }

diff --git a/tests/nvme/017 b/tests/nvme/017
index 5f8d6090729359728d936be2532fe04221c99cf4..ef27de65cf2e7ac9a9facdaad2e321c94c2d5d37 100755 (executable)
--- a/tests/nvme/017
+++ b/tests/nvme/017
@@ -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"
 }

diff --git a/tests/nvme/018 b/tests/nvme/018
index f5f5ecdb0989f84f52d494e8a46e1d4d74703e06..0a5b4c2ab0191e8feb056a5ff5e2f3e882fc03b3 100755 (executable)
--- a/tests/nvme/018
+++ b/tests/nvme/018
@@ -18,8 +18,7 @@ requires() {
 test() {
        echo "Running ${TEST_NAME}"
 
-       modprobe nvmet
-       modprobe nvme-loop
+       _setup_nvmet
 
        local port
        local nvmedev

diff --git a/tests/nvme/019 b/tests/nvme/019
index 4a167361c42cf4f65295b6adec90fc6e402facb9..a8b0204ec0eb02eef149663098cd167fecb556d7 100755 (executable)
--- a/tests/nvme/019
+++ b/tests/nvme/019
@@ -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"
 }

diff --git a/tests/nvme/020 b/tests/nvme/020
index 6bd8075b1f4d84a31b55e4cbd937be11b874d815..b480ee1b92d09a7b6bb9727f1f63ab6b498e7281 100755 (executable)
--- a/tests/nvme/020
+++ b/tests/nvme/020
@@ -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"
 }

diff --git a/tests/nvme/021 b/tests/nvme/021
index fef31b080c99edfa9d5113f71cd577502cd168d4..bbee54d16ff19c0c75d3169d9b1570a323ded011 100755 (executable)
--- a/tests/nvme/021
+++ b/tests/nvme/021
@@ -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"
 }

diff --git a/tests/nvme/022 b/tests/nvme/022
index 8f7492c0ff15b74dc5bc7b588622d7cea47af975..9ba07c1cc50f6c6d259fca90cc323ec70e58d235 100755 (executable)
--- a/tests/nvme/022
+++ b/tests/nvme/022
@@ -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"
 }

diff --git a/tests/nvme/023 b/tests/nvme/023
index de1a6bc0f975fa201f5b81da958fd69a44d430bd..ed2a5ad7653fed9f52f3ac3787bb1c1422891065 100755 (executable)
--- a/tests/nvme/023
+++ b/tests/nvme/023
@@ -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"
 }

diff --git a/tests/nvme/024 b/tests/nvme/024
index c88fbd8a3663af05fb16a16fcc3b9d11804e920f..538580947c5cce091b1135a79656388d69dc724d 100755 (executable)
--- a/tests/nvme/024
+++ b/tests/nvme/024
@@ -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"
 }

diff --git a/tests/nvme/025 b/tests/nvme/025
index 6468f59d9dd9c871782ebd45716135d5433f59bf..0039fefa50070c497817c454a1d9077fb4fa6f65 100755 (executable)
--- a/tests/nvme/025
+++ b/tests/nvme/025
@@ -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"
 }

diff --git a/tests/nvme/026 b/tests/nvme/026
index 2e9655bdd40f5930883baca7d1263398540a4821..7e89d840529c2d4ad2f7fccaf1fde12283e45f42 100755 (executable)
--- a/tests/nvme/026
+++ b/tests/nvme/026
@@ -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"
 }

diff --git a/tests/nvme/027 b/tests/nvme/027
index db732425db2151c54beef2e5cbc27cb6ab923927..4d293beb8b477cfdfb62809ffd5f050d4fb362c5 100755 (executable)
--- a/tests/nvme/027
+++ b/tests/nvme/027
@@ -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"
 }

diff --git a/tests/nvme/028 b/tests/nvme/028
index 10be8fb4ba9c87c74130f5449c44361552c0d373..1280107ed5df038500564f8135c842683a7b5474 100755 (executable)
--- a/tests/nvme/028
+++ b/tests/nvme/028
@@ -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"
 }

diff --git a/tests/nvme/029 b/tests/nvme/029
index e63dfc166f26a2174996ffb8a7b2a5f6e91c4442..65eb400318883b6144dc393231130b473f9b519d 100755 (executable)
--- a/tests/nvme/029
+++ b/tests/nvme/029
@@ -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"
 }

diff --git a/tests/nvme/030 b/tests/nvme/030
index 963e1ad7118c6b2e8e4707f78bad3194619f72af..94020f47411eecd16415b7e44b9f54113fec6a58 100755 (executable)
--- a/tests/nvme/030
+++ b/tests/nvme/030
@@ -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"
 }

diff --git a/tests/nvme/rc b/tests/nvme/rc
index 7be6c903611b95428d276ecae35aab6e37c50e6e..16bdb7f0c083aba2e46c1059bd6c9141628462bc 100644 (file)
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -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"