From 2cc6b0dfcb1f9a1306d3431b1ea6446eb98b8dce Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 5 Apr 2019 11:15:10 -0700 Subject: [PATCH] rdma: set the number of wr sge_entries per I/O This was not being properly set in the multi-sgl path. Also add a verification step to the fio configuration file to prevent against future regressions. Change-Id: I510b6acd92bc2fbc9b6fbec1d59945cc53584ad3 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450305 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker --- examples/nvme/fio_plugin/mock_sgl_config.fio | 4 ++-- lib/nvmf/rdma.c | 1 + test/nvmf/host/fio.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/nvme/fio_plugin/mock_sgl_config.fio b/examples/nvme/fio_plugin/mock_sgl_config.fio index ede5bfd70..7602087d7 100644 --- a/examples/nvme/fio_plugin/mock_sgl_config.fio +++ b/examples/nvme/fio_plugin/mock_sgl_config.fio @@ -3,14 +3,14 @@ ioengine=spdk thread=1 group_reporting=1 direct=1 -verify=0 enable_sgl=1 time_based=1 ramp_time=0 runtime=2 -iodepth=4 +iodepth=128 rw=randrw bs=16k +verify=md5 [test] numjobs=1 diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index f3a707169..15fcebe65 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -1497,6 +1497,7 @@ nvmf_rdma_fill_buffers(struct spdk_nvmf_rdma_transport *rtransport, } i++; } + wr->num_sge = i; return 0; } diff --git a/test/nvmf/host/fio.sh b/test/nvmf/host/fio.sh index 83bfb06ef..0043feaa3 100755 --- a/test/nvmf/host/fio.sh +++ b/test/nvmf/host/fio.sh @@ -96,6 +96,7 @@ fi trap - SIGINT SIGTERM EXIT +rm -f ./local-test-0-verify.state killprocess $nvmfpid nvmftestfini $1 timing_exit fio