From 60a0f0855d5d086d5549c19dec41f640d002767e Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 2 Nov 2017 13:07:59 -0700 Subject: [PATCH] test/nvmf: test multi-process access to local NVMe Change-Id: Id7b09f6d872ceec78274dbfbb1ce2148f9022191 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/385480 Tested-by: SPDK Automated Test System Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- test/nvmf/host/perf.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/test/nvmf/host/perf.sh b/test/nvmf/host/perf.sh index b2d0e025c3..8bf091979d 100755 --- a/test/nvmf/host/perf.sh +++ b/test/nvmf/host/perf.sh @@ -22,7 +22,12 @@ fi timing_enter perf timing_enter start_nvmf_tgt -$NVMF_APP -c $testdir/../nvmf.conf & +cp $testdir/../nvmf.conf $testdir/nvmf.conf +$rootdir/scripts/gen_nvme.sh >> $testdir/nvmf.conf + +local_nvme_trid=$(grep TransportID $testdir/nvmf.conf | head -n1 | awk -F"\"" '{print $2}') + +$NVMF_APP -c $testdir/nvmf.conf -i 0 & nvmfpid=$! trap "killprocess $nvmfpid; exit 1" SIGINT SIGTERM EXIT @@ -32,13 +37,24 @@ timing_exit start_nvmf_tgt bdevs="$bdevs $($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" +if [ -n "$local_nvme_trid" ]; then + bdevs="$bdevs Nvme0n1" +fi + $rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" '' -a -s SPDK00000000000001 -n "$bdevs" -$rootdir/examples/nvme/perf/perf -q 128 -s 4096 -w randrw -M 50 -t 1 -r "trtype:RDMA adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" +# Test multi-process access to local NVMe device +if [ -n "$local_nvme_trid" ]; then + $rootdir/examples/nvme/perf/perf -i 0 -q 32 -s 4096 -w randrw -M 50 -t 1 -r "$local_nvme_trid" +fi + +$rootdir/examples/nvme/perf/perf -q 32 -s 4096 -w randrw -M 50 -t 1 -r "trtype:RDMA adrfam:IPv4 traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" sync $rpc_py delete_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 trap - SIGINT SIGTERM EXIT +rm -f $testdir/nvmf.conf + killprocess $nvmfpid timing_exit perf