linux-kernel - Re: [PATCH v2 5/8] ftrace: Add swap_func to ftrace_process

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240826132909.306b08fc@gandalf.local.home>
Date: Mon, 26 Aug 2024 13:29:09 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Mike Rapoport <rppt@...nel.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>, Andreas Larsson
 <andreas@...sler.com>, Andy Lutomirski <luto@...nel.org>, Arnd Bergmann
 <arnd@...db.de>, Borislav Petkov <bp@...en8.de>, Brian Cain
 <bcain@...cinc.com>, Catalin Marinas <catalin.marinas@....com>, Christoph
 Hellwig <hch@...radead.org>, Christophe Leroy
 <christophe.leroy@...roup.eu>, Dave Hansen <dave.hansen@...ux.intel.com>,
 Dinh Nguyen <dinguyen@...nel.org>, Geert Uytterhoeven
 <geert@...ux-m68k.org>, Guo Ren <guoren@...nel.org>, Helge Deller
 <deller@....de>, Huacai Chen <chenhuacai@...nel.org>, Ingo Molnar
 <mingo@...hat.com>, Johannes Berg <johannes@...solutions.net>, John Paul
 Adrian Glaubitz <glaubitz@...sik.fu-berlin.de>, Kent Overstreet
 <kent.overstreet@...ux.dev>, "Liam R. Howlett" <Liam.Howlett@...cle.com>,
 Luis Chamberlain <mcgrof@...nel.org>, Mark Rutland <mark.rutland@....com>,
 Masami Hiramatsu <mhiramat@...nel.org>, Matt Turner <mattst88@...il.com>,
 Max Filippov <jcmvbkbc@...il.com>, Michael Ellerman <mpe@...erman.id.au>,
 Michal Simek <monstr@...str.eu>, Oleg Nesterov <oleg@...hat.com>, Palmer
 Dabbelt <palmer@...belt.com>, Peter Zijlstra <peterz@...radead.org>,
 Richard Weinberger <richard@....at>, Russell King <linux@...linux.org.uk>,
 Song Liu <song@...nel.org>, Stafford Horne <shorne@...il.com>, Thomas
 Bogendoerfer <tsbogend@...ha.franken.de>, Thomas Gleixner
 <tglx@...utronix.de>, Uladzislau Rezki <urezki@...il.com>, Vineet Gupta
 <vgupta@...nel.org>, Will Deacon <will@...nel.org>, bpf@...r.kernel.org,
 linux-alpha@...r.kernel.org, linux-arch@...r.kernel.org,
 linux-arm-kernel@...ts.infradead.org, linux-csky@...r.kernel.org,
 linux-hexagon@...r.kernel.org, linux-kernel@...r.kernel.org,
 linux-m68k@...ts.linux-m68k.org, linux-mips@...r.kernel.org,
 linux-mm@...ck.org, linux-modules@...r.kernel.org,
 linux-openrisc@...r.kernel.org, linux-parisc@...r.kernel.org,
 linux-riscv@...ts.infradead.org, linux-sh@...r.kernel.org,
 linux-snps-arc@...ts.infradead.org, linux-trace-kernel@...r.kernel.org,
 linux-um@...ts.infradead.org, linuxppc-dev@...ts.ozlabs.org,
 loongarch@...ts.linux.dev, sparclinux@...r.kernel.org, x86@...nel.org
Subject: Re: [PATCH v2 5/8] ftrace: Add swap_func to ftrace_process_locs()

On Mon, 26 Aug 2024 09:55:29 +0300
Mike Rapoport <rppt@...nel.org> wrote:

> From: Song Liu <song@...nel.org>
> 
> ftrace_process_locs sorts module mcount, which is inside RO memory. Add a
> ftrace_swap_func so that archs can use RO-memory-poke function to do the
> sorting.

Can you add the above as a comment above the ftrace_swap_func() function?

Thanks,

-- Steve

> 
> Signed-off-by: Song Liu <song@...nel.org>
> Signed-off-by: Mike Rapoport (Microsoft) <rppt@...nel.org>
> ---
>  include/linux/ftrace.h |  2 ++
>  kernel/trace/ftrace.c  | 13 ++++++++++++-
>  2 files changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
> index fd5e84d0ec47..b794dcb7cae8 100644
> --- a/include/linux/ftrace.h
> +++ b/include/linux/ftrace.h
> @@ -1188,4 +1188,6 @@ unsigned long arch_syscall_addr(int nr);
>  
>  #endif /* CONFIG_FTRACE_SYSCALLS */
>  
> +void ftrace_swap_func(void *a, void *b, int n);
> +
>  #endif /* _LINUX_FTRACE_H */
> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
> index 4c28dd177ca6..9829979f3a46 100644
> --- a/kernel/trace/ftrace.c
> +++ b/kernel/trace/ftrace.c
> @@ -6989,6 +6989,17 @@ static void test_is_sorted(unsigned long *start,
> unsigned long count) }
>  #endif
>  
> +void __weak ftrace_swap_func(void *a, void *b, int n)
> +{
> +	unsigned long t;
> +
> +	WARN_ON_ONCE(n != sizeof(t));
> +
> +	t = *((unsigned long *)a);
> +	*(unsigned long *)a = *(unsigned long *)b;
> +	*(unsigned long *)b = t;
> +}
> +
>  static int ftrace_process_locs(struct module *mod,
>  			       unsigned long *start,
>  			       unsigned long *end)
> @@ -7016,7 +7027,7 @@ static int ftrace_process_locs(struct module *mod,
>  	 */
>  	if (!IS_ENABLED(CONFIG_BUILDTIME_MCOUNT_SORT) || mod) {
>  		sort(start, count, sizeof(*start),
> -		     ftrace_cmp_ips, NULL);
> +		     ftrace_cmp_ips, ftrace_swap_func);
>  	} else {
>  		test_is_sorted(start, count);
>  	}