Skip to content

Commit a3ed415

Browse files
mhiramatrostedt
mhiramat
authored and
rostedt
committed
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: Masami Hiramatsu (Google) <mhiramat@kernel.org> Acked-by: Heiko Carstens <hca@linux.ibm.com> Acked-by: Will 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: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 41705c4 commit a3ed415

File tree

24 files changed

+119
-207
lines changed

24 files changed

+119
-207
lines changed

‎arch/arm64/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ config ARM64
219219
select HAVE_FTRACE_MCOUNT_RECORD
220220
select HAVE_FUNCTION_TRACER
221221
select HAVE_FUNCTION_ERROR_INJECTION
222+
select HAVE_FUNCTION_GRAPH_FREGS
222223
select HAVE_FUNCTION_GRAPH_TRACER
223224
select HAVE_FUNCTION_GRAPH_RETVAL
224225
select HAVE_GCC_PLUGINS

‎arch/arm64/include/asm/ftrace.h‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,12 @@ ftrace_override_function_with_return(struct ftrace_regs *fregs)
129129
arch_ftrace_regs(fregs)->pc = arch_ftrace_regs(fregs)->lr;
130130
}
131131

132+
static __always_inline unsigned long
133+
ftrace_regs_get_frame_pointer(const struct ftrace_regs *fregs)
134+
{
135+
return arch_ftrace_regs(fregs)->fp;
136+
}
137+
132138
int ftrace_regs_query_register_offset(const char *name);
133139

134140
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,
186192

187193
#ifndef __ASSEMBLY__
188194
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
189-
struct fgraph_ret_regs {
190-
/* x0 - x7 */
191-
unsigned long regs[8];
192-
193-
unsigned long fp;
194-
unsigned long __unused;
195-
};
196-
197-
static inline unsigned long fgraph_ret_regs_return_value(struct fgraph_ret_regs *ret_regs)
198-
{
199-
return ret_regs->regs[0];
200-
}
201-
202-
static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs *ret_regs)
203-
{
204-
return ret_regs->fp;
205-
}
206195

207196
void prepare_ftrace_return(unsigned long self_addr, unsigned long *parent,
208197
unsigned long frame_pointer);

‎arch/arm64/kernel/asm-offsets.c‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,18 +179,6 @@ int main(void)
179179
DEFINE(FTRACE_OPS_FUNC, offsetof(struct ftrace_ops, func));
180180
#endif
181181
BLANK();
182-
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
183-
DEFINE(FGRET_REGS_X0, offsetof(struct fgraph_ret_regs, regs[0]));
184-
DEFINE(FGRET_REGS_X1, offsetof(struct fgraph_ret_regs, regs[1]));
185-
DEFINE(FGRET_REGS_X2, offsetof(struct fgraph_ret_regs, regs[2]));
186-
DEFINE(FGRET_REGS_X3, offsetof(struct fgraph_ret_regs, regs[3]));
187-
DEFINE(FGRET_REGS_X4, offsetof(struct fgraph_ret_regs, regs[4]));
188-
DEFINE(FGRET_REGS_X5, offsetof(struct fgraph_ret_regs, regs[5]));
189-
DEFINE(FGRET_REGS_X6, offsetof(struct fgraph_ret_regs, regs[6]));
190-
DEFINE(FGRET_REGS_X7, offsetof(struct fgraph_ret_regs, regs[7]));
191-
DEFINE(FGRET_REGS_FP, offsetof(struct fgraph_ret_regs, fp));
192-
DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs));
193-
#endif
194182
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
195183
DEFINE(FTRACE_OPS_DIRECT_CALL, offsetof(struct ftrace_ops, direct_call));
196184
#endif

‎arch/arm64/kernel/entry-ftrace.S‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -329,24 +329,28 @@ SYM_FUNC_END(ftrace_stub_graph)
329329
* @fp is checked against the value passed by ftrace_graph_caller().
330330
*/
331331
SYM_CODE_START(return_to_handler)
332-
/* save return value regs */
333-
sub sp, sp, #FGRET_REGS_SIZE
334-
stp x0, x1, [sp, #FGRET_REGS_X0]
335-
stp x2, x3, [sp, #FGRET_REGS_X2]
336-
stp x4, x5, [sp, #FGRET_REGS_X4]
337-
stp x6, x7, [sp, #FGRET_REGS_X6]
338-
str x29, [sp, #FGRET_REGS_FP] // parent's fp
332+
/* Make room for ftrace_regs */
333+
sub sp, sp, #FREGS_SIZE
334+
335+
/* Save return value regs */
336+
stp x0, x1, [sp, #FREGS_X0]
337+
stp x2, x3, [sp, #FREGS_X2]
338+
stp x4, x5, [sp, #FREGS_X4]
339+
stp x6, x7, [sp, #FREGS_X6]
340+
341+
/* Save the callsite's FP */
342+
str x29, [sp, #FREGS_FP]
339343

340344
mov x0, sp
341-
bl ftrace_return_to_handler // addr = ftrace_return_to_hander(regs);
345+
bl ftrace_return_to_handler // addr = ftrace_return_to_hander(fregs);
342346
mov x30, x0 // restore the original return address
343347

344-
/* restore return value regs */
345-
ldp x0, x1, [sp, #FGRET_REGS_X0]
346-
ldp x2, x3, [sp, #FGRET_REGS_X2]
347-
ldp x4, x5, [sp, #FGRET_REGS_X4]
348-
ldp x6, x7, [sp, #FGRET_REGS_X6]
349-
add sp, sp, #FGRET_REGS_SIZE
348+
/* Restore return value regs */
349+
ldp x0, x1, [sp, #FREGS_X0]
350+
ldp x2, x3, [sp, #FREGS_X2]
351+
ldp x4, x5, [sp, #FREGS_X4]
352+
ldp x6, x7, [sp, #FREGS_X6]
353+
add sp, sp, #FREGS_SIZE
350354

351355
ret
352356
SYM_CODE_END(return_to_handler)

‎arch/loongarch/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ config LOONGARCH
137137
select HAVE_FTRACE_MCOUNT_RECORD
138138
select HAVE_FUNCTION_ARG_ACCESS_API
139139
select HAVE_FUNCTION_ERROR_INJECTION
140-
select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
140+
select HAVE_FUNCTION_GRAPH_FREGS
141141
select HAVE_FUNCTION_GRAPH_TRACER
142142
select HAVE_FUNCTION_TRACER
143143
select HAVE_GCC_PLUGINS

‎arch/loongarch/include/asm/ftrace.h‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, unsigned long ip)
5757
instruction_pointer_set(&arch_ftrace_regs(fregs)->regs, ip);
5858
}
5959

60+
#undef ftrace_regs_get_frame_pointer
61+
#define ftrace_regs_get_frame_pointer(fregs) \
62+
(arch_ftrace_regs(fregs)->regs.regs[22])
63+
6064
#define ftrace_graph_func ftrace_graph_func
6165
void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
6266
struct ftrace_ops *op, struct ftrace_regs *fregs);
@@ -78,26 +82,4 @@ __arch_ftrace_set_direct_caller(struct pt_regs *regs, unsigned long addr)
7882

7983
#endif /* CONFIG_FUNCTION_TRACER */
8084

81-
#ifndef __ASSEMBLY__
82-
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
83-
struct fgraph_ret_regs {
84-
/* a0 - a1 */
85-
unsigned long regs[2];
86-
87-
unsigned long fp;
88-
unsigned long __unused;
89-
};
90-
91-
static inline unsigned long fgraph_ret_regs_return_value(struct fgraph_ret_regs *ret_regs)
92-
{
93-
return ret_regs->regs[0];
94-
}
95-
96-
static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs *ret_regs)
97-
{
98-
return ret_regs->fp;
99-
}
100-
#endif /* ifdef CONFIG_FUNCTION_GRAPH_TRACER */
101-
#endif
102-
10385
#endif /* _ASM_LOONGARCH_FTRACE_H */

‎arch/loongarch/kernel/asm-offsets.c‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -280,18 +280,6 @@ static void __used output_pbe_defines(void)
280280
}
281281
#endif
282282

283-
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
284-
static void __used output_fgraph_ret_regs_defines(void)
285-
{
286-
COMMENT("LoongArch fgraph_ret_regs offsets.");
287-
OFFSET(FGRET_REGS_A0, fgraph_ret_regs, regs[0]);
288-
OFFSET(FGRET_REGS_A1, fgraph_ret_regs, regs[1]);
289-
OFFSET(FGRET_REGS_FP, fgraph_ret_regs, fp);
290-
DEFINE(FGRET_REGS_SIZE, sizeof(struct fgraph_ret_regs));
291-
BLANK();
292-
}
293-
#endif
294-
295283
static void __used output_kvm_defines(void)
296284
{
297285
COMMENT("KVM/LoongArch Specific offsets.");

‎arch/loongarch/kernel/mcount.S‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,23 @@ SYM_FUNC_START(ftrace_graph_caller)
7979
SYM_FUNC_END(ftrace_graph_caller)
8080

8181
SYM_FUNC_START(return_to_handler)
82-
PTR_ADDI sp, sp, -FGRET_REGS_SIZE
83-
PTR_S a0, sp, FGRET_REGS_A0
84-
PTR_S a1, sp, FGRET_REGS_A1
85-
PTR_S zero, sp, FGRET_REGS_FP
82+
/* Save return value regs */
83+
PTR_ADDI sp, sp, -PT_SIZE
84+
PTR_S a0, sp, PT_R4
85+
PTR_S a1, sp, PT_R5
86+
PTR_S zero, sp, PT_R22
8687

8788
move a0, sp
8889
bl ftrace_return_to_handler
8990

9091
/* Restore the real parent address: a0 -> ra */
9192
move ra, a0
9293

93-
PTR_L a0, sp, FGRET_REGS_A0
94-
PTR_L a1, sp, FGRET_REGS_A1
95-
PTR_ADDI sp, sp, FGRET_REGS_SIZE
94+
/* Restore return value regs */
95+
PTR_L a0, sp, PT_R4
96+
PTR_L a1, sp, PT_R5
97+
PTR_ADDI sp, sp, PT_SIZE
98+
9699
jr ra
97100
SYM_FUNC_END(return_to_handler)
98101
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

‎arch/loongarch/kernel/mcount_dyn.S‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,19 @@ SYM_CODE_END(ftrace_graph_caller)
140140
SYM_CODE_START(return_to_handler)
141141
UNWIND_HINT_UNDEFINED
142142
/* Save return value regs */
143-
PTR_ADDI sp, sp, -FGRET_REGS_SIZE
144-
PTR_S a0, sp, FGRET_REGS_A0
145-
PTR_S a1, sp, FGRET_REGS_A1
146-
PTR_S zero, sp, FGRET_REGS_FP
143+
PTR_ADDI sp, sp, -PT_SIZE
144+
PTR_S a0, sp, PT_R4
145+
PTR_S a1, sp, PT_R5
146+
PTR_S zero, sp, PT_R22
147147

148148
move a0, sp
149149
bl ftrace_return_to_handler
150150
move ra, a0
151151

152152
/* Restore return value regs */
153-
PTR_L a0, sp, FGRET_REGS_A0
154-
PTR_L a1, sp, FGRET_REGS_A1
155-
PTR_ADDI sp, sp, FGRET_REGS_SIZE
153+
PTR_L a0, sp, PT_R4
154+
PTR_L a1, sp, PT_R5
155+
PTR_ADDI sp, sp, PT_SIZE
156156

157157
jr ra
158158
SYM_CODE_END(return_to_handler)

‎arch/riscv/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ config RISCV
148148
select HAVE_DYNAMIC_FTRACE_WITH_ARGS if HAVE_DYNAMIC_FTRACE
149149
select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
150150
select HAVE_FUNCTION_GRAPH_TRACER
151-
select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
151+
select HAVE_FUNCTION_GRAPH_FREGS
152152
select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
153153
select HAVE_EBPF_JIT if MMU
154154
select HAVE_GUP_FAST if MMU

0 commit comments

Comments
 (0)