diff options
| author | David A. Long <dave.long@linaro.org> | 2014-02-03 19:25:49 (GMT) |
|---|---|---|
| committer | David A. Long <dave.long@linaro.org> | 2014-03-18 20:39:34 (GMT) |
| commit | 6fe50a28ba6e5fafb4a549dea666dd15297dd8bd (patch) | |
| tree | 998f67b5bb336339c5308e000b0f8f5c9e97a44e | |
| parent | 21254ebc9e509967317ad8c6922797e21137ad53 (diff) | |
| download | linux-6fe50a28ba6e5fafb4a549dea666dd15297dd8bd.tar.xz | |
uprobes: allow ignoring of probe hits
Allow arches to decided to ignore a probe hit. ARM will use this to
only call handlers if the conditions to execute a conditionally executed
instruction are satisfied.
Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
| -rw-r--r-- | include/linux/uprobes.h | 1 | ||||
| -rw-r--r-- | kernel/events/uprobes.c | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index e32251e..edff2b9 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -126,6 +126,7 @@ extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data); extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs); extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs); +extern bool __weak arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs); #else /* !CONFIG_UPROBES */ struct uprobes_state { }; diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 307d87c..04709b6 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1804,6 +1804,11 @@ static bool handle_trampoline(struct pt_regs *regs) return true; } +bool __weak arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs) +{ + return false; +} + /* * Run handler and ask thread to singlestep. * Ensure all non-fatal signals cannot interrupt thread while it singlesteps. @@ -1858,7 +1863,11 @@ static void handle_swbp(struct pt_regs *regs) if (!get_utask()) goto out; + if (arch_uprobe_ignore(&uprobe->arch, regs)) + goto out; + handler_chain(uprobe, regs); + if (can_skip_sstep(uprobe, regs)) goto out; |