Commit 8b4534e4 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

nvmf_rdma: When destroying a qpair, fail the I/O. 



This helps us get rit of outstanding requests at the bdev layer.

Change-Id: I362c7c0c6641715fcd96e8eb465b308c368d34fc
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/431844


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 00450d8a

lib/nvme/nvme_rdma.c

+22 −1
Original line number Diff line number Diff line
@@ -1271,6 +1271,7 @@ nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair) 
	if (!qpair) {

		return -1;

	}

	nvme_rdma_qpair_fail(qpair);

	nvme_qpair_deinit(qpair);



	rqpair = nvme_rdma_qpair(qpair);
@@ -1564,7 +1565,27 @@ nvme_rdma_qpair_reset(struct spdk_nvme_qpair *qpair) 
int

nvme_rdma_qpair_fail(struct spdk_nvme_qpair *qpair)

{

	/* Currently, doing nothing here */

	/*

	 * If the qpair is really failed, the connection is broken

	 * and we need to flush back all I/O

	 */

	struct spdk_nvme_rdma_req *rdma_req, *tmp;

	struct nvme_request *req;

	struct spdk_nvme_cpl cpl;

	struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair);



	/* Call it power loss since we don't know what happened, but the controller is gone. */

	cpl.status.sc = SPDK_NVME_SC_ABORTED_POWER_LOSS;

	cpl.status.sct = SPDK_NVME_SCT_GENERIC;



	TAILQ_FOREACH_SAFE(rdma_req, &rqpair->outstanding_reqs, link, tmp) {

		assert(rdma_req->req != NULL);

		req = rdma_req->req;



		nvme_rdma_req_complete(req, &cpl);

		nvme_rdma_req_put(rqpair, rdma_req);

	}



	return 0;

}