8113e62292
commit 79f32b221b18c15a98507b101ef4beb52444cc6f upstream Teach ftrace_make_call() and ftrace_make_nop() about PLTs. Teach PLT code about FTRACE and all its callbacks. Otherwise the following might happen: ------------[ cut here ]------------ WARNING: CPU: 14 PID: 2265 at .../arch/arm/kernel/insn.c:14 __arm_gen_branch+0x83/0x8c() ... Hardware name: LSI Axxia AXM55XX [<c0314a49>] (unwind_backtrace) from [<c03115e9>] (show_stack+0x11/0x14) [<c03115e9>] (show_stack) from [<c0519f51>] (dump_stack+0x81/0xa8) [<c0519f51>] (dump_stack) from [<c032185d>] (warn_slowpath_common+0x69/0x90) [<c032185d>] (warn_slowpath_common) from [<c03218f3>] (warn_slowpath_null+0x17/0x1c) [<c03218f3>] (warn_slowpath_null) from [<c03143cf>] (__arm_gen_branch+0x83/0x8c) [<c03143cf>] (__arm_gen_branch) from [<c0314337>] (ftrace_make_nop+0xf/0x24) [<c0314337>] (ftrace_make_nop) from [<c038ebcb>] (ftrace_process_locs+0x27b/0x3e8) [<c038ebcb>] (ftrace_process_locs) from [<c0378d79>] (load_module+0x11e9/0x1a44) [<c0378d79>] (load_module) from [<c037974d>] (SyS_finit_module+0x59/0x84) [<c037974d>] (SyS_finit_module) from [<c030e981>] (ret_fast_syscall+0x1/0x18) ---[ end trace e1b64ced7a89adcc ]--- ------------[ cut here ]------------ WARNING: CPU: 14 PID: 2265 at .../kernel/trace/ftrace.c:1979 ftrace_bug+0x1b1/0x234() ... Hardware name: LSI Axxia AXM55XX [<c0314a49>] (unwind_backtrace) from [<c03115e9>] (show_stack+0x11/0x14) [<c03115e9>] (show_stack) from [<c0519f51>] (dump_stack+0x81/0xa8) [<c0519f51>] (dump_stack) from [<c032185d>] (warn_slowpath_common+0x69/0x90) [<c032185d>] (warn_slowpath_common) from [<c03218f3>] (warn_slowpath_null+0x17/0x1c) [<c03218f3>] (warn_slowpath_null) from [<c038e87d>] (ftrace_bug+0x1b1/0x234) [<c038e87d>] (ftrace_bug) from [<c038ebd5>] (ftrace_process_locs+0x285/0x3e8) [<c038ebd5>] (ftrace_process_locs) from [<c0378d79>] (load_module+0x11e9/0x1a44) [<c0378d79>] (load_module) from [<c037974d>] (SyS_finit_module+0x59/0x84) [<c037974d>] (SyS_finit_module) from [<c030e981>] (ret_fast_syscall+0x1/0x18) ---[ end trace e1b64ced7a89adcd ]--- ftrace failed to modify [<e9ef7006>] 0xe9ef7006 actual: 02:f0:3b:fa ftrace record flags: 0 (0) expected tramp: c0314265 [florian: resolved merge conflict with struct dyn_arch_ftrace::old_mcount] Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
75 lines
1.6 KiB
C
75 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_ARM_MODULE_H
|
|
#define _ASM_ARM_MODULE_H
|
|
|
|
#include <asm-generic/module.h>
|
|
|
|
struct unwind_table;
|
|
|
|
#ifdef CONFIG_ARM_UNWIND
|
|
enum {
|
|
ARM_SEC_INIT,
|
|
ARM_SEC_DEVINIT,
|
|
ARM_SEC_CORE,
|
|
ARM_SEC_EXIT,
|
|
ARM_SEC_DEVEXIT,
|
|
ARM_SEC_HOT,
|
|
ARM_SEC_UNLIKELY,
|
|
ARM_SEC_MAX,
|
|
};
|
|
#endif
|
|
|
|
#define PLT_ENT_STRIDE L1_CACHE_BYTES
|
|
#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32))
|
|
#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT)
|
|
|
|
struct plt_entries {
|
|
u32 ldr[PLT_ENT_COUNT];
|
|
u32 lit[PLT_ENT_COUNT];
|
|
};
|
|
|
|
struct mod_plt_sec {
|
|
struct elf32_shdr *plt;
|
|
struct plt_entries *plt_ent;
|
|
int plt_count;
|
|
};
|
|
|
|
struct mod_arch_specific {
|
|
#ifdef CONFIG_ARM_UNWIND
|
|
struct unwind_table *unwind[ARM_SEC_MAX];
|
|
#endif
|
|
#ifdef CONFIG_ARM_MODULE_PLTS
|
|
struct mod_plt_sec core;
|
|
struct mod_plt_sec init;
|
|
#endif
|
|
};
|
|
|
|
struct module;
|
|
u32 get_module_plt(struct module *mod, unsigned long loc, Elf32_Addr val);
|
|
|
|
/*
|
|
* Add the ARM architecture version to the version magic string
|
|
*/
|
|
#define MODULE_ARCH_VERMAGIC_ARMVSN "ARMv" __stringify(__LINUX_ARM_ARCH__) " "
|
|
|
|
/* Add __virt_to_phys patching state as well */
|
|
#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
|
|
#define MODULE_ARCH_VERMAGIC_P2V "p2v8 "
|
|
#else
|
|
#define MODULE_ARCH_VERMAGIC_P2V ""
|
|
#endif
|
|
|
|
/* Add instruction set architecture tag to distinguish ARM/Thumb kernels */
|
|
#ifdef CONFIG_THUMB2_KERNEL
|
|
#define MODULE_ARCH_VERMAGIC_ARMTHUMB "thumb2 "
|
|
#else
|
|
#define MODULE_ARCH_VERMAGIC_ARMTHUMB ""
|
|
#endif
|
|
|
|
#define MODULE_ARCH_VERMAGIC \
|
|
MODULE_ARCH_VERMAGIC_ARMVSN \
|
|
MODULE_ARCH_VERMAGIC_ARMTHUMB \
|
|
MODULE_ARCH_VERMAGIC_P2V
|
|
|
|
#endif /* _ASM_ARM_MODULE_H */
|