From: Srikar Dronamraju <srikar@linux.vnet.ibm.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@elte.hu> Cc: Steven Rostedt <rostedt@goodmis.org>, Srikar Dronamraju <srikar@linux.vnet.ibm.com>, Linux-mm <linux-mm@kvack.org>, Arnaldo Carvalho de Melo <acme@infradead.org>, Linus Torvalds <torvalds@linux-foundation.org>, Andi Kleen <andi@firstfloor.org>, Christoph Hellwig <hch@infradead.org>, Jonathan Corbet <corbet@lwn.net>, Thomas Gleixner <tglx@linutronix.de>, Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>, Oleg Nesterov <oleg@redhat.com>, Andrew Morton <akpm@linux-foundation.org>, SystemTap <systemtap@sources.redhat.com>, Jim Keniston <jkenisto@linux.vnet.ibm.com>, Roland McGrath <roland@hack.frob.com>, Ananth N Mavinakayanahalli <ananth@in.ibm.com>, LKML <linux-kernel@vger.kernel.org> Subject: [PATCH v3 2.6.39-rc1-tip 16/26] 16: x86: uprobes exception notifier for x86. Date: Fri, 01 Apr 2011 20:05:37 +0530 [thread overview] Message-ID: <20110401143537.15455.82130.sendpatchset@localhost6.localdomain6> (raw) In-Reply-To: <20110401143223.15455.19844.sendpatchset@localhost6.localdomain6> Provides a uprobes exception notifier for x86. This uprobes_exception notifier gets called in interrupt context and routes int3 and singlestep exception when a uprobed process encounters a INT3 or a singlestep exception. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> --- arch/x86/include/asm/uprobes.h | 3 +++ arch/x86/kernel/signal.c | 14 ++++++++++++++ arch/x86/kernel/uprobes.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h index 0c9c8b6..bb5c03c 100644 --- a/arch/x86/include/asm/uprobes.h +++ b/arch/x86/include/asm/uprobes.h @@ -22,6 +22,7 @@ * Srikar Dronamraju * Jim Keniston */ +#include <linux/notifier.h> typedef u8 uprobe_opcode_t; #define MAX_UINSN_BYTES 16 @@ -49,4 +50,6 @@ extern int pre_xol(struct uprobe *uprobe, struct pt_regs *regs); extern int post_xol(struct uprobe *uprobe, struct pt_regs *regs); extern void arch_uprobe_enable_sstep(struct pt_regs *regs); extern void arch_uprobe_disable_sstep(struct pt_regs *regs); +extern int uprobes_exception_notify(struct notifier_block *self, + unsigned long val, void *data); #endif /* _ASM_UPROBES_H */ diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 4fd173c..0b06b94 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -20,6 +20,7 @@ #include <linux/personality.h> #include <linux/uaccess.h> #include <linux/user-return-notifier.h> +#include <linux/uprobes.h> #include <asm/processor.h> #include <asm/ucontext.h> @@ -848,6 +849,19 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); + if (thread_info_flags & _TIF_UPROBE) { + clear_thread_flag(TIF_UPROBE); +#ifdef CONFIG_X86_32 + /* + * On x86_32, do_notify_resume() gets called with + * interrupts disabled. Hence enable interrupts if they + * are still disabled. + */ + local_irq_enable(); +#endif + uprobe_notify_resume(regs); + } + if (thread_info_flags & _TIF_NOTIFY_RESUME) { clear_thread_flag(TIF_NOTIFY_RESUME); tracehook_notify_resume(regs); diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index bf98841..e0ce207 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -583,3 +583,32 @@ void arch_uprobe_disable_sstep(struct pt_regs *regs) clear_thread_flag(TIF_FORCED_TF); regs->flags &= ~X86_EFLAGS_TF; } + +/* + * Wrapper routine for handling exceptions. + */ +int uprobes_exception_notify(struct notifier_block *self, + unsigned long val, void *data) +{ + struct die_args *args = data; + struct pt_regs *regs = args->regs; + int ret = NOTIFY_DONE; + + /* We are only interested in userspace traps */ + if (regs && !user_mode_vm(regs)) + return NOTIFY_DONE; + + switch (val) { + case DIE_INT3: + /* Run your handler here */ + if (uprobe_bkpt_notifier(regs)) + ret = NOTIFY_STOP; + break; + case DIE_DEBUG: + if (uprobe_post_notifier(regs)) + ret = NOTIFY_STOP; + default: + break; + } + return ret; +}
WARNING: multiple messages have this Message-ID (diff)
From: Srikar Dronamraju <srikar@linux.vnet.ibm.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@elte.hu> Cc: Steven Rostedt <rostedt@goodmis.org>, Srikar Dronamraju <srikar@linux.vnet.ibm.com>, Linux-mm <linux-mm@kvack.org>, Arnaldo Carvalho de Melo <acme@infradead.org>, Linus Torvalds <torvalds@linux-foundation.org>, Andi Kleen <andi@firstfloor.org>, Christoph Hellwig <hch@infradead.org>, Jonathan Corbet <corbet@lwn.net>, Thomas Gleixner <tglx@linutronix.de>, Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>, Oleg Nesterov <oleg@redhat.com>, Andrew Morton <akpm@linux-foundation.org>, SystemTap <systemtap@sources.redhat.com>, Jim Keniston <jkenisto@linux.vnet.ibm.com>, Roland McGrath <roland@hack.frob.com>, Ananth N Mavinakayanahalli <ananth@in.ibm.com>, LKML <linux-kernel@vger.kernel.org> Subject: [PATCH v3 2.6.39-rc1-tip 16/26] 16: x86: uprobes exception notifier for x86. Date: Fri, 01 Apr 2011 20:05:37 +0530 [thread overview] Message-ID: <20110401143537.15455.82130.sendpatchset@localhost6.localdomain6> (raw) In-Reply-To: <20110401143223.15455.19844.sendpatchset@localhost6.localdomain6> Provides a uprobes exception notifier for x86. This uprobes_exception notifier gets called in interrupt context and routes int3 and singlestep exception when a uprobed process encounters a INT3 or a singlestep exception. Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> --- arch/x86/include/asm/uprobes.h | 3 +++ arch/x86/kernel/signal.c | 14 ++++++++++++++ arch/x86/kernel/uprobes.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 0 deletions(-) diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h index 0c9c8b6..bb5c03c 100644 --- a/arch/x86/include/asm/uprobes.h +++ b/arch/x86/include/asm/uprobes.h @@ -22,6 +22,7 @@ * Srikar Dronamraju * Jim Keniston */ +#include <linux/notifier.h> typedef u8 uprobe_opcode_t; #define MAX_UINSN_BYTES 16 @@ -49,4 +50,6 @@ extern int pre_xol(struct uprobe *uprobe, struct pt_regs *regs); extern int post_xol(struct uprobe *uprobe, struct pt_regs *regs); extern void arch_uprobe_enable_sstep(struct pt_regs *regs); extern void arch_uprobe_disable_sstep(struct pt_regs *regs); +extern int uprobes_exception_notify(struct notifier_block *self, + unsigned long val, void *data); #endif /* _ASM_UPROBES_H */ diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 4fd173c..0b06b94 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -20,6 +20,7 @@ #include <linux/personality.h> #include <linux/uaccess.h> #include <linux/user-return-notifier.h> +#include <linux/uprobes.h> #include <asm/processor.h> #include <asm/ucontext.h> @@ -848,6 +849,19 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) if (thread_info_flags & _TIF_SIGPENDING) do_signal(regs); + if (thread_info_flags & _TIF_UPROBE) { + clear_thread_flag(TIF_UPROBE); +#ifdef CONFIG_X86_32 + /* + * On x86_32, do_notify_resume() gets called with + * interrupts disabled. Hence enable interrupts if they + * are still disabled. + */ + local_irq_enable(); +#endif + uprobe_notify_resume(regs); + } + if (thread_info_flags & _TIF_NOTIFY_RESUME) { clear_thread_flag(TIF_NOTIFY_RESUME); tracehook_notify_resume(regs); diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index bf98841..e0ce207 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -583,3 +583,32 @@ void arch_uprobe_disable_sstep(struct pt_regs *regs) clear_thread_flag(TIF_FORCED_TF); regs->flags &= ~X86_EFLAGS_TF; } + +/* + * Wrapper routine for handling exceptions. + */ +int uprobes_exception_notify(struct notifier_block *self, + unsigned long val, void *data) +{ + struct die_args *args = data; + struct pt_regs *regs = args->regs; + int ret = NOTIFY_DONE; + + /* We are only interested in userspace traps */ + if (regs && !user_mode_vm(regs)) + return NOTIFY_DONE; + + switch (val) { + case DIE_INT3: + /* Run your handler here */ + if (uprobe_bkpt_notifier(regs)) + ret = NOTIFY_STOP; + break; + case DIE_DEBUG: + if (uprobe_post_notifier(regs)) + ret = NOTIFY_STOP; + default: + break; + } + return ret; +} -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-04-01 14:45 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-04-01 14:32 [PATCH v3 2.6.39-rc1-tip 0/26] 0: Uprobes patchset with perf probe support Srikar Dronamraju 2011-04-01 14:32 ` Srikar Dronamraju 2011-04-01 14:32 ` [PATCH v3 2.6.39-rc1-tip 1/26] 1: mm: replace_page() loses static attribute Srikar Dronamraju 2011-04-01 14:32 ` Srikar Dronamraju 2011-04-01 14:32 ` [PATCH v3 2.6.39-rc1-tip 2/26] 2: mm: Move replace_page() to mm/memory.c Srikar Dronamraju 2011-04-01 14:32 ` Srikar Dronamraju 2011-04-01 14:33 ` [PATCH v3 2.6.39-rc1-tip 3/26] 3: X86 specific breakpoint definitions Srikar Dronamraju 2011-04-01 14:33 ` Srikar Dronamraju 2011-04-01 14:33 ` [PATCH v3 2.6.39-rc1-tip 4/26] 4: uprobes: Breakground page replacement Srikar Dronamraju 2011-04-01 14:33 ` Srikar Dronamraju 2011-04-18 12:20 ` Peter Zijlstra 2011-04-18 12:20 ` Peter Zijlstra 2011-04-01 14:33 ` [PATCH v3 2.6.39-rc1-tip 5/26] 5: uprobes: Adding and remove a uprobe in a rb tree Srikar Dronamraju 2011-04-01 14:33 ` Srikar Dronamraju 2011-04-18 12:20 ` Peter Zijlstra 2011-04-18 12:20 ` Peter Zijlstra 2011-04-01 14:33 ` [PATCH v3 2.6.39-rc1-tip 6/26] 6: Uprobes: register/unregister probes Srikar Dronamraju 2011-04-01 14:33 ` Srikar Dronamraju 2011-04-02 0:26 ` Stephen Wilson 2011-04-02 0:26 ` Stephen Wilson 2011-04-02 0:53 ` Srikar Dronamraju 2011-04-02 0:53 ` Srikar Dronamraju 2011-04-02 1:29 ` Stephen Wilson 2011-04-02 1:29 ` Stephen Wilson 2011-04-18 12:20 ` Peter Zijlstra 2011-04-18 12:20 ` Peter Zijlstra 2011-04-01 14:33 ` [PATCH v3 2.6.39-rc1-tip 7/26] 7: x86: analyze instruction and determine fixups Srikar Dronamraju 2011-04-01 14:33 ` Srikar Dronamraju 2011-04-19 13:29 ` Steven Rostedt 2011-04-19 13:29 ` Steven Rostedt 2011-04-21 17:31 ` Srikar Dronamraju 2011-04-21 17:31 ` Srikar Dronamraju 2011-04-21 17:52 ` Peter Zijlstra 2011-04-21 17:52 ` Peter Zijlstra 2011-04-01 14:33 ` [PATCH v3 2.6.39-rc1-tip 8/26] 8: uprobes: store/restore original instruction Srikar Dronamraju 2011-04-01 14:33 ` Srikar Dronamraju 2011-04-18 16:12 ` Peter Zijlstra 2011-04-18 16:12 ` Peter Zijlstra 2011-04-01 14:34 ` [PATCH v3 2.6.39-rc1-tip 9/26] 9: uprobes: mmap and fork hooks Srikar Dronamraju 2011-04-01 14:34 ` Srikar Dronamraju 2011-04-18 16:21 ` Peter Zijlstra 2011-04-18 16:21 ` Peter Zijlstra 2011-04-18 16:29 ` Peter Zijlstra 2011-04-18 16:29 ` Peter Zijlstra 2011-04-19 6:45 ` Srikar Dronamraju 2011-04-19 6:45 ` Srikar Dronamraju 2011-04-01 14:34 ` [PATCH v3 2.6.39-rc1-tip 10/26] 10: x86: architecture specific task information Srikar Dronamraju 2011-04-01 14:34 ` Srikar Dronamraju 2011-04-01 14:34 ` [PATCH v3 2.6.39-rc1-tip 11/26] 11: uprobes: task specific information Srikar Dronamraju 2011-04-01 14:34 ` Srikar Dronamraju 2011-04-01 14:34 ` [PATCH v3 2.6.39-rc1-tip 12/26] 12: uprobes: slot allocation for uprobes Srikar Dronamraju 2011-04-01 14:34 ` Srikar Dronamraju 2011-04-18 16:46 ` Peter Zijlstra 2011-04-18 16:46 ` Peter Zijlstra 2011-04-19 6:26 ` Srikar Dronamraju 2011-04-19 6:26 ` Srikar Dronamraju 2011-04-19 9:02 ` Peter Zijlstra 2011-04-19 9:02 ` Peter Zijlstra 2011-04-19 9:11 ` Peter Zijlstra 2011-04-19 9:11 ` Peter Zijlstra 2011-04-20 13:40 ` Eric Paris 2011-04-20 13:40 ` Eric Paris 2011-04-20 14:51 ` Frank Ch. Eigler 2011-04-20 14:51 ` Frank Ch. Eigler 2011-04-20 15:16 ` Stephen Smalley 2011-04-20 15:16 ` Stephen Smalley 2011-04-21 14:11 ` Srikar Dronamraju 2011-04-21 14:11 ` Srikar Dronamraju 2011-04-21 14:45 ` Eric Paris 2011-04-21 14:45 ` Eric Paris 2011-04-21 16:14 ` Roland McGrath 2011-04-21 16:14 ` Roland McGrath 2011-04-21 16:59 ` Srikar Dronamraju 2011-04-21 16:59 ` Srikar Dronamraju 2011-04-01 14:35 ` [PATCH v3 2.6.39-rc1-tip 13/26] 13: uprobes: get the breakpoint address Srikar Dronamraju 2011-04-01 14:35 ` Srikar Dronamraju 2011-04-18 16:47 ` Peter Zijlstra 2011-04-18 16:47 ` Peter Zijlstra 2011-04-01 14:35 ` [PATCH v3 2.6.39-rc1-tip 14/26] 14: x86: x86 specific probe handling Srikar Dronamraju 2011-04-01 14:35 ` Srikar Dronamraju 2011-04-18 16:55 ` Peter Zijlstra 2011-04-18 16:55 ` Peter Zijlstra 2011-04-19 5:43 ` Srikar Dronamraju 2011-04-19 5:43 ` Srikar Dronamraju 2011-04-18 16:57 ` Peter Zijlstra 2011-04-18 16:57 ` Peter Zijlstra 2011-04-01 14:35 ` [PATCH v3 2.6.39-rc1-tip 15/26] 15: uprobes: Handing int3 and singlestep exception Srikar Dronamraju 2011-04-01 14:35 ` Srikar Dronamraju 2011-04-19 13:03 ` Peter Zijlstra 2011-04-19 13:03 ` Peter Zijlstra 2011-04-19 13:12 ` Steven Rostedt 2011-04-19 13:12 ` Steven Rostedt 2011-04-21 17:10 ` Srikar Dronamraju 2011-04-21 17:10 ` Srikar Dronamraju 2011-04-21 17:41 ` Peter Zijlstra 2011-04-21 17:41 ` Peter Zijlstra 2011-04-19 13:39 ` Peter Zijlstra 2011-04-19 13:39 ` Peter Zijlstra 2011-04-21 17:03 ` Srikar Dronamraju 2011-04-21 17:03 ` Srikar Dronamraju 2011-04-01 14:35 ` Srikar Dronamraju [this message] 2011-04-01 14:35 ` [PATCH v3 2.6.39-rc1-tip 16/26] 16: x86: uprobes exception notifier for x86 Srikar Dronamraju 2011-04-01 14:35 ` [PATCH v3 2.6.39-rc1-tip 17/26] 17: uprobes: register a notifier for uprobes Srikar Dronamraju 2011-04-01 14:35 ` Srikar Dronamraju 2011-04-19 13:54 ` Peter Zijlstra 2011-04-19 13:54 ` Peter Zijlstra 2011-04-01 14:36 ` [PATCH v3 2.6.39-rc1-tip 18/26] 18: uprobes: commonly used filters Srikar Dronamraju 2011-04-01 14:36 ` Srikar Dronamraju 2011-04-05 1:26 ` Masami Hiramatsu 2011-04-05 1:26 ` Masami Hiramatsu 2011-04-19 13:57 ` Peter Zijlstra 2011-04-19 13:57 ` Peter Zijlstra 2011-04-21 11:09 ` Srikar Dronamraju 2011-04-21 11:09 ` Srikar Dronamraju 2011-04-21 11:37 ` Peter Zijlstra 2011-04-21 11:37 ` Peter Zijlstra 2011-04-21 11:49 ` Srikar Dronamraju 2011-04-21 11:49 ` Srikar Dronamraju 2011-04-01 14:36 ` [PATCH v3 2.6.39-rc1-tip 19/26] 19: tracing: Extract out common code for kprobes/uprobes traceevents Srikar Dronamraju 2011-04-01 14:36 ` Srikar Dronamraju 2011-04-01 14:36 ` [PATCH v3 2.6.39-rc1-tip 20/26] 20: tracing: uprobes trace_event interface Srikar Dronamraju 2011-04-01 14:36 ` Srikar Dronamraju 2011-04-01 14:36 ` [PATCH v3 2.6.39-rc1-tip 21/26] 21: Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Srikar Dronamraju 2011-04-01 14:36 ` Srikar Dronamraju 2011-04-01 14:47 ` [RESEND] [PATCH v3 2.6.39-rc1-tip 21/26] 21: Uprobe tracer documentation " Srikar Dronamraju 2011-04-01 14:47 ` Srikar Dronamraju 2011-04-01 14:36 ` [PATCH v3 2.6.39-rc1-tip 22/26] 22: perf: rename target_module to target Srikar Dronamraju 2011-04-01 14:36 ` Srikar Dronamraju 2011-04-04 10:06 ` Masami Hiramatsu 2011-04-04 10:06 ` Masami Hiramatsu 2011-04-06 23:46 ` Srikar Dronamraju 2011-04-06 23:46 ` Srikar Dronamraju 2011-04-01 14:37 ` [PATCH v3 2.6.39-rc1-tip 23/26] 23: perf: show possible probes in a given executable file or library Srikar Dronamraju 2011-04-01 14:37 ` Srikar Dronamraju 2011-04-04 10:15 ` Masami Hiramatsu 2011-04-04 10:15 ` Masami Hiramatsu 2011-04-06 22:50 ` Srikar Dronamraju 2011-04-06 22:50 ` Srikar Dronamraju 2011-04-01 14:37 ` [PATCH v3 2.6.39-rc1-tip 24/26] 24: perf: perf interface for uprobes Srikar Dronamraju 2011-04-01 14:37 ` Srikar Dronamraju 2011-04-01 14:37 ` [PATCH v3 2.6.39-rc1-tip 25/26] 25: perf: Documentation for perf uprobes Srikar Dronamraju 2011-04-01 14:37 ` Srikar Dronamraju 2011-04-01 14:37 ` [PATCH v3 2.6.39-rc1-tip 26/26] 26: uprobes: filter chain Srikar Dronamraju 2011-04-01 14:37 ` Srikar Dronamraju 2011-04-05 1:27 ` Masami Hiramatsu 2011-04-05 1:27 ` Masami Hiramatsu 2011-04-06 22:41 ` Srikar Dronamraju 2011-04-06 22:41 ` Srikar Dronamraju 2011-04-07 3:19 ` Masami Hiramatsu 2011-04-07 3:19 ` Masami Hiramatsu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20110401143537.15455.82130.sendpatchset@localhost6.localdomain6 \ --to=srikar@linux.vnet.ibm.com \ --cc=acme@infradead.org \ --cc=akpm@linux-foundation.org \ --cc=ananth@in.ibm.com \ --cc=andi@firstfloor.org \ --cc=corbet@lwn.net \ --cc=hch@infradead.org \ --cc=jkenisto@linux.vnet.ibm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=masami.hiramatsu.pt@hitachi.com \ --cc=mingo@elte.hu \ --cc=oleg@redhat.com \ --cc=peterz@infradead.org \ --cc=roland@hack.frob.com \ --cc=rostedt@goodmis.org \ --cc=systemtap@sources.redhat.com \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.