Commit f366e261 authored by Jim Harris's avatar Jim Harris Committed by Changpeng Liu
Browse files

nvme: abort aers at common layer 



We submit AERs to all controllers - both pcie and
fabrics.  But currently we only manually abort the
aers when disabling the qpair for pcie.  Make this
common instead by creating a new transport function
for aborting aers.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I1e926b61b8035488cdc6e8cb4336b373732f985e

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453482


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent a5c54a1f

lib/nvme/nvme_ctrlr.c

+5 −0
Original line number Diff line number Diff line
@@ -842,6 +842,8 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) 
		ctrlr->outstanding_aborts--;

	}



	nvme_transport_admin_qpair_abort_aers(ctrlr->adminq);



	/* Disable all queues before disabling the controller hardware. */

	nvme_qpair_disable(ctrlr->adminq);

	TAILQ_FOREACH(qpair, &ctrlr->active_io_qpairs, tailq) {
@@ -2283,6 +2285,9 @@ nvme_ctrlr_destruct(struct spdk_nvme_ctrlr *ctrlr) 
	struct spdk_nvme_qpair *qpair, *tmp;



	SPDK_DEBUGLOG(SPDK_LOG_NVME, "Prepare to destruct SSD: %s\n", ctrlr->trid.traddr);



	nvme_transport_admin_qpair_abort_aers(ctrlr->adminq);



	TAILQ_FOREACH_SAFE(qpair, &ctrlr->active_io_qpairs, tailq, tmp) {

		spdk_nvme_ctrlr_free_io_qpair(qpair);

	}

lib/nvme/nvme_internal.h

+2 −1
Original line number Diff line number Diff line
@@ -993,7 +993,8 @@ struct spdk_nvme_ctrlr *spdk_nvme_get_ctrlr_by_trid_unsafe( 
	int nvme_ ## name ## _qpair_reset(struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _qpair_fail(struct spdk_nvme_qpair *qpair); \

	int nvme_ ## name ## _qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_request *req); \

	int32_t nvme_ ## name ## _qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions);

	int32_t nvme_ ## name ## _qpair_process_completions(struct spdk_nvme_qpair *qpair, uint32_t max_completions); \

	void nvme_ ## name ## _admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair); \



DECLARE_TRANSPORT(transport) /* generic transport dispatch functions */

DECLARE_TRANSPORT(pcie)

lib/nvme/nvme_pcie.c

+1 −2
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ nvme_pcie_qpair_abort_trackers(struct spdk_nvme_qpair *qpair, uint32_t dnr) 
	}

}



static void

void

nvme_pcie_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair)

{

	struct nvme_pcie_qpair	*pqpair = nvme_pcie_qpair(qpair);
@@ -1448,7 +1448,6 @@ nvme_pcie_qpair_enable(struct spdk_nvme_qpair *qpair) 
static void

nvme_pcie_admin_qpair_disable(struct spdk_nvme_qpair *qpair)

{

	nvme_pcie_admin_qpair_abort_aers(qpair);

}



static void

lib/nvme/nvme_rdma.c

+23 −0
Original line number Diff line number Diff line
@@ -1790,6 +1790,29 @@ nvme_rdma_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, siz 
	return 0;

}



void

nvme_rdma_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair)

{

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



	cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;

	cpl.status.sct = SPDK_NVME_SCT_GENERIC;



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

		if (rdma_req->req->cmd.opc != SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) {

			continue;

		}

		assert(rdma_req->req != NULL);

		req = rdma_req->req;



		nvme_rdma_req_complete(req, &cpl);

		nvme_rdma_req_put(rqpair, rdma_req);

	}

}



void

spdk_nvme_rdma_init_hooks(struct spdk_nvme_rdma_hooks *hooks)

{

lib/nvme/nvme_tcp.c

+23 −0
Original line number Diff line number Diff line
@@ -1878,3 +1878,26 @@ nvme_tcp_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, size 
{

	return 0;

}



void

nvme_tcp_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair)

{

	struct nvme_tcp_req *tcp_req, *tmp;

	struct nvme_request *req;

	struct spdk_nvme_cpl cpl;

	struct nvme_tcp_qpair *tqpair = nvme_tcp_qpair(qpair);



	cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;

	cpl.status.sct = SPDK_NVME_SCT_GENERIC;



	TAILQ_FOREACH_SAFE(tcp_req, &tqpair->outstanding_reqs, link, tmp) {

		if (tcp_req->req->cmd.opc != SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) {

			continue;

		}

		assert(tcp_req->req != NULL);

		req = tcp_req->req;



		nvme_tcp_req_complete(req, &cpl);

		nvme_tcp_req_put(tqpair, tcp_req);

	}

}