On Wed, 7 Feb 2024 00:11:34 +0900
"Masami Hiramatsu (Google)" <mhiramat@xxxxxxxxxx> wrote:
> From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
>
> Add a new entry handler to fgraph_ops as 'entryregfunc' which takes
> parent_ip and ftrace_regs. Note that the 'entryfunc' and 'entryregfunc'
> are mutual exclusive. You can set only one of them.
>
> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
> ---
> Changes in v3:
> - Update for new multiple fgraph.
> ---
> arch/arm64/kernel/ftrace.c | 2 +
> arch/loongarch/kernel/ftrace_dyn.c | 2 +
> arch/powerpc/kernel/trace/ftrace.c | 2 +
> arch/powerpc/kernel/trace/ftrace_64_pg.c | 10 ++++---
> arch/x86/kernel/ftrace.c | 42 ++++++++++++++++--------------
> include/linux/ftrace.h | 19 +++++++++++---
> kernel/trace/fgraph.c | 30 +++++++++++++++++----
> 7 files changed, 72 insertions(+), 35 deletions(-)
>
> diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c
> index b96740829798..779b975f03f5 100644
> --- a/arch/arm64/kernel/ftrace.c
> +++ b/arch/arm64/kernel/ftrace.c
> @@ -497,7 +497,7 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
> return;
>
> if (!function_graph_enter_ops(*parent, ip, frame_pointer,
> - (void *)frame_pointer, gops))
> + (void *)frame_pointer, fregs, gops))
I would like to replace that second frame_pointer with fregs.
> *parent = (unsigned long)&return_to_handler;
>
> ftrace_test_recursion_unlock(bit);
> diff --git a/arch/loongarch/kernel/ftrace_dyn.c b/arch/loongarch/kernel/ftrace_dyn.c
> index 81d18b911cc1..45d26c6e6564 100644
> --- a/arch/loongarch/kernel/ftrace_dyn.c
> +++ b/arch/loongarch/kernel/ftrace_dyn.c
> @@ -250,7 +250,7 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
>
> old = *parent;
>
> - if (!function_graph_enter_ops(old, ip, 0, parent, gops))
> + if (!function_graph_enter_ops(old, ip, 0, parent, fregs, gops))
That is, to replace the parent with fregs, as the parent can be retrieved
from fregs.
We should add a fregs helper (something like):
unsigned long *fregs_caller_addr(fregs) {
return (unsigned long *)(kernel_stack_pointer(fregs->regs) + PT_R1);
}
That returns the address that points to the parent caller on the stack.
This was on my todo list to do. That is, replace the passing of the parent
of the stack with fregs as it is redundant information.
> *parent = return_hooker;
> }
> #else
> diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c
> index 4ef8bf480279..eeaaa798f4f9 100644
> --- a/arch/powerpc/kernel/trace/ftrace.c
> +++ b/arch/powerpc/kernel/trace/ftrace.c
> @@ -423,7 +423,7 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
> if (bit < 0)
> goto out;
>
> - if (!function_graph_enter_ops(parent_ip, ip, 0, (unsigned long *)sp, gops))
> + if (!function_graph_enter_ops(parent_ip, ip, 0, (unsigned long *)sp, fregs, gops))
> parent_ip = ppc_function_entry(return_to_handler);
>
> ftrace_test_recursion_unlock(bit);
> diff --git a/arch/powerpc/kernel/trace/ftrace_64_pg.c b/arch/powerpc/kernel/trace/ftrace_64_pg.c
> index 7b85c3b460a3..43f6cfaaf7db 100644
> --- a/arch/powerpc/kernel/trace/ftrace_64_pg.c
> +++ b/arch/powerpc/kernel/trace/ftrace_64_pg.c
> @@ -795,7 +795,8 @@ int ftrace_disable_ftrace_graph_caller(void)
> * in current thread info. Return the address we want to divert to.
> */
> static unsigned long
> -__prepare_ftrace_return(unsigned long parent, unsigned long ip, unsigned long sp)
> +__prepare_ftrace_return(unsigned long parent, unsigned long ip, unsigned long sp,
> + struct ftrace_regs *fregs)
And sp shouldn't need to be passed in either, as hat should be part of the fregs.
I really like to consolidate the parameters and not just keep adding to
them. This all slows down the logic to load the parameters.
-- Steve
> {
> unsigned long return_hooker;
> int bit;
