ARM: kprobes: introduces checker

This patch introdces 'checker' to decoding phase, and calls checkers
when instruction decoding. This allows further decoding for specific
instructions.  This patch introduces a stub call of checkers in kprobe
arch_prepare_kprobe() as an example and for further expansion.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Jon Medhurst <tixy@linaro.org>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>

diff --git a/arch/arm/probes/decode-arm.c b/arch/arm/probes/decode-arm.c
index 04114f7..f72c33a 100644 (file)
--- a/arch/arm/probes/decode-arm.c
+++ b/arch/arm/probes/decode-arm.c
@@ -726,10 +726,11 @@ static void __kprobes arm_singlestep(probes_opcode_t insn,
  */
 enum probes_insn __kprobes
 arm_probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi,
-                      bool emulate, const union decode_action *actions)
+                      bool emulate, const union decode_action *actions,
+                      const struct decode_checker *checkers[])
 {
        asi->insn_singlestep = arm_singlestep;
        asi->insn_check_cc = probes_condition_checks[insn>>28];
        return probes_decode_insn(insn, asi, probes_decode_arm_table, false,
-                                 emulate, actions);
+                                 emulate, actions, checkers);
 }

diff --git a/arch/arm/probes/decode-arm.h b/arch/arm/probes/decode-arm.h
index cb0b263..b3b80f6 100644 (file)
--- a/arch/arm/probes/decode-arm.h
+++ b/arch/arm/probes/decode-arm.h
@@ -68,6 +68,7 @@ extern const union decode_item probes_decode_arm_table[];
 
 enum probes_insn arm_probes_decode_insn(probes_opcode_t,
                struct arch_probes_insn *, bool emulate,
-               const union decode_action *actions);
+               const union decode_action *actions,
+               const struct decode_checker *checkers[]);
 
 #endif

diff --cc arch/arm/probes/decode-thumb.c
Simple merge

diff --cc arch/arm/probes/decode-thumb.h
Simple merge

diff --cc arch/arm/probes/decode.c
Simple merge

diff --cc arch/arm/probes/decode.h
Simple merge

diff --cc arch/arm/probes/kprobes/actions-arm.c
Simple merge

diff --cc arch/arm/probes/kprobes/actions-thumb.c
Simple merge

diff --cc arch/arm/probes/kprobes/core.c
Simple merge

diff --cc arch/arm/probes/kprobes/core.h
Simple merge

diff --cc arch/arm/probes/uprobes/core.c
Simple merge