Unverified Commit 54ecbc8d authored by Andy Chiu's avatar Andy Chiu Committed by Palmer Dabbelt
Browse files

riscv: ftrace factor out code defined by !WITH_ARG 



DYNAMIC_FTRACE selects DYNAMIC_FTRACE_WITH_ARGS and mcount-dyn.S in
riscv, so we can remove ifdef jargons of WITH_ARG when it is known that
DYNAMIC_FTRACE is true.

Signed-off-by: default avatarAndy Chiu <andybnac@gmail.com>
Link: https://lore.kernel.org/r/20250407180838.42877-2-andybnac@gmail.com


Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@dabbelt.com>
parent f8693f6d

arch/riscv/kernel/ftrace.c

+0 −15
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, 
}



#ifdef CONFIG_DYNAMIC_FTRACE

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_ARGS

void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,

		       struct ftrace_ops *op, struct ftrace_regs *fregs)

{
@@ -231,19 +230,5 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, 
	if (!function_graph_enter_regs(old, ip, frame_pointer, parent, fregs))

		*parent = return_hooker;

}

#else /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */

extern void ftrace_graph_call(void);

int ftrace_enable_ftrace_graph_caller(void)

{

	return __ftrace_modify_call((unsigned long)&ftrace_graph_call,

				    (unsigned long)&prepare_ftrace_return, true, true);

}



int ftrace_disable_ftrace_graph_caller(void)

{

	return __ftrace_modify_call((unsigned long)&ftrace_graph_call,

				    (unsigned long)&prepare_ftrace_return, false, true);

}

#endif /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */

#endif /* CONFIG_DYNAMIC_FTRACE */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

arch/riscv/kernel/mcount-dyn.S

+0 −34
Original line number Diff line number Diff line
@@ -56,8 +56,6 @@ 
	addi	sp, sp, ABI_SIZE_ON_STACK

	.endm



#ifdef CONFIG_DYNAMIC_FTRACE_WITH_ARGS



/**

* SAVE_ABI_REGS - save regs against the ftrace_regs struct

*
@@ -149,36 +147,6 @@ 
	mv	a3, sp

	.endm



#endif /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */



#ifndef CONFIG_DYNAMIC_FTRACE_WITH_ARGS

SYM_FUNC_START(ftrace_caller)

	SAVE_ABI



	addi	a0, t0, -FENTRY_RA_OFFSET

	la	a1, function_trace_op

	REG_L	a2, 0(a1)

	mv	a1, ra

	mv	a3, sp



SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL)

	call	ftrace_stub



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	addi	a0, sp, ABI_RA

	REG_L	a1, ABI_T0(sp)

	addi	a1, a1, -FENTRY_RA_OFFSET

#ifdef HAVE_FUNCTION_GRAPH_FP_TEST

	mv	a2, s0

#endif

SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL)

	call	ftrace_stub

#endif

	RESTORE_ABI

	jr	t0

SYM_FUNC_END(ftrace_caller)



#else /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */

SYM_FUNC_START(ftrace_caller)

	mv	t1, zero

	SAVE_ABI_REGS
@@ -194,8 +162,6 @@ SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL) 
	jr	t1

SYM_FUNC_END(ftrace_caller)



#endif /* CONFIG_DYNAMIC_FTRACE_WITH_ARGS */



#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

SYM_CODE_START(ftrace_stub_direct_tramp)

	jr	t0