diff options
| author | Oleg Nesterov | 2015-07-21 15:40:26 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-07-31 10:38:06 +0200 |
| commit | 86dcb702e74b8ab7d3b2d36984ef00671cea73b9 (patch) | |
| tree | 11ca9d381085a5936368c78203b0f3f505edfe30 /arch/x86/kernel/uprobes.c | |
| parent | uprobes: Change prepare_uretprobe() to (try to) flush the dead frames (diff) | |
| download | kernel-qcow2-linux-86dcb702e74b8ab7d3b2d36984ef00671cea73b9.tar.gz kernel-qcow2-linux-86dcb702e74b8ab7d3b2d36984ef00671cea73b9.tar.xz kernel-qcow2-linux-86dcb702e74b8ab7d3b2d36984ef00671cea73b9.zip | |
uprobes: Add the "enum rp_check ctx" arg to arch_uretprobe_is_alive()
arch/x86 doesn't care (so far), but as Pratyush Anand pointed
out other architectures might want why arch_uretprobe_is_alive()
was called and use different checks depending on the context.
Add the new argument to distinguish 2 callers.
Tested-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Anton Arapov <arapov@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20150721134026.GA4779@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/uprobes.c')
| -rw-r--r-- | arch/x86/kernel/uprobes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index 58e9b842633f..acf8b9010bbf 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -986,7 +986,8 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs return -1; } -bool arch_uretprobe_is_alive(struct return_instance *ret, struct pt_regs *regs) +bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check ctx, + struct pt_regs *regs) { return regs->sp <= ret->stack; } |