ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/nvmf: only check for rxe when testing RDMA

Browse Source 
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: Tomasz 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: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Tomasz Zawadzki 2020-07-30 05:00:16 -04:00
parent 79aac78398
commit 31d2240873
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/nvmf/common.sh
View File

@ -217,6 +217,9 @@ function revert_soft_roce() {
} }
function check_ip_is_soft_roce() { function check_ip_is_soft_roce() {
if [ "$TEST_TRANSPORT" != "rdma" ]; then
return 0
fi
rxe_cfg status rxe | grep -wq "$1" rxe_cfg status rxe | grep -wq "$1"
} }

2
test/nvmf/host/bdevperf.sh
View File

@ -23,7 +23,7 @@ function tgt_init() {
nvmftestinit nvmftestinit
# There is an intermittent error relating to this test and Soft-RoCE. for now, just # 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 # 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." echo "Using software RDMA, skipping the host bdevperf tests."
exit 0 exit 0
fi fi

2
test/nvmf/host/target_disconnect.sh
View File

@ -75,7 +75,7 @@ function nvmf_target_disconnect_tc3() {
nvmftestinit nvmftestinit
# There is an intermittent error relating to this test and Soft-RoCE. for now, just # 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 # 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." echo "Using software RDMA, skipping the target disconnect tests."
else else
run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1 run_test "nvmf_target_disconnect_tc1" nvmf_target_disconnect_tc1

2
test/nvmf/target/shutdown.sh
View File

@ -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. # 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 # 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. # 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." echo "Using software RDMA, skipping the shutdown tests."
exit 0 exit 0
fi fi