system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-30 21:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

nvme: widen nvme_qpair_manual_complete_request for better errors

Browse source 
Make nvme_qpair_manual_complete_request take dnr as well as a
print_on_error action. Make the status word computation common between
it and nvme_qpair_manual_complete_tracker. And print the error when
we are cancelling the I/O on failure, but not when we're filtering
the I/O after we've failed. Make it private again to nvme_qpair.c.

Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D46049
This commit is contained in:
Warner Losh 2024-07-19 20:56:04 -06:00
parent 9229b3105d
commit 123e29068e
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/dev/nvme/nvme_private.h
View file

@ -417,9 +417,6 @@ void nvme_qpair_submit_request(struct nvme_qpair *qpair,
struct nvme_request *req);
void nvme_qpair_reset(struct nvme_qpair *qpair);
void nvme_qpair_fail(struct nvme_qpair *qpair);
void nvme_qpair_manual_complete_request(struct nvme_qpair *qpair,
struct nvme_request *req,
uint32_t sct, uint32_t sc);
void nvme_admin_qpair_enable(struct nvme_qpair *qpair);
void nvme_admin_qpair_disable(struct nvme_qpair *qpair);

37
sys/dev/nvme/nvme_qpair.c
View file

@ -482,6 +482,20 @@ nvme_qpair_complete_tracker(struct nvme_tracker *tr,
mtx_unlock(&qpair->lock);
}
static uint32_t
nvme_qpair_make_status(uint32_t sct, uint32_t sc, uint32_t dnr)
{
uint32_t status = 0;
status |= NVMEF(NVME_STATUS_SCT, sct);
status |= NVMEF(NVME_STATUS_SC, sc);
status |= NVMEF(NVME_STATUS_DNR, dnr);
/* M=0 : this is artificial so no data in error log page */
/* CRD=0 : this is artificial and no delayed retry support anyway */
/* P=0 : phase not checked */
return (status);
}
static void
nvme_qpair_manual_complete_tracker(
struct nvme_tracker *tr, uint32_t sct, uint32_t sc, uint32_t dnr,
@ -496,30 +510,24 @@ nvme_qpair_manual_complete_tracker(
cpl.sqid = qpair->id;
cpl.cid = tr->cid;
cpl.status |= NVMEF(NVME_STATUS_SCT, sct);
cpl.status |= NVMEF(NVME_STATUS_SC, sc);
cpl.status |= NVMEF(NVME_STATUS_DNR, dnr);
/* M=0 : this is artificial so no data in error log page */
/* CRD=0 : this is artificial and no delayed retry support anyway */
/* P=0 : phase not checked */
cpl.status = nvme_qpair_make_status(sct, sc, dnr);
nvme_qpair_complete_tracker(tr, &cpl, print_on_error);
}
void
static void
nvme_qpair_manual_complete_request(struct nvme_qpair *qpair,
struct nvme_request *req, uint32_t sct, uint32_t sc)
struct nvme_request *req, uint32_t sct, uint32_t sc, uint32_t dnr,
error_print_t print_on_error)
{
struct nvme_completion cpl;
bool error;
memset(&cpl, 0, sizeof(cpl));
cpl.sqid = qpair->id;
cpl.status |= NVMEF(NVME_STATUS_SCT, sct);
cpl.status |= NVMEF(NVME_STATUS_SC, sc);
cpl.status = nvme_qpair_make_status(sct, sc, dnr);
error = nvme_completion_is_error(&cpl);
if (error) {
if (error && print_on_error == ERROR_PRINT_ALL) {
nvme_qpair_print_command(qpair, &req->cmd);
nvme_qpair_print_completion(qpair, &cpl);
}
@ -1277,7 +1285,8 @@ _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req)
*/
if (qpair->ctrlr->is_failed) {
nvme_qpair_manual_complete_request(qpair, req,
NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST);
NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, 1,
ERROR_PRINT_NONE);
return;
}
@ -1512,7 +1521,7 @@ nvme_qpair_fail(struct nvme_qpair *qpair)
STAILQ_REMOVE_HEAD(&qpair->queued_req, stailq);
mtx_unlock(&qpair->lock);
nvme_qpair_manual_complete_request(qpair, req, NVME_SCT_GENERIC,
NVME_SC_ABORTED_BY_REQUEST);
NVME_SC_ABORTED_BY_REQUEST, 1, ERROR_PRINT_ALL);
mtx_lock(&qpair->lock);
}