On 8/3/20 2:48 PM, Sagi Grimberg wrote:
Signed-off-by: Sagi Grimberg <sagi@xxxxxxxxxxx>
---
tests/nvme/rc | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/tests/nvme/rc b/tests/nvme/rc
index 69ab7d2f3964..31d02fefa70e 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -5,6 +5,7 @@
# Test specific to NVMe devices
. common/rc
+. common/multipath-over-rdma
def_traddr="127.0.0.1"
def_adrfam="ipv4"
@@ -25,6 +26,12 @@ _nvme_requires() {
_have_modules nvmet nvme-core nvme-tcp nvmet-tcp
_have_configfs
;;
+ rdma)
+ _have_modules nvmet nvme-core nvme-rdma nvmet-rdma
+ _have_configfs
+ _have_program rdma
+ _have_modules rdma_rxe siw
+ ;;
*)
SKIP_REASON="unsupported nvme_trtype=${nvme_trtype}"
return 1
@@ -115,6 +122,9 @@ _cleanup_nvmet() {
modprobe -r nvmet-${nvme_trtype} 2>/dev/null
fi
modprobe -r nvmet 2>/dev/null
+ if [[ "${nvme_trtype}" == "rdma" ]]; then
+ stop_soft_rdma
+ fi
}
# nvme_trtype=rdma ./check nvme/030
nvme/030 (ensure the discovery generation counter is updated appropriately)
nvme/030 (ensure the discovery generation counter is updated
appropriately) [passed]
runtime 0.616s ... 0.520s 460: unload_module: command not found
The unload_module[1] was defined in [2], how about move the definition
to [3],
[1]
_cleanup_nvmet->stop_soft_rdma->unload_module
[2]
./tests/nvmeof-mp/rc
[3]
common/multipath-over-rdma
_setup_nvmet() {
@@ -124,6 +134,11 @@ _setup_nvmet() {
modprobe nvmet-${nvme_trtype}
fi
modprobe nvme-${nvme_trtype}
+ if [[ "${nvme_trtype}" == "rdma" ]]; then
+ start_soft_rdma
+ rdma_intfs=$(rdma_network_interfaces)
+ def_traddr=$(get_ipv4_addr ${rdma_intfs[0]})
+ fi
}
_nvme_disconnect_ctrl() {
