Commit 31d22408 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/nvmf: only check for rxe when testing RDMA 



Using Soft-RoCE is only relevant when testing
RDMA transport. For all other cases, we might
treat the IP address as non-rxe.

This simplifies the checks a little bit in couple places.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I996afb364070fbe107bbe97207952f99e4089308
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3596


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 79aac783

test/nvmf/common.sh

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ function revert_soft_roce() { 
}



function check_ip_is_soft_roce() {

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

		return 0

	fi

	rxe_cfg status rxe | grep -wq "$1"

}

test/nvmf/host/bdevperf.sh

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ function tgt_init() { 
nvmftestinit

# There is an intermittent error relating to this test and Soft-RoCE. for now, just

# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1165

if [ $TEST_TRANSPORT == "rdma" ] && check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, skipping the host bdevperf tests."

	exit 0

fi

test/nvmf/host/target_disconnect.sh

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ function nvmf_target_disconnect_tc3() { 
nvmftestinit

# There is an intermittent error relating to this test and Soft-RoCE. for now, just

# skip this test if we are using rxe. TODO: get to the bottom of GitHub issue #1043

if [ $TEST_TRANSPORT == "rdma" ] && check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, skipping the target disconnect tests."

else

	run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1

test/nvmf/target/shutdown.sh

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ function nvmf_shutdown_tc3() { 
# The shutdown tests create a lot of edge cases that Soft-RoCE doesn't respond well to.

# Specifically Soft-RoCE will return invalid values in the WC field after a qp has been

# destroyed which lead to NULL pointer references not seen in real hardware.

if [ $TEST_TRANSPORT == "rdma" ] && check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

if check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then

	echo "Using software RDMA, skipping the shutdown tests."

	exit 0

fi