From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754524Ab0LPKCR (ORCPT ); Thu, 16 Dec 2010 05:02:17 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:49695 "EHLO e28smtp05.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754327Ab0LPKCM (ORCPT ); Thu, 16 Dec 2010 05:02:12 -0500 From: Srikar Dronamraju To: Peter Zijlstra , Ingo Molnar Cc: Steven Rostedt , Srikar Dronamraju , Arnaldo Carvalho de Melo , Linus Torvalds , Andi Kleen , Christoph Hellwig , Ananth N Mavinakayanahalli , Masami Hiramatsu , Oleg Nesterov , LKML , Linux-mm , Jim Keniston , Frederic Weisbecker , SystemTap , Andrew Morton , "Paul E. McKenney" Date: Thu, 16 Dec 2010 15:29:36 +0530 Message-Id: <20101216095936.23751.62727.sendpatchset@localhost6.localdomain6> In-Reply-To: <20101216095714.23751.52601.sendpatchset@localhost6.localdomain6> References: <20101216095714.23751.52601.sendpatchset@localhost6.localdomain6> Subject: [RFC] [PATCH 2.6.37-rc5-tip 12/20] 12: uprobes: get the breakpoint address. Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On a breakpoint hit, perform a architecture specific calculation to return the address where the breakpoint was hit. Signed-off-by: Srikar Dronamraju Signed-off-by: Jim Keniston --- include/linux/uprobes.h | 5 +++++ kernel/uprobes.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index a631c42..ee12b2e 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -154,6 +154,7 @@ extern void uprobe_free_utask(struct task_struct *tsk); struct vm_area_struct; extern void uprobe_mmap(struct vm_area_struct *vma); +extern unsigned long uprobes_get_bkpt_addr(struct pt_regs *regs); extern void uprobe_dup_mmap(struct mm_struct *old_mm, struct mm_struct *mm); extern void uprobes_free_xol_area(struct mm_struct *mm); #else /* CONFIG_UPROBES is not defined */ @@ -173,5 +174,9 @@ static inline void uprobe_dup_mmap(struct mm_struct *old_mm, static inline void uprobe_free_utask(struct task_struct *tsk) {} static inline void uprobe_mmap(struct vm_area_struct *vma) { } static inline void uprobes_free_xol_area(struct mm_struct *mm) {} +static inline unsigned long uprobes_get_bkpt_addr(struct pt_regs *regs) +{ + return 0; +} #endif /* CONFIG_UPROBES */ #endif /* _LINUX_UPROBES_H */ diff --git a/kernel/uprobes.c b/kernel/uprobes.c index 09e36f6..f486c4f 100644 --- a/kernel/uprobes.c +++ b/kernel/uprobes.c @@ -976,6 +976,17 @@ static void xol_free_insn_slot(struct task_struct *tsk, unsigned long slot_addr) __func__, slot_addr); } +/** + * uprobes_get_bkpt_addr - compute address of bkpt given post-bkpt regs + * @regs: Reflects the saved state of the task after it has hit a breakpoint + * instruction. + * Return the address of the breakpoint instruction. + */ +unsigned long uprobes_get_bkpt_addr(struct pt_regs *regs) +{ + return instruction_pointer(regs) - UPROBES_BKPT_INSN_SIZE; +} + /* * Called with no locks held. * Called in context of a exiting or a exec-ing thread.