Skip to content

Commit 4aedb70

Browse files
author
Christoph Hellwig
committed
nvme-pci: split metadata handling from nvme_map_data / nvme_unmap_data
This prepares for some bigger changes to the data mapping helpers. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Keith Busch <[email protected]> Reviewed-by: Sagi Grimberg <[email protected]> Reviewed-by: Chaitanya Kulkarni <[email protected]>
1 parent 783b94b commit 4aedb70

File tree

1 file changed

+27
-21
lines changed

1 file changed

+27
-21
lines changed

drivers/nvme/host/pci.c

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -592,11 +592,6 @@ static void nvme_unmap_data(struct nvme_dev *dev, struct request *req)
592592
dma_addr_t dma_addr = iod->first_dma, next_dma_addr;
593593
int i;
594594

595-
if (blk_integrity_rq(req)) {
596-
dma_unmap_page(dev->dev, iod->meta_dma,
597-
rq_integrity_vec(req)->bv_len, dma_dir);
598-
}
599-
600595
if (iod->nents) {
601596
/* P2PDMA requests do not need to be unmapped */
602597
if (!is_pci_p2pdma_page(sg_page(iod->sg)))
@@ -858,24 +853,23 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
858853
ret = nvme_pci_setup_sgls(dev, req, &cmnd->rw, nr_mapped);
859854
else
860855
ret = nvme_pci_setup_prps(dev, req, &cmnd->rw);
861-
856+
out:
862857
if (ret != BLK_STS_OK)
863-
goto out;
864-
865-
ret = BLK_STS_IOERR;
866-
if (blk_integrity_rq(req)) {
867-
iod->meta_dma = dma_map_bvec(dev->dev, rq_integrity_vec(req),
868-
dma_dir, 0);
869-
if (dma_mapping_error(dev->dev, iod->meta_dma))
870-
goto out;
871-
cmnd->rw.metadata = cpu_to_le64(iod->meta_dma);
872-
}
858+
nvme_unmap_data(dev, req);
859+
return ret;
860+
}
873861

874-
return BLK_STS_OK;
862+
static blk_status_t nvme_map_metadata(struct nvme_dev *dev, struct request *req,
863+
struct nvme_command *cmnd)
864+
{
865+
struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
875866

876-
out:
877-
nvme_unmap_data(dev, req);
878-
return ret;
867+
iod->meta_dma = dma_map_bvec(dev->dev, rq_integrity_vec(req),
868+
rq_dma_dir(req), 0);
869+
if (dma_mapping_error(dev->dev, iod->meta_dma))
870+
return BLK_STS_IOERR;
871+
cmnd->rw.metadata = cpu_to_le64(iod->meta_dma);
872+
return 0;
879873
}
880874

881875
/*
@@ -913,9 +907,17 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
913907
goto out_free_cmd;
914908
}
915909

910+
if (blk_integrity_rq(req)) {
911+
ret = nvme_map_metadata(dev, req, &cmnd);
912+
if (ret)
913+
goto out_unmap_data;
914+
}
915+
916916
blk_mq_start_request(req);
917917
nvme_submit_cmd(nvmeq, &cmnd, bd->last);
918918
return BLK_STS_OK;
919+
out_unmap_data:
920+
nvme_unmap_data(dev, req);
919921
out_free_cmd:
920922
nvme_cleanup_cmd(req);
921923
return ret;
@@ -924,10 +926,14 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
924926
static void nvme_pci_complete_rq(struct request *req)
925927
{
926928
struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
929+
struct nvme_dev *dev = iod->nvmeq->dev;
927930

928931
nvme_cleanup_cmd(req);
932+
if (blk_integrity_rq(req))
933+
dma_unmap_page(dev->dev, iod->meta_dma,
934+
rq_integrity_vec(req)->bv_len, rq_data_dir(req));
929935
if (blk_rq_nr_phys_segments(req))
930-
nvme_unmap_data(iod->nvmeq->dev, req);
936+
nvme_unmap_data(dev, req);
931937
nvme_complete_rq(req);
932938
}
933939

0 commit comments

Comments
 (0)