Commit a3ed4157 authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google) Committed by Steven Rostedt (Google)
Browse files

fgraph: Replace fgraph_ret_regs with ftrace_regs 



Use ftrace_regs instead of fgraph_ret_regs for tracing return value
on function_graph tracer because of simplifying the callback interface.

The CONFIG_HAVE_FUNCTION_GRAPH_RETVAL is also replaced by
CONFIG_HAVE_FUNCTION_GRAPH_FREGS.

Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Florent Revest <revest@chromium.org>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: bpf <bpf@vger.kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Alan Maguire <alan.maguire@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Heiko Carstens <hca@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: x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/173518991508.391279.16635322774382197642.stgit@devnote2


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 41705c42

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ config ARM64 
	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_FREGS

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_RETVAL

	select HAVE_GCC_PLUGINS

arch/arm64/include/asm/ftrace.h

+6 −17
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ ftrace_override_function_with_return(struct ftrace_regs *fregs) 
	arch_ftrace_regs(fregs)->pc = arch_ftrace_regs(fregs)->lr;

}



static __always_inline unsigned long

ftrace_regs_get_frame_pointer(const struct ftrace_regs *fregs)

{

	return arch_ftrace_regs(fregs)->fp;

}



int ftrace_regs_query_register_offset(const char *name);



int ftrace_init_nop(struct module *mod, struct dyn_ftrace *rec);
@@ -186,23 +192,6 @@ static inline bool arch_syscall_match_sym_name(const char *sym, 


#ifndef __ASSEMBLY__

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

struct fgraph_ret_regs {

	/* x0 - x7 */

	unsigned long regs[8];



	unsigned long fp;

	unsigned long __unused;

};



static inline unsigned long fgraph_ret_regs_return_value(struct fgraph_ret_regs *ret_regs)

{

	return ret_regs->regs[0];

}



static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs *ret_regs)

{

	return ret_regs->fp;

}



void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,

			   unsigned long frame_pointer);

arch/arm64/kernel/asm-offsets.c

+0 −12
Original line number Diff line number Diff line
@@ -179,18 +179,6 @@ int main(void) 
  DEFINE(FTRACE_OPS_FUNC,		offsetof(struct ftrace_ops, func));

#endif

  BLANK();

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

  DEFINE(FGRET_REGS_X0,			offsetof(struct fgraph_ret_regs, regs[0]));

  DEFINE(FGRET_REGS_X1,			offsetof(struct fgraph_ret_regs, regs[1]));

  DEFINE(FGRET_REGS_X2,			offsetof(struct fgraph_ret_regs, regs[2]));

  DEFINE(FGRET_REGS_X3,			offsetof(struct fgraph_ret_regs, regs[3]));

  DEFINE(FGRET_REGS_X4,			offsetof(struct fgraph_ret_regs, regs[4]));

  DEFINE(FGRET_REGS_X5,			offsetof(struct fgraph_ret_regs, regs[5]));

  DEFINE(FGRET_REGS_X6,			offsetof(struct fgraph_ret_regs, regs[6]));

  DEFINE(FGRET_REGS_X7,			offsetof(struct fgraph_ret_regs, regs[7]));

  DEFINE(FGRET_REGS_FP,			offsetof(struct fgraph_ret_regs, fp));

  DEFINE(FGRET_REGS_SIZE,		sizeof(struct fgraph_ret_regs));

#endif

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

  DEFINE(FTRACE_OPS_DIRECT_CALL,	offsetof(struct ftrace_ops, direct_call));

#endif

arch/arm64/kernel/entry-ftrace.S

+18 −14
Original line number Diff line number Diff line
@@ -329,24 +329,28 @@ SYM_FUNC_END(ftrace_stub_graph) 
 * @fp is checked against the value passed by ftrace_graph_caller().

 */

SYM_CODE_START(return_to_handler)

	/* save return value regs */

	sub sp, sp, #FGRET_REGS_SIZE

	stp x0, x1, [sp, #FGRET_REGS_X0]

	stp x2, x3, [sp, #FGRET_REGS_X2]

	stp x4, x5, [sp, #FGRET_REGS_X4]

	stp x6, x7, [sp, #FGRET_REGS_X6]

	str x29,    [sp, #FGRET_REGS_FP]	// parent's fp

	/* Make room for ftrace_regs */

	sub	sp, sp, #FREGS_SIZE



	/* Save return value regs */

	stp	x0, x1, [sp, #FREGS_X0]

	stp	x2, x3, [sp, #FREGS_X2]

	stp	x4, x5, [sp, #FREGS_X4]

	stp	x6, x7, [sp, #FREGS_X6]



	/* Save the callsite's FP */

	str	x29, [sp, #FREGS_FP]



	mov	x0, sp

	bl	ftrace_return_to_handler	// addr = ftrace_return_to_hander(regs);

	bl	ftrace_return_to_handler	// addr = ftrace_return_to_hander(fregs);

	mov	x30, x0				// restore the original return address



	/* restore return value regs */

	ldp x0, x1, [sp, #FGRET_REGS_X0]

	ldp x2, x3, [sp, #FGRET_REGS_X2]

	ldp x4, x5, [sp, #FGRET_REGS_X4]

	ldp x6, x7, [sp, #FGRET_REGS_X6]

	add sp, sp, #FGRET_REGS_SIZE

	/* Restore return value regs */

	ldp	x0, x1, [sp, #FREGS_X0]

	ldp	x2, x3, [sp, #FREGS_X2]

	ldp	x4, x5, [sp, #FREGS_X4]

	ldp	x6, x7, [sp, #FREGS_X6]

	add	sp, sp, #FREGS_SIZE



	ret

SYM_CODE_END(return_to_handler)

arch/loongarch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ config LOONGARCH 
	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_ARG_ACCESS_API

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FREGS

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_GCC_PLUGINS