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

nvmf: resume queued zcopy requests 



The zero-copy requests can also be queued when a subsystem is paused, so
we need to properly resume and submit them by using zcopy_start.

Since only requests that haven't received the zero-copy buffer (i.e.
before zcopy_start was called) can be queued, we don't need to bother
with checking zcopy_phase.

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


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

lib/nvmf/nvmf.c

+6 −2
Original line number Diff line number Diff line
@@ -1591,9 +1591,13 @@ nvmf_poll_group_resume_subsystem(struct spdk_nvmf_poll_group *group, 
	/* Release all queued requests */

	TAILQ_FOREACH_SAFE(req, &sgroup->queued, link, tmp) {

		TAILQ_REMOVE(&sgroup->queued, req, link);

		assert(req->zcopy_phase == NVMF_ZCOPY_PHASE_NONE);

		if (spdk_nvmf_request_using_zcopy(req)) {

			spdk_nvmf_request_zcopy_start(req);

		} else {

			spdk_nvmf_request_exec(req);

		}



	}

fini:

	if (cb_fn) {

		cb_fn(cb_arg, rc);

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ DEFINE_STUB_V(rte_hash_free, (struct rte_hash *h)); 
DEFINE_STUB(nvmf_fc_lld_port_add, int, (struct spdk_nvmf_fc_port *fc_port), 0);

DEFINE_STUB(nvmf_fc_lld_port_remove, int, (struct spdk_nvmf_fc_port *fc_port), 0);



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

DEFINE_STUB_V(spdk_nvmf_request_zcopy_end, (struct spdk_nvmf_request *req, bool commit));



const char *

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

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ DEFINE_STUB(nvmf_transport_qpair_get_listen_trid, int, 
	    (struct spdk_nvmf_qpair *qpair,

	     struct spdk_nvme_transport_id *trid), 0);

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

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

DEFINE_STUB(spdk_nvmf_get_transport_name, const char *,

	    (struct spdk_nvmf_transport *transport), NULL);

DEFINE_STUB(spdk_nvmf_transport_destroy, int, (struct spdk_nvmf_transport *transport,