ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ftrace: rename ftrace_instruction_pointer_set() -> ftrace_regs_set_instruction_pointer()

Browse Source 
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:
Mark Rutland
2022-11-03 17:05:18 +00:00
committed by Will Deacon
parent 9705bc7096
commit 0ef86097f1
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/ftrace.h
View File

@@ -37,8 +37,9 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *
return fregs->regs.msr ? &fregs->regs : NULL; return fregs->regs.msr ? &fregs->regs : NULL;
} }
static __always_inline void ftrace_instruction_pointer_set(struct ftrace_regs *fregs, static __always_inline void
unsigned long ip) ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
unsigned long ip)
{ {
regs_set_return_ip(&fregs->regs, ip); regs_set_return_ip(&fregs->regs, ip);
} }

5
arch/s390/include/asm/ftrace.h
View File

@@ -54,8 +54,9 @@ static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *
return NULL; return NULL;
} }
static __always_inline void ftrace_instruction_pointer_set(struct ftrace_regs *fregs, static __always_inline void
unsigned long ip) ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs,
unsigned long ip)
{ {
fregs->regs.psw.addr = ip; fregs->regs.psw.addr = ip;
} }

2
arch/x86/include/asm/ftrace.h
View File

@@ -48,7 +48,7 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs)
return &fregs->regs; 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) do { (fregs)->regs.ip = (_ip); } while (0)
struct ftrace_ops; struct ftrace_ops;

9
include/linux/ftrace.h
View File

@@ -111,12 +111,11 @@ struct ftrace_regs {
#define arch_ftrace_get_regs(fregs) (&(fregs)->regs) #define arch_ftrace_get_regs(fregs) (&(fregs)->regs)
/* /*
* ftrace_instruction_pointer_set() is to be defined by the architecture * ftrace_regs_set_instruction_pointer() is to be defined by the architecture
* if to allow setting of the instruction pointer from the ftrace_regs * if to allow setting of the instruction pointer from the ftrace_regs when
* when HAVE_DYNAMIC_FTRACE_WITH_ARGS is set and it supports * HAVE_DYNAMIC_FTRACE_WITH_ARGS is set and it supports live kernel patching.
* 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 */ #endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */
static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs) static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs)

2
kernel/livepatch/patch.c
View File

@@ -118,7 +118,7 @@ static void notrace klp_ftrace_handler(unsigned long ip,
if (func->nop) if (func->nop)
goto unlock; goto unlock;
ftrace_instruction_pointer_set(fregs, (unsigned long)func->new_func); ftrace_regs_set_instruction_pointer(fregs, (unsigned long)func->new_func);
unlock: unlock:
ftrace_test_recursion_unlock(bit); ftrace_test_recursion_unlock(bit);