From c540ca01a3faa5cb36f7c2da052a1cc7b08c3f30 Mon Sep 17 00:00:00 2001 From: Ed Rodriguez Date: Thu, 22 Mar 2018 10:12:48 -0400 Subject: [PATCH] test: nvmf host test script modifications to support fc hardware This problem was discovered after an lpfc card was installed in one of our CIT tetbeds. When an lpfc card is installed the modprobe call in identify_kernel_nvmf.sh will load lpfc as a side effect of loading nvmet. When this happens, you can't unload nvmet until lpfc is unloaded. Change-Id: I2cf63ea7d20b7dc15d73c7a8c8502fb05bef29f8 Signed-off-by: John Meneghini Reviewed-on: https://review.gerrithub.io/405518 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris --- test/nvmf/host/identify_kernel_nvmf.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/nvmf/host/identify_kernel_nvmf.sh b/test/nvmf/host/identify_kernel_nvmf.sh index 16534e68e..931930f6d 100755 --- a/test/nvmf/host/identify_kernel_nvmf.sh +++ b/test/nvmf/host/identify_kernel_nvmf.sh @@ -21,6 +21,8 @@ subsystemname=nqn.2016-06.io.spdk:testnqn modprobe null_blk nr_devices=1 modprobe nvmet modprobe nvmet-rdma +modprobe nvmet-fc +modprobe lpfc if [ ! -d /sys/kernel/config/nvmet/subsystems/$subsystemname ]; then mkdir /sys/kernel/config/nvmet/subsystems/$subsystemname @@ -63,6 +65,8 @@ rmdir --ignore-fail-on-non-empty /sys/kernel/config/nvmet/subsystems/$subsystemn rmdir --ignore-fail-on-non-empty /sys/kernel/config/nvmet/subsystems/$subsystemname rmdir --ignore-fail-on-non-empty /sys/kernel/config/nvmet/ports/1 +rmmod lpfc +rmmod nvmet_fc rmmod nvmet-rdma rmmod null_blk rmmod nvmet