summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/insn.h
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2015-01-09 07:37:36 +0100
committerJon Medhurst <tixy@linaro.org>2015-01-13 17:10:17 +0100
commit0dc016dbd820260b8ea74337980735b8c88d4ef2 (patch)
tree0a6408b4181016d41858afec026cc4e93455f852 /arch/arm/kernel/insn.h
parentkprobes: Pass the original kprobe for preparing optimized kprobe (diff)
downloadlinux-0dc016dbd820260b8ea74337980735b8c88d4ef2.tar.xz
linux-0dc016dbd820260b8ea74337980735b8c88d4ef2.zip
ARM: kprobes: enable OPTPROBES for ARM 32
This patch introduce kprobeopt for ARM 32. Limitations: - Currently only kernel compiled with ARM ISA is supported. - Offset between probe point and optinsn slot must not larger than 32MiB. Masami Hiramatsu suggests replacing 2 words, it will make things complex. Futher patch can make such optimization. Kprobe opt on ARM is relatively simpler than kprobe opt on x86 because ARM instruction is always 4 bytes aligned and 4 bytes long. This patch replace probed instruction by a 'b', branch to trampoline code and then calls optimized_callback(). optimized_callback() calls opt_pre_handler() to execute kprobe handler. It also emulate/simulate replaced instruction. When unregistering kprobe, the deferred manner of unoptimizer may leave branch instruction before optimizer is called. Different from x86_64, which only copy the probed insn after optprobe_template_end and reexecute them, this patch call singlestep to emulate/simulate the insn directly. Futher patch can optimize this behavior. Signed-off-by: Wang Nan <wangnan0@huawei.com> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Will Deacon <will.deacon@arm.com> Reviewed-by: Jon Medhurst (Tixy) <tixy@linaro.org> Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/kernel/insn.h')
-rw-r--r--arch/arm/kernel/insn.h29
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/kernel/insn.h b/arch/arm/kernel/insn.h
deleted file mode 100644
index e96065da4dae..000000000000
--- a/arch/arm/kernel/insn.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __ASM_ARM_INSN_H
-#define __ASM_ARM_INSN_H
-
-static inline unsigned long
-arm_gen_nop(void)
-{
-#ifdef CONFIG_THUMB2_KERNEL
- return 0xf3af8000; /* nop.w */
-#else
- return 0xe1a00000; /* mov r0, r0 */
-#endif
-}
-
-unsigned long
-__arm_gen_branch(unsigned long pc, unsigned long addr, bool link);
-
-static inline unsigned long
-arm_gen_branch(unsigned long pc, unsigned long addr)
-{
- return __arm_gen_branch(pc, addr, false);
-}
-
-static inline unsigned long
-arm_gen_branch_link(unsigned long pc, unsigned long addr)
-{
- return __arm_gen_branch(pc, addr, true);
-}
-
-#endif