nvme-pci: fix dma_vecs leak on p2p memory
PATCH v3 1/2 nvme-pci: fix dma_vecs leak on p2p memory
From: Keith Busch <[email protected]>
We don't unmap P2P memory, so allocating the dma_vec for it was being leaked on completion.
--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/nvme/host/pci.c +2 -1
@@ -966,7 +966,8 @@ static bool nvme_pci_prp_save_mapping(struct request *req, {struct nvme_iod *iod =blk_mq_rq_to_pdu (req); -if (dma_use_iova (&iod->dma_state) || !dma_need_unmap (dma_dev)) +if (dma_use_iova (&iod->dma_state) || !dma_need_unmap (dma_dev) || + iod->flags &IOD_DATA_P2P )return true;if (!iod->nr_dma_vecs) {
Signature · 1 line
2.53.0-Meta
PATCH v3 2/2 nvme-pci: fix dma mapping leak on data setup error
From: Keith Busch <[email protected]>
We're leaking the initial DMA mapping during iteration if we fail to allocate the tracking descriptor for both PRP and SGL. Unmap the iterator directly; we can't use the existing unmap helper because it depends on the tracking descriptor being successfully allocated, so a new one for an in-use iterator is provided.
The mappings were also leaking when the driver detects an invalid bio_vec when mapping PRPs, so fix that too.
---v2->v3:
Made the same fix for metadata sgl handling, and factored out a common helper that data and metadata can both use.
drivers/nvme/host/pci.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-)
drivers/nvme/host/pci.c +28 -3
@@ -997,6 +997,23 @@ static bool nvme_pci_prp_iter_next(struct request *req, struct device *dma_dev,return nvme_pci_prp_save_mapping (req, dma_dev, iter); } +static void nvme_unmap_iter (struct request *req,struct blk_dma_iter *iter, +struct dma_iova_state *state) +{ +struct nvme_queue *nvmeq = req->mq_hctx->driver_data; +struct device *dev = nvmeq->dev->dev; + +if (!blk_rq_dma_unmap (req, dev, state, iter->len, iter->p2pdma.map)) { +unsigned int attrs =0 ; + +if (iter->p2pdma.map ==PCI_P2PDMA_MAP_THRU_HOST_BRIDGE ) + attrs |=DMA_ATTR_MMIO ; + +dma_unmap_phys (dev, iter->addr, iter->len,rq_dma_dir (req), + attrs); + } +} +static blk_status_t nvme_pci_setup_data_prp (struct request *req,struct blk_dma_iter *iter) {
@@ -1007,8 +1024,10 @@ static blk_status_t nvme_pci_setup_data_prp(struct request *req,unsigned int prp_len, i;__le64 *prp_list; -if (!nvme_pci_prp_save_mapping (req, nvmeq->dev->dev, iter)) +if (!nvme_pci_prp_save_mapping (req, nvmeq->dev->dev, iter)) { +nvme_unmap_iter (req, iter, &iod->dma_state);return iter->status; + }/* * PRP1 always points to the start of the DMA transfers.
@@ -1113,6 +1132,7 @@ static blk_status_t nvme_pci_setup_data_prp(struct request *req,dev_err_once (nvmeq->dev->dev,"Incorrectly formed request for payload:%d nents:%d\n" ,blk_rq_payload_bytes (req),blk_rq_nr_phys_segments (req)); +nvme_unmap_data (req);return BLK_STS_IOERR ; }
@@ -1156,8 +1176,11 @@ static blk_status_t nvme_pci_setup_data_sgl(struct request *req, sg_list =dma_pool_alloc (nvme_dma_pool (nvmeq, iod),GFP_ATOMIC , &sgl_dma); -if (!sg_list) +if (!sg_list) { +nvme_unmap_iter (req, iter, &iod->dma_state);return BLK_STS_RESOURCE ; + } + iod->descriptors[iod->nr_descriptors++] = sg_list; do {
@@ -1314,8 +1337,10 @@ static blk_status_t nvme_pci_setup_meta_iter(struct request *req) sg_list =dma_pool_alloc (nvmeq->descriptor_pools.small,GFP_ATOMIC , &sgl_dma); -if (!sg_list) +if (!sg_list) { +nvme_unmap_iter (req, &iter, &iod->meta_dma_state);return BLK_STS_RESOURCE ; + } iod->meta_descriptor = sg_list; iod->meta_dma = sgl_dma;
Signature · 1 line
2.53.0-Meta
Re: [PATCHv3 2/2] nvme-pci: fix dma mapping leak on data setup error
Quoted 5 lines · Keith Busch
drivers/nvme/host/pci.c +5
-0+static void nvme_unmap_iter (struct request *req,struct blk_dma_iter *iter, +struct dma_iova_state *state) +{ +struct nvme_queue *nvmeq = req->mq_hctx->driver_data; +struct device *dev = nvmeq->dev->dev;
drivers/nvme/host/pci.c static bool nvme_pci_prp_iter_next(struct request *req, struct device *dma_dev, · line 1014
Quoted 10 lines
drivers/nvme/host/pci.c +10
-0+ +if (!blk_rq_dma_unmap (req, dev, state, iter->len, iter->p2pdma.map)) { +unsigned int attrs =0 ; + +if (iter->p2pdma.map ==PCI_P2PDMA_MAP_THRU_HOST_BRIDGE ) + attrs |=DMA_ATTR_MMIO ; + +dma_unmap_phys (dev, iter->addr, iter->len,rq_dma_dir (req), + attrs); + }
At some point this might be worth lifting to the block layer, but we can defer that until needed.
Otherwise looks good:
Quoted 16 lines · Keith Busch
From: Keith Busch <[email protected]>
We don't unmap P2P memory, so allocating the
dma_vecfor it was being leaked on completion.Fixes b8b7570a7ec87 ("nvme-pci: fix dma unmapping when using PRPs and not using the IOVA mapping")Signed-off-by Keith Busch <[email protected]>--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/nvme/host/pci.c +0
-0
drivers/nvme/host/pci.c static bool nvme_pci_prp_save_mapping(struct request *req, · line 970
Quoted 6 lines
drivers/nvme/host/pci.c +2
-1@@ -966,7 +966,8 @@ static bool nvme_pci_prp_save_mapping(struct request *req, {struct nvme_iod *iod =blk_mq_rq_to_pdu (req); -if (dma_use_iova (&iod->dma_state) || !dma_need_unmap (dma_dev)) +if (dma_use_iova (&iod->dma_state) || !dma_need_unmap (dma_dev) || + iod->flags &IOD_DATA_P2P )
Missing braces around the & for our usual style?
Otherwise looks good:
Keith Busch
maintainerQuoted 20 lines · Christoph Hellwig
Quoted 19 lines · Keith Busch
From: Keith Busch <[email protected]>
We don't unmap P2P memory, so allocating the
dma_vecfor it was being leaked on completion.Fixes b8b7570a7ec87 ("nvme-pci: fix dma unmapping when using PRPs and not using the IOVA mapping")Signed-off-by Keith Busch <[email protected]>--- drivers/nvme/host/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/nvme/host/pci.c +0
-0@@ -966,7 +966,8 @@ static bool nvme_pci_prp_save_mapping(struct request *req, {struct nvme_iod *iod =blk_mq_rq_to_pdu (req);
Quoted 5 lines
drivers/nvme/host/pci.c static bool nvme_pci_prp_save_mapping(struct request *req, · line 970
Quoted 3 lines
drivers/nvme/host/pci.c +2
-1-if (dma_use_iova (&iod->dma_state) || !dma_need_unmap (dma_dev)) +if (dma_use_iova (&iod->dma_state) || !dma_need_unmap (dma_dev) || + iod->flags &IOD_DATA_P2P )Missing braces around the & for our usual style?
Thanks, fixed up and applied.