From: Chaitanya.Kulkarni@wdc.com (Chaitanya Kulkarni)
Subject: [PATCH 08/15] nvme-pci: merge nvme_free_iod into nvme_unmap_data
Date: Mon, 25 Mar 2019 05:22:27 +0000 [thread overview]
Message-ID: <SN6PR04MB452734A9E74001D4684E2675865E0@SN6PR04MB4527.namprd04.prod.outlook.com> (raw)
In-Reply-To: 20190321231037.25104-9-hch@lst.de
On 3/21/19 4:11 PM, Christoph Hellwig wrote:
> This means we now have a function that undoes everything nvme_map_data
> does and we can simplify the error handling a bit.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/pci.c | 44 ++++++++++++++++-------------------------
> 1 file changed, 17 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 2fb35d44010a..ce8bdc15ec3c 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -583,14 +583,24 @@ static inline bool nvme_pci_use_sgls(struct nvme_dev *dev, struct request *req)
> return true;
> }
>
> -static void nvme_free_iod(struct nvme_dev *dev, struct request *req)
> +static void nvme_unmap_data(struct nvme_dev *dev, struct request *req)
> {
> struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
> + enum dma_data_direction dma_dir = rq_data_dir(req) ?
> + DMA_TO_DEVICE : DMA_FROM_DEVICE;
> const int last_prp = dev->ctrl.page_size / sizeof(__le64) - 1;
> dma_addr_t dma_addr = iod->first_dma, next_dma_addr;
> -
> int i;
>
> + if (iod->nents) {
> + /* P2PDMA requests do not need to be unmapped */
> + if (!is_pci_p2pdma_page(sg_page(iod->sg)))
> + dma_unmap_sg(dev->dev, iod->sg, iod->nents, dma_dir);
> +
> + if (blk_integrity_rq(req))
> + dma_unmap_sg(dev->dev, &iod->meta_sg, 1, dma_dir);
> + }
> +
> if (iod->npages == 0)
> dma_pool_free(dev->prp_small_pool, nvme_pci_iod_list(req)[0],
> dma_addr);
> @@ -847,50 +857,30 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
> ret = nvme_pci_setup_prps(dev, req, &cmnd->rw);
>
> if (ret != BLK_STS_OK)
> - goto out_unmap;
> + goto out;
>
> ret = BLK_STS_IOERR;
> if (blk_integrity_rq(req)) {
> if (blk_rq_count_integrity_sg(q, req->bio) != 1)
> - goto out_unmap;
> + goto out;
>
> sg_init_table(&iod->meta_sg, 1);
> if (blk_rq_map_integrity_sg(q, req->bio, &iod->meta_sg) != 1)
> - goto out_unmap;
> + goto out;
>
> if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir))
> - goto out_unmap;
> + goto out;
>
> cmnd->rw.metadata = cpu_to_le64(sg_dma_address(&iod->meta_sg));
> }
>
> return BLK_STS_OK;
>
> -out_unmap:
> - dma_unmap_sg(dev->dev, iod->sg, iod->nents, dma_dir);
> out:
> - nvme_free_iod(dev, req);
> + nvme_unmap_data(dev, req);
> return ret;
> }
>
> -static void nvme_unmap_data(struct nvme_dev *dev, struct request *req)
> -{
> - struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
> - enum dma_data_direction dma_dir = rq_data_dir(req) ?
> - DMA_TO_DEVICE : DMA_FROM_DEVICE;
> -
> - if (iod->nents) {
> - /* P2PDMA requests do not need to be unmapped */
> - if (!is_pci_p2pdma_page(sg_page(iod->sg)))
> - dma_unmap_sg(dev->dev, iod->sg, iod->nents, dma_dir);
> -
> - if (blk_integrity_rq(req))
> - dma_unmap_sg(dev->dev, &iod->meta_sg, 1, dma_dir);
> - }
> -
> - nvme_free_iod(dev, req);
> -}
> -
> /*
> * NOTE: ns is NULL when called on the admin queue.
> */
>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>
next prev parent reply other threads:[~2019-03-25 5:22 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-21 23:10 [RFC] optimize nvme single segment I/O Christoph Hellwig
2019-03-21 23:10 ` [PATCH 01/15] block: add a req_bvec helper Christoph Hellwig
2019-03-25 5:07 ` Chaitanya Kulkarni
2019-03-27 14:16 ` Christoph Hellwig
2019-03-21 23:10 ` [PATCH 02/15] block: add a rq_integrity_vec helper Christoph Hellwig
2019-03-25 5:10 ` Chaitanya Kulkarni
2019-03-27 14:19 ` Christoph Hellwig
2019-03-21 23:10 ` [PATCH 03/15] block: add a rq_dma_dir helper Christoph Hellwig
2019-03-22 13:06 ` Johannes Thumshirn
2019-03-27 14:20 ` Christoph Hellwig
2019-03-28 10:26 ` Johannes Thumshirn
2019-03-25 5:11 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 04/15] block: add dma_map_bvec helper Christoph Hellwig
2019-03-25 5:13 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 05/15] nvme-pci: remove the unused iod->length field Christoph Hellwig
2019-03-25 5:14 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 06/15] nvme-pci: remove nvme_init_iod Christoph Hellwig
2019-03-25 5:19 ` Chaitanya Kulkarni
2019-03-27 14:21 ` Christoph Hellwig
2019-03-21 23:10 ` [PATCH 07/15] nvme-pci: move the call to nvme_cleanup_cmd out of nvme_unmap_data Christoph Hellwig
2019-03-25 5:21 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 08/15] nvme-pci: merge nvme_free_iod into nvme_unmap_data Christoph Hellwig
2019-03-25 5:22 ` Chaitanya Kulkarni [this message]
2019-03-21 23:10 ` [PATCH 09/15] nvme-pci: only call nvme_unmap_data for requests transferring data Christoph Hellwig
2019-03-25 5:23 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 10/15] nvme-pci: do not build a scatterlist to map metadata Christoph Hellwig
2019-03-25 5:27 ` Chaitanya Kulkarni
[not found] ` <20190828092057.GA15524@ming.t460p>
2019-09-12 1:02 ` Ming Lei
2019-09-12 8:20 ` Christoph Hellwig
2019-03-21 23:10 ` [PATCH 11/15] nvme-pci: split metadata handling from nvme_map_data / nvme_unmap_data Christoph Hellwig
2019-03-25 5:29 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 12/15] nvme-pci: remove the inline scatterlist optimization Christoph Hellwig
2019-03-25 5:30 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 13/15] nvme-pci: optimize mapping of small single segment requests Christoph Hellwig
2019-03-25 5:36 ` Chaitanya Kulkarni
2019-03-21 23:10 ` [PATCH 14/15] nvme-pci: optimize mapping single segment requests using SGLs Christoph Hellwig
2019-03-25 5:39 ` Chaitanya Kulkarni
2019-04-30 14:17 ` Klaus Birkelund
2019-04-30 14:32 ` Christoph Hellwig
2019-03-21 23:10 ` [PATCH 15/15] nvme-pci: tidy up nvme_map_data Christoph Hellwig
2019-03-25 5:40 ` Chaitanya Kulkarni
2019-03-22 15:44 ` [RFC] optimize nvme single segment I/O Jens Axboe
2019-03-27 14:24 ` Christoph Hellwig
2019-03-22 17:37 ` Keith Busch
2019-03-22 18:55 ` Sagi Grimberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=SN6PR04MB452734A9E74001D4684E2675865E0@SN6PR04MB4527.namprd04.prod.outlook.com \
--to=chaitanya.kulkarni@wdc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).