lkml.org 
[lkml]   [2015]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC PATCH v3 23/26] early kprobes: x86: arch_restore_optimized_kprobe().
Date
arch_restore_optimized_kprobe() can be used to temporarily restore
probed instruction. It will actually disable optimized kprobe, but keep
the relatived data structure. It uses stop_machine() to enforce
atimicity.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
arch/x86/kernel/kprobes/opt.c | 26 ++++++++++++++++++++++++++
include/linux/kprobes.h | 1 +
2 files changed, 27 insertions(+)

diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
index f3ea954..12332c2 100644
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -28,6 +28,7 @@
#include <linux/kdebug.h>
#include <linux/kallsyms.h>
#include <linux/ftrace.h>
+#include <linux/stop_machine.h>

#include <asm/cacheflush.h>
#include <asm/desc.h>
@@ -486,4 +487,29 @@ void arch_fix_ftrace_early_kprobe(struct optimized_kprobe *op)
memcpy(&list_p->opcode, correct_nop5, sizeof(kprobe_opcode_t));

}
+
+static int do_restore_kprobe(void *p)
+{
+ struct optimized_kprobe *op = p;
+ u8 insn_buf[RELATIVEJUMP_SIZE];
+
+ memcpy(insn_buf, &op->kp.opcode, sizeof(kprobe_opcode_t));
+ memcpy(insn_buf + INT3_SIZE,
+ op->optinsn.copied_insn,
+ RELATIVE_ADDR_SIZE);
+ text_poke(op->kp.addr, insn_buf, RELATIVEJUMP_SIZE);
+ return 0;
+}
+
+void arch_restore_optimized_kprobe(struct optimized_kprobe *op)
+{
+ u32 mask = KPROBE_FLAG_EARLY |
+ KPROBE_FLAG_OPTIMIZED |
+ KPROBE_FLAG_FTRACE;
+
+ if ((op->kp.flags & mask) != mask)
+ return;
+
+ stop_machine(do_restore_kprobe, op, NULL);
+}
#endif
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index e483f1b..e615402 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -462,6 +462,7 @@ extern int arch_prepare_kprobe_ftrace(struct kprobe *p);

#ifdef CONFIG_EARLY_KPROBES
extern void arch_fix_ftrace_early_kprobe(struct optimized_kprobe *p);
+extern void arch_restore_optimized_kprobe(struct optimized_kprobe *p);
#endif

#endif
--
1.8.4


\
 
 \ /
  Last update: 2015-02-13 07:01    [W:0.118 / U:0.828 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site