Commit a50a70ec authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

nvmf: abort outstanding zcopy reqs in qpair disconnect 



Zero-copy requests are kept on the outstanding queue for the whole
duration of the request - from the initial zcopy_start submission to the
completion of zcopy_end.  This means, that there's a period in which a
request doesn't wait for a completion from the bdev layer, but is still
on the oustanding queue (after zcopy_start callback, before zcopy_end
submit).  If a qpair gets disconnected while a request is in this state,
we need to manually force its completion, as otherwise it might hang
indefinitely (e.g. waiting for host data).

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I53731b8e363b725efa564ca3c7d89b46f5fb2a24
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10793


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 974a32b7

lib/nvmf/ctrlr.c

+20 −0
Original line number Diff line number Diff line
@@ -2777,6 +2777,26 @@ nvmf_qpair_abort_aer(struct spdk_nvmf_qpair *qpair, uint16_t cid) 
	return false;

}



void

nvmf_qpair_abort_pending_zcopy_reqs(struct spdk_nvmf_qpair *qpair)

{

	struct spdk_nvmf_request *req, *tmp;



	TAILQ_FOREACH_SAFE(req, &qpair->outstanding, link, tmp) {

		if (req->zcopy_phase == NVMF_ZCOPY_PHASE_EXECUTE) {

			/* Zero-copy requests are kept on the outstanding queue from the moment

			 * zcopy_start is sent until a zcopy_end callback is received.  Therefore,

			 * we can't remove them from the outstanding queue here, but need to rely on

			 * the transport to do a zcopy_end to release their buffers and, in turn,

			 * remove them from the queue.

			 */

			req->rsp->nvme_cpl.status.sct = SPDK_NVME_SCT_GENERIC;

			req->rsp->nvme_cpl.status.sc = SPDK_NVME_SC_ABORTED_BY_REQUEST;

			nvmf_transport_req_free(req);

		}

	}

}



static void

nvmf_qpair_abort_request(struct spdk_nvmf_qpair *qpair, struct spdk_nvmf_request *req)

{

lib/nvmf/nvmf.c

+1 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ spdk_nvmf_qpair_disconnect(struct spdk_nvmf_qpair *qpair, nvmf_qpair_disconnect_ 
		SPDK_DTRACE_PROBE2(nvmf_poll_group_drain_qpair, qpair, spdk_thread_get_id(group->thread));

		qpair->state_cb = _nvmf_qpair_destroy;

		qpair->state_cb_arg = qpair_ctx;

		nvmf_qpair_abort_pending_zcopy_reqs(qpair);

		nvmf_qpair_free_aer(qpair);

		return 0;

	}

lib/nvmf/nvmf_internal.h

+8 −0
Original line number Diff line number Diff line
@@ -448,6 +448,14 @@ void nvmf_ctrlr_reservation_notice_log(struct spdk_nvmf_ctrlr *ctrlr, 
 */

void nvmf_ctrlr_abort_aer(struct spdk_nvmf_ctrlr *ctrlr);



/*

 * Abort zero-copy requests that already got the buffer (received zcopy_start cb), but haven't

 * started zcopy_end.  These requests are kept on the outstanding queue, but are not waiting for a

 * completion from the bdev layer, so, when a qpair is being disconnected, we need to kick them to

 * force their completion.

 */

void nvmf_qpair_abort_pending_zcopy_reqs(struct spdk_nvmf_qpair *qpair);



/*

 * Free aer simply frees the rdma resources for the aer without informing the host.

 * This function should be called when deleting a qpair when one wants to make sure

test/unit/lib/nvmf/fc.c/fc_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ DEFINE_STUB(spdk_nvme_transport_id_compare, int, 
DEFINE_STUB(spdk_bdev_get_name, const char *, (const struct spdk_bdev *bdev), "fc_ut_test");

DEFINE_STUB_V(nvmf_ctrlr_destruct, (struct spdk_nvmf_ctrlr *ctrlr));

DEFINE_STUB_V(nvmf_qpair_free_aer, (struct spdk_nvmf_qpair *qpair));

DEFINE_STUB_V(nvmf_qpair_abort_pending_zcopy_reqs, (struct spdk_nvmf_qpair *qpair));

DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *, (struct spdk_bdev_desc *desc),

	    NULL);

DEFINE_STUB_V(spdk_nvmf_request_exec, (struct spdk_nvmf_request *req));

test/unit/lib/nvmf/nvmf.c/nvmf_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ DEFINE_STUB_V(nvmf_transport_qpair_fini, (struct spdk_nvmf_qpair *qpair, 
		spdk_nvmf_transport_qpair_fini_cb cb_fn,

		void *cb_arg));

DEFINE_STUB_V(nvmf_qpair_free_aer, (struct spdk_nvmf_qpair *qpair));

DEFINE_STUB_V(nvmf_qpair_abort_pending_zcopy_reqs, (struct spdk_nvmf_qpair *qpair));

DEFINE_STUB(nvmf_transport_poll_group_create, struct spdk_nvmf_transport_poll_group *,

	    (struct spdk_nvmf_transport *transport), NULL);

DEFINE_STUB(spdk_bdev_get_io_channel, struct spdk_io_channel *, (struct spdk_bdev_desc *desc),