new file mode 100644
@@ -0,0 +1,58 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0+
+#
+# fcloop helper functions.
+
+. common/shellcheck
+
+_nvme_fcloop_add_rport() {
+ local local_wwnn="$1"
+ local local_wwpn="$2"
+ local remote_wwnn="$3"
+ local remote_wwpn="$4"
+ local loopctl=/sys/class/fcloop/ctl
+
+ echo "wwnn=${remote_wwnn},wwpn=${remote_wwpn},lpwwnn=${local_wwnn},lpwwpn=${local_wwpn},roles=0x60" > ${loopctl}/add_remote_port
+}
+
+_nvme_fcloop_del_rport() {
+ local local_wwnn="$1"
+ local local_wwpn="$2"
+ local remote_wwnn="$3"
+ local remote_wwpn="$4"
+ local loopctl=/sys/class/fcloop/ctl
+
+ echo "wwnn=${remote_wwnn},wwpn=${remote_wwpn}" > ${loopctl}/del_remote_port
+}
+
+_nvme_fcloop_add_lport() {
+ local wwnn="$1"
+ local wwpn="$2"
+ local loopctl=/sys/class/fcloop/ctl
+
+ echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/add_local_port
+}
+
+_nvme_fcloop_del_lport() {
+ local wwnn="$1"
+ local wwpn="$2"
+ local loopctl=/sys/class/fcloop/ctl
+
+ echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/del_local_port
+}
+
+_nvme_fcloop_add_tport() {
+ local wwnn="$1"
+ local wwpn="$2"
+ local loopctl=/sys/class/fcloop/ctl
+
+ echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/add_target_port
+}
+
+_nvme_fcloop_del_tport() {
+ local wwnn="$1"
+ local wwpn="$2"
+ local loopctl=/sys/class/fcloop/ctl
+
+ echo "wwnn=${wwnn},wwpn=${wwpn}" > ${loopctl}/del_target_port
+}
new file mode 100644
@@ -0,0 +1,122 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2018 Johannes Thumshirn, Hannes Reinecke, SUSE Linux GmbH
+#
+# Reproducer for nvme-fcloop
+#
+
+. tests/nvme/rc
+. common/fcloop
+
+DESCRIPTION="create nvme-fcloop with two ports and connect/disconnect"
+
+requires() {
+ _have_program nvme && \
+ _have_modules loop nvme-fcloop nvmet nvmet-fc && \
+ _have_configfs
+}
+
+test() {
+ local subsys="blktests-subsystem-1"
+ local remote_wwnn1="0x100140111111dbcc"
+ local remote_wwpn1="0x200140111111dbcc"
+ local remote_wwnn2="0x100140111111dbcd"
+ local remote_wwpn2="0x200140111111dbcd"
+ local host_wwnn1="0x100140111111dac8"
+ local host_wwpn1="0x200140111111dac8"
+ local host_wwnn2="0x100140111111dac9"
+ local host_wwpn2="0x200140111111dac9"
+
+ echo "Running ${TEST_NAME}"
+
+ modprobe nvmet-fc
+ modprobe nvme-fcloop
+
+ _nvme_fcloop_add_tport ${remote_wwnn1} ${remote_wwpn1}
+ _nvme_fcloop_add_tport ${remote_wwnn2} ${remote_wwpn2}
+
+ _nvme_fcloop_add_lport ${host_wwnn1} ${host_wwpn1}
+ _nvme_fcloop_add_lport ${host_wwnn2} ${host_wwpn2}
+
+ _nvme_fcloop_add_rport ${host_wwnn1} ${host_wwpn1} \
+ ${remote_wwnn1} ${remote_wwpn1}
+ _nvme_fcloop_add_rport ${host_wwnn2} ${host_wwpn2} \
+ ${remote_wwnn2} ${remote_wwpn2}
+
+ local port1
+ port1=$(_create_nvmet_port "fc")
+ ag1="$(_create_nvmet_anagroup "${port1}")"
+
+ local port2
+ port2=$(_create_nvmet_port "fc")
+ ag2="$(_create_nvmet_anagroup "${port2}")"
+
+ local remote_traddr1
+ remote_traddr1=$(printf "nn-%s:pn-%s" "${remote_wwnn1}" "${remote_wwpn1}")
+ echo fc > /sys/kernel/config/nvmet/ports/${port1}/addr_adrfam
+ echo "${remote_traddr1}" > /sys/kernel/config/nvmet/ports/${port1}/addr_traddr
+
+ local remote_traddr2
+ remote_traddr2=$(printf "nn-%s:pn-%s" "${remote_wwnn2}" "${remote_wwpn2}")
+ echo fc > /sys/kernel/config/nvmet/ports/${port2}/addr_adrfam
+ echo "${remote_traddr2}" > /sys/kernel/config/nvmet/ports/${port2}/addr_traddr
+
+ truncate -s 1G "$TMPDIR/img"
+
+ local loop_dev
+ loop_dev="$(losetup -f --show "$TMPDIR/img")"
+
+ _create_nvmet_subsystem "${subsys}" "${loop_dev}" \
+ "91fdba0d-f87b-4c25-b80f-db7be1418b9e" "1"
+ _add_nvmet_subsys_to_port "${port1}" "${subsys}"
+ _add_nvmet_subsys_to_port "${port2}" "${subsys}"
+
+ _set_nvmet_anagroup_state "${port2}" "1" "inaccessible"
+ _set_nvmet_anagroup_state "${port2}" "2" "optimized"
+
+ local host_traddr1
+ host_traddr1=$(printf "nn-%s:pn-%s" "${host_wwnn1}" "${host_wwpn1}")
+
+ nvme connect -t fc -a "${remote_traddr1}" -w "${host_traddr1}" \
+ -n "${subsys}"
+
+ local host_traddr2
+ host_traddr2=$(printf "nn-%s:pn-%s" "${host_wwnn2}" "${host_wwpn2}")
+
+ nvme connect -t fc -a "${remote_traddr2}" -w "${host_traddr2}" \
+ -n "${subsys}"
+
+ nvmedev="$(_find_nvme_ns 91fdba0d-f87b-4c25-b80f-db7be1418b9e)"
+
+ # Allow I/O to settle
+ udevadm settle
+
+ nvme disconnect -n "${subsys}"
+
+ _remove_nvmet_subsystem_from_port "${port1}" "${subsys}"
+ _remove_nvmet_subsystem_from_port "${port2}" "${subsys}"
+ _remove_nvmet_subsystem "${subsys}"
+ _remove_nvmet_anagroup "${port1}" "${ag1}"
+ _remove_nvmet_port "${port1}"
+ _remove_nvmet_anagroup "${port2}" "${ag2}"
+ _remove_nvmet_port "${port2}"
+
+ losetup -d "$loop_dev"
+ rm "$TMPDIR/img"
+
+ # Fixme: need to wait for RCU grace period
+ sleep 5
+
+ _nvme_fcloop_del_rport "${host_wwnn1}" "${host_wwpn1}" \
+ "${remote_wwnn1}" "${remote_wwpn1}"
+ _nvme_fcloop_del_rport "${host_wwnn2}" "${host_wwpn2}" \
+ "${remote_wwnn2}" "${remote_wwpn2}"
+
+ _nvme_fcloop_del_tport "${remote_wwnn1}" "${remote_wwpn1}"
+ _nvme_fcloop_del_tport "${remote_wwnn2}" "${remote_wwpn2}"
+
+ _nvme_fcloop_del_lport "${host_wwnn1}" "${host_wwpn1}"
+ _nvme_fcloop_del_lport "${host_wwnn2}" "${host_wwpn2}"
+
+ echo "Test complete"
+}
new file mode 100644
@@ -0,0 +1,3 @@
+Running nvme/034
+NQN:blktests-subsystem-1 disconnected 2 controller(s)
+Test complete
Add a test for the in-kernel fcloop driver. Despite being a loop driver it still requires an actual FC card to run this test. Signed-off-by: Hannes Reinecke <hare@suse.de> --- common/fcloop | 58 +++++++++++++++++++++++++ tests/nvme/034 | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/nvme/034.out | 3 ++ 3 files changed, 183 insertions(+) create mode 100644 common/fcloop create mode 100644 tests/nvme/034 create mode 100644 tests/nvme/034.out