Messages in this thread Patch in this message | | | Subject | [PATCH 2/2] nvme-pci: fix metadata mapping length | From | Jinyoung CHOI <> | Date | Wed, 12 Apr 2023 14:24:43 +0900 |
| |
Even if the memory allocated for integrity is physically continuous, struct bio_vec is composed separately for each page size. In order not to use the blk_rq_map_integrity_sg(), the length of the DMA mapping should be the total size of integrity payload.
Fixes: 783b94bd9250 ("nvme-pci: do not build a scatterlist to map metadata") Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com> --- drivers/nvme/host/pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 593f86323e25..611c677add67 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -827,8 +827,10 @@ static blk_status_t nvme_map_metadata(struct nvme_dev *dev, struct request *req, { struct nvme_iod *iod = blk_mq_rq_to_pdu(req); - iod->meta_dma = dma_map_bvec(dev->dev, rq_integrity_vec(req), - rq_dma_dir(req), 0); + iod->meta_dma = dma_map_page(dev->dev, rq_integrity_vec(req)->bv_page, + rq_integrity_vec(req)->bv_offset, + rq_integrity_payload_size(req), + rq_dma_dir(req)); if (dma_mapping_error(dev->dev, iod->meta_dma)) return BLK_STS_IOERR; cmnd->rw.metadata = cpu_to_le64(iod->meta_dma); @@ -968,7 +970,8 @@ 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_payload_size(req), + rq_data_dir(req)); } if (blk_rq_nr_phys_segments(req)) -- 2.34.1
| |