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

nvme: Call the timeout callback only a single time

Browse Source 
For each command that times out, call the timeout
callback one time if the user registered one.

Change-Id: Iaad39a886468e89bef63fe292c5cad1dce97a57c
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2017-03-30 09:20:47 -07:00
parent a005708d7d
commit b9feeb03c1
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/nvme/nvme_pcie.c
View File

@ -119,7 +119,8 @@ struct nvme_tracker {
struct nvme_request *req; struct nvme_request *req;
uint16_t cid; uint16_t cid;
uint16_t rsvd1: 15; uint16_t rsvd1: 14;
uint16_t timed_out: 1;
uint16_t active: 1; uint16_t active: 1;
uint32_t rsvd2; uint32_t rsvd2;
@ -1020,6 +1021,7 @@ nvme_pcie_qpair_submit_tracker(struct spdk_nvme_qpair *qpair, struct nvme_tracke
struct nvme_pcie_ctrlr *pctrlr = nvme_pcie_ctrlr(qpair->ctrlr); struct nvme_pcie_ctrlr *pctrlr = nvme_pcie_ctrlr(qpair->ctrlr);
tr->submit_tick = spdk_get_ticks(); tr->submit_tick = spdk_get_ticks();
tr->timed_out = 0;
req = tr->req; req = tr->req;
pqpair->tr[tr->cid].active = true; pqpair->tr[tr->cid].active = true;
@ -1778,7 +1780,7 @@ nvme_pcie_qpair_submit_request(struct spdk_nvme_qpair *qpair, struct nvme_reques
} }
TAILQ_REMOVE(&pqpair->free_tr, tr, tq_list); /* remove tr from free_tr */ TAILQ_REMOVE(&pqpair->free_tr, tr, tq_list); /* remove tr from free_tr */
TAILQ_INSERT_HEAD(&pqpair->outstanding_tr, tr, tq_list); TAILQ_INSERT_TAIL(&pqpair->outstanding_tr, tr, tq_list);
tr->req = req; tr->req = req;
req->cmd.cid = tr->cid; req->cmd.cid = tr->cid;
@ -1817,36 +1819,29 @@ static void
nvme_pcie_qpair_check_timeout(struct spdk_nvme_qpair *qpair) nvme_pcie_qpair_check_timeout(struct spdk_nvme_qpair *qpair)
{ {
uint64_t t02; uint64_t t02;
struct nvme_tracker *tr; struct nvme_tracker *tr, *tmp;
struct nvme_pcie_qpair *pqpair = nvme_pcie_qpair(qpair); struct nvme_pcie_qpair *pqpair = nvme_pcie_qpair(qpair);
struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr; struct spdk_nvme_ctrlr *ctrlr = qpair->ctrlr;
if (TAILQ_EMPTY(&pqpair->outstanding_tr)) {
return;
}
/*
* qpair could be either for normal i/o or for admin command. If qpair is admin
* and request is SPDK_NVME_OPC_ASYNC_EVENT_REQUEST, skip to next previous.
*/
tr = TAILQ_LAST(&pqpair->outstanding_tr, nvme_outstanding_tr_head);
while (tr->req->cmd.opc == SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) {
/* qpair is for admin request */
tr = TAILQ_PREV(tr, nvme_outstanding_tr_head, tq_list);
if (!tr) {
/*
* All request were AER
*/
return;
}
}
t02 = spdk_get_ticks(); t02 = spdk_get_ticks();
if (tr->submit_tick + ctrlr->timeout_ticks <= t02) { TAILQ_FOREACH_SAFE(tr, &pqpair->outstanding_tr, tq_list, tmp) {
/* if (tr->timed_out) {
* Request has timed out. This could be i/o or admin request. continue;
* Call the registered timeout function for user to take action. }
*/
if (qpair == ctrlr->adminq &&
tr->req->cmd.opc == SPDK_NVME_OPC_ASYNC_EVENT_REQUEST) {
continue;
}
if (tr->submit_tick + ctrlr->timeout_ticks > t02) {
/* The trackers are in order, so as soon as one has not timed out,
* stop iterating.
*/
break;
}
tr->timed_out = 1;
ctrlr->timeout_cb_fn(ctrlr->timeout_cb_arg, ctrlr, qpair, tr->cid); ctrlr->timeout_cb_fn(ctrlr->timeout_cb_arg, ctrlr, qpair, tr->cid);
} }
} }