From: krisman@linux.vnet.ibm.com (Gabriel Krisman Bertazi)
Subject: [PATCH 2/3] nvme: implement DMA_ATTR_NO_WARN
Date: Wed, 06 Jul 2016 21:41:45 -0300 [thread overview]
Message-ID: <878txep9di.fsf@linux.vnet.ibm.com> (raw)
In-Reply-To: <1467839013-22481-3-git-send-email-mauricfo@linux.vnet.ibm.com> (Mauricio Faria de Oliveira's message of "Wed, 6 Jul 2016 18:03:32 -0300")
Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com> writes:
> Use the DMA_ATTR_NO_WARN attribute on dma_map_sg() calls of nvme driver.
>
> Signed-off-by: Mauricio Faria de Oliveira <mauricfo at linux.vnet.ibm.com>
checkpatch.pl complains about line wrapping. Other than that, this
looks good to me.
Reviewed-by: Gabriel Krisman Bertazi <krisman at linux.vnet.ibm.com>
> ---
> drivers/nvme/host/pci.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index d1a8259..c3c3348 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -18,6 +18,7 @@
> #include <linux/blk-mq.h>
> #include <linux/cpu.h>
> #include <linux/delay.h>
> +#include <linux/dma-attrs.h>
> #include <linux/errno.h>
> #include <linux/fs.h>
> #include <linux/genhd.h>
> @@ -65,6 +66,8 @@ MODULE_PARM_DESC(use_cmb_sqes, "use controller's memory buffer for I/O SQes");
>
> static struct workqueue_struct *nvme_workq;
>
> +static DEFINE_DMA_ATTRS(nvme_dma_attrs);
> +
> struct nvme_dev;
> struct nvme_queue;
>
> @@ -498,7 +501,7 @@ static int nvme_map_data(struct nvme_dev *dev, struct request *req,
> goto out;
>
> ret = BLK_MQ_RQ_QUEUE_BUSY;
> - if (!dma_map_sg(dev->dev, iod->sg, iod->nents, dma_dir))
> + if (!dma_map_sg_attrs(dev->dev, iod->sg, iod->nents, dma_dir, &nvme_dma_attrs))
> goto out;
>
> if (!nvme_setup_prps(dev, req, size))
> @@ -516,7 +519,7 @@ static int nvme_map_data(struct nvme_dev *dev, struct request *req,
> if (rq_data_dir(req))
> nvme_dif_remap(req, nvme_dif_prep);
>
> - if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir))
> + if (!dma_map_sg_attrs(dev->dev, &iod->meta_sg, 1, dma_dir, &nvme_dma_attrs))
> goto out_unmap;
> }
>
> @@ -2118,6 +2121,9 @@ static int __init nvme_init(void)
> result = pci_register_driver(&nvme_driver);
> if (result)
> destroy_workqueue(nvme_workq);
> +
> + dma_set_attr(DMA_ATTR_NO_WARN, &nvme_dma_attrs);
> +
> return result;
> }
--
Gabriel Krisman Bertazi
WARNING: multiple messages have this Message-ID (diff)
From: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
To: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-nvme@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
Jens Axboe <axboe@fb.com>, Jonathan Corbet <corbet@lwn.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Keith Busch <keith.busch@intel.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH 2/3] nvme: implement DMA_ATTR_NO_WARN
Date: Wed, 06 Jul 2016 21:41:45 -0300 [thread overview]
Message-ID: <878txep9di.fsf@linux.vnet.ibm.com> (raw)
In-Reply-To: <1467839013-22481-3-git-send-email-mauricfo@linux.vnet.ibm.com> (Mauricio Faria de Oliveira's message of "Wed, 6 Jul 2016 18:03:32 -0300")
Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com> writes:
> Use the DMA_ATTR_NO_WARN attribute on dma_map_sg() calls of nvme driver.
>
> Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
checkpatch.pl complains about line wrapping. Other than that, this
looks good to me.
Reviewed-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
> ---
> drivers/nvme/host/pci.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index d1a8259..c3c3348 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -18,6 +18,7 @@
> #include <linux/blk-mq.h>
> #include <linux/cpu.h>
> #include <linux/delay.h>
> +#include <linux/dma-attrs.h>
> #include <linux/errno.h>
> #include <linux/fs.h>
> #include <linux/genhd.h>
> @@ -65,6 +66,8 @@ MODULE_PARM_DESC(use_cmb_sqes, "use controller's memory buffer for I/O SQes");
>
> static struct workqueue_struct *nvme_workq;
>
> +static DEFINE_DMA_ATTRS(nvme_dma_attrs);
> +
> struct nvme_dev;
> struct nvme_queue;
>
> @@ -498,7 +501,7 @@ static int nvme_map_data(struct nvme_dev *dev, struct request *req,
> goto out;
>
> ret = BLK_MQ_RQ_QUEUE_BUSY;
> - if (!dma_map_sg(dev->dev, iod->sg, iod->nents, dma_dir))
> + if (!dma_map_sg_attrs(dev->dev, iod->sg, iod->nents, dma_dir, &nvme_dma_attrs))
> goto out;
>
> if (!nvme_setup_prps(dev, req, size))
> @@ -516,7 +519,7 @@ static int nvme_map_data(struct nvme_dev *dev, struct request *req,
> if (rq_data_dir(req))
> nvme_dif_remap(req, nvme_dif_prep);
>
> - if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir))
> + if (!dma_map_sg_attrs(dev->dev, &iod->meta_sg, 1, dma_dir, &nvme_dma_attrs))
> goto out_unmap;
> }
>
> @@ -2118,6 +2121,9 @@ static int __init nvme_init(void)
> result = pci_register_driver(&nvme_driver);
> if (result)
> destroy_workqueue(nvme_workq);
> +
> + dma_set_attr(DMA_ATTR_NO_WARN, &nvme_dma_attrs);
> +
> return result;
> }
--
Gabriel Krisman Bertazi
next prev parent reply other threads:[~2016-07-07 0:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-06 21:03 [PATCH 0/3] dma, nvme, powerpc: introduce and implement DMA_ATTR_NO_WARN Mauricio Faria de Oliveira
2016-07-06 21:03 ` Mauricio Faria de Oliveira
2016-07-06 21:03 ` [PATCH 1/3] dma: introduce DMA_ATTR_NO_WARN Mauricio Faria de Oliveira
2016-07-06 21:03 ` Mauricio Faria de Oliveira
2016-07-06 21:03 ` [PATCH 2/3] nvme: implement DMA_ATTR_NO_WARN Mauricio Faria de Oliveira
2016-07-06 21:03 ` Mauricio Faria de Oliveira
2016-07-07 0:41 ` Gabriel Krisman Bertazi [this message]
2016-07-07 0:41 ` Gabriel Krisman Bertazi
2016-07-07 12:46 ` Mauricio Faria de Oliveira
2016-07-07 12:46 ` Mauricio Faria de Oliveira
2016-07-06 21:03 ` [PATCH 3/3] powerpc: " Mauricio Faria de Oliveira
2016-07-06 21:03 ` Mauricio Faria de Oliveira
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=878txep9di.fsf@linux.vnet.ibm.com \
--to=krisman@linux.vnet.ibm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.