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

test/nvmf: add tcp support

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I1d162b9bb4c9ee61871f4bc5b81e6b9bb696ab48

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456697
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ziye Yang <ziye.yang@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
This commit is contained in:
Jim Harris 2019-06-03 13:35:33 -07:00 committed by Ben Walker
parent 02c1c5a69a
commit aa429c8044
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/nvmf/common.sh
View File

@ -141,7 +141,7 @@ function nvmfcleanup()
sync sync
set +e set +e
for i in {1..20}; do for i in {1..20}; do
modprobe -v -r nvme-rdma nvme-fabrics modprobe -v -r nvme-$TEST_TRANSPORT nvme-fabrics
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
set -e set -e
return return
@ -152,7 +152,7 @@ function nvmfcleanup()
# So far unable to remove the kernel modules. Try # So far unable to remove the kernel modules. Try
# one more time and let it fail. # one more time and let it fail.
modprobe -v -r nvme-rdma nvme-fabrics modprobe -v -r nvme-$TEST_TRANSPORT nvme-fabrics
} }
function nvmftestinit() function nvmftestinit()
@ -163,13 +163,19 @@ function nvmftestinit()
fi fi
if [ "$TEST_MODE" == "iso" ]; then if [ "$TEST_MODE" == "iso" ]; then
$rootdir/scripts/setup.sh $rootdir/scripts/setup.sh
rdma_device_init if [ "$TEST_TRANSPORT" == "rdma" ]; then
rdma_device_init
fi
fi fi
RDMA_IP_LIST=$(get_available_rdma_ips) if [ "$TEST_TRANSPORT" == "rdma" ]; then
NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1) RDMA_IP_LIST=$(get_available_rdma_ips)
if [ -z $NVMF_FIRST_TARGET_IP ]; then NVMF_FIRST_TARGET_IP=$(echo "$RDMA_IP_LIST" | head -n 1)
echo "no NIC for nvmf test" if [ -z $NVMF_FIRST_TARGET_IP ]; then
exit 0 echo "no NIC for nvmf test"
exit 0
fi
elif [ "$TEST_TRANSPORT" == "tcp" ]; then
NVMF_FIRST_TARGET_IP=127.0.0.1
fi fi
} }
@ -180,7 +186,7 @@ function nvmfappstart()
nvmfpid=$! nvmfpid=$!
trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT trap "process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1" SIGINT SIGTERM EXIT
waitforlisten $nvmfpid waitforlisten $nvmfpid
modprobe nvme-rdma modprobe nvme-$TEST_TRANSPORT
timing_exit start_nvmf_tgt timing_exit start_nvmf_tgt
} }
@ -189,7 +195,9 @@ function nvmftestfini()
killprocess $nvmfpid killprocess $nvmfpid
if [ "$TEST_MODE" == "iso" ]; then if [ "$TEST_MODE" == "iso" ]; then
$rootdir/scripts/setup.sh reset $rootdir/scripts/setup.sh reset
rdma_device_init if [ "$TEST_TRANSPORT" == "rdma" ]; then
rdma_device_init
fi
fi fi
} }