From 2a7c957bd6330753c8ed67cf1e5a35fcf4778326 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Mon, 19 Dec 2016 13:37:34 -0800 Subject: [PATCH] nvme: factor out a nvme_unmap_data helper This is the counter part to nvme_map_data. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe (cherry picked from commit d4f6c3aba5b496a2cb80a8e8e082ae51e46579f3) Orabug: 25130845 Conflicts: drivers/nvme/host/pci.c Signed-off-by: Ashok Vairavan Reviewed-by: Martin K. Petersen --- drivers/nvme/host/pci.c | 42 ++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 9028912139b17..6ee3ab3612974 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -93,10 +93,12 @@ static struct class *nvme_class; struct nvme_dev; struct nvme_queue; +struct nvme_iod; static int __nvme_reset(struct nvme_dev *dev); static int nvme_reset(struct nvme_dev *dev); static int nvme_process_cq(struct nvme_queue *nvmeq); +static void nvme_unmap_data(struct nvme_dev *dev, struct nvme_iod *iod); static void nvme_dead_ctrl(struct nvme_dev *dev); struct async_cmd_info { @@ -675,21 +677,21 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, struct nvme_iod *iod = ctx; struct request *req = iod_get_private(iod); struct nvme_cmd_info *cmd_rq = blk_mq_rq_to_pdu(req); - bool requeue = false; - u16 status = le16_to_cpup(&cqe->status) >> 1; + int error = 0; if (unlikely(status)) { if (!(status & NVME_SC_DNR || blk_noretry_request(req)) && (jiffies - req->start_time) < req->timeout) { unsigned long flags; + nvme_unmap_data(nvmeq->dev, iod); blk_mq_requeue_request(req); spin_lock_irqsave(req->q->queue_lock, flags); if (!blk_queue_stopped(req->q)) blk_mq_kick_requeue_list(req->q); spin_unlock_irqrestore(req->q->queue_lock, flags); - goto release_iod; + return; } if (req->cmd_type == REQ_TYPE_DRV_PRIV) { if (cmd_rq->ctx == CMD_CTX_CANCELLED) @@ -711,21 +713,9 @@ static void req_completion(struct nvme_queue *nvmeq, void *ctx, dev_warn(nvmeq->dev->dev, "completing aborted command with status:%04x\n", status); - release_iod: - if (iod->nents) { - dma_unmap_sg(nvmeq->dev->dev, iod->sg, iod->nents, - rq_data_dir(req) ? DMA_TO_DEVICE : DMA_FROM_DEVICE); - if (blk_integrity_rq(req)) { - if (!rq_data_dir(req)) - nvme_dif_remap(req, nvme_dif_complete); - dma_unmap_sg(nvmeq->dev->dev, iod->meta_sg, 1, - rq_data_dir(req) ? DMA_TO_DEVICE : DMA_FROM_DEVICE); - } - } - nvme_free_iod(nvmeq->dev, iod); - if (likely(!requeue)) - blk_mq_complete_request(req); + nvme_unmap_data(nvmeq->dev, iod); + blk_mq_complete_request(req, error); } /* length is in bytes. gfp flags indicates whether we may sleep. */ @@ -857,6 +847,24 @@ out: return ret; } +static void nvme_unmap_data(struct nvme_dev *dev, struct nvme_iod *iod) +{ + struct request *req = iod_get_private(iod); + enum dma_data_direction dma_dir = rq_data_dir(req) ? + DMA_TO_DEVICE : DMA_FROM_DEVICE; + + if (iod->nents) { + dma_unmap_sg(dev->dev, iod->sg, iod->nents, dma_dir); + if (blk_integrity_rq(req)) { + if (!rq_data_dir(req)) + nvme_dif_remap(req, nvme_dif_complete); + dma_unmap_sg(dev->dev, iod->meta_sg, 1, dma_dir); + } + } + + nvme_free_iod(dev, iod); +} + /* * We reuse the small pool to allocate the 16-byte range here as it is not * worth having a special pool for these or additional cases to handle freeing -- 2.50.1