From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: <linux-mm@kvack.org>, Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH 2/4] mm: ioremap: Add arch_ioremap/iounmap_check()
Date: Wed, 27 Apr 2022 20:14:11 +0800 [thread overview]
Message-ID: <20220427121413.168468-3-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20220427121413.168468-1-wangkefeng.wang@huawei.com>
Add special check hook for architecture to verify addr, size
or prot when ioremap() or iounmap(), which will make the generic
ioremap more useful.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
include/asm-generic/io.h | 3 +++
mm/ioremap.c | 20 +++++++++++++++++++-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 7ce93aaf69f8..26924fded7c3 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -964,6 +964,9 @@ static inline void iounmap(volatile void __iomem *addr)
#elif defined(CONFIG_GENERIC_IOREMAP)
#include <linux/pgtable.h>
+bool arch_ioremap_check(phys_addr_t addr, size_t size, unsigned long prot);
+bool arch_iounmap_check(void __iomem *addr);
+
void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot);
void iounmap(volatile void __iomem *addr);
diff --git a/mm/ioremap.c b/mm/ioremap.c
index 522ef899c35f..d1117005dcc7 100644
--- a/mm/ioremap.c
+++ b/mm/ioremap.c
@@ -11,6 +11,16 @@
#include <linux/io.h>
#include <linux/export.h>
+bool __weak arch_ioremap_check(phys_addr_t addr, size_t size, unsigned long prot)
+{
+ return true;
+}
+
+bool __weak arch_iounmap_check(void __iomem *addr)
+{
+ return true;
+}
+
void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot)
{
unsigned long offset, vaddr;
@@ -27,6 +37,9 @@ void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot)
addr -= offset;
size = PAGE_ALIGN(size + offset);
+ if (!arch_ioremap_check(addr, size, prot))
+ return NULL;
+
area = get_vm_area_caller(size, VM_IOREMAP,
__builtin_return_address(0));
if (!area)
@@ -45,6 +58,11 @@ EXPORT_SYMBOL(ioremap_prot);
void iounmap(volatile void __iomem *addr)
{
- vunmap((void *)((unsigned long)addr & PAGE_MASK));
+ void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);
+
+ if (!arch_iounmap_check(vaddr))
+ return;
+
+ vunmap(vaddr);
}
EXPORT_SYMBOL(iounmap);
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-04-27 12:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-27 12:14 [PATCH 0/4] arm64: Cleanup ioremap() and support ioremap_prot() Kefeng Wang
2022-04-27 12:14 ` [PATCH 1/4] mm: ioremap: Setup phys_addr of struct vm_struct Kefeng Wang
2022-04-27 17:10 ` Andrew Morton
2022-04-28 1:40 ` Kefeng Wang
2022-04-28 15:41 ` Christoph Hellwig
2022-04-27 12:14 ` Kefeng Wang [this message]
2022-04-27 17:04 ` [PATCH 2/4] mm: ioremap: Add arch_ioremap/iounmap_check() Andrew Morton
2022-04-28 6:16 ` Kefeng Wang
2022-04-28 15:46 ` Christoph Hellwig
2022-04-27 18:20 ` Arnd Bergmann
2022-04-27 18:25 ` Andrew Morton
2022-04-27 20:46 ` Arnd Bergmann
2022-04-28 6:20 ` Kefeng Wang
2022-04-28 6:47 ` Arnd Bergmann
2022-04-27 12:14 ` [PATCH 3/4] arm64: mm: Convert to GENERIC_IOREMAP Kefeng Wang
2022-04-27 17:11 ` Andrew Morton
2022-04-27 12:14 ` [PATCH 4/4] arm64: Add HAVE_IOREMAP_PROT support Kefeng Wang
2022-04-28 10:46 ` [PATCH 0/4] arm64: Cleanup ioremap() and support ioremap_prot() Will Deacon
2022-04-28 11:48 ` Kefeng Wang
2022-04-28 15:48 ` 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=20220427121413.168468-3-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=will@kernel.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).