[ARM] 5206/1: remove kprobe_trap_handler() hack

Nicolas Pitre · Russell King · commit 3305a6079544 · 2008-09-01T12:06:26.000+01:00
As mentioned in commit 7969691, and because of commit b03a5b7, the direct calling of kprobe_trap_handler() can be removed. Signed-off-by: Nicolas Pitre <nico@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
@@ -61,7 +61,6 @@ struct kprobe_ctlblk {
 void arch_remove_kprobe(struct kprobe *);
 void kretprobe_trampoline(void);
 
-int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr);
 int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);
 int kprobe_exceptions_notify(struct notifier_block *self,
 			     unsigned long val, void *data);
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c
@@ -200,9 +200,12 @@ void __kprobes kprobe_handler(struct pt_regs *regs)
 	}
 }
 
-int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)
+static int __kprobes kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)
 {
+	unsigned long flags;
+	local_irq_save(flags);
 	kprobe_handler(regs);
+	local_irq_restore(flags);
 	return 0;
 }
 
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
@@ -19,7 +19,6 @@
 #include <linux/kallsyms.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/kprobes.h>
 
 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
@@ -328,17 +327,6 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
 		get_user(instr, (u32 __user *)pc);
 	}
 
-#ifdef CONFIG_KPROBES
-	/*
-	 * It is possible to have recursive kprobes, so we can't call
-	 * the kprobe trap handler with the undef_lock held.
-	 */
-	if (instr == KPROBE_BREAKPOINT_INSTRUCTION && !user_mode(regs)) {
-		kprobe_trap_handler(regs, instr);
-		return;
-	}
-#endif
-
 	if (call_undef_hook(regs, instr) == 0)
 		return;
 

Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,12 @@ void __kprobes kprobe_handler(struct pt_regs *regs)`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`		`-int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)`
	`203`	`+static int __kprobes kprobe_trap_handler(struct pt_regs *regs, unsigned int instr)`
`204`	`204`	`{`
	`205`	`+ unsigned long flags;`
	`206`	`+ local_irq_save(flags);`
`205`	`207`	`kprobe_handler(regs);`
	`208`	`+ local_irq_restore(flags);`
`206`	`209`	`return 0;`
`207`	`210`	`}`
`208`	`211`