Commit 82afdd05 authored by Jiri Olsa's avatar Jiri Olsa Committed by Peter Zijlstra
Browse files

uprobes: Make copy_from_page global 



Making copy_from_page global and adding uprobe prefix.
Adding the uprobe prefix to copy_to_page as well for symmetry.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/r/20250720112133.244369-4-jolsa@kernel.org
parent 0f07b791

include/linux/uprobes.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ extern void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, 
extern void uprobe_handle_trampoline(struct pt_regs *regs);

extern void *arch_uretprobe_trampoline(unsigned long *psize);

extern unsigned long uprobe_get_trampoline_vaddr(void);

extern void uprobe_copy_from_page(struct page *page, unsigned long vaddr, void *dst, int len);

#else /* !CONFIG_UPROBES */

struct uprobes_state {

};

kernel/events/uprobes.c

+5 −5
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ bool __weak is_trap_insn(uprobe_opcode_t *insn) 
	return is_swbp_insn(insn);

}



static void copy_from_page(struct page *page, unsigned long vaddr, void *dst, int len)

void uprobe_copy_from_page(struct page *page, unsigned long vaddr, void *dst, int len)

{

	void *kaddr = kmap_atomic(page);

	memcpy(dst, kaddr + (vaddr & ~PAGE_MASK), len);
@@ -205,7 +205,7 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t 
	 * is a trap variant; uprobes always wins over any other (gdb)

	 * breakpoint.

	 */

	copy_from_page(page, vaddr, &old_opcode, UPROBE_SWBP_INSN_SIZE);

	uprobe_copy_from_page(page, vaddr, &old_opcode, UPROBE_SWBP_INSN_SIZE);

	is_swbp = is_swbp_insn(&old_opcode);



	if (is_swbp_insn(new_opcode)) {
@@ -1051,7 +1051,7 @@ static int __copy_insn(struct address_space *mapping, struct file *filp, 
	if (IS_ERR(page))

		return PTR_ERR(page);



	copy_from_page(page, offset, insn, nbytes);

	uprobe_copy_from_page(page, offset, insn, nbytes);

	put_page(page);



	return 0;
@@ -1397,7 +1397,7 @@ struct uprobe *uprobe_register(struct inode *inode, 
		return ERR_PTR(-EINVAL);



	/*

	 * This ensures that copy_from_page(), copy_to_page() and

	 * This ensures that uprobe_copy_from_page(), copy_to_page() and

	 * __update_ref_ctr() can't cross page boundary.

	 */

	if (!IS_ALIGNED(offset, UPROBE_SWBP_INSN_SIZE))
@@ -2393,7 +2393,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) 
	if (result < 0)

		return result;



	copy_from_page(page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE);

	uprobe_copy_from_page(page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE);

	put_page(page);

 out:

	/* This needs to return true for any variant of the trap insn */