Commit b7423187 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

autotest.sh: call rdma_device_init only for RDMA tests 



Check test flags before calling rdma_device_init if
it's really needed, so that we don't call it when doing
TCP tests.

Change-Id: I2675a008cf84c7c4084cb83b44c279d2a497c3cb
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6998


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 8f052695

autotest.sh

+5 −6
Original line number Diff line number Diff line
@@ -151,10 +151,6 @@ timing_enter afterboot 
./scripts/setup.sh

timing_exit afterboot



timing_enter nvmf_setup

rdma_device_init

timing_exit nvmf_setup



if [[ $SPDK_TEST_CRYPTO -eq 1 || $SPDK_TEST_REDUCE -eq 1 ]]; then

	# Make sure that memory is distributed across all NUMA nodes - by default, all goes to

	# node0, but if QAT devices are attached to a different node, all of their VFs will end
@@ -248,11 +244,14 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
		# The NVMe-oF run test cases are split out like this so that the parser that compiles the

		# list of all tests can properly differentiate them. Please do not merge them into one line.

		if [ "$SPDK_TEST_NVMF_TRANSPORT" = "rdma" ]; then

			timing_enter rdma_setup

			rdma_device_init

			timing_exit rdma_setup

			run_test "nvmf_rdma" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT

			run_test "spdkcli_nvmf_rdma" ./test/spdkcli/nvmf.sh

			run_test "spdkcli_nvmf_rdma" ./test/spdkcli/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT

		elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "tcp" ]; then

			run_test "nvmf_tcp" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT

			run_test "spdkcli_nvmf_tcp" ./test/spdkcli/nvmf.sh

			run_test "spdkcli_nvmf_tcp" ./test/spdkcli/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT

			run_test "nvmf_identify_passthru" test/nvmf/target/identify_passthru.sh --transport=$SPDK_TEST_NVMF_TRANSPORT

			run_test "nvmf_dif" test/nvmf/target/dif.sh

		elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "fc" ]; then

test/json_config/json_config.sh

+8 −4
Original line number Diff line number Diff line
@@ -300,8 +300,12 @@ function create_iscsi_subsystem_config() { 
function create_nvmf_subsystem_config() {

	timing_enter "${FUNCNAME[0]}"



	RDMA_IP_LIST=$(get_available_rdma_ips)

	NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

	NVMF_FIRST_TARGET_IP="127.0.0.1"

	if [[ $SPDK_TEST_NVMF_TRANSPORT == "rdma" ]]; then

		rdma_device_init

		NVMF_FIRST_TARGET_IP=$(get_available_rdma_ips | head -n 1)

	fi



	if [[ -z $NVMF_FIRST_TARGET_IP ]]; then

		echo "Error: no NIC for nvmf test"

		return 1
@@ -310,11 +314,11 @@ function create_nvmf_subsystem_config() { 
	tgt_rpc bdev_malloc_create 8 512 --name MallocForNvmf0

	tgt_rpc bdev_malloc_create 4 1024 --name MallocForNvmf1



	tgt_rpc nvmf_create_transport -t RDMA -u 8192 -c 0

	tgt_rpc nvmf_create_transport -t $SPDK_TEST_NVMF_TRANSPORT -u 8192 -c 0

	tgt_rpc nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001

	tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf0

	tgt_rpc nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 MallocForNvmf1

	tgt_rpc nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t RDMA -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT"

	tgt_rpc nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $SPDK_TEST_NVMF_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s "$NVMF_PORT"



	timing_exit "${FUNCNAME[0]}"

}

test/spdkcli/match_files/spdkcli_nvmf.test.match

+7 −7
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ o- nvmf ........................................................................ 
  | | o- hosts .......................................................................................................... [Hosts: 1]

  | | | o- nqn.2014-08.org.spdk:cnode2 ....................................................................................... [...]

  | | o- listen_addresses ........................................................................................... [Addresses: 3]

  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]

  | | | o- $(N).$(N).$(N).$(N):4261 $(S) [RDMA]

  | | | o- $(N).$(N).$(N).$(N):4262 $(S) [RDMA]

  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [$(S)]

  | | | o- $(N).$(N).$(N).$(N):4261 $(S) [$(S)]

  | | | o- $(N).$(N).$(N).$(N):4262 $(S) [$(S)]

  | | o- namespaces ................................................................................................ [Namespaces: 4]

  | |   o- Malloc3 .................................................................................................... [Malloc3, 1]

  | |   o- Malloc4 .................................................................................................... [Malloc4, 2]
@@ -18,7 +18,7 @@ o- nvmf ........................................................................ 
  | o- nqn.2014-08.org.spdk:cnode2 ...................................................... [sn=$(S), st=NVMe, Allow any host]

  | | o- hosts .......................................................................................................... [Hosts: 0]

  | | o- listen_addresses ........................................................................................... [Addresses: 1]

  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]

  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [$(S)]

  | | o- namespaces ................................................................................................ [Namespaces: 1]

  | |   o- Malloc2 .................................................................................................... [Malloc2, 1]

  | o- nqn.2014-08.org.spdk:cnode3 ...................................................... [sn=$(S), st=NVMe, Allow any host]
@@ -26,9 +26,9 @@ o- nvmf ........................................................................ 
  |   | o- nqn.2014-08.org.spdk:cnode1 ....................................................................................... [...]

  |   | o- nqn.2014-08.org.spdk:cnode2 ....................................................................................... [...]

  |   o- listen_addresses ........................................................................................... [Addresses: 2]

  |   | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]

  |   | o- $(N).$(N).$(N).$(N):4261 $(S) [RDMA]

  |   | o- $(N).$(N).$(N).$(N):4260 $(S) [$(S)]

  |   | o- $(N).$(N).$(N).$(N):4261 $(S) [$(S)]

  |   o- namespaces ................................................................................................ [Namespaces: 1]

  |     o- Malloc1 .................................................................................................... [Malloc1, 1]

  o- transport ..................................................................................................... [Transports: 1]

    o- RDMA .................................................................................................................. [...]
 
    o- $(S) $(*) [...]

test/spdkcli/nvmf.sh

+13 −11
Original line number Diff line number Diff line
@@ -10,14 +10,16 @@ MATCH_FILE="spdkcli_nvmf.test" 
SPDKCLI_BRANCH="/nvmf"



trap 'on_error_exit; revert_soft_roce' ERR

rdma_device_init



timing_enter run_nvmf_tgt

run_nvmf_tgt

timing_exit run_nvmf_tgt



RDMA_IP_LIST=$(get_available_rdma_ips)

NVMF_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)

NVMF_TARGET_IP="127.0.0.1"

if [[ $TEST_TRANSPORT == "rdma" ]]; then

	rdma_device_init

	NVMF_TARGET_IP=$(get_available_rdma_ips | head -n 1)

fi



timing_enter spdkcli_create_nvmf_config

$spdkcli_job "'/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True
@@ -26,33 +28,33 @@ $spdkcli_job "'/bdevs/malloc create 32 512 Malloc1' 'Malloc1' True 
'/bdevs/malloc create 32 512 Malloc4' 'Malloc4' True

'/bdevs/malloc create 32 512 Malloc5' 'Malloc5' True

'/bdevs/malloc create 32 512 Malloc6' 'Malloc6' True

'nvmf/transport create RDMA max_io_qpairs_per_ctrlr=4 io_unit_size=8192' '' True

'nvmf/transport create $TEST_TRANSPORT max_io_qpairs_per_ctrlr=4 io_unit_size=8192' '' True

'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode1 N37SXV509SRW\

  max_namespaces=4 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode1' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc3 1' 'Malloc3' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc4 2' 'Malloc4' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

 $TEST_TRANSPORT $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode2 N37SXV509SRD\

 max_namespaces=2 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/namespaces create Malloc2' 'Malloc2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode2/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

 $TEST_TRANSPORT $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

'/nvmf/subsystem create nqn.2014-08.org.spdk:cnode3 N37SXV509SRR\

 max_namespaces=2 allow_any_host=True' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/namespaces create Malloc1' 'Malloc1' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

 $TEST_TRANSPORT $NVMF_TARGET_IP 4260 IPv4' '$NVMF_TARGET_IP:4260' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/listen_addresses create \

 RDMA $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True

 $TEST_TRANSPORT $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \

 nqn.2014-08.org.spdk:cnode1' 'nqn.2014-08.org.spdk:cnode1' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts create \

 nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host True' 'Allow any host'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1 allow_any_host False' 'Allow any host' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create RDMA $NVMF_TARGET_IP 4262 IPv4' '$NVMF_TARGET_IP:4262' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create $TEST_TRANSPORT $NVMF_TARGET_IP 4261 IPv4' '$NVMF_TARGET_IP:4261' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses create $TEST_TRANSPORT $NVMF_TARGET_IP 4262 IPv4' '$NVMF_TARGET_IP:4262' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts create nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc5' 'Malloc5' True

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces create Malloc6' 'Malloc6' True
@@ -68,7 +70,7 @@ $spdkcli_job "'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete nsi 
'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/namespaces delete_all' 'Malloc4'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/hosts delete nqn.2014-08.org.spdk:cnode2' 'nqn.2014-08.org.spdk:cnode2'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode3/hosts delete_all' 'nqn.2014-08.org.spdk:cnode1'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete RDMA $NVMF_TARGET_IP 4262' '$NVMF_TARGET_IP:4262'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete $TEST_TRANSPORT $NVMF_TARGET_IP 4262' '$NVMF_TARGET_IP:4262'

'/nvmf/subsystem/nqn.2014-08.org.spdk:cnode1/listen_addresses delete_all' '$NVMF_TARGET_IP:4261'

'/nvmf/subsystem delete nqn.2014-08.org.spdk:cnode3' 'nqn.2014-08.org.spdk:cnode3'

'/nvmf/subsystem delete_all' 'nqn.2014-08.org.spdk:cnode2'