Commit 7740b02e authored by Ben Walker's avatar Ben Walker
Browse files

nvmf: Keep track of outstanding requests 



This will allow us to later quiesce all requests for
a given subsystem.

Change-Id: I50a4df9bf1f65a2fc6668295cf9978d2099f6507
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/406450


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 16d0fbd0

lib/nvmf/nvmf.c

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ spdk_nvmf_poll_group_add_subsystem(struct spdk_nvmf_poll_group *group, 
	sgroup = &group->sgroups[subsystem->id];

	sgroup->state = SPDK_NVMF_SUBSYSTEM_ACTIVE;

	TAILQ_INIT(&sgroup->queued);

	TAILQ_INIT(&sgroup->outstanding);



	return 0;

}

lib/nvmf/nvmf_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ struct spdk_nvmf_subsystem_poll_group { 
	enum spdk_nvmf_subsystem_state state;



	TAILQ_HEAD(, spdk_nvmf_request)	queued;

	TAILQ_HEAD(, spdk_nvmf_request)	outstanding;

};



struct spdk_nvmf_poll_group {

lib/nvmf/request.c

+16 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ int 
spdk_nvmf_request_complete(struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl;

	struct spdk_nvmf_capsule_cmd *cap_hdr;



	rsp->sqid = 0;

	rsp->status.p = 0;
@@ -59,6 +60,18 @@ spdk_nvmf_request_complete(struct spdk_nvmf_request *req) 
		      rsp->cid, rsp->cdw0, rsp->rsvd1,

		      *(uint16_t *)&rsp->status);



	cap_hdr = &req->cmd->nvmf_cmd;



	if (spdk_unlikely(req->cmd->nvmf_cmd.opcode == SPDK_NVME_OPC_FABRIC &&

			  cap_hdr->fctype == SPDK_NVMF_FABRIC_COMMAND_CONNECT)) {

		/* CONNECT commands don't actually get placed on the outstanding list. */

	} else {

		struct spdk_nvmf_subsystem_poll_group *sgroup;



		sgroup = &req->qpair->group->sgroups[req->qpair->ctrlr->subsys->id];

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

	}



	if (spdk_nvmf_transport_req_complete(req)) {

		SPDK_ERRLOG("Transport request completion error!\n");

	}
@@ -126,6 +139,9 @@ spdk_nvmf_request_exec(struct spdk_nvmf_request *req) 
			TAILQ_INSERT_TAIL(&sgroup->queued, req, link);

			return;

		}



		/* Place the request on the outstanding list so we can keep track of it */

		TAILQ_INSERT_TAIL(&sgroup->outstanding, req, link);

	}



	if (spdk_unlikely(req->cmd->nvmf_cmd.opcode == SPDK_NVME_OPC_FABRIC)) {