diff options
Diffstat (limited to 'arch/arm/kernel/hw_breakpoint.c')
| -rw-r--r-- | arch/arm/kernel/hw_breakpoint.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 78c6be1b2714..89fd86301242 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -631,7 +631,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp) info->address &= ~alignment_mask; info->ctrl.len <<= offset; - if (!bp->overflow_handler) { + if (is_default_overflow_handler(bp)) { /* * Mismatch breakpoints are required for single-stepping * breakpoints. @@ -688,12 +688,6 @@ static void disable_single_step(struct perf_event *bp) arch_install_hw_breakpoint(bp); } -static int watchpoint_fault_on_uaccess(struct pt_regs *regs, - struct arch_hw_breakpoint *info) -{ - return !user_mode(regs) && info->ctrl.privilege == ARM_BREAKPOINT_USER; -} - static void watchpoint_handler(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { @@ -760,20 +754,17 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr, * can't help us with this. */ if (watchpoint_fault_on_uaccess(regs, info)) - goto step; + enable_single_step(wp, instruction_pointer(regs)); perf_bp_event(wp, regs); /* - * Defer stepping to the overflow handler if one is installed. - * Otherwise, insert a temporary mismatch breakpoint so that - * we can single-step over the watchpoint trigger. + * If no overflow handler is present, insert a temporary + * mismatch breakpoint so we can single-step over the + * watchpoint trigger. */ - if (wp->overflow_handler) - goto unlock; - -step: - enable_single_step(wp, instruction_pointer(regs)); + if (is_default_overflow_handler(wp)) + enable_single_step(wp, instruction_pointer(regs)); unlock: rcu_read_unlock(); } @@ -1163,4 +1154,4 @@ int hw_breakpoint_exceptions_notify(struct notifier_block *unused, unsigned long val, void *data) { return NOTIFY_DONE; -} +}
\ No newline at end of file |