Commit 5f7fb89a authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

function_graph: Everyone uses HAVE_FUNCTION_GRAPH_RET_ADDR_PTR, remove it 

All architectures that implement function graph also implements
HAVE_FUNCTION_GRAPH_RET_ADDR_PTR. Remove it, as it is no longer a
differentiator.

Link: https://lore.kernel.org/linux-trace-kernel/20240611031737.982047614@goodmis.org



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 29c1c24a

Documentation/trace/ftrace-design.rst

+0 −12
Original line number Diff line number Diff line
@@ -217,18 +217,6 @@ along to ftrace_push_return_trace() instead of a stub value of 0. 


Similarly, when you call ftrace_return_to_handler(), pass it the frame pointer.



HAVE_FUNCTION_GRAPH_RET_ADDR_PTR

--------------------------------



An arch may pass in a pointer to the return address on the stack.  This

prevents potential stack unwinding issues where the unwinder gets out of

sync with ret_stack and the wrong addresses are reported by

ftrace_graph_ret_addr().



Adding support for it is easy: just define the macro in asm/ftrace.h and

pass the return address pointer as the 'retp' argument to

ftrace_push_return_trace().



HAVE_SYSCALL_TRACEPOINTS

------------------------

arch/arm64/include/asm/ftrace.h

+0 −11
Original line number Diff line number Diff line
@@ -12,17 +12,6 @@ 


#define HAVE_FUNCTION_GRAPH_FP_TEST



/*

 * HAVE_FUNCTION_GRAPH_RET_ADDR_PTR means that the architecture can provide a

 * "return address pointer" which can be used to uniquely identify a return

 * address which has been overwritten.

 *

 * On arm64 we use the address of the caller's frame record, which remains the

 * same for the lifetime of the instrumented function, unlike the return

 * address in the LR.

 */

#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



#ifdef CONFIG_DYNAMIC_FTRACE_WITH_ARGS

#define ARCH_SUPPORTS_FTRACE_OPS 1

#else

arch/csky/include/asm/ftrace.h

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#define HAVE_FUNCTION_GRAPH_FP_TEST



#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



#define ARCH_SUPPORTS_FTRACE_OPS 1



#define MCOUNT_ADDR	((unsigned long)_mcount)

arch/loongarch/include/asm/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct dyn_ftrace; 
struct dyn_arch_ftrace { };



#define ARCH_SUPPORTS_FTRACE_OPS 1

#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



#define ftrace_init_nop ftrace_init_nop

int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec);

arch/powerpc/include/asm/ftrace.h

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#define MCOUNT_ADDR		((unsigned long)(_mcount))

#define MCOUNT_INSN_SIZE	4 /* sizeof mcount call */



#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR



/* Ignore unused weak functions which will have larger offsets */

#if defined(CONFIG_MPROFILE_KERNEL) || defined(CONFIG_ARCH_USING_PATCHABLE_FUNCTION_ENTRY)

#define FTRACE_MCOUNT_MAX_OFFSET	16