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

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

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

Change-Id: I362c7c0c6641715fcd96e8eb465b308c368d34fc
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/431844
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Seth Howell 2018-11-02 15:53:17 -07:00 committed by Jim Harris
parent 00450d8a84
commit 8b4534e43e
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/nvme/nvme_rdma.c
View File

@ -1271,6 +1271,7 @@ nvme_rdma_qpair_destroy(struct spdk_nvme_qpair *qpair)
if (!qpair) { if (!qpair) {
return -1; return -1;
} }
nvme_rdma_qpair_fail(qpair);
nvme_qpair_deinit(qpair); nvme_qpair_deinit(qpair);
rqpair = nvme_rdma_qpair(qpair); rqpair = nvme_rdma_qpair(qpair);
@ -1564,7 +1565,27 @@ nvme_rdma_qpair_reset(struct spdk_nvme_qpair *qpair)
int int
nvme_rdma_qpair_fail(struct spdk_nvme_qpair *qpair) 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; return 0;
} }