From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F99BC433F5 for ; Wed, 13 Oct 2021 10:06:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 244A06101D for ; Wed, 13 Oct 2021 10:06:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 244A06101D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SDvssSm9vEYru6+JioHCYOIbPOr9g6MDn7WFoJZsnQY=; b=JcdMZytVmVbCFM TBRFoVc01jj1rfeXYVIYIcI+89AcbUP3avSKFKV/zHU4oYGFG+A823xeIMIY2FwWW+uwpbUKqsqCw 5f/N3m/MQQtOYkhQXMJJGkSwKyiMn4XMlanMGcFyUDvztp5PNUBsZEGlVI44PiirPEX9q+FSgpa4w LMpoCp+F3MtNqoy+KoomchGGva3urVT+FIoAdFv+lDNQsbG7uXtqzOEtVby1y6KBpWKWz1i/QlfDu dqU2knvqVXri7/HmY6bQ447sVeDWTkAtGSvIm5gAqmkoJZ5qvImNnp8mhT0kcyIrY8rUsbr1QZslM u18deRJ6/QqwIHYModxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mab6g-00FswH-Ib; Wed, 13 Oct 2021 10:03:32 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1maZPX-00FWb1-BE for linux-arm-kernel@lists.infradead.org; Wed, 13 Oct 2021 08:14:52 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD54460FDA; Wed, 13 Oct 2021 08:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634112890; bh=Kr5n30jWJFn/1ztvhvCbSOta4kJ1v2lin+xuRMC2dz4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lQUEFZWpunPpDLyiyf/ScamsM3tBj/uky2XgVcM3Vq7YyWv78uyBjg5kOYg8BdZ7L 2C1shLcdXbmwns55oM0aA5MqrZvlOAJCaWzahBY5MFMl24l8ovnERcZ136C+eJMgUZ PQSHwmo5iMqFzmVDXHtJu95xzyYdxNTwSRm+wy5Cx9i7DdVVmSpWeqA/UDo9v4WdcF DUnfm2MvvVJk1wb6me+KBz3LXYQRJh2IRVgRE7bw8MMHQP9MbwFHuvC0tfYOAQRHLc 1y4V4mqC+CeFOIcY8rFuET5U/ufRaToQH7h7s0W3jG/5r1qv51uPAA2+W88x+2lC0C JH5DxEHEFvsGw== Date: Wed, 13 Oct 2021 09:14:45 +0100 From: Will Deacon To: Masami Hiramatsu Cc: Steven Rostedt , "Naveen N . Rao" , Ananth N Mavinakayanahalli , Ingo Molnar , linux-kernel@vger.kernel.org, Sven Schnelle , Catalin Marinas , Russell King , Nathan Chancellor , Nick Desaulniers , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 3/8] arm64: kprobes: Record frame pointer with kretprobe instance Message-ID: <20211013081445.GD6701@willie-the-truck> References: <163369609308.636038.15295764725220907794.stgit@devnote2> <163369611948.636038.11552166777773804729.stgit@devnote2> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <163369611948.636038.11552166777773804729.stgit@devnote2> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211013_011451_480712_71F84CA4 X-CRM114-Status: GOOD ( 15.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Oct 08, 2021 at 09:28:39PM +0900, Masami Hiramatsu wrote: > Record the frame pointer instead of stack address with kretprobe > instance as the identifier on the instance list. > Since arm64 always enable CONFIG_FRAME_POINTER, we can use the > actual frame pointer (x29). > > Signed-off-by: Masami Hiramatsu > --- > arch/arm64/kernel/probes/kprobes.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c > index e7ad6da980e8..d9dfa82c1f18 100644 > --- a/arch/arm64/kernel/probes/kprobes.c > +++ b/arch/arm64/kernel/probes/kprobes.c > @@ -401,14 +401,14 @@ int __init arch_populate_kprobe_blacklist(void) > > void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs) > { > - return (void *)kretprobe_trampoline_handler(regs, (void *)kernel_stack_pointer(regs)); > + return (void *)kretprobe_trampoline_handler(regs, (void *)regs->regs[29]); > } > > void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, > struct pt_regs *regs) > { > ri->ret_addr = (kprobe_opcode_t *)regs->regs[30]; > - ri->fp = (void *)kernel_stack_pointer(regs); > + ri->fp = (void *)regs->regs[29]; > > /* replace return addr (x30) with trampoline */ > regs->regs[30] = (long)&__kretprobe_trampoline; Acked-by: Will Deacon Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel