From: Mike Rapoport <rppt@kernel•org>
To: Steven Rostedt <rostedt@goodmis•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Luis Chamberlain <mcgrof@kernel•org>,
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>,
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>, 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>,
Suren Baghdasaryan <surenb@google•com>,
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: Re: [PATCH v7 0/8] x86/module: use large ROX pages for text allocations
Date: Mon, 18 Nov 2024 10:40:26 -0800 [thread overview]
Message-ID: <ZzuKGoj99rIuMaBE@kernel.org> (raw)
In-Reply-To: <20241118132501.4eddb46c@gandalf.local.home>
On Mon, Nov 18, 2024 at 01:25:01PM -0500, Steven Rostedt wrote:
> On Wed, 23 Oct 2024 19:27:03 +0300
> Mike Rapoport <rppt@kernel•org> wrote:
>
> > From: "Mike Rapoport (Microsoft)" <rppt@kernel•org>
> >
> > Hi,
> >
> > This is an updated version of execmem ROX caches.
> >
>
> FYI, I booted a kernel before and after applying these patches with my
> change:
>
> https://lore.kernel.org/20241017113105.1edfa943@gandalf.local.home
>
> Before these patches:
>
> # cat /sys/kernel/tracing/dyn_ftrace_total_info
> 57695 pages:231 groups: 9
> ftrace boot update time = 14733459 (ns)
> ftrace module total update time = 449016 (ns)
>
> After:
>
> # cat /sys/kernel/tracing/dyn_ftrace_total_info
> 57708 pages:231 groups: 9
> ftrace boot update time = 47195374 (ns)
> ftrace module total update time = 592080 (ns)
>
> Which caused boot time to slowdown by over 30ms. That may not seem like
> much, but we are very concerned about boot time and are fighting every ms
> we can get.
Hmm, looks like this change was lost in rebase :/
@Andrew, should I send it as a patch on top of mm-stable?
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 8da0e66ca22d..859902dd06fc 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -111,17 +111,22 @@ static int ftrace_verify_code(unsigned long ip, const char *old_code)
*/
static int __ref
ftrace_modify_code_direct(unsigned long ip, const char *old_code,
- const char *new_code)
+ const char *new_code, struct module *mod)
{
int ret = ftrace_verify_code(ip, old_code);
if (ret)
return ret;
/* replace the text with the new text */
- if (ftrace_poke_late)
+ if (ftrace_poke_late) {
text_poke_queue((void *)ip, new_code, MCOUNT_INSN_SIZE, NULL);
- else
+ } else if (!mod) {
text_poke_early((void *)ip, new_code, MCOUNT_INSN_SIZE);
+ } else {
+ mutex_lock(&text_mutex);
+ text_poke((void *)ip, new_code, MCOUNT_INSN_SIZE);
+ mutex_unlock(&text_mutex);
+ }
return 0;
}
@@ -142,7 +147,7 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long ad
* just modify the code directly.
*/
if (addr == MCOUNT_ADDR)
- return ftrace_modify_code_direct(ip, old, new);
+ return ftrace_modify_code_direct(ip, old, new, mod);
/*
* x86 overrides ftrace_replace_code -- this function will never be used
@@ -161,7 +166,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
new = ftrace_call_replace(ip, addr);
/* Should only be called when module is loaded */
- return ftrace_modify_code_direct(rec->ip, old, new);
+ return ftrace_modify_code_direct(rec->ip, old, new, NULL);
}
/*
> -- Steve
--
Sincerely yours,
Mike.
prev parent reply other threads:[~2024-11-18 18:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 16:27 [PATCH v7 0/8] x86/module: use large ROX pages for text allocations Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 1/8] mm: vmalloc: group declarations depending on CONFIG_MMU together Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 2/8] mm: vmalloc: don't account for number of nodes for HUGE_VMAP allocations Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 3/8] asm-generic: introduce text-patching.h Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 4/8] module: prepare to handle ROX allocations for text Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 5/8] arch: introduce set_direct_map_valid_noflush() Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 6/8] x86/module: prepare module loading for ROX allocations of text Mike Rapoport
2024-11-04 23:27 ` Nathan Chancellor
2024-11-05 7:02 ` Mike Rapoport
2024-11-05 19:04 ` Nathan Chancellor
2024-10-23 16:27 ` [PATCH v7 7/8] execmem: add support for cache of large ROX pages Mike Rapoport
2025-02-27 11:13 ` Ryan Roberts
2025-02-28 13:55 ` Mike Rapoport
2024-10-23 16:27 ` [PATCH v7 8/8] x86/module: enable ROX caches for module text on 64 bit Mike Rapoport
2024-11-18 18:25 ` [PATCH v7 0/8] x86/module: use large ROX pages for text allocations Steven Rostedt
2024-11-18 18:40 ` 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=ZzuKGoj99rIuMaBE@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=surenb@google$(echo .)com \
--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