d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvme: coherently read status of completion records

Browse Source 
Coherently read the phase bit of the status completion record. We loop
over the completion record array, looking for all the transactions in
the same phase that have been completed. In doing that, we have to be
careful to read the status field first, and if it indicates a complete
record, we need to read and process that record. Otherwise, the host
might be overtaken by device when reading this completion record,
leading to a mistaken belief that the record is in phase. This leads to
the code using old values and looking at an already completed entry, which
has no current tracker.

To work around this problem, we read the status and make sure it is in
phase, we then re-read the entire completion record guaranteeing it's
complete, valid, and consistent . In addition we resync the dmatag to
reflect changes since the prior loop for the bouncing dma case.

Reviewed by:		jrtc27@, chuck@
Found by:		jrtc27 (this fix is based in part on her D30995 fix)
Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D31002
This commit is contained in:
Warner Losh 2021-07-02 16:00:42 -06:00
parent fea3cf1d6d
commit aa0ab681ae
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/nvme/nvme_qpair.c
View File

@ -583,13 +583,30 @@ nvme_qpair_process_completions(struct nvme_qpair *qpair)
}
while (1) {
cpl = qpair->cpl[qpair->cq_head];
uint16_t status;
/* Convert to host endian */
/*
* We need to do this dance to avoid a race between the host and
* the device where the device overtakes the host while the host
* is reading this record, leaving the status field 'new' and
* the sqhd and cid fields potentially stale. If the phase
* doesn't match, that means status hasn't yet been updated and
* we'll get any pending changes next time. It also means that
* the phase must be the same the second time. We have to sync
* before reading to ensure any bouncing completes.
*/
status = le16toh(qpair->cpl[qpair->cq_head].status);
if (NVME_STATUS_GET_P(status) != qpair->phase)
break;
bus_dmamap_sync(qpair->dma_tag, qpair->queuemem_map,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
cpl = qpair->cpl[qpair->cq_head];
nvme_completion_swapbytes(&cpl);
if (NVME_STATUS_GET_P(cpl.status) != qpair->phase)
break;
KASSERT(
NVME_STATUS_GET_P(status) == NVME_STATUS_GET_P(cpl.status),
("Phase unexpectedly inconsistent"));
tr = qpair->act_tr[cpl.cid];