Commit 813756e7 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

nvme: Do not abort transport commands when disconnecting a qpair 



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: default avatarBen 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
parent bdc9fa83

lib/nvme/nvme_rdma.c

+4 −2
Original line number Diff line number Diff line
@@ -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

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_abort_reqs(&rqpair->qpair, 0);



	if (ret) {

		SPDK_DEBUGLOG(nvme, "Target did not respond to qpair disconnect.\n");

		goto quiet;
@@ -2178,8 +2182,6 @@ nvme_rdma_stale_conn_retry(struct nvme_rdma_qpair *rqpair) 
	return 0;

}



static void nvme_rdma_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);



static int

nvme_rdma_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

lib/nvme/nvme_tcp.c

+3 −2
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ fail: 
	return -ENOMEM;

}



static void nvme_tcp_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);



static void

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);

	}



	nvme_tcp_qpair_abort_reqs(qpair, 0);

	nvme_transport_ctrlr_disconnect_qpair_done(qpair);

}



static void nvme_tcp_qpair_abort_reqs(struct spdk_nvme_qpair *qpair, uint32_t dnr);



static int

nvme_tcp_ctrlr_delete_io_qpair(struct spdk_nvme_ctrlr *ctrlr, struct spdk_nvme_qpair *qpair)

{

lib/nvme/nvme_transport.c

+0 −1
Original line number Diff line number Diff line
@@ -546,7 +546,6 @@ void 
nvme_transport_ctrlr_disconnect_qpair_done(struct spdk_nvme_qpair *qpair)

{

	nvme_qpair_abort_all_queued_reqs(qpair, 0);

	nvme_transport_qpair_abort_reqs(qpair, 0);

	nvme_qpair_set_state(qpair, NVME_QPAIR_DISCONNECTED);

}