Commit e7b29a14 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

nvme: move timeout information to nvme_request 



This is the first step toward timeout handling for other transports.

Change-Id: I386dd990f667d449e94ba4bcedaa3435743755fd
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/413862


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 1681a055

lib/nvme/nvme_internal.h

+8 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ struct nvme_request { 


	uint8_t				retries;



	bool				timed_out;



	/**

	 * Number of children requests still outstanding for this

	 *  request which was split into multiple child requests.
@@ -217,6 +219,12 @@ struct nvme_request { 


	struct spdk_nvme_qpair		*qpair;



	/*

	 * The value of spdk_get_ticks() when the request was submitted to the hardware.

	 * Only set if ctrlr->timeout_enabled is true.

	 */

	uint64_t			submit_tick;



	/**

	 * The active admin request can be moved to a per process pending

	 *  list based on the saved pid to tell which process it belongs

lib/nvme/nvme_pcie.c

+11 −10
Original line number Diff line number Diff line
@@ -115,14 +115,12 @@ struct nvme_tracker { 
	struct nvme_request		*req;

	uint16_t			cid;



	uint16_t			rsvd1: 14;

	uint16_t			timed_out: 1;

	uint16_t			rsvd1: 15;

	uint16_t			active: 1;



	uint32_t			rsvd2;



	/* The value of spdk_get_ticks() when the tracker was submitted to the hardware. */

	uint64_t			submit_tick;

	uint64_t			rsvd3;



	uint64_t			prp_sgl_bus_addr;
@@ -1168,12 +1166,13 @@ nvme_pcie_qpair_submit_tracker(struct spdk_nvme_qpair *qpair, struct nvme_tracke 
	struct nvme_pcie_qpair	*pqpair = nvme_pcie_qpair(qpair);

	struct nvme_pcie_ctrlr	*pctrlr = nvme_pcie_ctrlr(qpair->ctrlr);



	tr->timed_out = 0;

	req = tr->req;

	assert(req != NULL);

	req->timed_out = false;

	if (spdk_unlikely(pctrlr->ctrlr.timeout_enabled)) {

		tr->submit_tick = spdk_get_ticks();

		req->submit_tick = spdk_get_ticks();

	}



	req = tr->req;

	pqpair->tr[tr->cid].active = true;



	/* Copy the command from the tracker to the submission queue. */
@@ -2000,7 +1999,9 @@ nvme_pcie_qpair_check_timeout(struct spdk_nvme_qpair *qpair) 


	t02 = spdk_get_ticks();

	TAILQ_FOREACH_SAFE(tr, &pqpair->outstanding_tr, tq_list, tmp) {

		if (tr->timed_out) {

		assert(tr->req != NULL);



		if (tr->req->timed_out) {

			continue;

		}
@@ -2014,14 +2015,14 @@ nvme_pcie_qpair_check_timeout(struct spdk_nvme_qpair *qpair) 
			}

		}



		if (tr->submit_tick + active_proc->timeout_ticks > t02) {

		if (tr->req->submit_tick + active_proc->timeout_ticks > t02) {

			/* The trackers are in order, so as soon as one has not timed out,

			 * stop iterating.

			 */

			break;

		}



		tr->timed_out = 1;

		tr->req->timed_out = true;



		/* We don't want to expose the admin queue to the user,

		 * so when we're timing out admin commands set the