Skip to content

Commit 3948955

Browse files
committed
Merge branch 'nvme-5.7' of git://git.infradead.org/nvme into block-5.7
Pull NVMe fix from Christoph. * 'nvme-5.7' of git://git.infradead.org/nvme: nvme-pci: dma read memory barrier for completions
2 parents 59c7c3c + b69e2ef commit 3948955

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/nvme/host/pci.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -989,6 +989,11 @@ static inline int nvme_process_cq(struct nvme_queue *nvmeq)
989989

990990
while (nvme_cqe_pending(nvmeq)) {
991991
found++;
992+
/*
993+
* load-load control dependency between phase and the rest of
994+
* the cqe requires a full read memory barrier
995+
*/
996+
dma_rmb();
992997
nvme_handle_cqe(nvmeq, nvmeq->cq_head);
993998
nvme_update_cq_head(nvmeq);
994999
}

0 commit comments

Comments
 (0)