From: Chaitanya.Kulkarni@wdc.com (Chaitanya Kulkarni)
Subject: [PATCH 11/15] nvme-pci: split metadata handling from nvme_map_data / nvme_unmap_data
Date: Mon, 25 Mar 2019 05:29:14 +0000 [thread overview]
Message-ID: <SN6PR04MB4527681E200935EE2481A32A865E0@SN6PR04MB4527.namprd04.prod.outlook.com> (raw)
In-Reply-To: 20190321231037.25104-12-hch@lst.de
On 3/21/19 4:12 PM, Christoph Hellwig wrote:
> This prepares for some bigger changes to the data mapping helpers.
>
> Signed-off-by: Christoph Hellwig <hch at lst.de>
> ---
> drivers/nvme/host/pci.c | 48 +++++++++++++++++++++++------------------
> 1 file changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index a7dad24e0406..cf29d079ad5b 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -592,11 +592,6 @@ static void nvme_unmap_data(struct nvme_dev *dev, struct request *req)
> dma_addr_t dma_addr = iod->first_dma, next_dma_addr;
> int i;
>
> - if (blk_integrity_rq(req)) {
> - dma_unmap_page(dev->dev, iod->meta_dma,
> - rq_integrity_vec(req)->bv_len, dma_dir);
> - }
> -
> if (iod->nents) {
> /* P2PDMA requests do not need to be unmapped */
> 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,
> ret = nvme_pci_setup_sgls(dev, req, &cmnd->rw, nr_mapped);
> else
> ret = nvme_pci_setup_prps(dev, req, &cmnd->rw);
> -
> +out:
> if (ret != BLK_STS_OK)
> - goto out;
> -
> - ret = BLK_STS_IOERR;
> - if (blk_integrity_rq(req)) {
> - iod->meta_dma = dma_map_bvec(dev->dev, rq_integrity_vec(req),
> - dma_dir, 0);
> - if (dma_mapping_error(dev->dev, iod->meta_dma))
> - goto out;
> - cmnd->rw.metadata = cpu_to_le64(iod->meta_dma);
> - }
> + nvme_unmap_data(dev, req);
> + return ret;
> +}
>
> - return BLK_STS_OK;
> +static blk_status_t nvme_map_metadata(struct nvme_dev *dev, struct request *req,
> + struct nvme_command *cmnd)
> +{
> + struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
>
> -out:
> - nvme_unmap_data(dev, req);
> - return ret;
> + iod->meta_dma = dma_map_bvec(dev->dev, rq_integrity_vec(req),
> + rq_dma_dir(req), 0);
> + if (dma_mapping_error(dev->dev, iod->meta_dma))
> + return BLK_STS_IOERR;
> + cmnd->rw.metadata = cpu_to_le64(iod->meta_dma);
> + return 0;
> }
>
> /*
> @@ -913,9 +907,17 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
> goto out_free_cmd;
> }
>
> + if (blk_integrity_rq(req)) {
> + ret = nvme_map_metadata(dev, req, &cmnd);
> + if (ret)
> + goto out_unmap_data;
> + }
> +
> blk_mq_start_request(req);
> nvme_submit_cmd(nvmeq, &cmnd, bd->last);
> return BLK_STS_OK;
> +out_unmap_data:
> + nvme_unmap_data(dev, req);
> out_free_cmd:
> nvme_cleanup_cmd(req);
> return ret;
> @@ -924,10 +926,14 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
> static void nvme_pci_complete_rq(struct request *req)
> {
> struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
> + struct nvme_dev *dev = iod->nvmeq->dev;
>
> nvme_cleanup_cmd(req);
> + if (blk_integrity_rq(req))
> + dma_unmap_page(dev->dev, iod->meta_dma,
> + rq_integrity_vec(req)->bv_len, rq_data_dir(req));
> if (blk_rq_nr_phys_segments(req))
> - nvme_unmap_data(iod->nvmeq->dev, req);
> + nvme_unmap_data(dev, req);
> nvme_complete_rq(req);
> }
>
>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>
next prev parent reply other threads:[~2019-03-25 5:29 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
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 [this message]
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=SN6PR04MB4527681E200935EE2481A32A865E0@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).