Commit 6d18ea42 authored Apr 21, 2020 by Seth Howell Committed by Tomasz Zawadzki Jun 01, 2020

lib/nvme: force qpair disconnect before aborting rdma requests.



This is needed for shared completion queues which can still give us
successful completions on aborted requests if the qpair hasn't been
disconnected.

Signed-off-by: Seth Howell <seth.howell@intel.com>
Change-Id: I85cf1a81ef563d8c02d684b09d2f7ad5008e38cb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1961


Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>

parent b4e060b5

lib/nvme/nvme_rdma.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -2011,6 +2011,16 @@ nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr)
		cpl.status.sct = SPDK_NVME_SCT_GENERIC;
		cpl.status.dnr = dnr;

		/*
		* We cannot abort requests at the RDMA layer without
		* unregistering them. If we do, we can still get error
		* free completions on the shared completion queue.
		*/
		if (nvme_qpair_get_state(qpair) > NVME_QPAIR_DISCONNECTING &&
		nvme_qpair_get_state(qpair) != NVME_QPAIR_DESTROYING) {
		nvme_ctrlr_disconnect_qpair(qpair);
		}

		TAILQ_FOREACH_SAFE(rdma_req, &rqpair->outstanding_reqs, link, tmp) {
		assert(rdma_req->req != NULL);
		req = rdma_req->req;