block-5.7-2020-05-16

-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAl7ASxUQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgplFiD/4s4U+lu1pGEl2hZnzs62AcWB5dNMH6nHGG
 3aDewvzkGz30nPa6VykZIsIULgKeM0kTOC49efQ0+oeMdHnBeQGsfgWeZyToPAxc
 jyTZfmMmTAUNAL1venfVkTCOrk1IRoRrBLQ6I66t+6oQj2cWFj6eK2c/N45ZlpuV
 /NJZo6zegt2gz3Ay43VFXRMs2JACFQcrXapgNE8YFvfrUS0+6vJSig0UCRZGaR0x
 HL76V3qiZHLr/fdROnvu0fhtc4/CxfVu3V50v6ax9DCkpf80sQtOynkPW/5ssD/x
 oW2S2JMwu1MCJMDUB9gNUoYiLs2u/OdS4d2XnKI5V6Y0fcxkLEeqowCHbEP1ymJ/
 STUuJwCdlu0Zuwz64eLClFdq9coL1YykrqTLLwMVr86OcU/0xYu1iJ/c289htimq
 pB2CWvPZkECwENAy0cBHyMjfOla6/1pIXG9tnUvd9g5NqzerZDyC/lXA0oRmP3/E
 sws7Hd9Q5FeJBGCzjje7ZvsxkswncEMHIi5IEXu0P3W2y0PoJ6duY63QsC0AEiwy
 ZuFbmAfOJlQSDHA3M3N62Zfz0tgyYgs0P5duemHxeFhGrSdBTT9G83HqO1VL2mgv
 CWd4iAlcMAqoCgZx2ecXzsjEQZQ0A/S3HdXFfSd1DFqO0YUaXcueT1v70Pw9ZgZp
 6dvw3hSL5Q==
 =5rIo
 -----END PGP SIGNATURE-----

Merge tag 'block-5.7-2020-05-16' of git://git.kernel.dk/linux-block

Pull block fix from Jens Axboe:
 "Just a single NVMe pull in here, with a single fix for a missing DMA
  read memory barrier for completions"

* tag 'block-5.7-2020-05-16' of git://git.kernel.dk/linux-block:
  nvme-pci: dma read memory barrier for completions
This commit is contained in:
Linus Torvalds 2020-05-16 13:24:41 -07:00
commit 3d1c1e5931

View file

@ -989,6 +989,11 @@ static inline int nvme_process_cq(struct nvme_queue *nvmeq)
while (nvme_cqe_pending(nvmeq)) {
found++;
/*
* load-load control dependency between phase and the rest of
* the cqe requires a full read memory barrier
*/
dma_rmb();
nvme_handle_cqe(nvmeq, nvmeq->cq_head);
nvme_update_cq_head(nvmeq);
}