Commit e826bd04 authored by Krzysztof Goreczny's avatar Krzysztof Goreczny Committed by Tomasz Zawadzki
Browse files

test/nvmf: add no hugepages to the NVMf tests 



This patch builds on top the 1826245a to cover all current NVMf tests.

Change-Id: Ib96213383698585715ecbaad22dfba3c1c26fab4
Signed-off-by: default avatarKrzysztof Goreczny <krzysztof.goreczny@dell.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26330


Reviewed-by: default avatarMichal Berger <michal.berger@nutanix.com>
Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Reviewed-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Reviewed-by: default avatarKonrad Sztyber <ksztyber@nvidia.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent bc8c7f97

test/nvmf/fips/fips.sh

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ setup_nvmf_tgt_conf $key_path 
# Use bdevperf as initiator.

bdevperf_rpc_sock="/var/tmp/bdevperf.sock"

"$rootdir/build/examples/bdevperf" -m 0x4 -z -r $bdevperf_rpc_sock \

	-q 128 -o 4096 -w verify -t 10 &

	-q 128 -o 4096 -w verify -t 10 "${NO_HUGE[@]}" &

bdevperf_pid=$!

waitforlisten $bdevperf_pid $bdevperf_rpc_sock

test/nvmf/host/digest.sh

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ run_bperf_err() { 
	local rw bs qd



	rw=$1 bs=$2 qd=$3

	"$rootdir/build/examples/bdevperf" -m 2 -r "$bperfsock" -w $rw -o $bs -t $runtime -q $qd -z &

	"$rootdir/build/examples/bdevperf" -m 2 -r "$bperfsock" -w $rw -o $bs -t $runtime -q $qd -z "${NO_HUGE[@]}" &

	bperfpid=$!



	waitforlisten "$bperfpid" "$bperfsock"
@@ -79,7 +79,7 @@ run_bperf() { 


	rw=$1 bs=$2 qd=$3 scan_dsa=$4



	"$rootdir/build/examples/bdevperf" -m 2 -r "$bperfsock" -w $rw -o $bs -t $runtime -q $qd -z --wait-for-rpc &

	"$rootdir/build/examples/bdevperf" -m 2 -r "$bperfsock" -w $rw -o $bs -t $runtime -q $qd -z --wait-for-rpc "${NO_HUGE[@]}" &

	bperfpid=$!

	waitforlisten "$bperfpid" "$bperfsock"

test/nvmf/host/discovery.sh

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ $rpc_py bdev_wait_for_examine 
# and then check if the discovery service has detected the changes and constructed the correct

# subsystem, ctrlr and bdev objects.



$SPDK_BIN_DIR/nvmf_tgt -m 0x1 -r $HOST_SOCK &

$SPDK_BIN_DIR/nvmf_tgt -m 0x1 -r $HOST_SOCK "${NO_HUGE[@]}" &

hostpid=$!

waitforlisten $hostpid $HOST_SOCK

test/nvmf/host/discovery_remove_ifc.sh

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ $rpc_py << CFG 
	nvmf_subsystem_add_host ${nqn}0 $host_nqn

CFG



$SPDK_BIN_DIR/nvmf_tgt -m 0x1 -r $host_sock --wait-for-rpc -L bdev_nvme &

$SPDK_BIN_DIR/nvmf_tgt -m 0x1 -r $host_sock --wait-for-rpc -L bdev_nvme "${NO_HUGE[@]}" &

hostpid=$!

waitforlisten $hostpid $host_sock

test/nvmf/host/failover.sh

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ $rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPOR 
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_SECOND_PORT

$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_THIRD_PORT



$rootdir/build/examples/bdevperf -z -r $bdevperf_rpc_sock -q 128 -o 4096 -w verify -t 15 -f &> $testdir/try.txt &

$rootdir/build/examples/bdevperf -z -r $bdevperf_rpc_sock -q 128 -o 4096 -w verify -t 15 -f "${NO_HUGE[@]}" &> $testdir/try.txt &

bdevperf_pid=$!



trap 'process_shm --id $NVMF_APP_SHM_ID; cat $testdir/try.txt; rm -f $testdir/try.txt; killprocess $bdevperf_pid; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
@@ -69,7 +69,7 @@ if ((count != 3)); then 
fi



# Part 2 of the test. Start removing ports, starting with the one we are connected to, confirm that the ctrlr remains active until the final trid is removed.

$rootdir/build/examples/bdevperf -z -r $bdevperf_rpc_sock -q 128 -o 4096 -w verify -t 1 -f &> $testdir/try.txt &

$rootdir/build/examples/bdevperf "${NO_HUGE[@]}" -z -r $bdevperf_rpc_sock -q 128 -o 4096 -w verify -t 1 -f &> $testdir/try.txt &

bdevperf_pid=$!



waitforlisten $bdevperf_pid $bdevperf_rpc_sock