ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: move timeout information to nvme_request

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

Change-Id: I386dd990f667d449e94ba4bcedaa3435743755fd
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/413862
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2018-06-05 15:58:02 -07:00 committed by Jim Harris
parent 1681a055f9
commit e7b29a14c0
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nvme/nvme_internal.h
View File

@ -191,6 +191,8 @@ struct nvme_request {
uint8_t retries; uint8_t retries;
bool timed_out;
/** /**
* Number of children requests still outstanding for this * Number of children requests still outstanding for this
* request which was split into multiple child requests. * request which was split into multiple child requests.
@ -217,6 +219,12 @@ struct nvme_request {
struct spdk_nvme_qpair *qpair; 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 * The active admin request can be moved to a per process pending
* list based on the saved pid to tell which process it belongs * list based on the saved pid to tell which process it belongs

21
lib/nvme/nvme_pcie.c
View File

@ -115,14 +115,12 @@ struct nvme_tracker {
struct nvme_request *req; struct nvme_request *req;
uint16_t cid; uint16_t cid;
uint16_t rsvd1: 14; uint16_t rsvd1: 15;
uint16_t timed_out: 1;
uint16_t active: 1; uint16_t active: 1;
uint32_t rsvd2; uint32_t rsvd2;
/* The value of spdk_get_ticks() when the tracker was submitted to the hardware. */ uint64_t rsvd3;
uint64_t submit_tick;
uint64_t prp_sgl_bus_addr; 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_qpair *pqpair = nvme_pcie_qpair(qpair);
struct nvme_pcie_ctrlr *pctrlr = nvme_pcie_ctrlr(qpair->ctrlr); 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)) { 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; pqpair->tr[tr->cid].active = true;
/* Copy the command from the tracker to the submission queue. */ /* 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(); t02 = spdk_get_ticks();
TAILQ_FOREACH_SAFE(tr, &pqpair->outstanding_tr, tq_list, tmp) { TAILQ_FOREACH_SAFE(tr, &pqpair->outstanding_tr, tq_list, tmp) {
if (tr->timed_out) { assert(tr->req != NULL);
if (tr->req->timed_out) {
continue; 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, /* The trackers are in order, so as soon as one has not timed out,
* stop iterating. * stop iterating.
*/ */
break; break;
} }
tr->timed_out = 1; tr->req->timed_out = true;
/* We don't want to expose the admin queue to the user, /* We don't want to expose the admin queue to the user,
* so when we're timing out admin commands set the * so when we're timing out admin commands set the