github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 08:33:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nvme-pci: create common sgl unmapping helper

Browse Source 
This can be reused by metadata sgls once that starts using the blk-mq
dma api.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20250813153153.3260897-9-kbusch@meta.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Keith Busch 2025-08-13 08:31:52 -07:00 committed by Jens Axboe
parent c16b52a0a0
commit f0887e2a52
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/nvme/host/pci.c
View File

@ -693,25 +693,23 @@ static void nvme_free_prps(struct request *req)
mempool_free(iod->dma_vecs, nvmeq->dev->dmavec_mempool); mempool_free(iod->dma_vecs, nvmeq->dev->dmavec_mempool);
} }
static void nvme_free_sgls(struct request *req) static void nvme_free_sgls(struct request *req, struct nvme_sgl_desc *sge,
struct nvme_sgl_desc *sg_list)
{ {
struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
struct nvme_queue *nvmeq = req->mq_hctx->driver_data; struct nvme_queue *nvmeq = req->mq_hctx->driver_data;
struct device *dma_dev = nvmeq->dev->dev;
dma_addr_t sqe_dma_addr = le64_to_cpu(iod->cmd.common.dptr.sgl.addr);
unsigned int sqe_dma_len = le32_to_cpu(iod->cmd.common.dptr.sgl.length);
struct nvme_sgl_desc *sg_list = iod->descriptors[0];
enum dma_data_direction dir = rq_dma_dir(req); enum dma_data_direction dir = rq_dma_dir(req);
unsigned int len = le32_to_cpu(sge->length);
struct device *dma_dev = nvmeq->dev->dev;
unsigned int i;
if (iod->nr_descriptors) { if (sge->type == (NVME_SGL_FMT_DATA_DESC << 4)) {
unsigned int nr_entries = sqe_dma_len / sizeof(*sg_list), i; dma_unmap_page(dma_dev, le64_to_cpu(sge->addr), len, dir);
return;
for (i = 0; i < nr_entries; i++)
dma_unmap_page(dma_dev, le64_to_cpu(sg_list[i].addr),
le32_to_cpu(sg_list[i].length), dir);
} else {
dma_unmap_page(dma_dev, sqe_dma_addr, sqe_dma_len, dir);
} }
for (i = 0; i < len / sizeof(*sg_list); i++)
dma_unmap_page(dma_dev, le64_to_cpu(sg_list[i].addr),
le32_to_cpu(sg_list[i].length), dir);
} }
static void nvme_unmap_data(struct request *req) static void nvme_unmap_data(struct request *req)
@ -731,7 +729,8 @@ static void nvme_unmap_data(struct request *req)
if (!blk_rq_dma_unmap(req, dma_dev, &iod->dma_state, iod->total_len, if (!blk_rq_dma_unmap(req, dma_dev, &iod->dma_state, iod->total_len,
iod->flags & IOD_P2P_BUS_ADDR)) { iod->flags & IOD_P2P_BUS_ADDR)) {
if (nvme_pci_cmd_use_sgl(&iod->cmd)) if (nvme_pci_cmd_use_sgl(&iod->cmd))
nvme_free_sgls(req); nvme_free_sgls(req, iod->descriptors[0],
&iod->cmd.common.dptr.sgl);
else else
nvme_free_prps(req); nvme_free_prps(req);
} }