From: lijiazi <jqqlijiazi@gmail.com>
To: Christoph Hellwig <hch@lst.de>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Robin Murphy <robin.murphy@arm.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: lijiazi <lijiazi@xiaomi.com>,
iommu@lists.linux-foundation.org, linux-mm@kvack.org
Subject: [PATCH] dma-mapping: do not mapping module memory
Date: Fri, 29 Nov 2019 19:03:40 +0800 [thread overview]
Message-ID: <d6a63ad37b2556b8ba2fda16fc4dde95aa721741.1574997534.git.lijiazi@xiaomi.com> (raw)
On ARM, x86_64, sparc64 platform, virt_to_page only convert a
_valid_ virtual address to struct page *, virt_addr_valid(x)
indicates whether a virtual address is valid. If ptr is point
to a static variable in module area, virt_to_page will return
a invalid value.
Signed-off-by: lijiazi <lijiazi@xiaomi.com>
---
include/linux/dma-mapping.h | 10 +++++++---
mm/vmalloc.c | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 330ad58..37e645d 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -580,9 +580,13 @@ static inline unsigned long dma_get_merge_boundary(struct device *dev)
static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
size_t size, enum dma_data_direction dir, unsigned long attrs)
{
- /* DMA must never operate on areas that might be remapped. */
- if (dev_WARN_ONCE(dev, is_vmalloc_addr(ptr),
- "rejecting DMA map of vmalloc memory\n"))
+ /* DMA must never operate on areas that might be remapped.
+ * ARM, X86_64, sparc64 put module in a special place, if ptr
+ * point to static variable in module area, virt_to_page will
+ * return err page *.
+ */
+ if (dev_WARN_ONCE(dev, is_vmalloc_or_module_addr(ptr),
+ "rejecting DMA map of vmalloc or module memory\n"))
return DMA_MAPPING_ERROR;
debug_dma_map_single(dev, ptr, size);
return dma_map_page_attrs(dev, virt_to_page(ptr), offset_in_page(ptr),
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 588303a..71ce6dc 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -262,6 +262,7 @@ int is_vmalloc_or_module_addr(const void *x)
#endif
return is_vmalloc_addr(x);
}
+EXPORT_SYMBOL(is_vmalloc_or_module_addr);
/*
* Walk a vmap address to the struct page it maps.
--
2.7.4
next reply other threads:[~2019-11-29 11:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 11:03 lijiazi [this message]
2019-12-02 7:22 ` [PATCH] dma-mapping: do not mapping module memory 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=d6a63ad37b2556b8ba2fda16fc4dde95aa721741.1574997534.git.lijiazi@xiaomi.com \
--to=jqqlijiazi@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=lijiazi@xiaomi.com \
--cc=linux-mm@kvack.org \
--cc=m.szyprowski@samsung.com \
--cc=robin.murphy@arm.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).