From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de,
hch@lst.de, christophe.leroy@csgroup.eu, rppt@kernel.org,
willy@infradead.org, agordeev@linux.ibm.com,
wangkefeng.wang@huawei.com, schnelle@linux.ibm.com,
David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de,
nathan@kernel.org, glaubitz@physik.fu-berlin.de,
Baoquan He <bhe@redhat.com>
Subject: [PATCH v7 16/19] mm: move is_ioremap_addr() into new header file
Date: Tue, 20 Jun 2023 21:13:53 +0800 [thread overview]
Message-ID: <20230620131356.25440-17-bhe@redhat.com> (raw)
In-Reply-To: <20230620131356.25440-1-bhe@redhat.com>
Now is_ioremap_addr() is only used in kernel/iomem.c and gonna be used
in mm/ioremap.c. Move it into its own new header file linux/ioremap.h.
Signed-off-by: Baoquan He <bhe@redhat.com>
Suggested-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
arch/powerpc/include/asm/pgtable.h | 8 --------
include/linux/ioremap.h | 30 ++++++++++++++++++++++++++++++
include/linux/mm.h | 5 -----
kernel/iomem.c | 1 +
mm/ioremap.c | 10 +---------
5 files changed, 32 insertions(+), 22 deletions(-)
create mode 100644 include/linux/ioremap.h
diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
index 9972626ddaf6..d252323a753f 100644
--- a/arch/powerpc/include/asm/pgtable.h
+++ b/arch/powerpc/include/asm/pgtable.h
@@ -158,14 +158,6 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd)
}
#ifdef CONFIG_PPC64
-#define is_ioremap_addr is_ioremap_addr
-static inline bool is_ioremap_addr(const void *x)
-{
- unsigned long addr = (unsigned long)x;
-
- return addr >= IOREMAP_BASE && addr < IOREMAP_END;
-}
-
struct seq_file;
void arch_report_meminfo(struct seq_file *m);
#endif /* CONFIG_PPC64 */
diff --git a/include/linux/ioremap.h b/include/linux/ioremap.h
new file mode 100644
index 000000000000..f0e99fc7dd8b
--- /dev/null
+++ b/include/linux/ioremap.h
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _LINUX_IOREMAP_H
+#define _LINUX_IOREMAP_H
+
+#include <linux/kasan.h>
+#include <asm/pgtable.h>
+
+#if defined(CONFIG_HAS_IOMEM) || defined(CONFIG_GENERIC_IOREMAP)
+/*
+ * Ioremap often, but not always uses the generic vmalloc area. E.g on
+ * Power ARCH, it could have different ioremap space.
+ */
+#ifndef IOREMAP_START
+#define IOREMAP_START VMALLOC_START
+#define IOREMAP_END VMALLOC_END
+#endif
+static inline bool is_ioremap_addr(const void *x)
+{
+ unsigned long addr = (unsigned long)kasan_reset_tag(x);
+
+ return addr >= IOREMAP_START && addr < IOREMAP_END;
+}
+#else
+static inline bool is_ioremap_addr(const void *x)
+{
+ return false;
+}
+#endif
+
+#endif /* _LINUX_IOREMAP_H */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 27ce77080c79..7379f19768b4 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1041,11 +1041,6 @@ unsigned long vmalloc_to_pfn(const void *addr);
* On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there
* is no special casing required.
*/
-
-#ifndef is_ioremap_addr
-#define is_ioremap_addr(x) is_vmalloc_addr(x)
-#endif
-
#ifdef CONFIG_MMU
extern bool is_vmalloc_addr(const void *x);
extern int is_vmalloc_or_module_addr(const void *x);
diff --git a/kernel/iomem.c b/kernel/iomem.c
index 62c92e43aa0d..9682471e6471 100644
--- a/kernel/iomem.c
+++ b/kernel/iomem.c
@@ -3,6 +3,7 @@
#include <linux/types.h>
#include <linux/io.h>
#include <linux/mm.h>
+#include <linux/ioremap.h>
#ifndef ioremap_cache
/* temporary while we convert existing ioremap_cache users to memremap */
diff --git a/mm/ioremap.c b/mm/ioremap.c
index 68d9895144ad..a21a6c9fa5ab 100644
--- a/mm/ioremap.c
+++ b/mm/ioremap.c
@@ -10,15 +10,7 @@
#include <linux/mm.h>
#include <linux/io.h>
#include <linux/export.h>
-
-/*
- * Ioremap often, but not always uses the generic vmalloc area. E.g on
- * Power ARCH, it could have different ioremap space.
- */
-#ifndef IOREMAP_START
-#define IOREMAP_START VMALLOC_START
-#define IOREMAP_END VMALLOC_END
-#endif
+#include <linux/ioremap.h>
void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
pgprot_t prot)
--
2.34.1
next prev parent reply other threads:[~2023-06-20 13:19 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 13:13 [PATCH v7 00/19] mm: ioremap: Convert architectures to take GENERIC_IOREMAP way Baoquan He
2023-06-20 13:13 ` [PATCH v7 01/19] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP_xx macros Baoquan He
2023-06-20 13:13 ` [PATCH v7 02/19] hexagon: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-21 2:15 ` kernel test robot
2023-06-21 8:50 ` Baoquan He
2023-06-21 19:08 ` Nathan Chancellor
2023-06-25 1:15 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 03/19] openrisc: mm: remove unneeded early ioremap code Baoquan He
2023-06-20 13:13 ` [PATCH v7 04/19] mm/ioremap: Define generic_ioremap_prot() and generic_iounmap() Baoquan He
2023-06-20 13:13 ` [PATCH v7 05/19] mm: ioremap: allow ARCH to have its own ioremap method definition Baoquan He
2023-06-20 13:13 ` [PATCH v7 06/19] mm/ioremap: add slab availability checking in ioremap_prot Baoquan He
2023-06-20 13:13 ` [PATCH v7 07/19] arc: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-20 13:13 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 08/19] ia64: " Baoquan He
2023-06-20 13:13 ` [PATCH v7 09/19] openrisc: " Baoquan He
2023-07-08 0:33 ` Stafford Horne
2023-07-09 10:11 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 10/19] s390: " Baoquan He
2023-06-21 5:43 ` kernel test robot
2023-06-21 10:41 ` Baoquan He
2023-06-21 10:46 ` Alexander Gordeev
2023-06-21 13:55 ` Baoquan He
2023-06-21 19:21 ` Nathan Chancellor
2023-06-24 12:45 ` Baoquan He
2023-07-06 15:55 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 11/19] sh: add <asm-generic/io.h> including Baoquan He
2023-06-20 13:13 ` [PATCH v7 12/19] sh: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-25 21:12 ` John Paul Adrian Glaubitz
2023-06-26 2:45 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 13/19] xtensa: " Baoquan He
2023-06-20 13:13 ` [PATCH v7 14/19] parisc: " Baoquan He
2023-06-20 13:13 ` [PATCH v7 15/19] mm/ioremap: Consider IOREMAP space in generic ioremap Baoquan He
2023-06-20 13:13 ` Baoquan He [this message]
2023-06-20 13:13 ` [PATCH v7 17/19] powerpc: mm: Convert to GENERIC_IOREMAP Baoquan He
2023-06-20 13:13 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 18/19] arm64 : mm: add wrapper function ioremap_prot() Baoquan He
2023-06-20 13:13 ` Baoquan He
2023-06-20 13:13 ` [PATCH v7 19/19] mm: ioremap: remove unneeded ioremap_allowed and iounmap_allowed Baoquan He
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=20230620131356.25440-17-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=David.Laight@ACULAB.COM \
--cc=agordeev@linux.ibm.com \
--cc=arnd@arndb.de \
--cc=christophe.leroy@csgroup.eu \
--cc=deller@gmx.de \
--cc=glaubitz@physik.fu-berlin.de \
--cc=hch@lst.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nathan@kernel.org \
--cc=rppt@kernel.org \
--cc=schnelle@linux.ibm.com \
--cc=shorne@gmail.com \
--cc=wangkefeng.wang@huawei.com \
--cc=willy@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 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.