From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Naveen N Rao <naveen@kernel.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [PATCH 06/17] powerpc/ftrace: Extend ftrace support for large kernels to ppc32
Date: Fri, 23 Jun 2023 05:21:01 +0000 [thread overview]
Message-ID: <bb8b900f-a23b-f179-1f77-9b50d49ec898@csgroup.eu> (raw)
In-Reply-To: <9fa3258cbb9105cf8a0a8135214d44ffbc75fe84.1687166935.git.naveen@kernel.org>
Le 19/06/2023 à 11:47, Naveen N Rao a écrit :
> Commit 67361cf8071286 ("powerpc/ftrace: Handle large kernel configs")
> added ftrace support for ppc64 kernel images with a text section larger
> than 32MB. The approach itself isn't specific to ppc64, so extend the
> same to also work on ppc32.
>
> While at it, reduce the space reserved for the stub from 64 bytes to 32
> bytes since the different stub variants are all less than 8
> instructions.
>
> To reduce use of #ifdef, a stub implementation is provided for
> kernel_toc_address() and -SZ_2G is cast to 'long long' to prevent
> errors on ppc32.
>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> Signed-off-by: Naveen N Rao <naveen@kernel.org>
> ---
> arch/powerpc/include/asm/ftrace.h | 10 +++++--
> arch/powerpc/include/asm/sections.h | 2 ++
> arch/powerpc/kernel/trace/ftrace.c | 39 ++++++++++++++------------
> arch/powerpc/kernel/trace/ftrace_low.S | 6 ++--
> arch/powerpc/kernel/vmlinux.lds.S | 4 ---
> 5 files changed, 32 insertions(+), 29 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
> index 2edc6269b1a357..702aaf2efa966c 100644
> --- a/arch/powerpc/include/asm/ftrace.h
> +++ b/arch/powerpc/include/asm/ftrace.h
> @@ -124,15 +124,19 @@ static inline u8 this_cpu_get_ftrace_enabled(void)
> {
> return get_paca()->ftrace_enabled;
> }
> -
> -void ftrace_free_init_tramp(void);
> #else /* CONFIG_PPC64 */
> static inline void this_cpu_disable_ftrace(void) { }
> static inline void this_cpu_enable_ftrace(void) { }
> static inline void this_cpu_set_ftrace_enabled(u8 ftrace_enabled) { }
> static inline u8 this_cpu_get_ftrace_enabled(void) { return 1; }
> -static inline void ftrace_free_init_tramp(void) { }
> #endif /* CONFIG_PPC64 */
> +
> +#ifdef CONFIG_FUNCTION_TRACER
> +extern unsigned int ftrace_tramp_text[], ftrace_tramp_init[];
> +void ftrace_free_init_tramp(void);
> +#else
> +static inline void ftrace_free_init_tramp(void) { }
> +#endif
> #endif /* !__ASSEMBLY__ */
>
> #endif /* _ASM_POWERPC_FTRACE */
> diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h
> index 4e1f548c8d373d..ea26665f82cfc8 100644
> --- a/arch/powerpc/include/asm/sections.h
> +++ b/arch/powerpc/include/asm/sections.h
> @@ -74,6 +74,8 @@ static inline int overlaps_kernel_text(unsigned long start, unsigned long end)
> (unsigned long)_stext < end;
> }
>
> +#else
> +static inline unsigned long kernel_toc_addr(void) { BUILD_BUG(); return -1UL; }
> #endif
>
> #endif /* __KERNEL__ */
> diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c
> index 5aa36272617a03..913c7aa63d3fa3 100644
> --- a/arch/powerpc/kernel/trace/ftrace.c
> +++ b/arch/powerpc/kernel/trace/ftrace.c
> @@ -707,11 +707,6 @@ void arch_ftrace_update_code(int command)
> ftrace_modify_all_code(command);
> }
>
> -#ifdef CONFIG_PPC64
> -#define PACATOC offsetof(struct paca_struct, kernel_toc)
> -
> -extern unsigned int ftrace_tramp_text[], ftrace_tramp_init[];
> -
> void ftrace_free_init_tramp(void)
> {
> int i;
> @@ -725,28 +720,30 @@ void ftrace_free_init_tramp(void)
>
> int __init ftrace_dyn_arch_init(void)
> {
> - int i;
> unsigned int *tramp[] = { ftrace_tramp_text, ftrace_tramp_init };
> -#ifdef CONFIG_PPC_KERNEL_PCREL
> + unsigned long addr = FTRACE_REGS_ADDR;
> + long reladdr;
> + int i;
> u32 stub_insns[] = {
> +#ifdef CONFIG_PPC_KERNEL_PCREL
> /* pla r12,addr */
> PPC_PREFIX_MLS | __PPC_PRFX_R(1),
> PPC_INST_PADDI | ___PPC_RT(_R12),
> PPC_RAW_MTCTR(_R12),
> PPC_RAW_BCTR()
> - };
> -#else
> - u32 stub_insns[] = {
> - PPC_RAW_LD(_R12, _R13, PACATOC),
> +#elif defined(CONFIG_PPC64)
> + PPC_RAW_LD(_R12, _R13, offsetof(struct paca_struct, kernel_toc)),
> PPC_RAW_ADDIS(_R12, _R12, 0),
> PPC_RAW_ADDI(_R12, _R12, 0),
> PPC_RAW_MTCTR(_R12),
> PPC_RAW_BCTR()
> - };
> +#else
> + PPC_RAW_LIS(_R12, 0),
> + PPC_RAW_ADDI(_R12, _R12, 0),
> + PPC_RAW_MTCTR(_R12),
> + PPC_RAW_BCTR()
> #endif
> -
> - unsigned long addr = FTRACE_REGS_ADDR;
> - long reladdr;
> + };
>
> if (IS_ENABLED(CONFIG_PPC_KERNEL_PCREL)) {
> for (i = 0; i < 2; i++) {
> @@ -763,10 +760,10 @@ int __init ftrace_dyn_arch_init(void)
> tramp[i][1] |= IMM_L(reladdr);
> add_ftrace_tramp((unsigned long)tramp[i]);
> }
> - } else {
> + } else if (IS_ENABLED(CONFIG_PPC64)) {
> reladdr = addr - kernel_toc_addr();
>
> - if (reladdr >= (long)SZ_2G || reladdr < -(long)SZ_2G) {
> + if (reladdr >= (long)SZ_2G || reladdr < -(long long)SZ_2G) {
> pr_err("Address of %ps out of range of kernel_toc.\n",
> (void *)addr);
> return -1;
> @@ -778,11 +775,17 @@ int __init ftrace_dyn_arch_init(void)
> tramp[i][2] |= PPC_LO(reladdr);
> add_ftrace_tramp((unsigned long)tramp[i]);
> }
> + } else {
> + for (i = 0; i < 2; i++) {
> + memcpy(tramp[i], stub_insns, sizeof(stub_insns));
> + tramp[i][0] |= PPC_HA(addr);
> + tramp[i][1] |= PPC_LO(addr);
> + add_ftrace_tramp((unsigned long)tramp[i]);
> + }
> }
>
> return 0;
> }
> -#endif
>
> #ifdef CONFIG_FUNCTION_GRAPH_TRACER
> void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
> diff --git a/arch/powerpc/kernel/trace/ftrace_low.S b/arch/powerpc/kernel/trace/ftrace_low.S
> index 294d1e05958aae..2fc7dd0a5ae968 100644
> --- a/arch/powerpc/kernel/trace/ftrace_low.S
> +++ b/arch/powerpc/kernel/trace/ftrace_low.S
> @@ -10,19 +10,17 @@
> #include <asm/ppc-opcode.h>
> #include <asm/export.h>
>
> -#ifdef CONFIG_PPC64
> .pushsection ".tramp.ftrace.text","aw",@progbits;
> .globl ftrace_tramp_text
> ftrace_tramp_text:
> - .space 64
> + .space 32
> .popsection
>
> .pushsection ".tramp.ftrace.init","aw",@progbits;
> .globl ftrace_tramp_init
> ftrace_tramp_init:
> - .space 64
> + .space 32
> .popsection
> -#endif
>
> _GLOBAL(mcount)
> _GLOBAL(_mcount)
> diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
> index 13614f0b269cf4..1c5970df323366 100644
> --- a/arch/powerpc/kernel/vmlinux.lds.S
> +++ b/arch/powerpc/kernel/vmlinux.lds.S
> @@ -107,9 +107,7 @@ SECTIONS
> #endif
> /* careful! __ftr_alt_* sections need to be close to .text */
> *(.text.hot .text.hot.* TEXT_MAIN .text.fixup .text.unlikely .text.unlikely.* .fixup __ftr_alt_* .ref.text);
> -#ifdef CONFIG_PPC64
> *(.tramp.ftrace.text);
> -#endif
> NOINSTR_TEXT
> SCHED_TEXT
> LOCK_TEXT
> @@ -276,9 +274,7 @@ SECTIONS
> */
> . = ALIGN(PAGE_SIZE);
> _einittext = .;
> -#ifdef CONFIG_PPC64
> *(.tramp.ftrace.init);
> -#endif
> } :text
>
> /* .exit.text is discarded at runtime, not link time,
next prev parent reply other threads:[~2023-06-23 5:22 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 9:47 [PATCH 00/17] powerpc/ftrace: refactor and add support for -fpatchable-function-entry Naveen N Rao
2023-06-19 9:47 ` [PATCH 01/17] powerpc/ftrace: Fix dropping weak symbols with older toolchains Naveen N Rao
2023-06-23 5:10 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 02/17] powerpc/module: Remove unused .ftrace.tramp section Naveen N Rao
2023-06-23 5:12 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 03/17] powerpc64/ftrace: Move ELFv1 and -pg support code into a separate file Naveen N Rao
2023-06-23 5:13 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 04/17] powerpc/ftrace: Simplify function_graph support in ftrace.c Naveen N Rao
2023-06-23 5:14 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 05/17] powerpc/ftrace: Use FTRACE_REGS_ADDR to identify the correct ftrace trampoline Naveen N Rao
2023-06-23 5:15 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 06/17] powerpc/ftrace: Extend ftrace support for large kernels to ppc32 Naveen N Rao
2023-06-23 5:21 ` Christophe Leroy [this message]
2023-06-19 9:47 ` [PATCH 07/17] powerpc/ftrace: Consolidate ftrace support into fewer files Naveen N Rao
2023-06-23 5:25 ` Christophe Leroy
2023-06-28 7:32 ` Naveen N Rao
2023-06-19 9:47 ` [PATCH 08/17] powerpc/ftrace: Refactor ftrace_modify_code() Naveen N Rao
2023-06-23 5:27 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 09/17] powerpc/ftrace: Stop re-purposing linker generated long branches for ftrace Naveen N Rao
2023-06-23 5:28 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 10/17] powerpc/ftrace: Add separate ftrace_init_nop() with additional validation Naveen N Rao
2023-06-23 5:29 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 11/17] powerpc/ftrace: Simplify ftrace_make_nop() Naveen N Rao
2023-06-23 5:30 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 12/17] powerpc/ftrace: Simplify ftrace_make_call() Naveen N Rao
2023-06-23 5:30 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 13/17] powerpc/ftrace: Simplify ftrace_modify_call() Naveen N Rao
2023-06-23 5:31 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 14/17] powerpc/ftrace: Replace use of ftrace_call_replace() with ftrace_create_branch_inst() Naveen N Rao
2023-06-23 5:32 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 15/17] powerpc/ftrace: Implement ftrace_replace_code() Naveen N Rao
2023-06-23 5:32 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 16/17] powerpc/ftrace: Add support for -fpatchable-function-entry Naveen N Rao
2023-06-23 5:37 ` Christophe Leroy
2023-06-28 7:40 ` Naveen N Rao
2023-06-19 9:47 ` [PATCH 17/17] powerpc/ftrace: Create a dummy stackframe to fix stack unwind Naveen N Rao
2023-06-23 5:40 ` Christophe Leroy
2023-06-28 7:43 ` Naveen N Rao
2023-08-23 11:55 ` [PATCH 00/17] powerpc/ftrace: refactor and add support for -fpatchable-function-entry Michael Ellerman
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=bb8b900f-a23b-f179-1f77-9b50d49ec898@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen@kernel.org \
--cc=rostedt@goodmis.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.