Re: [patch 36/38] x86/ftrace: Make it call depth tracking aware

[Steven Rostedt <rostedt@goodmis.org>]

On Sun, 17 Jul 2022 01:18:08 +0200 (CEST)
Thomas Gleixner <tglx@linutronix.de> wrote:

> @@ -280,7 +291,19 @@ SYM_INNER_LABEL(ftrace_regs_caller_end,
>  	/* Restore flags */
>  	popfq
>  	UNWIND_HINT_FUNC
> -	jmp	ftrace_epilogue
> +
> +	/*
> +	 * Since we're effectively emulating a tail-call with PUSH;RET
> +	 * make sure we don't unbalance the RSB and mess up accounting.
> +	 */
> +	ANNOTATE_INTRA_FUNCTION_CALL
> +	call	2f
> +	int3
> +2:
> +	add	$8, %rsp
> +	ALTERNATIVE __stringify(RET), \
> +		    __stringify(ANNOTATE_UNRET_SAFE; ret; int3), \
> +		    X86_FEATURE_CALL_DEPTH
>  
>  SYM_FUNC_END(ftrace_regs_caller)

Would this code be simpler if we nuked the ftrace_epilogue altogether?

After commit 0c0593b45c9b ("x86/ftrace: Make function graph use ftrace
directly"), the ftrace_epilogue is no longer needed. That was there to make
sure all the trampolines would call the function graph tracer. But now that
function graph tracing is just another ftrace caller, it's not needed
anymore.

Something like the below. It booted and passed the ftrace kselftests.

Feel free to include this in your series.

-- Steve

From 533f10bd48ffbc4ee5d2a07f0a7fe99aeb1c823a Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
Date: Mon, 18 Jul 2022 16:01:07 -0400
Subject: [PATCH] ftrace/x86: Remove jumps to ftrace_epilogue

The jumps to ftrace_epilogue were done as a way to make sure all the
function tracing trampolines ended at the function graph trampoline, as
the ftrace_epilogue was the location that it would handle that.

With the advent of function graph tracer now being just one of the
callbacks of the function tracer there is no more requirement that all
trampolines go to a single location.

Remove the jumps to the ftrace_epilogue and replace them with return
statements.

Note, the ftrace_epilogue can probably be renamed to ftrace_stub and the
weak logic for that could probably be removed. But lets leave that as a
separate change.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 arch/x86/kernel/ftrace_64.S | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index dfeb227de561..8f225fafa5fb 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -173,7 +173,9 @@ SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL)
 SYM_INNER_LABEL(ftrace_caller_end, SYM_L_GLOBAL)
 	ANNOTATE_NOENDBR
 
-	jmp ftrace_epilogue
+	UNWIND_HINT_FUNC
+	ENDBR
+	RET
 SYM_FUNC_END(ftrace_caller);
 STACK_FRAME_NON_STANDARD_FP(ftrace_caller)
 
@@ -261,15 +263,9 @@ SYM_INNER_LABEL(ftrace_regs_caller_jmp, SYM_L_GLOBAL)
 	/* Restore flags */
 	popfq
 
-	/*
-	 * As this jmp to ftrace_epilogue can be a short jump
-	 * it must not be copied into the trampoline.
-	 * The trampoline will add the code to jump
-	 * to the return.
-	 */
 SYM_INNER_LABEL(ftrace_regs_caller_end, SYM_L_GLOBAL)
 	ANNOTATE_NOENDBR
-	jmp ftrace_epilogue
+	jmp 2f
 
 	/* Swap the flags with orig_rax */
 1:	movq MCOUNT_REG_SIZE(%rsp), %rdi
@@ -279,8 +275,10 @@ SYM_INNER_LABEL(ftrace_regs_caller_end, SYM_L_GLOBAL)
 	restore_mcount_regs 8
 	/* Restore flags */
 	popfq
+2:
 	UNWIND_HINT_FUNC
-	jmp	ftrace_epilogue
+	ENDBR
+	RET
 
 SYM_FUNC_END(ftrace_regs_caller)
 STACK_FRAME_NON_STANDARD_FP(ftrace_regs_caller)
-- 
2.35.1