Skip to content

Commit d5d01b7

Browse files
mhiramatrostedt
authored andcommitted
tracing: Add ftrace_fill_perf_regs() for perf event
Add ftrace_fill_perf_regs() which should be compatible with the perf_fetch_caller_regs(). In other words, the pt_regs returned from the ftrace_fill_perf_regs() must satisfy 'user_mode(regs) == false' and can be used for stack tracing. Signed-off-by: Masami Hiramatsu (Google) <[email protected]> Acked-by: Will Deacon <[email protected]> Acked-by: Heiko Carstens <[email protected]> # s390 Cc: Alexei Starovoitov <[email protected]> Cc: Florent Revest <[email protected]> Cc: Martin KaFai Lau <[email protected]> Cc: bpf <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Alan Maguire <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Nicholas Piggin <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: Naveen N Rao <[email protected]> Cc: Madhavan Srinivasan <[email protected]> Cc: Vasily Gorbik <[email protected]> Cc: Alexander Gordeev <[email protected]> Cc: Christian Borntraeger <[email protected]> Cc: Sven Schnelle <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Dave Hansen <[email protected]> Cc: [email protected] Cc: "H. Peter Anvin" <[email protected]> Link: https://lore.kernel.org/173518997908.391279.15910334347345106424.stgit@devnote2 Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent b9b55c8 commit d5d01b7

File tree

5 files changed

+58
-0
lines changed

5 files changed

+58
-0
lines changed

arch/arm64/include/asm/ftrace.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ ftrace_partial_regs(const struct ftrace_regs *fregs, struct pt_regs *regs)
148148
return regs;
149149
}
150150

151+
#define arch_ftrace_fill_perf_regs(fregs, _regs) do { \
152+
(_regs)->pc = arch_ftrace_regs(fregs)->pc; \
153+
(_regs)->regs[29] = arch_ftrace_regs(fregs)->fp; \
154+
(_regs)->sp = arch_ftrace_regs(fregs)->sp; \
155+
(_regs)->pstate = PSR_MODE_EL1h; \
156+
} while (0)
157+
151158
int ftrace_regs_query_register_offset(const char *name);
152159

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

arch/powerpc/include/asm/ftrace.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *
4343
return arch_ftrace_regs(fregs)->regs.msr ? &arch_ftrace_regs(fregs)->regs : NULL;
4444
}
4545

46+
#define arch_ftrace_fill_perf_regs(fregs, _regs) do { \
47+
(_regs)->result = 0; \
48+
(_regs)->nip = arch_ftrace_regs(fregs)->regs.nip; \
49+
(_regs)->gpr[1] = arch_ftrace_regs(fregs)->regs.gpr[1]; \
50+
asm volatile("mfmsr %0" : "=r" ((_regs)->msr)); \
51+
} while (0)
52+
4653
static __always_inline void
4754
ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
4855
unsigned long ip)

arch/s390/include/asm/ftrace.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ ftrace_regs_get_frame_pointer(struct ftrace_regs *fregs)
7676
return ftrace_regs_get_stack_pointer(fregs);
7777
}
7878

79+
#define arch_ftrace_fill_perf_regs(fregs, _regs) do { \
80+
(_regs)->psw.mask = 0; \
81+
(_regs)->psw.addr = arch_ftrace_regs(fregs)->regs.psw.addr; \
82+
(_regs)->gprs[15] = arch_ftrace_regs(fregs)->regs.gprs[15]; \
83+
} while (0)
84+
7985
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
8086
/*
8187
* When an ftrace registered caller is tracing a function that is

arch/x86/include/asm/ftrace.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs)
4747
return &arch_ftrace_regs(fregs)->regs;
4848
}
4949

50+
#define arch_ftrace_fill_perf_regs(fregs, _regs) do { \
51+
(_regs)->ip = arch_ftrace_regs(fregs)->regs.ip; \
52+
(_regs)->sp = arch_ftrace_regs(fregs)->regs.sp; \
53+
(_regs)->cs = __KERNEL_CS; \
54+
(_regs)->flags = 0; \
55+
} while (0)
56+
5057
#define ftrace_regs_set_instruction_pointer(fregs, _ip) \
5158
do { arch_ftrace_regs(fregs)->regs.ip = (_ip); } while (0)
5259

include/linux/ftrace.h

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,37 @@ ftrace_partial_regs(struct ftrace_regs *fregs, struct pt_regs *regs)
207207

208208
#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS || CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS */
209209

210+
#ifdef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS
211+
212+
/*
213+
* Please define arch dependent pt_regs which compatible to the
214+
* perf_arch_fetch_caller_regs() but based on ftrace_regs.
215+
* This requires
216+
* - user_mode(_regs) returns false (always kernel mode).
217+
* - able to use the _regs for stack trace.
218+
*/
219+
#ifndef arch_ftrace_fill_perf_regs
220+
/* As same as perf_arch_fetch_caller_regs(), do nothing by default */
221+
#define arch_ftrace_fill_perf_regs(fregs, _regs) do {} while (0)
222+
#endif
223+
224+
static __always_inline struct pt_regs *
225+
ftrace_fill_perf_regs(struct ftrace_regs *fregs, struct pt_regs *regs)
226+
{
227+
arch_ftrace_fill_perf_regs(fregs, regs);
228+
return regs;
229+
}
230+
231+
#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
232+
233+
static __always_inline struct pt_regs *
234+
ftrace_fill_perf_regs(struct ftrace_regs *fregs, struct pt_regs *regs)
235+
{
236+
return &arch_ftrace_regs(fregs)->regs;
237+
}
238+
239+
#endif
240+
210241
/*
211242
* When true, the ftrace_regs_{get,set}_*() functions may be used on fregs.
212243
* Note: this can be true even when ftrace_get_regs() cannot provide a pt_regs.

0 commit comments

Comments
 (0)