lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc, hw_breakpoint: Cooperate better with other single-steppers

Browse Source 
The code we had to clear the MSR_SE bit was not doing anything because
the caller (ultimately single_step_exception() in traps.c) had already
cleared.  Instead of trying to leave MSR_SE set if the TIF_SINGLESTEP
flag is set (which indicates that the process is being single-stepped
by ptrace), we instead return NOTIFY_DONE in that case, which means
the caller will generate a SIGTRAP for the process.

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Paul Mackerras
2010-06-23 15:46:55 +10:00
parent 574cb24899
commit 76b0f13376
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/kernel/hw_breakpoint.c
View File

@@ -304,15 +304,16 @@ int __kprobes single_step_dabr_instruction(struct die_args *args)
if (!bp_info->extraneous_interrupt) if (!bp_info->extraneous_interrupt)
perf_bp_event(bp, regs); perf_bp_event(bp, regs);
/*
* Do not disable MSR_SE if the process was already in
* single-stepping mode.
*/
if (!test_thread_flag(TIF_SINGLESTEP))
regs->msr &= ~MSR_SE;
set_dabr(bp_info->address | bp_info->type | DABR_TRANSLATION); set_dabr(bp_info->address | bp_info->type | DABR_TRANSLATION);
current->thread.last_hit_ubp = NULL; current->thread.last_hit_ubp = NULL;
/*
* If the process was being single-stepped by ptrace, let the
* other single-step actions occur (e.g. generate SIGTRAP).
*/
if (test_thread_flag(TIF_SINGLESTEP))
return NOTIFY_DONE;
return NOTIFY_STOP; return NOTIFY_STOP;
} }