Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eb9ba5e authored by Ananth N Mavinakayanahalli's avatar Ananth N Mavinakayanahalli Committed by Ingo Molnar
Browse files

uprobes: Pass probed vaddr to arch_uprobe_analyze_insn() 



On RISC architectures like powerpc, instructions are fixed size.
Instruction analysis on such platforms is just a matter of
(insn % 4). Pass the vaddr at which the uprobe is to be inserted so
that arch_uprobe_analyze_insn() can flag misaligned registration
requests.

Signed-off-by: default avatarAnanth N Mavinakaynahalli <ananth@in.ibm.com>
Cc: michael@ellerman.id.au
Cc: antonb@thinktux.localdomain
Cc: Paul Mackerras <paulus@samba.org>
Cc: benh@kernel.crashing.org
Cc: peterz@infradead.org
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: oleg@redhat.com
Cc: linuxppc-dev@lists.ozlabs.org
Link: http://lkml.kernel.org/r/20120608093257.GG13409@in.ibm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 70ab7003

arch/x86/include/asm/uprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct arch_uprobe_task { 
#endif

};



extern int  arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm);

extern int  arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long addr);

extern int  arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs);

extern int  arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);

extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);

arch/x86/kernel/uprobes.c

+2 −1
Original line number Diff line number Diff line
@@ -409,9 +409,10 @@ static int validate_insn_bits(struct arch_uprobe *auprobe, struct mm_struct *mm, 
 * arch_uprobe_analyze_insn - instruction analysis including validity and fixups.

 * @mm: the probed address space.

 * @arch_uprobe: the probepoint information.

 * @addr: virtual address at which to install the probepoint

 * Return 0 on success or a -ve number on error.

 */

int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm)

int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long addr)

{

	int ret;

	struct insn insn;

kernel/events/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, 
		if (is_swbp_insn((uprobe_opcode_t *)uprobe->arch.insn))

			return -EEXIST;



		ret = arch_uprobe_analyze_insn(&uprobe->arch, mm);

		ret = arch_uprobe_analyze_insn(&uprobe->arch, mm, addr);

		if (ret)

			return ret;