From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: iommu@lists.linux-foundation.org
Subject: Re: [PATCH 2/2] dma-direct: improve DMA mask overflow reporting
Date: Tue, 4 Feb 2020 09:55:24 -0500 [thread overview]
Message-ID: <20200204145524.GC5400@localhost.localdomain> (raw)
In-Reply-To: <20200204063205.652456-3-hch@lst.de>
On Tue, Feb 04, 2020 at 07:32:05AM +0100, Christoph Hellwig wrote:
> Remove the unset dma_mask case as that won't get into mapping calls
> anymore, and also report the other errors unconditonally and with a
> slightly improved message. Remove the now pointless report_addr helper.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad@darnok.org>
> ---
> kernel/dma/direct.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
> index 82ad50aaf42c..04f308a47fc3 100644
> --- a/kernel/dma/direct.c
> +++ b/kernel/dma/direct.c
> @@ -23,18 +23,6 @@
> */
> unsigned int zone_dma_bits __ro_after_init = 24;
>
> -static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size)
> -{
> - if (!dev->dma_mask) {
> - dev_err_once(dev, "DMA map on device without dma_mask\n");
> - } else if (*dev->dma_mask >= DMA_BIT_MASK(32) || dev->bus_dma_limit) {
> - dev_err_once(dev,
> - "overflow %pad+%zu of DMA mask %llx bus limit %llx\n",
> - &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> - }
> - WARN_ON_ONCE(1);
> -}
> -
> static inline dma_addr_t phys_to_dma_direct(struct device *dev,
> phys_addr_t phys)
> {
> @@ -371,7 +359,10 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
> if (swiotlb_force != SWIOTLB_NO_FORCE)
> return swiotlb_map(dev, phys, size, dir, attrs);
>
> - report_addr(dev, dma_addr, size);
> + dev_err_once(dev,
> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
> return DMA_MAPPING_ERROR;
> }
>
> @@ -409,7 +400,10 @@ dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
> dma_addr_t dma_addr = paddr;
>
> if (unlikely(!dma_capable(dev, dma_addr, size, false))) {
> - report_addr(dev, dma_addr, size);
> + dev_err_once(dev,
> + "DMA addr %pad+%zu overflow (mask %llx, bus limit %llx).\n",
> + &dma_addr, size, *dev->dma_mask, dev->bus_dma_limit);
> + WARN_ON_ONCE(1);
> return DMA_MAPPING_ERROR;
> }
>
> --
> 2.24.1
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-02-04 14:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 6:32 improve dma-direct / swiotlb error reporting Christoph Hellwig
2020-02-04 6:32 ` [PATCH 1/2] dma-direct: improve " Christoph Hellwig
2020-02-04 14:54 ` Konrad Rzeszutek Wilk
2020-02-04 6:32 ` [PATCH 2/2] dma-direct: improve DMA mask overflow reporting Christoph Hellwig
2020-02-04 14:55 ` Konrad Rzeszutek Wilk [this message]
2020-02-04 15:14 ` Robin Murphy
2020-02-04 15:58 ` Christoph Hellwig
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=20200204145524.GC5400@localhost.localdomain \
--to=konrad.wilk@oracle.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
/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