From: Linus Walleij <linus.walleij@linaro.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
Vineet Gupta <vgupta@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Russell King <linux@armlinux.org.uk>,
Greg Ungerer <gerg@linux-m68k.org>
Cc: linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-snps-arc@lists.infradead.org,
linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org,
samba-technical@lists.samba.org,
linux-arm-kernel@lists.infradead.org,
linux-arch@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 11/12] arm64: memory: Make virt_to_pfn() a static inline
Date: Thu, 11 May 2023 13:59:28 +0200 [thread overview]
Message-ID: <20230503-virt-to-pfn-v6-4-rc1-v1-11-6c4698dcf9c8@linaro.org> (raw)
In-Reply-To: <20230503-virt-to-pfn-v6-4-rc1-v1-0-6c4698dcf9c8@linaro.org>
Making virt_to_pfn() a static inline taking a strongly typed
(const void *) makes the contract of a passing a pointer of that
type to the function explicit and exposes any misuse of the
macro virt_to_pfn() acting polymorphic and accepting many types
such as (void *), (unitptr_t) or (unsigned long) as arguments
without warnings.
Since arm64 is using <asm-generic/memory_model.h> to provide
__phys_to_pfn() we need to move the inclusion of that header
up, so we can resolve the static inline at compile time.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm64/include/asm/memory.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index c735afdf639b..4d85212b622e 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -331,6 +331,14 @@ static inline void *phys_to_virt(phys_addr_t x)
return (void *)(__phys_to_virt(x));
}
+/* Needed already here for resolving __phys_to_pfn() in virt_to_pfn() */
+#include <asm-generic/memory_model.h>
+
+static inline unsigned long virt_to_pfn(const void *kaddr)
+{
+ return __phys_to_pfn(virt_to_phys(kaddr));
+}
+
/*
* Drivers should NOT use these either.
*/
@@ -339,7 +347,6 @@ static inline void *phys_to_virt(phys_addr_t x)
#define __pa_nodebug(x) __virt_to_phys_nodebug((unsigned long)(x))
#define __va(x) ((void *)__phys_to_virt((phys_addr_t)(x)))
#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
-#define virt_to_pfn(x) __phys_to_pfn(__virt_to_phys((unsigned long)(x)))
#define sym_to_pfn(x) __phys_to_pfn(__pa_symbol(x))
/*
--
2.34.1
_______________________________________________
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
next prev parent reply other threads:[~2023-05-11 13:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-11 11:59 [PATCH 00/12] arch: Make virt_to_pfn into a static inline Linus Walleij
2023-05-11 11:59 ` [PATCH 01/12] fs/proc/kcore.c: Pass a pointer to virt_addr_valid() Linus Walleij
2023-05-11 11:59 ` [PATCH 02/12] m68k: Pass a pointer to virt_to_pfn() virt_to_page() Linus Walleij
2023-05-12 9:55 ` Geert Uytterhoeven
2023-05-12 10:26 ` Geert Uytterhoeven
2023-05-16 9:18 ` Linus Walleij
2023-05-11 11:59 ` [PATCH 03/12] ARC: init: Pass a pointer to virt_to_pfn() in init Linus Walleij
2023-05-11 11:59 ` [PATCH 04/12] riscv: mm: init: Pass a pointer to virt_to_page() Linus Walleij
2023-05-12 8:56 ` Alexandre Ghiti
2023-05-11 11:59 ` [PATCH 05/12] cifs: " Linus Walleij
2023-05-17 14:00 ` Tom Talpey
2023-05-11 11:59 ` [PATCH 06/12] cifs: Pass a pointer to virt_to_page() in cifsglob Linus Walleij
2023-05-17 14:01 ` Tom Talpey
2023-05-11 11:59 ` [PATCH 07/12] netfs: Pass a pointer to virt_to_page() Linus Walleij
2023-05-11 11:59 ` [PATCH 08/12] arm64: vdso: Pass (void *) " Linus Walleij
2023-05-12 10:43 ` Catalin Marinas
2023-05-11 11:59 ` [PATCH 09/12] asm-generic/page.h: Make pfn accessors static inlines Linus Walleij
2023-05-11 11:59 ` [PATCH 10/12] ARM: mm: Make virt_to_pfn() a static inline Linus Walleij
2023-05-11 11:59 ` Linus Walleij [this message]
2023-05-12 10:44 ` [PATCH 11/12] arm64: memory: " Catalin Marinas
2023-05-11 11:59 ` [PATCH 12/12] m68k/mm: Make pfn accessors static inlines Linus Walleij
2023-05-12 9:57 ` [PATCH 00/12] arch: Make virt_to_pfn into a static inline Geert Uytterhoeven
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=20230503-virt-to-pfn-v6-4-rc1-v1-11-6c4698dcf9c8@linaro.org \
--to=linus.walleij@linaro.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=geert@linux-m68k.org \
--cc=gerg@linux-m68k.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=samba-technical@lists.samba.org \
--cc=vgupta@kernel.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).