LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] kprobes: bugfix: set kprobes_all_disarmed earlier to enable re-optimization.
@ 2015-01-05 12:31 Wang Nan
  2015-01-12 11:24 ` Masami Hiramatsu
  0 siblings, 1 reply; 5+ messages in thread
From: Wang Nan @ 2015-01-05 12:31 UTC (permalink / raw)
  To: masami.hiramatsu.pt, tixy, linux; +Cc: linux-kernel, linux-arm-kernel

In original code, the probed instruction doesn't get optimized after

echo 0 > /sys/kernel/debug/kprobes/enabled
echo 1 > /sys/kernel/debug/kprobes/enabled

This is because original code checks kprobes_all_disarmed in
optimize_kprobe(), but this flag is turned off after calling that
function. Therefore, optimize_kprobe() will see
kprobes_all_disarmed == true and doesn't do the optimization.

This patch simply turns off kprobes_all_disarmed earlier to enable
optimization.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
 kernel/kprobes.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index bad4e95..b185464 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -2320,6 +2320,12 @@ static void arm_all_kprobes(void)
 	if (!kprobes_all_disarmed)
 		goto already_enabled;
 
+	/*
+	 * optimize_kprobe() called by arm_kprobe() checks
+	 * kprobes_all_disarmed, so set kprobes_all_disarmed before
+	 * arm_kprobe.
+	 */
+	kprobes_all_disarmed = false;
 	/* Arming kprobes doesn't optimize kprobe itself */
 	for (i = 0; i < KPROBE_TABLE_SIZE; i++) {
 		head = &kprobe_table[i];
@@ -2328,7 +2334,6 @@ static void arm_all_kprobes(void)
 				arm_kprobe(p);
 	}
 
-	kprobes_all_disarmed = false;
 	printk(KERN_INFO "Kprobes globally enabled\n");
 
 already_enabled:
-- 
1.8.4


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-02-19  0:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-05 12:31 [PATCH] kprobes: bugfix: set kprobes_all_disarmed earlier to enable re-optimization Wang Nan
2015-01-12 11:24 ` Masami Hiramatsu
2015-01-20  3:02   ` Wang Nan
2015-01-20  7:12     ` Masami Hiramatsu
2015-02-19  0:10       ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).