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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 48487C38A2D for ; Mon, 24 Oct 2022 14:49:37 +0000 (UTC) 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:MIME-Version:References:In-Reply-To: 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=mM5NWNSK+28cz8rhNK0XzxUpACLAb/wsGCeSCYSsvPU=; b=KSotjtUwmY+aFS WHyBIFg/6hP4Kv374tK2piJxIu5TrcHy/HqQzZYuoQCuMS0KzhIB9QDNtfZCFfIMHF9X+XenV+/+6 96TJh2rnBJPeK1svr/8s9jECA51uYxyLpSqzinle6USMKGiqg9flqV1EoSekH154iDwKOxqd85QrA 6JPpf/EPIpdX/JFP/WcOEQfmXE53UNkzny//yHXmunpcAgW1+Y0dmxdimWALh4wUH/oB3f47fZliV w6xKgmpFG4fuyJ35hhj6KEuUVdOarKL89PMdwWr49mITKKCxBIijqELk+MZZRf/Am3lx3HNQR/LOb dpWVvczk/ssttqL07f7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1omykq-001y75-Uo; Mon, 24 Oct 2022 14:48:41 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1omyko-001y5w-Dc for linux-arm-kernel@lists.infradead.org; Mon, 24 Oct 2022 14:48:39 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 57F7561386; Mon, 24 Oct 2022 14:48:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9A75C433C1; Mon, 24 Oct 2022 14:48:35 +0000 (UTC) Date: Mon, 24 Oct 2022 10:48:45 -0400 From: Steven Rostedt To: Mark Rutland Cc: linux-kernel@vger.kernel.org, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org, mhiramat@kernel.org, revest@chromium.org, will@kernel.org Subject: Re: [PATCH 1/4] ftrace: pass fregs to arch_ftrace_set_direct_caller() Message-ID: <20221024104845.3c898d85@gandalf.local.home> In-Reply-To: <20221024140846.3555435-2-mark.rutland@arm.com> References: <20221024140846.3555435-1-mark.rutland@arm.com> <20221024140846.3555435-2-mark.rutland@arm.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221024_074838_544433_E0BDF04D X-CRM114-Status: GOOD ( 16.52 ) 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 Mon, 24 Oct 2022 15:08:43 +0100 Mark Rutland wrote: > --- a/include/linux/ftrace.h > +++ b/include/linux/ftrace.h > @@ -429,6 +429,7 @@ static inline int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsi > } > #endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */ > > +#ifdef CONFIG_FUNCTION_TRACER Instead of adding the above preprocessor check, the below chunk should be moved into the CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS block above. -- Steve > #ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS > /* > * This must be implemented by the architecture. > @@ -443,9 +444,10 @@ static inline int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsi > * the return from the trampoline jump to the direct caller > * instead of going back to the function it just traced. > */ > -static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs, > +static inline void arch_ftrace_set_direct_caller(struct ftrace_regs *fregs, > unsigned long addr) { } > #endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */ > +#endif /* CONFIG_FUNCTION_TRACER */ > > #ifdef CONFIG_STACK_TRACER > > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index fbf2543111c0..234c5414deee 100644 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel