nvme-pci: fix DMA direction of unmapping integrity data
authorMing Lei <ming.lei@redhat.com>
Thu, 13 Jul 2023 09:26:20 +0000 (17:26 +0800)
committerKeith Busch <kbusch@kernel.org>
Thu, 13 Jul 2023 15:16:07 +0000 (08:16 -0700)
DMA direction should be taken in dma_unmap_page() for unmapping integrity
data.

Fix this DMA direction, and reported in Guangwu's test.

Reported-by: Guangwu Zhang <guazhang@redhat.com>
Fixes: 4aedb705437f ("nvme-pci: split metadata handling from nvme_map_data / nvme_unmap_data")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/pci.c

index 8e7dbe0ab89044e4d90818a5310266e9d2852c12..baf69af7ea78efd27e57c1c2cfe763ff17867c4e 100644 (file)
@@ -967,7 +967,7 @@ static __always_inline void nvme_pci_unmap_rq(struct request *req)
                struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
 
                dma_unmap_page(dev->dev, iod->meta_dma,
-                              rq_integrity_vec(req)->bv_len, rq_data_dir(req));
+                              rq_integrity_vec(req)->bv_len, rq_dma_dir(req));
        }
 
        if (blk_rq_nr_phys_segments(req))