Skip to content

Commit 0b58261

Browse files
mhiramatrostedt
authored andcommitted
ftrace: Use arch_ftrace_regs() for ftrace_regs_*() macros
Since the arch_ftrace_get_regs(fregs) is only valid when the FL_SAVE_REGS is set, we need to use `&arch_ftrace_regs()->regs` for ftrace_regs_*() APIs because those APIs are for ftrace_regs, not complete pt_regs. 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: Mark Rutland <[email protected]> Link: https://lore.kernel.org/172895572290.107311.16057631001860177198.stgit@devnote2 Fixes: e4cf33c ("ftrace: Consolidate ftrace_regs accessor functions for archs using pt_regs") Signed-off-by: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent e4cf33c commit 0b58261

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/linux/ftrace_regs.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ struct __arch_ftrace_regs {
1717
struct ftrace_regs;
1818

1919
#define ftrace_regs_get_instruction_pointer(fregs) \
20-
instruction_pointer(arch_ftrace_get_regs(fregs))
20+
instruction_pointer(&arch_ftrace_regs(fregs)->regs)
2121
#define ftrace_regs_get_argument(fregs, n) \
22-
regs_get_kernel_argument(arch_ftrace_get_regs(fregs), n)
22+
regs_get_kernel_argument(&arch_ftrace_regs(fregs)->regs, n)
2323
#define ftrace_regs_get_stack_pointer(fregs) \
24-
kernel_stack_pointer(arch_ftrace_get_regs(fregs))
24+
kernel_stack_pointer(&arch_ftrace_regs(fregs)->regs)
2525
#define ftrace_regs_return_value(fregs) \
26-
regs_return_value(arch_ftrace_get_regs(fregs))
26+
regs_return_value(&arch_ftrace_regs(fregs)->regs)
2727
#define ftrace_regs_set_return_value(fregs, ret) \
28-
regs_set_return_value(arch_ftrace_get_regs(fregs), ret)
28+
regs_set_return_value(&arch_ftrace_regs(fregs)->regs, ret)
2929
#define ftrace_override_function_with_return(fregs) \
30-
override_function_with_return(arch_ftrace_get_regs(fregs))
30+
override_function_with_return(&arch_ftrace_regs(fregs)->regs)
3131
#define ftrace_regs_query_register_offset(name) \
3232
regs_query_register_offset(name)
3333

0 commit comments

Comments
 (0)