d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nvme: add nvme_wait_for_completion_robust_lock_timeout_poll

Browse Source 
This is exension to the existing nvme_wait_for_completion* interface
that allows the user to poll for request's completion without blocking.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Change-Id: I6c5b7203883f8e2fa28ceb039ce63aa50631f571
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8601
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Monica Kenguva <monica.kenguva@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Jim Harris 2021-05-28 19:52:53 +00:00 committed by Tomasz Zawadzki
parent 20e6c821dc
commit ecd46370d9
2 changed files with 69 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
lib/nvme/nvme.c
View File

@ -262,6 +262,66 @@ dummy_disconnected_qpair_cb(struct spdk_nvme_qpair *qpair, void *poll_group_ctx)
{
}
int
nvme_wait_for_completion_robust_lock_timeout_poll(struct spdk_nvme_qpair *qpair,
struct nvme_completion_poll_status *status,
pthread_mutex_t *robust_mutex)
{
int rc;
if (robust_mutex) {
nvme_robust_mutex_lock(robust_mutex);
}
if (qpair->poll_group) {
rc = (int)spdk_nvme_poll_group_process_completions(qpair->poll_group->group, 0,
dummy_disconnected_qpair_cb);
} else {
rc = spdk_nvme_qpair_process_completions(qpair, 0);
}
if (robust_mutex) {
nvme_robust_mutex_unlock(robust_mutex);
}
if (rc < 0) {
status->cpl.status.sct = SPDK_NVME_SCT_GENERIC;
status->cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;
goto error;
}
if (!status->done && status->timeout_tsc && spdk_get_ticks() > status->timeout_tsc) {
goto error;
}
if (qpair->ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE) {
union spdk_nvme_csts_register csts = spdk_nvme_ctrlr_get_regs_csts(qpair->ctrlr);
if (csts.raw == SPDK_NVME_INVALID_REGISTER_VALUE) {
status->cpl.status.sct = SPDK_NVME_SCT_GENERIC;
status->cpl.status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;
goto error;
}
}
if (!status->done) {
return -EAGAIN;
} else if (spdk_nvme_cpl_is_error(&status->cpl)) {
return -EIO;
} else {
return 0;
}
error:
/* Either transport error occurred or we've timed out. Either way, if the response hasn't
* been received yet, mark the command as timed out, so the status gets freed when the
* command is completed or aborted.
*/
if (!status->done) {
status->timed_out = true;
}
return -ECANCELED;
}
/**
* Poll qpair for completions until a command completes.
*
@ -285,7 +345,7 @@ nvme_wait_for_completion_robust_lock_timeout(
pthread_mutex_t *robust_mutex,
uint64_t timeout_in_usecs)
{
int rc = 0;
int rc;
if (timeout_in_usecs) {
status->timeout_tsc = spdk_get_ticks() + timeout_in_usecs *
@ -294,50 +354,12 @@ nvme_wait_for_completion_robust_lock_timeout(
status->timeout_tsc = 0;
}
while (status->done == false) {
if (robust_mutex) {
nvme_robust_mutex_lock(robust_mutex);
}
status->cpl.status_raw = 0;
do {
rc = nvme_wait_for_completion_robust_lock_timeout_poll(qpair, status, robust_mutex);
} while (rc == -EAGAIN);
if (qpair->poll_group) {
rc = (int)spdk_nvme_poll_group_process_completions(qpair->poll_group->group, 0,
dummy_disconnected_qpair_cb);
} else {
rc = spdk_nvme_qpair_process_completions(qpair, 0);
}
if (robust_mutex) {
nvme_robust_mutex_unlock(robust_mutex);
}
if (rc < 0) {
status->cpl.status.sct = SPDK_NVME_SCT_GENERIC;
status->cpl.status.sc = SPDK_NVME_SC_ABORTED_SQ_DELETION;
break;
}
if (status->timeout_tsc && spdk_get_ticks() > status->timeout_tsc) {
rc = -1;
break;
}
if (qpair->ctrlr->trid.trtype == SPDK_NVME_TRANSPORT_PCIE) {
union spdk_nvme_csts_register csts = spdk_nvme_ctrlr_get_regs_csts(qpair->ctrlr);
if (csts.raw == SPDK_NVME_INVALID_REGISTER_VALUE) {
status->cpl.status.sct = SPDK_NVME_SCT_GENERIC;
status->cpl.status.sc = SPDK_NVME_SC_INTERNAL_DEVICE_ERROR;
break;
}
}
}
if (status->done == false) {
status->timed_out = true;
}
if (rc < 0) {
return -ECANCELED;
}
return spdk_nvme_cpl_is_error(&status->cpl) ? -EIO : 0;
return rc;
}
/**

3
lib/nvme/nvme_internal.h
View File

@ -1038,6 +1038,9 @@ int nvme_wait_for_completion_robust_lock_timeout(struct spdk_nvme_qpair *qpair,
struct nvme_completion_poll_status *status,
pthread_mutex_t *robust_mutex,
uint64_t timeout_in_usecs);
int nvme_wait_for_completion_robust_lock_timeout_poll(struct spdk_nvme_qpair *qpair,
struct nvme_completion_poll_status *status,
pthread_mutex_t *robust_mutex);
struct spdk_nvme_ctrlr_process *nvme_ctrlr_get_process(struct spdk_nvme_ctrlr *ctrlr,
pid_t pid);