From mboxrd@z Thu Jan 1 00:00:00 1970 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 C3AF28BEA; Tue, 25 Jun 2024 00:28:41 +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=1719275322; cv=none; b=djT7YPxEu+cq5bD5hOy+pkM6ZAdNuyS4lp6ksmk0NC95CQkHdrlmlDW6QQ/eaQEziRKWP7rBIDwkoZCfvT2kkcKe69K3rOLQFzfy+1NpMrMwVw2ZPgyqx5TN4yAL6k93SJTz9JoxRcA1kYhP7cvtMopChZMarsuSDAplp+ItT1s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719275322; c=relaxed/simple; bh=yxIW5coRtYQrSaBRZJgMqdo/5lnDyuIt7gtZMHoyzds=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=lVrbqdKNMXnbUU93v+MklZc1ZtdW2EP6ig6tJg/WG4DIlJbRI+L9fQFAYRmQmpgplnox+ghamXjJRBPVav7Y0eNAhyRNjJZvTMVENypgfiT+lg5unZibuMV/YqGDf8zbDSap5F2whWN2HaCqYgbfjxPzUreG4rlX85N4zlrvHk4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GOAOIdZ6; 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="GOAOIdZ6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A876CC2BBFC; Tue, 25 Jun 2024 00:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719275321; bh=yxIW5coRtYQrSaBRZJgMqdo/5lnDyuIt7gtZMHoyzds=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=GOAOIdZ6if4YuZLyTAuJJJfszUbUiUlen/ltKVOBy6uhcnoJt7PjeYFEye8494st1 OywBsARWToQfiK4SE37zG56njzevkzI8ckwOg/515oxYc4aap8+hQpdqZxycyaq2Lf cqteKSTvFptZMQXzXIpxqD4p91mw2ez14nrJucbUAsb8PeqahFeNlpJCtvtRGEdfKe iz/1D9ePUmzeGWJVMFNYE1s5lLvkpqGPGON6U4zHx3WyxFitB4UTHbwGHUQRknscz3 Bji4hs/ktG77WpPnl86b64rpWLI0B4yJsOTR2iK5U7ufwZhRSIVDUZG0eWpFhS9sX8 V3sxGwS5IHitw== Date: Tue, 25 Jun 2024 09:28:36 +0900 From: Masami Hiramatsu (Google) To: Andrii Nakryiko Cc: linux-trace-kernel@vger.kernel.org, rostedt@goodmis.org, x86@kernel.org, peterz@infradead.org, mingo@redhat.com, tglx@linutronix.de, bpf@vger.kernel.org, rihams@fb.com, linux-perf-users@vger.kernel.org Subject: Re: [PATCH v2 1/4] uprobes: rename get_trampoline_vaddr() and make it global Message-Id: <20240625092836.cf20dc28e0ad86a0e24db44f@kernel.org> In-Reply-To: <20240522013845.1631305-2-andrii@kernel.org> References: <20240522013845.1631305-1-andrii@kernel.org> <20240522013845.1631305-2-andrii@kernel.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 21 May 2024 18:38:42 -0700 Andrii Nakryiko wrote: > This helper is needed in another file, so make it a bit more uniquely > named and expose it internally. > > Signed-off-by: Andrii Nakryiko Looks good to me. Acked-by: Masami Hiramatsu (Google) Thank you > --- > include/linux/uprobes.h | 1 + > kernel/events/uprobes.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h > index f46e0ca0169c..0c57eec85339 100644 > --- a/include/linux/uprobes.h > +++ b/include/linux/uprobes.h > @@ -138,6 +138,7 @@ extern bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check c > 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 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 8ae0eefc3a34..d60d24f0f2f4 100644 > --- a/kernel/events/uprobes.c > +++ b/kernel/events/uprobes.c > @@ -1827,7 +1827,7 @@ void uprobe_copy_process(struct task_struct *t, unsigned long flags) > * > * Returns -1 in case the xol_area is not allocated. > */ > -static unsigned long get_trampoline_vaddr(void) > +unsigned long uprobe_get_trampoline_vaddr(void) > { > struct xol_area *area; > unsigned long trampoline_vaddr = -1; > @@ -1878,7 +1878,7 @@ static void prepare_uretprobe(struct uprobe *uprobe, struct pt_regs *regs) > if (!ri) > return; > > - trampoline_vaddr = get_trampoline_vaddr(); > + trampoline_vaddr = uprobe_get_trampoline_vaddr(); > orig_ret_vaddr = arch_uretprobe_hijack_return_addr(trampoline_vaddr, regs); > if (orig_ret_vaddr == -1) > goto fail; > @@ -2187,7 +2187,7 @@ static void handle_swbp(struct pt_regs *regs) > int is_swbp; > > bp_vaddr = uprobe_get_swbp_addr(regs); > - if (bp_vaddr == get_trampoline_vaddr()) > + if (bp_vaddr == uprobe_get_trampoline_vaddr()) > return handle_trampoline(regs); > > uprobe = find_active_uprobe(bp_vaddr, &is_swbp); > -- > 2.43.0 > -- Masami Hiramatsu (Google)