linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hch@lst.de (Christoph Hellwig)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 25/33] dma-direct: add dma address sanity checks
Date: Wed, 10 Jan 2018 09:00:19 +0100	[thread overview]
Message-ID: <20180110080027.13879-26-hch@lst.de> (raw)
In-Reply-To: <20180110080027.13879-1-hch@lst.de>

Roughly based on the x86 pci-nommu implementation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 lib/dma-direct.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/lib/dma-direct.c b/lib/dma-direct.c
index 12ea9653781b..32fd4d9e4c47 100644
--- a/lib/dma-direct.c
+++ b/lib/dma-direct.c
@@ -9,6 +9,23 @@
 #include <linux/scatterlist.h>
 #include <linux/pfn.h>
 
+#define DIRECT_MAPPING_ERROR		0
+
+static bool
+check_addr(struct device *dev, dma_addr_t dma_addr, size_t size,
+		const char *caller)
+{
+	if (unlikely(dev && !dma_capable(dev, dma_addr, size))) {
+		if (*dev->dma_mask >= DMA_BIT_MASK(32)) {
+			dev_err(dev,
+				"%s: overflow %pad+%zu of device mask %llx\n",
+				caller, &dma_addr, size, *dev->dma_mask);
+		}
+		return false;
+	}
+	return true;
+}
+
 static void *dma_direct_alloc(struct device *dev, size_t size,
 		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
 {
@@ -31,7 +48,11 @@ static dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
 		unsigned long offset, size_t size, enum dma_data_direction dir,
 		unsigned long attrs)
 {
-	return phys_to_dma(dev, page_to_phys(page)) + offset;
+	dma_addr_t dma_addr = phys_to_dma(dev, page_to_phys(page)) + offset;
+
+	if (!check_addr(dev, dma_addr, size, __func__))
+		return DIRECT_MAPPING_ERROR;
+	return dma_addr;
 }
 
 static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
@@ -44,16 +65,24 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
 		BUG_ON(!sg_page(sg));
 
 		sg_dma_address(sg) = phys_to_dma(dev, sg_phys(sg));
+		if (!check_addr(dev, sg_dma_address(sg), sg->length, __func__))
+			return 0;
 		sg_dma_len(sg) = sg->length;
 	}
 
 	return nents;
 }
 
+static int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)
+{
+	return dma_addr == DIRECT_MAPPING_ERROR;
+}
+
 const struct dma_map_ops dma_direct_ops = {
 	.alloc			= dma_direct_alloc,
 	.free			= dma_direct_free,
 	.map_page		= dma_direct_map_page,
 	.map_sg			= dma_direct_map_sg,
+	.mapping_error		= dma_direct_mapping_error,
 };
 EXPORT_SYMBOL(dma_direct_ops);
-- 
2.14.2

  parent reply	other threads:[~2018-01-10  8:00 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-10  7:59 consolidate direct dma mapping V3 Christoph Hellwig
2018-01-10  7:59 ` [PATCH 01/33] alpha: mark jensen as broken Christoph Hellwig
2018-01-10  7:59 ` [PATCH 02/33] hexagon: remove unused flush_write_buffers definition Christoph Hellwig
2018-01-10  7:59 ` [PATCH 03/33] m32r: " Christoph Hellwig
2018-01-10  7:59 ` [PATCH 04/33] powerpc: " Christoph Hellwig
2018-01-10  7:59 ` [PATCH 05/33] arc: remove CONFIG_ARC_PLAT_NEEDS_PHYS_TO_DMA Christoph Hellwig
2018-01-10  8:00 ` [PATCH 06/33] m32r: remove the unused dma_capable helper Christoph Hellwig
2018-01-10  8:00 ` [PATCH 07/33] riscv: " Christoph Hellwig
2018-01-10  8:00 ` [PATCH 08/33] s390: " Christoph Hellwig
2018-01-10  8:00 ` [PATCH 09/33] dma-mapping: take dma_pfn_offset into account in dma_max_pfn Christoph Hellwig
2018-01-10 11:07   ` Robin Murphy
2018-01-10  8:00 ` [PATCH 10/33] arm64: don't override dma_max_pfn Christoph Hellwig
2018-01-10 11:08   ` Robin Murphy
2018-01-10  8:00 ` [PATCH 11/33] dma-mapping: move swiotlb arch helpers to a new header Christoph Hellwig
2018-01-10  9:31   ` Vladimir Murzin
2018-01-10 15:22     ` Christoph Hellwig
2018-01-10 14:56   ` Robin Murphy
2018-01-10 15:26     ` Christoph Hellwig
2018-01-10 15:31       ` Robin Murphy
2018-01-10 15:40         ` Christoph Hellwig
2018-01-10  8:00 ` [PATCH 12/33] dma-mapping: move dma_mark_clean to dma-direct.h Christoph Hellwig
2018-01-10  8:00 ` [PATCH 13/33] hexagon: use the generic dma_capable helper Christoph Hellwig
2018-01-10  8:00 ` [PATCH 14/33] powerpc: rename dma_direct_ to dma_nommu_ Christoph Hellwig
2018-01-10  8:00 ` [PATCH 15/33] microblaze: rename dma_direct to dma_nommu Christoph Hellwig
2018-01-10  8:00 ` [PATCH 16/33] microblaze: remove dma_nommu_dma_supported Christoph Hellwig
2018-01-10  8:00 ` [PATCH 17/33] microblaze: remove the dead !NOT_COHERENT_CACHE dma code Christoph Hellwig
2018-01-10  8:00 ` [PATCH 18/33] s390: move s390_pci_dma_ops to asm/pci_dma.h Christoph Hellwig
2018-01-10  8:00 ` [PATCH 19/33] dma-mapping: warn when there is no coherent_dma_mask Christoph Hellwig
2018-01-12 13:16   ` Konrad Rzeszutek Wilk
2018-01-10  8:00 ` [PATCH 20/33] dma-mapping: clear harmful GFP_* flags in common code Christoph Hellwig
2018-01-10 11:59   ` Robin Murphy
2018-01-10 15:29     ` Christoph Hellwig
2018-01-10  8:00 ` [PATCH 21/33] dma-mapping: add an arch_dma_supported hook Christoph Hellwig
2018-01-12 13:17   ` Konrad Rzeszutek Wilk
2018-01-10  8:00 ` [PATCH 22/33] dma-mapping: provide a generic asm/dma-mapping.h Christoph Hellwig
2018-01-10  8:00 ` [PATCH 23/33] dma-direct: rename dma_noop to dma_direct Christoph Hellwig
2018-01-10  8:00 ` [PATCH 24/33] dma-direct: use phys_to_dma Christoph Hellwig
2018-01-10  8:00 ` Christoph Hellwig [this message]
2018-01-10  8:00 ` [PATCH 26/33] dma-direct: add support for CMA allocation Christoph Hellwig
2018-01-10  8:00 ` [PATCH 27/33] dma-direct: use node local allocations for coherent memory Christoph Hellwig
2018-01-10 12:06   ` Robin Murphy
2018-01-10 15:30     ` Christoph Hellwig
2018-01-10 16:49       ` Robin Murphy
2018-01-10  8:00 ` [PATCH 28/33] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Christoph Hellwig
2018-01-10  8:00 ` [PATCH 29/33] dma-direct: retry allocations using GFP_DMA for small masks Christoph Hellwig
2018-01-10  9:32   ` Vladimir Murzin
2018-01-10  8:00 ` [PATCH 30/33] dma-direct: make dma_direct_{alloc, free} available to other implementations Christoph Hellwig
2018-01-10  8:00 ` [PATCH 31/33] dma-direct: reject too small dma masks Christoph Hellwig
2018-01-10 11:49   ` Robin Murphy
2018-01-10 15:32     ` Christoph Hellwig
2018-01-10 17:00       ` Robin Murphy
2018-01-10  8:00 ` [PATCH 32/33] cris: use dma-direct Christoph Hellwig
2018-01-10  8:00 ` [PATCH 33/33] h8300: " 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=20180110080027.13879-26-hch@lst.de \
    --to=hch@lst.de \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).