From: Mike Rapoport <rppt@kernel•org>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Andreas Larsson <andreas@gaisler•com>,
Andy Lutomirski <luto@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 v3 8/8] x86/module: enable ROX caches for module text
Date: Mon, 9 Sep 2024 09:47:30 +0300 [thread overview]
Message-ID: <20240909064730.3290724-9-rppt@kernel.org> (raw)
In-Reply-To: <20240909064730.3290724-1-rppt@kernel.org>
From: "Mike Rapoport (Microsoft)" <rppt@kernel•org>
Enable execmem's cache of PMD_SIZE'ed pages mapped as ROX for module
text allocations.
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel•org>
---
arch/x86/mm/init.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index eb503f53c319..a0ec99fb9385 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -1053,6 +1053,15 @@ unsigned long arch_max_swapfile_size(void)
#ifdef CONFIG_EXECMEM
static struct execmem_info execmem_info __ro_after_init;
+static void execmem_fill_trapping_insns(void *ptr, size_t size, bool writeable)
+{
+ /* fill memory with INT3 instructions */
+ if (writeable)
+ memset(ptr, INT3_INSN_OPCODE, size);
+ else
+ text_poke_set(ptr, INT3_INSN_OPCODE, size);
+}
+
struct execmem_info __init *execmem_arch_setup(void)
{
unsigned long start, offset = 0;
@@ -1063,8 +1072,23 @@ struct execmem_info __init *execmem_arch_setup(void)
start = MODULES_VADDR + offset;
execmem_info = (struct execmem_info){
+ .fill_trapping_insns = execmem_fill_trapping_insns,
.ranges = {
- [EXECMEM_DEFAULT] = {
+ [EXECMEM_MODULE_TEXT] = {
+ .flags = EXECMEM_KASAN_SHADOW | EXECMEM_ROX_CACHE,
+ .start = start,
+ .end = MODULES_END,
+ .pgprot = PAGE_KERNEL_ROX,
+ .alignment = MODULE_ALIGN,
+ },
+ [EXECMEM_KPROBES ... EXECMEM_BPF] = {
+ .flags = EXECMEM_KASAN_SHADOW,
+ .start = start,
+ .end = MODULES_END,
+ .pgprot = PAGE_KERNEL,
+ .alignment = MODULE_ALIGN,
+ },
+ [EXECMEM_MODULE_DATA] = {
.flags = EXECMEM_KASAN_SHADOW,
.start = start,
.end = MODULES_END,
--
2.43.0
prev parent reply other threads:[~2024-09-09 6:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 6:47 [PATCH v3 0/8] x86/module: use large ROX pages for text allocations Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 1/8] mm: vmalloc: group declarations depending on CONFIG_MMU together Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 2/8] mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 3/8] asm-generic: introduce text-patching.h Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 4/8] module: prepare to handle ROX allocations for text Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 5/8] ftrace: Add swap_func to ftrace_process_locs() Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 6/8] x86/module: perpare module loading for ROX allocations of text Mike Rapoport
2024-09-09 9:29 ` Peter Zijlstra
2024-09-09 14:34 ` Mike Rapoport
2024-09-09 14:49 ` Steven Rostedt
2024-09-11 10:19 ` Mike Rapoport
2024-09-09 6:47 ` [PATCH v3 7/8] execmem: add support for cache of large ROX pages Mike Rapoport
2024-09-13 15:00 ` Ard Biesheuvel
2024-09-15 13:48 ` Mike Rapoport
2024-09-19 11:18 ` Liam R. Howlett
2024-09-09 6:47 ` Mike Rapoport [this message]
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=20240909064730.3290724-9-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=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