From nobody Tue Dec 16 09:28:20 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AAEB219A93; Mon, 21 Apr 2025 21:44:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745271884; cv=none; b=uPMcBThKGnf+zpFNbda71Npy/K8S+hpTHeFVXxqOEFhdcOoM+NZX6OD541wyiEezSR3ZalVkCwJilyYYDCRhllr3xhcWAGXMHayO67rpupQdQ2vB3e5I0/WZtsv9Xx8oeuFLv8clMJXkKJsVOTV+9VL7qJVra+W0nKkUMRpDVfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745271884; c=relaxed/simple; bh=ozxOQG7S4Db/4oOGw6R6e/Vcd0TPftjqn1miU1qB/8w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P2Sos+0bpQY+k8WmN+UFf3lw8ee2/z+9NH+PrmrsuFQGjT5F31a12MXT1+ub1VEOS+oVM26k6a2WlC9Fa1dy5ivfc/2Rqy5+9NhkrxKjKu9iTfWKjdXUqQBB3DF7s52HX6+daMCxDuk2uSZLH7dJjQmmlj8RdG/pr8QHGUh9w3Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s4tTdWbw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s4tTdWbw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 730B3C4CEE4; Mon, 21 Apr 2025 21:44:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745271883; bh=ozxOQG7S4Db/4oOGw6R6e/Vcd0TPftjqn1miU1qB/8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4tTdWbwM5h15iwNHXqBLIFn5Bwp1Bo3lGjoG2TUdrH1qgL2l1D9reFtXhh6YQCWV 5FUg9QtFIyCI7ze6GzYY1L14djqclSMDSI99I7dIs5Hanxpa9A/QBgpQ+av48U5Ujy oCK0mEVHdlKylTdUKzb2P4FWABqnrfLzK/B8j0jgmo4cvw3EOi+lqgJRq5N2EmjeuH nWxH6oztd8Kdp7j0eqYj8e04UAlqEdr2E8DeypPAIBH9z5zsCDjo+c8EqACZL04H+C 8qobOGgH0Kjm5lP/fNoEMxuE26PTZZq3Mr/PyXJD1OMjakO+eXqVZvm7eEwSZA6E7v UT55MMHSVrWvQ== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Andrii Nakryiko Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, x86@kernel.org, Song Liu , Yonghong Song , John Fastabend , Hao Luo , Steven Rostedt , Masami Hiramatsu , Alan Maguire , David Laight , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Ingo Molnar Subject: [PATCH perf/core 01/22] uprobes: Rename arch_uretprobe_trampoline function Date: Mon, 21 Apr 2025 23:44:01 +0200 Message-ID: <20250421214423.393661-2-jolsa@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250421214423.393661-1-jolsa@kernel.org> References: <20250421214423.393661-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We are about to add uprobe trampoline, so cleaning up the namespace. Acked-by: Andrii Nakryiko Signed-off-by: Jiri Olsa --- arch/x86/kernel/uprobes.c | 2 +- include/linux/uprobes.h | 2 +- kernel/events/uprobes.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index 6d383839e839..77050e5a4680 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -338,7 +338,7 @@ extern u8 uretprobe_trampoline_entry[]; extern u8 uretprobe_trampoline_end[]; extern u8 uretprobe_syscall_check[]; =20 -void *arch_uprobe_trampoline(unsigned long *psize) +void *arch_uretprobe_trampoline(unsigned long *psize) { static uprobe_opcode_t insn =3D UPROBE_SWBP_INSN; struct pt_regs *regs =3D task_pt_regs(current); diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h index 516217c39094..01112f27cd21 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -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 { diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 4c965ba77f9f..8415c087a71f 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1727,7 +1727,7 @@ static int xol_add_vma(struct mm_struct *mm, struct x= ol_area *area) return ret; } =20 -void * __weak arch_uprobe_trampoline(unsigned long *psize) +void * __weak arch_uretprobe_trampoline(unsigned long *psize) { static uprobe_opcode_t insn =3D UPROBE_SWBP_INSN; =20 @@ -1759,7 +1759,7 @@ static struct xol_area *__create_xol_area(unsigned lo= ng vaddr) init_waitqueue_head(&area->wq); /* Reserve the 1st slot for get_trampoline_vaddr() */ set_bit(0, area->bitmap); - insns =3D arch_uprobe_trampoline(&insns_size); + insns =3D arch_uretprobe_trampoline(&insns_size); arch_uprobe_copy_ixol(area->page, 0, insns, insns_size); =20 if (!xol_add_vma(mm, area)) --=20 2.49.0