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

nvme: Do not abort transport commands when disconnecting a qpair

Browse Source 
Make this a transport-level decision instead. TCP and RDMA do want to
abort, but PCIe cannot because these commands may still be receiving DMA
operations from the device.

Change-Id: I305acddc3819c903eb3217e8f710d4216d0b3931
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11509
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Michael Haeuptle <michaelhaeuptle@gmail.com>
This commit is contained in:
Ben Walker 2022-03-14 14:23:55 -07:00 committed by Tomasz Zawadzki
parent bdc9fa832d
commit 813756e75e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nvme/nvme_rdma.c
View File

@ -1994,6 +1994,8 @@ nvme_rdma_qpair_destroy(struct nvme_rdma_qpair *rqpair)
} }
} }
static void nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);
static int static int
nvme_rdma_qpair_disconnected(struct nvme_rdma_qpair *rqpair, int ret) nvme_rdma_qpair_disconnected(struct nvme_rdma_qpair *rqpair, int ret)
{ {
@ -2001,6 +2003,8 @@ nvme_rdma_qpair_disconnected(struct nvme_rdma_qpair *rqpair, int ret)
nvme_rdma_qpair_destroy(rqpair); nvme_rdma_qpair_destroy(rqpair);
nvme_rdma_qpair_abort_reqs(&rqpair->qpair, 0);
if (ret) { if (ret) {
SPDK_DEBUGLOG(nvme, "Target did not respond to qpair disconnect.\n"); SPDK_DEBUGLOG(nvme, "Target did not respond to qpair disconnect.\n");
goto quiet; goto quiet;
@ -2178,8 +2182,6 @@ nvme_rdma_stale_conn_retry(struct nvme_rdma_qpair *rqpair)
return 0; return 0;
} }
static void nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);
static int static int
nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {

5
lib/nvme/nvme_tcp.c
View File

@ -320,6 +320,8 @@ fail:
return -ENOMEM; return -ENOMEM;
} }
static void nvme_tcp_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);
static void static void
nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {
@ -351,11 +353,10 @@ nvme_tcp_ctrlr_disconnect_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_
TAILQ_REMOVE(&tqpair->send_queue, pdu, tailq); TAILQ_REMOVE(&tqpair->send_queue, pdu, tailq);
} }
nvme_tcp_qpair_abort_reqs(qpair, 0);
nvme_transport_ctrlr_disconnect_qpair_done(qpair); nvme_transport_ctrlr_disconnect_qpair_done(qpair);
} }
static void nvme_tcp_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);
static int static int
nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair) nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)
{ {

1
lib/nvme/nvme_transport.c
View File

@ -546,7 +546,6 @@ void
nvme_transport_ctrlr_disconnect_qpair_done(struct spdk_nvme_qpair *qpair) nvme_transport_ctrlr_disconnect_qpair_done(struct spdk_nvme_qpair *qpair)
{ {
nvme_qpair_abort_all_queued_reqs(qpair, 0); nvme_qpair_abort_all_queued_reqs(qpair, 0);
nvme_transport_qpair_abort_reqs(qpair, 0);
nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED); nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);
} }