tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

uprobes: Rename arch_uretprobe_trampoline function

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

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/r/20250720112133.244369-3-jolsa@kernel.org

authored by

Jiri Olsa and committed by
Peter Zijlstra 0f07b791 7769cb17

+4 -4
+1 -1
arch/x86/kernel/uprobes.c
··· 338 338 extern u8 uretprobe_trampoline_end[]; 339 339 extern u8 uretprobe_syscall_check[]; 340 340 341 - void *arch_uprobe_trampoline(unsigned long *psize) 341 + void *arch_uretprobe_trampoline(unsigned long *psize) 342 342 { 343 343 static uprobe_opcode_t insn = UPROBE_SWBP_INSN; 344 344 struct pt_regs *regs = task_pt_regs(current);
+1 -1
include/linux/uprobes.h
··· 224 224 extern void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, 225 225 void *src, unsigned long len); 226 226 extern void uprobe_handle_trampoline(struct pt_regs *regs); 227 - extern void *arch_uprobe_trampoline(unsigned long *psize); 227 + extern void *arch_uretprobe_trampoline(unsigned long *psize); 228 228 extern unsigned long uprobe_get_trampoline_vaddr(void); 229 229 #else /* !CONFIG_UPROBES */ 230 230 struct uprobes_state {
+2 -2
kernel/events/uprobes.c
··· 1726 1726 return ret; 1727 1727 } 1728 1728 1729 - void * __weak arch_uprobe_trampoline(unsigned long *psize) 1729 + void * __weak arch_uretprobe_trampoline(unsigned long *psize) 1730 1730 { 1731 1731 static uprobe_opcode_t insn = UPROBE_SWBP_INSN; 1732 1732 ··· 1758 1758 init_waitqueue_head(&area->wq); 1759 1759 /* Reserve the 1st slot for get_trampoline_vaddr() */ 1760 1760 set_bit(0, area->bitmap); 1761 - insns = arch_uprobe_trampoline(&insns_size); 1761 + insns = arch_uretprobe_trampoline(&insns_size); 1762 1762 arch_uprobe_copy_ixol(area->page, 0, insns, insns_size); 1763 1763 1764 1764 if (!xol_add_vma(mm, area))