Commit 0f07b791 authored by Jiri Olsa's avatar Jiri Olsa Committed by Peter Zijlstra
Browse files

uprobes: Rename arch_uretprobe_trampoline function 



We are about to add uprobe trampoline, so cleaning up the namespace.

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-3-jolsa@kernel.org
parent 7769cb17

arch/x86/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ extern u8 uretprobe_trampoline_entry[]; 
extern u8 uretprobe_trampoline_end[];

extern u8 uretprobe_syscall_check[];



void *arch_uprobe_trampoline(unsigned long *psize)

void *arch_uretprobe_trampoline(unsigned long *psize)

{

	static uprobe_opcode_t insn = UPROBE_SWBP_INSN;

	struct pt_regs *regs = task_pt_regs(current);

include/linux/uprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ extern bool arch_uprobe_ignore(struct arch_uprobe *aup, struct pt_regs *regs); 
extern void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,

					 void *src, unsigned long len);

extern void uprobe_handle_trampoline(struct pt_regs *regs);

extern void *arch_uprobe_trampoline(unsigned long *psize);

extern void *arch_uretprobe_trampoline(unsigned long *psize);

extern unsigned long uprobe_get_trampoline_vaddr(void);

#else /* !CONFIG_UPROBES */

struct uprobes_state {

kernel/events/uprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -1726,7 +1726,7 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area) 
	return ret;

}



void * __weak arch_uprobe_trampoline(unsigned long *psize)

void * __weak arch_uretprobe_trampoline(unsigned long *psize)

{

	static uprobe_opcode_t insn = UPROBE_SWBP_INSN;
@@ -1758,7 +1758,7 @@ static struct xol_area *__create_xol_area(unsigned long vaddr) 
	init_waitqueue_head(&area->wq);

	/* Reserve the 1st slot for get_trampoline_vaddr() */

	set_bit(0, area->bitmap);

	insns = arch_uprobe_trampoline(&insns_size);

	insns = arch_uretprobe_trampoline(&insns_size);

	arch_uprobe_copy_ixol(area->page, 0, insns, insns_size);



	if (!xol_add_vma(mm, area))