mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
ftrace: rename ftrace_instruction_pointer_set() -> ftrace_regs_set_instruction_pointer()
In subsequent patches we'll add a sew of ftrace_regs_{get,set}_*() helpers. In preparation, this patch renames ftrace_instruction_pointer_set() to ftrace_regs_set_instruction_pointer(). There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Florent Revest <revest@chromium.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Steven Rostedt <rostedt@goodmis.org> Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Link: https://lore.kernel.org/r/20221103170520.931305-3-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
parent
9705bc7096
commit
0ef86097f1
|
@ -37,8 +37,9 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *
|
|||
return fregs->regs.msr ? &fregs->regs : NULL;
|
||||
}
|
||||
|
||||
static __always_inline void ftrace_instruction_pointer_set(struct ftrace_regs *fregs,
|
||||
unsigned long ip)
|
||||
static __always_inline void
|
||||
ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
|
||||
unsigned long ip)
|
||||
{
|
||||
regs_set_return_ip(&fregs->regs, ip);
|
||||
}
|
||||
|
|
|
@ -54,8 +54,9 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static __always_inline void ftrace_instruction_pointer_set(struct ftrace_regs *fregs,
|
||||
unsigned long ip)
|
||||
static __always_inline void
|
||||
ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
|
||||
unsigned long ip)
|
||||
{
|
||||
fregs->regs.psw.addr = ip;
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs)
|
|||
return &fregs->regs;
|
||||
}
|
||||
|
||||
#define ftrace_instruction_pointer_set(fregs, _ip) \
|
||||
#define ftrace_regs_set_instruction_pointer(fregs, _ip) \
|
||||
do { (fregs)->regs.ip = (_ip); } while (0)
|
||||
|
||||
struct ftrace_ops;
|
||||
|
|
|
@ -111,12 +111,11 @@ struct ftrace_regs {
|
|||
#define arch_ftrace_get_regs(fregs) (&(fregs)->regs)
|
||||
|
||||
/*
|
||||
* ftrace_instruction_pointer_set() is to be defined by the architecture
|
||||
* if to allow setting of the instruction pointer from the ftrace_regs
|
||||
* when HAVE_DYNAMIC_FTRACE_WITH_ARGS is set and it supports
|
||||
* live kernel patching.
|
||||
* ftrace_regs_set_instruction_pointer() is to be defined by the architecture
|
||||
* if to allow setting of the instruction pointer from the ftrace_regs when
|
||||
* HAVE_DYNAMIC_FTRACE_WITH_ARGS is set and it supports live kernel patching.
|
||||
*/
|
||||
#define ftrace_instruction_pointer_set(fregs, ip) do { } while (0)
|
||||
#define ftrace_regs_set_instruction_pointer(fregs, ip) do { } while (0)
|
||||
#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
|
||||
|
||||
static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs)
|
||||
|
|
|
@ -118,7 +118,7 @@ static void notrace klp_ftrace_handler(unsigned long ip,
|
|||
if (func->nop)
|
||||
goto unlock;
|
||||
|
||||
ftrace_instruction_pointer_set(fregs, (unsigned long)func->new_func);
|
||||
ftrace_regs_set_instruction_pointer(fregs, (unsigned long)func->new_func);
|
||||
|
||||
unlock:
|
||||
ftrace_test_recursion_unlock(bit);
|
||||
|
|
Loading…
Reference in a new issue