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

Commit f72d41fa authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes: Export write_opcode() as uprobe_write_opcode() 



set_swbp() and set_orig_insn() are __weak, but this is pointless
because write_opcode() is static.

Export write_opcode() as uprobe_write_opcode() for the upcoming
arm port, this way it can actually override set_swbp() and use
__opcode_to_mem_arm(bpinsn) instead if UPROBE_SWBP_INSN.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
parent 8a8de66c

include/linux/uprobes.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsign 
extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);

extern bool __weak is_swbp_insn(uprobe_opcode_t *insn);

extern bool __weak is_trap_insn(uprobe_opcode_t *insn);

extern int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);

extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);

extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

kernel/events/uprobes.c

+7 −7
Original line number Diff line number Diff line
@@ -245,12 +245,12 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t 
 * the architecture. If an arch has variable length instruction and the

 * breakpoint instruction is not of the smallest length instruction

 * supported by that architecture then we need to modify is_trap_at_addr and

 * write_opcode accordingly. This would never be a problem for archs that

 * have fixed length instructions.

 * uprobe_write_opcode accordingly. This would never be a problem for archs

 * that have fixed length instructions.

 */



/*

 * write_opcode - write the opcode at a given virtual address.

 * uprobe_write_opcode - write the opcode at a given virtual address.

 * @mm: the probed process address space.

 * @vaddr: the virtual address to store the opcode.

 * @opcode: opcode to be written at @vaddr.
@@ -261,7 +261,7 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t 
 * For mm @mm, write the opcode at @vaddr.

 * Return 0 (success) or a negative errno.

 */

static int write_opcode(struct mm_struct *mm, unsigned long vaddr,

int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr,

			uprobe_opcode_t opcode)

{

	struct page *old_page, *new_page;
@@ -315,7 +315,7 @@ put_old: 
 */

int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)

{

	return write_opcode(mm, vaddr, UPROBE_SWBP_INSN);

	return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);

}



/**
@@ -330,7 +330,7 @@ int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned 
int __weak

set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)

{

	return write_opcode(mm, vaddr, *(uprobe_opcode_t *)auprobe->insn);

	return uprobe_write_opcode(mm, vaddr, *(uprobe_opcode_t *)auprobe->insn);

}



static int match_uprobe(struct uprobe *l, struct uprobe *r)
@@ -577,7 +577,7 @@ static int prepare_uprobe(struct uprobe *uprobe, struct file *file, 
	if (ret)

		goto out;



	/* write_opcode() assumes we don't cross page boundary */

	/* uprobe_write_opcode() assumes we don't cross page boundary */

	BUG_ON((uprobe->offset & ~PAGE_MASK) +

			UPROBE_SWBP_INSN_SIZE > PAGE_SIZE);