This is the mail archive of the
systemtap@sources.redhat.com
mailing list for the systemtap project.
[RFC PATCH 3/4] kprobes: sparc64 specific preempt changes
Sparc64 specific preempt changes. Compile tested only
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
arch/sparc64/kernel/kprobes.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
Index: linux-2.6.13-rc3/arch/sparc64/kernel/kprobes.c
===================================================================
--- linux-2.6.13-rc3.orig/arch/sparc64/kernel/kprobes.c 2005-07-27 13:11:05.000000000 -0400
+++ linux-2.6.13-rc3/arch/sparc64/kernel/kprobes.c 2005-07-27 13:43:00.000000000 -0400
@@ -118,8 +118,6 @@ static int __kprobes kprobe_handler(stru
void *addr = (void *) regs->tpc;
int ret = 0;
- preempt_disable();
-
if (kprobe_running()) {
/* We *are* holding lock here, so this is safe.
* Disarm the probe we just hit, and ignore it.
@@ -179,6 +177,11 @@ static int __kprobes kprobe_handler(stru
ss_probe:
prepare_singlestep(p, regs);
kprobe_status = KPROBE_HIT_SS;
+ /*
+ * This preempt_disable() matches the preempt_enable_no_resched()
+ * in post_kprobes_handler()
+ */
+ preempt_disable();
return 1;
no_kprobe:
@@ -322,29 +325,29 @@ int __kprobes kprobe_exceptions_notify(s
unsigned long val, void *data)
{
struct die_args *args = (struct die_args *)data;
+ int ret = NOTIFY_DONE;
+
+ preempt_disable();
switch (val) {
case DIE_DEBUG:
if (kprobe_handler(args->regs))
- return NOTIFY_STOP;
+ ret = NOTIFY_STOP;
break;
case DIE_DEBUG_2:
if (post_kprobe_handler(args->regs))
- return NOTIFY_STOP;
+ ret = NOTIFY_STOP;
break;
case DIE_GPF:
- if (kprobe_running() &&
- kprobe_fault_handler(args->regs, args->trapnr))
- return NOTIFY_STOP;
- break;
case DIE_PAGE_FAULT:
if (kprobe_running() &&
kprobe_fault_handler(args->regs, args->trapnr))
- return NOTIFY_STOP;
+ ret = NOTIFY_STOP;
break;
default:
break;
}
- return NOTIFY_DONE;
+ preempt_enable();
+ return ret;
}
asmlinkage void __kprobes kprobe_trap(unsigned long trap_level,
@@ -396,7 +399,6 @@ int __kprobes setjmp_pre_handler(struct
void __kprobes jprobe_return(void)
{
- preempt_enable_no_resched();
__asm__ __volatile__(
".globl jprobe_return_trap_instruction\n"
"jprobe_return_trap_instruction:\n\t"