The patch titled
Kprobes: fix kprobe-booster: reenable kprobe-booster
has been removed from the -mm tree. Its filename is
kprobemulti-kprobe-posthandler-for-booster-kprobes-bugfix-of-kprobe-booster-reenable-kprobe-booster.patch
This patch was dropped because it was folded into kprobemulti-kprobe-posthandler-for-booster.patch
------------------------------------------------------
Subject: Kprobes: fix kprobe-booster: reenable kprobe-booster
From: Satoshi Oshima <soshima@xxxxxxxxxx>
I found a bug of kprobes in i386.
Kprobe-booster doesn't work if CONFIG_PREEMPT is not set. Because
pre_preempt_count is always 0.
Boostability have been disabled when removing '#ifdef CONFIG_PREEMPT' I
think.
This bug doesn't cause a kernel panic.
Signed-off-by: Satoshi Oshima <soshima@xxxxxxxxxx>
Cc: bibo, mao <bibo.mao@xxxxxxxxx>
Cc: Masami Hiramatsu <hiramatu@xxxxxxxxxxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: "Keshavamurthy, Anil S" <anil.s.keshavamurthy@xxxxxxxxx>
Cc: Prasanna S Panchamukhi <prasanna@xxxxxxxxxx>
Cc: Jim Keniston <jkenisto@xxxxxxxxxx>
Cc: Yumiko Sugita <sugita@xxxxxxxxxxxxxxxxx>
Cc: Satoshi Oshima <soshima@xxxxxxxxxx>
Cc: Hideo Aoki <haoki@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/kprobes.c | 4 ++++
1 files changed, 4 insertions(+)
diff -puN arch/i386/kernel/kprobes.c~kprobemulti-kprobe-posthandler-for-booster-kprobes-bugfix-of-kprobe-booster-reenable-kprobe-booster arch/i386/kernel/kprobes.c
--- 25/arch/i386/kernel/kprobes.c~kprobemulti-kprobe-posthandler-for-booster-kprobes-bugfix-of-kprobe-booster-reenable-kprobe-booster Fri May 19 13:24:26 2006
+++ 25-akpm/arch/i386/kernel/kprobes.c Fri May 19 13:24:26 2006
@@ -257,7 +257,11 @@ static int __kprobes kprobe_handler(stru
int ret = 0;
kprobe_opcode_t *addr;
struct kprobe_ctlblk *kcb;
+#ifdef CONFIG_PREEMPT
unsigned pre_preempt_count = preempt_count();
+#else
+ unsigned pre_preempt_count = 1;
+#endif
addr = (kprobe_opcode_t *)(regs->eip - sizeof(kprobe_opcode_t));
_
Patches currently in -mm which might be from soshima@xxxxxxxxxx are
kprobe-boost-2byte-opcodes-on-i386.patch
kprobemulti-kprobe-posthandler-for-booster.patch
kprobemulti-kprobe-posthandler-for-booster-kprobes-bugfix-of-kprobe-booster-reenable-kprobe-booster.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
