github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: ftrace: Simplify get_ftrace_plt

Browse Source 
Following recent refactorings, the get_ftrace_plt function only ever
gets called with addr = FTRACE_ADDR so its code can be simplified to
always return the ftrace trampoline plt.

Signed-off-by: Florent Revest <revest@chromium.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20230405180250.2046566-3-revest@chromium.org
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Florent Revest 2023-04-05 20:02:47 +02:00 committed by Will Deacon
parent 2aa6ac0351
commit 0f59dca63b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/kernel/ftrace.c
View File

@ -195,15 +195,15 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
return ftrace_modify_code(pc, 0, new, false); return ftrace_modify_code(pc, 0, new, false);
} }
static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) static struct plt_entry *get_ftrace_plt(struct module *mod)
{ {
#ifdef CONFIG_ARM64_MODULE_PLTS #ifdef CONFIG_ARM64_MODULE_PLTS
struct plt_entry *plt = mod->arch.ftrace_trampolines; struct plt_entry *plt = mod->arch.ftrace_trampolines;
if (addr == FTRACE_ADDR) return &plt[FTRACE_PLT_IDX];
return &plt[FTRACE_PLT_IDX]; #else
#endif
return NULL; return NULL;
#endif
} }
static bool reachable_by_bl(unsigned long addr, unsigned long pc) static bool reachable_by_bl(unsigned long addr, unsigned long pc)
@ -270,7 +270,7 @@ static bool ftrace_find_callable_addr(struct dyn_ftrace *rec,
if (WARN_ON(!mod)) if (WARN_ON(!mod))
return false; return false;
plt = get_ftrace_plt(mod, *addr); plt = get_ftrace_plt(mod);
if (!plt) { if (!plt) {
pr_err("ftrace: no module PLT for %ps\n", (void *)*addr); pr_err("ftrace: no module PLT for %ps\n", (void *)*addr);
return false; return false;