From: Mike Rapoport <rppt@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Andreas Larsson <andreas@gaisler•com>,
Andy Lutomirski <luto@kernel•org>,
Ard Biesheuvel <ardb@kernel•org>, Arnd Bergmann <arnd@arndb•de>,
Borislav Petkov <bp@alien8•de>, Brian Cain <bcain@quicinc•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Christoph Hellwig <hch@infradead•org>,
Christophe Leroy <christophe.leroy@csgroup•eu>,
Dave Hansen <dave.hansen@linux•intel.com>,
Dinh Nguyen <dinguyen@kernel•org>,
Geert Uytterhoeven <geert@linux-m68k•org>,
Guo Ren <guoren@kernel•org>, Helge Deller <deller@gmx•de>,
Huacai Chen <chenhuacai@kernel•org>,
Ingo Molnar <mingo@redhat•com>,
Johannes Berg <johannes@sipsolutions•net>,
John Paul Adrian Glaubitz <glaubitz@physik•fu-berlin.de>,
Kent Overstreet <kent.overstreet@linux•dev>,
"Liam R. Howlett" <Liam.Howlett@oracle•com>,
Luis Chamberlain <mcgrof@kernel•org>,
Mark Rutland <mark.rutland@arm•com>,
Masami Hiramatsu <mhiramat@kernel•org>,
Matt Turner <mattst88@gmail•com>,
Max Filippov <jcmvbkbc@gmail•com>,
Michael Ellerman <mpe@ellerman•id.au>,
Michal Simek <monstr@monstr•eu>, Mike Rapoport <rppt@kernel•org>,
Oleg Nesterov <oleg@redhat•com>,
Palmer Dabbelt <palmer@dabbelt•com>,
Peter Zijlstra <peterz@infradead•org>,
Richard Weinberger <richard@nod•at>,
Russell King <linux@armlinux•org.uk>, Song Liu <song@kernel•org>,
Stafford Horne <shorne@gmail•com>,
Steven Rostedt <rostedt@goodmis•org>,
Thomas Bogendoerfer <tsbogend@alpha•franken.de>,
Thomas Gleixner <tglx@linutronix•de>,
Uladzislau Rezki <urezki@gmail•com>,
Vineet Gupta <vgupta@kernel•org>, Will Deacon <will@kernel•org>,
bpf@vger•kernel.org, linux-alpha@vger•kernel.org,
linux-arch@vger•kernel.org, linux-arm-kernel@lists•infradead.org,
linux-csky@vger•kernel.org, linux-hexagon@vger•kernel.org,
linux-kernel@vger•kernel.org, linux-m68k@lists•linux-m68k.org,
linux-mips@vger•kernel.org, linux-mm@kvack•org,
linux-modules@vger•kernel.org, linux-openrisc@vger•kernel.org,
linux-parisc@vger•kernel.org, linux-riscv@lists•infradead.org,
linux-sh@vger•kernel.org, linux-snps-arc@lists•infradead.org,
linux-trace-kernel@vger•kernel.org, linux-um@lists•infradead.org,
linuxppc-dev@lists•ozlabs.org, loongarch@lists•linux.dev,
sparclinux@vger•kernel.org, x86@kernel•org
Subject: [PATCH v5 5/8] arch: introduce set_direct_map_valid_noflush()
Date: Wed, 9 Oct 2024 21:08:13 +0300 [thread overview]
Message-ID: <20241009180816.83591-6-rppt@kernel.org> (raw)
In-Reply-To: <20241009180816.83591-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel•org>
Add an API that will allow updates of the direct/linear map for a set of
physically contiguous pages.
It will be used in the following patches.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel•org>
---
arch/arm64/include/asm/set_memory.h | 1 +
arch/arm64/mm/pageattr.c | 10 ++++++++++
arch/loongarch/include/asm/set_memory.h | 1 +
arch/loongarch/mm/pageattr.c | 19 +++++++++++++++++++
arch/riscv/include/asm/set_memory.h | 1 +
arch/riscv/mm/pageattr.c | 15 +++++++++++++++
arch/s390/include/asm/set_memory.h | 1 +
arch/s390/mm/pageattr.c | 11 +++++++++++
arch/x86/include/asm/set_memory.h | 1 +
arch/x86/mm/pat/set_memory.c | 8 ++++++++
include/linux/set_memory.h | 6 ++++++
11 files changed, 74 insertions(+)
diff --git a/arch/arm64/include/asm/set_memory.h b/arch/arm64/include/asm/set_memory.h
index 917761feeffd..98088c043606 100644
--- a/arch/arm64/include/asm/set_memory.h
+++ b/arch/arm64/include/asm/set_memory.h
@@ -13,6 +13,7 @@ int set_memory_valid(unsigned long addr, int numpages, int enable);
int set_direct_map_invalid_noflush(struct page *page);
int set_direct_map_default_noflush(struct page *page);
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
bool kernel_page_present(struct page *page);
#endif /* _ASM_ARM64_SET_MEMORY_H */
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 0e270a1c51e6..01225900293a 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -192,6 +192,16 @@ int set_direct_map_default_noflush(struct page *page)
PAGE_SIZE, change_page_range, &data);
}
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
+{
+ unsigned long addr = (unsigned long)page_address(page);
+
+ if (!can_set_direct_map())
+ return 0;
+
+ return set_memory_valid(addr, nr, valid);
+}
+
#ifdef CONFIG_DEBUG_PAGEALLOC
void __kernel_map_pages(struct page *page, int numpages, int enable)
{
diff --git a/arch/loongarch/include/asm/set_memory.h b/arch/loongarch/include/asm/set_memory.h
index d70505b6676c..55dfaefd02c8 100644
--- a/arch/loongarch/include/asm/set_memory.h
+++ b/arch/loongarch/include/asm/set_memory.h
@@ -17,5 +17,6 @@ int set_memory_rw(unsigned long addr, int numpages);
bool kernel_page_present(struct page *page);
int set_direct_map_default_noflush(struct page *page);
int set_direct_map_invalid_noflush(struct page *page);
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
#endif /* _ASM_LOONGARCH_SET_MEMORY_H */
diff --git a/arch/loongarch/mm/pageattr.c b/arch/loongarch/mm/pageattr.c
index ffd8d76021d4..bf8678248444 100644
--- a/arch/loongarch/mm/pageattr.c
+++ b/arch/loongarch/mm/pageattr.c
@@ -216,3 +216,22 @@ int set_direct_map_invalid_noflush(struct page *page)
return __set_memory(addr, 1, __pgprot(0), __pgprot(_PAGE_PRESENT | _PAGE_VALID));
}
+
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
+{
+ unsigned long addr = (unsigned long)page_address(page);
+ pgprot_t set, clear;
+
+ if (addr < vm_map_base)
+ return 0;
+
+ if (valid) {
+ set = PAGE_KERNEL;
+ clear = __pgprot(0);
+ } else {
+ set = __pgprot(0);
+ clear = __pgprot(_PAGE_PRESENT | _PAGE_VALID);
+ }
+
+ return __set_memory(addr, 1, set, clear);
+}
diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h
index ab92fc84e1fc..ea263d3683ef 100644
--- a/arch/riscv/include/asm/set_memory.h
+++ b/arch/riscv/include/asm/set_memory.h
@@ -42,6 +42,7 @@ static inline int set_kernel_memory(char *startp, char *endp,
int set_direct_map_invalid_noflush(struct page *page);
int set_direct_map_default_noflush(struct page *page);
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
bool kernel_page_present(struct page *page);
#endif /* __ASSEMBLY__ */
diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c
index 271d01a5ba4d..d815448758a1 100644
--- a/arch/riscv/mm/pageattr.c
+++ b/arch/riscv/mm/pageattr.c
@@ -386,6 +386,21 @@ int set_direct_map_default_noflush(struct page *page)
PAGE_KERNEL, __pgprot(_PAGE_EXEC));
}
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
+{
+ pgprot_t set, clear;
+
+ if (valid) {
+ set = PAGE_KERNEL;
+ clear = __pgprot(_PAGE_EXEC);
+ } else {
+ set = __pgprot(0);
+ clear = __pgprot(_PAGE_PRESENT);
+ }
+
+ return __set_memory((unsigned long)page_address(page), nr, set, clear);
+}
+
#ifdef CONFIG_DEBUG_PAGEALLOC
static int debug_pagealloc_set_page(pte_t *pte, unsigned long addr, void *data)
{
diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h
index 06fbabe2f66c..240bcfbdcdce 100644
--- a/arch/s390/include/asm/set_memory.h
+++ b/arch/s390/include/asm/set_memory.h
@@ -62,5 +62,6 @@ __SET_MEMORY_FUNC(set_memory_4k, SET_MEMORY_4K)
int set_direct_map_invalid_noflush(struct page *page);
int set_direct_map_default_noflush(struct page *page);
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
#endif
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index 5f805ad42d4c..4c7ee74aa130 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -406,6 +406,17 @@ int set_direct_map_default_noflush(struct page *page)
return __set_memory((unsigned long)page_to_virt(page), 1, SET_MEMORY_DEF);
}
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
+{
+ unsigned long flags;
+
+ if (valid)
+ flags = SET_MEMORY_DEF;
+ else
+ flags = SET_MEMORY_INV;
+
+ return __set_memory((unsigned long)page_to_virt(page), nr, flags);
+}
#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE)
static void ipte_range(pte_t *pte, unsigned long address, int nr)
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
index 4b2abce2e3e7..cc62ef70ccc0 100644
--- a/arch/x86/include/asm/set_memory.h
+++ b/arch/x86/include/asm/set_memory.h
@@ -89,6 +89,7 @@ int set_pages_rw(struct page *page, int numpages);
int set_direct_map_invalid_noflush(struct page *page);
int set_direct_map_default_noflush(struct page *page);
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
bool kernel_page_present(struct page *page);
extern int kernel_set_to_readonly;
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index 44f7b2ea6a07..069e421c2247 100644
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -2444,6 +2444,14 @@ int set_direct_map_default_noflush(struct page *page)
return __set_pages_p(page, 1);
}
+int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
+{
+ if (valid)
+ return __set_pages_p(page, nr);
+
+ return __set_pages_np(page, nr);
+}
+
#ifdef CONFIG_DEBUG_PAGEALLOC
void __kernel_map_pages(struct page *page, int numpages, int enable)
{
diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h
index e7aec20fb44f..3030d9245f5a 100644
--- a/include/linux/set_memory.h
+++ b/include/linux/set_memory.h
@@ -34,6 +34,12 @@ static inline int set_direct_map_default_noflush(struct page *page)
return 0;
}
+static inline int set_direct_map_valid_noflush(struct page *page,
+ unsigned nr, bool valid)
+{
+ return 0;
+}
+
static inline bool kernel_page_present(struct page *page)
{
return true;
--
2.43.0
next prev parent reply other threads:[~2024-10-09 18:10 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-09 18:08 [PATCH v5 0/8] x86/module: use large ROX pages for text allocations Mike Rapoport
2024-10-09 18:08 ` [PATCH v5 1/8] mm: vmalloc: group declarations depending on CONFIG_MMU together Mike Rapoport
2024-10-10 6:54 ` Christoph Hellwig
2024-10-09 18:08 ` [PATCH v5 2/8] mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations Mike Rapoport
2024-10-10 6:54 ` Christoph Hellwig
2024-10-09 18:08 ` [PATCH v5 3/8] asm-generic: introduce text-patching.h Mike Rapoport
2024-10-10 6:55 ` Christoph Hellwig
2024-10-10 7:22 ` Geert Uytterhoeven
2024-10-10 8:04 ` Arnd Bergmann
2024-10-09 18:08 ` [PATCH v5 4/8] module: prepare to handle ROX allocations for text Mike Rapoport
2024-10-09 22:23 ` Song Liu
2024-10-10 5:43 ` Mike Rapoport
2024-10-10 17:18 ` Song Liu
2024-10-09 18:08 ` Mike Rapoport [this message]
2024-10-10 6:56 ` [PATCH v5 5/8] arch: introduce set_direct_map_valid_noflush() Christoph Hellwig
2024-10-09 18:08 ` [PATCH v5 6/8] x86/module: perpare module loading for ROX allocations of text Mike Rapoport
2024-10-10 6:57 ` Christoph Hellwig
2024-10-10 22:54 ` Nathan Chancellor
2024-10-11 12:58 ` Mike Rapoport
2024-10-15 8:29 ` Nathan Chancellor
2024-10-09 18:08 ` [PATCH v5 7/8] execmem: add support for cache of large ROX pages Mike Rapoport
2024-10-09 20:24 ` Andrew Morton
2024-10-10 9:29 ` Mike Rapoport
2024-10-10 6:58 ` Christoph Hellwig
2024-10-10 12:57 ` Mike Rapoport
2024-10-11 7:46 ` Christoph Hellwig
2024-10-13 8:43 ` Mike Rapoport
2024-10-14 3:26 ` Andrew Morton
2024-10-14 19:16 ` Luis Chamberlain
2024-10-15 4:09 ` Luis Chamberlain
2024-10-15 5:54 ` Mike Rapoport
2024-10-15 20:11 ` Luis Chamberlain
2024-10-16 10:40 ` Mike Rapoport
2024-10-16 23:58 ` Luis Chamberlain
2024-10-14 5:55 ` Christoph Hellwig
2024-10-14 13:07 ` Mike Rapoport
2024-10-10 18:35 ` Kees Bakker
2024-10-09 18:08 ` [PATCH v5 8/8] x86/module: enable ROX caches for module text Mike Rapoport
2024-10-10 8:30 ` Bisected: " Sergey Senozhatsky
2024-10-10 15:20 ` Mike Rapoport
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=20241009180816.83591-6-rppt@kernel.org \
--to=rppt@kernel$(echo .)org \
--cc=Liam.Howlett@oracle$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas@gaisler$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=bcain@quicinc$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=bpf@vger$(echo .)kernel.org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=christophe.leroy@csgroup$(echo .)eu \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=deller@gmx$(echo .)de \
--cc=dinguyen@kernel$(echo .)org \
--cc=geert@linux-m68k$(echo .)org \
--cc=glaubitz@physik$(echo .)fu-berlin.de \
--cc=guoren@kernel$(echo .)org \
--cc=hch@infradead$(echo .)org \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kent.overstreet@linux$(echo .)dev \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arch@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-hexagon@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=linux-modules@vger$(echo .)kernel.org \
--cc=linux-openrisc@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux-trace-kernel@vger$(echo .)kernel.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=luto@kernel$(echo .)org \
--cc=mark.rutland@arm$(echo .)com \
--cc=mattst88@gmail$(echo .)com \
--cc=mcgrof@kernel$(echo .)org \
--cc=mhiramat@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=mpe@ellerman$(echo .)id.au \
--cc=oleg@redhat$(echo .)com \
--cc=palmer@dabbelt$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=richard@nod$(echo .)at \
--cc=rostedt@goodmis$(echo .)org \
--cc=shorne@gmail$(echo .)com \
--cc=song@kernel$(echo .)org \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=urezki@gmail$(echo .)com \
--cc=vgupta@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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