Merge branch 'nvme-5.6-rc4' of git://git.infradead.org/nvme into block-5.6

axboe · axboe · commit 5b8ea58b6a33 · 2020-02-28T10:02:36.000-07:00
Pull NVMe fix from Keith.

* 'nvme-5.6-rc4' of git://git.infradead.org/nvme:
  nvme-pci: Hold cq_poll_lock while completing CQEs
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
@@ -1078,9 +1078,9 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx)
 
 	spin_lock(&nvmeq->cq_poll_lock);
 	found = nvme_process_cq(nvmeq, &start, &end, -1);
+	nvme_complete_cqes(nvmeq, start, end);
 	spin_unlock(&nvmeq->cq_poll_lock);
 
-	nvme_complete_cqes(nvmeq, start, end);
 	return found;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1078,9 +1078,9 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx)`
`1078`	`1078`
`1079`	`1079`	`spin_lock(&nvmeq->cq_poll_lock);`
`1080`	`1080`	`found = nvme_process_cq(nvmeq, &start, &end, -1);`
	`1081`	`+ nvme_complete_cqes(nvmeq, start, end);`
`1081`	`1082`	`spin_unlock(&nvmeq->cq_poll_lock);`
`1082`	`1083`
`1083`		`- nvme_complete_cqes(nvmeq, start, end);`
`1084`	`1084`	`return found;`
`1085`	`1085`	`}`
`1086`	`1086`