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 CD0D0C6FD20 for ; Fri, 24 Mar 2023 18:02:19 +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: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=6eIil7gVDmctaFJBOxvnekp3VOJ8ZvEN2jqzlaOM1Qw=; b=3urxGJEHC6nzJp x515MytkQBG1TBknkN1Xs2e993qdNe4T3nqsvl4l45b2aEwvyPQJi+Gj7ABEkiLcO59ScpKqoIYNZ X6DBv/HoaEsWfHC6M9h3RtVHdFyg+SnI6lMz+/bEVLYtv9bXncnHx1wn/kG2x4SyytrE4RqzEYe6v 4s0zttdcEKBFvH+B6g4brtqsQuCdDPzS9ErdgDX3orxw3Xtsur9YVSjoiD6gB+QmhHc7GC0GWInrH k7xr5K8RAf4VqUzYCZsRHeoCvB008+DdGSpB0UVjwp203JmXQRXoLXd7T/3fK7h9b8kWRDBmW/Mcu 1IC4SSc0jfYqxLNk+mpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pfljF-005EQx-2x; Fri, 24 Mar 2023 18:01:29 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pfljC-005EN2-1O for linux-arm-kernel@lists.infradead.org; Fri, 24 Mar 2023 18:01:28 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 28299113E; Fri, 24 Mar 2023 11:02:05 -0700 (PDT) Received: from FVFF77S0Q05N (unknown [10.57.56.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A01213F71E; Fri, 24 Mar 2023 11:01:18 -0700 (PDT) Date: Fri, 24 Mar 2023 18:01:13 +0000 From: Mark Rutland To: Florent Revest Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, catalin.marinas@arm.com, will@kernel.org, rostedt@goodmis.org, mhiramat@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org, jolsa@kernel.org, xukuohai@huaweicloud.com, lihuafei1@huawei.com Subject: Re: [PATCH v3 2/4] arm64: ftrace: Simplify get_ftrace_plt Message-ID: References: <20230324171451.2752302-1-revest@chromium.org> <20230324171451.2752302-3-revest@chromium.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230324171451.2752302-3-revest@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230324_110126_515541_9314ADF0 X-CRM114-Status: GOOD ( 15.93 ) 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, Mar 24, 2023 at 06:14:49PM +0100, Florent Revest wrote: > Following recent refactorings, the get_ftrace_plt function only ever > gets called with addr = FTRACE_ADDR so its code can be simplified to > always return the ftrace trampoline plt. > > Signed-off-by: Florent Revest Acked-by: Mark Rutland Mark. > --- > arch/arm64/kernel/ftrace.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c > index 758436727fba..432626c866a8 100644 > --- a/arch/arm64/kernel/ftrace.c > +++ b/arch/arm64/kernel/ftrace.c > @@ -195,15 +195,15 @@ int ftrace_update_ftrace_func(ftrace_func_t func) > return ftrace_modify_code(pc, 0, new, false); > } > > -static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) > +static struct plt_entry *get_ftrace_plt(struct module *mod) > { > #ifdef CONFIG_ARM64_MODULE_PLTS > struct plt_entry *plt = mod->arch.ftrace_trampolines; > > - if (addr == FTRACE_ADDR) > - return &plt[FTRACE_PLT_IDX]; > -#endif > + return &plt[FTRACE_PLT_IDX]; > +#else > return NULL; > +#endif > } > > static bool reachable_by_bl(unsigned long addr, unsigned long pc) > @@ -270,7 +270,7 @@ static bool ftrace_find_callable_addr(struct dyn_ftrace *rec, > if (WARN_ON(!mod)) > return false; > > - plt = get_ftrace_plt(mod, *addr); > + plt = get_ftrace_plt(mod); > if (!plt) { > pr_err("ftrace: no module PLT for %ps\n", (void *)*addr); > return false; > -- > 2.40.0.348.gf938b09366-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel