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 BA111C433F5 for ; Tue, 25 Jan 2022 15:52:33 +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:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wZOZ/8cJcPwE3opeyN7fYd8wZLxob8qqxC/hqcmwjg4=; b=LEqZTxgJF0WirC 3iD3LooJKRQ0wpDh5rakFMREWqpML/mYA4xJv7RoNl5+B6q3X33+xnPwKTnvR8eRBgvV9M8ExHHZh AT2eRvHBB3cV5ytJXnb7/J3Yi+ovALUssz940bqQksrqoK+02jvEO+oRVMjwWfn80fXaAEqXDNtYO bgn7tiarQKjnsAspypfdb7EII3BsZuKaE0YSiLwweejjfQ2Gv2ee5uxxqIV0Qzj/vvetnkT0ckSpb qUK+LWTe/UucVIDvx/mqbGROYgrEz0SB2gcKPrkY9dJtAgIRbp/irqWz2GeP4443v0XQlVIYMJoGc Nj7zWoJfiS1X2XnANIKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCO5u-008TKk-Lb; Tue, 25 Jan 2022 15:50:55 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nCNsp-008Q7z-QG for linux-arm-kernel@lists.infradead.org; Tue, 25 Jan 2022 15:37:25 +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 0D0A2616E4; Tue, 25 Jan 2022 15:37:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19A46C340E9; Tue, 25 Jan 2022 15:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643125042; bh=aPUloxFtVzhBfAJ9MVKdYUG+wi92teMDlhXB1t9gZ1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ss2tsqRiv98qB6RNd1rfrnTYu15dNxHw/cuHBZ0YAtTEjAMynhuENvfn4PRvUvUFz t5hH+ob8IbW1UdNGQ1Ml82akcxB51+c57QM6BpeJ/oovYzM/OBcH+7qb55Dib2zaM2 MwXVYvZ/z2PGeq3rnMcHulOmzjHDISYycQRVDypq5YiLbv6IwapJO4iaMwprJ4v3GJ NtALxa2675QkmxOeVDfj6YT7zv4g3npPWift+cQTNggxg/BD21fTv+XaIUchxhhLPo GEzLA+Z0w32aHFHD8p+fxnXg+ikTptVciwtzx1JHzNkbwlNBALzb4dYcLkZO0jCOXK rl/V++udEIoRw== From: Ard Biesheuvel To: linux@armlinux.org.uk, linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Arnd Bergmann , Linus Walleij , Nick Desaulniers Subject: [PATCH 5/8] ARM: ftrace: avoid unnecessary literal loads Date: Tue, 25 Jan 2022 16:36:53 +0100 Message-Id: <20220125153656.1802079-6-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220125153656.1802079-1-ardb@kernel.org> References: <20220125153656.1802079-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1892; h=from:subject; bh=aPUloxFtVzhBfAJ9MVKdYUG+wi92teMDlhXB1t9gZ1E=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh8BkSWlL12mAny98jJT5VZYUK+jMNMPCNmrOimYIK /iMCmzKJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYfAZEgAKCRDDTyI5ktmPJLgiDA CHUUNpCl80yXHYODPQzcIAAUIsHwDrAnnWNBR7nSGfPeALkyDjKRvb5sz7TsHevoKFTsJxzP5WdyrI Gns28mbEmOAz8Svytu2KoOEF/vZejD0YxiwbXiErh6ntJkDcJLmODiJnfFogGmgmRJFXYCCxzJRb3J cc4OOUCHFtwW9Tkwc15hh9S5vNWfpnn0NoWTROGXV+XXAVHWXkcR48iQhM10LOLahI6RUU5BKX/nul XTEjQgGpbh6XgHZLjbVX3H1FWqUl0InyC9IMrem9MN7WtMfwOzzTS3wiwb3n0kV0Owia+RUfmqf8IF O40g1qGcGuR8Q8HtI6xCc9tUPm9pgBh8ScfoMuiPM/mWygc5cLX1qcIOSnPTQp+XJuU8xQ2tgPdLYH A03xxF0amcjqTKQMbf7AAZfboGV+teWCbNWTM8FiSpVT6o0U9sX3DE2QkPjtVF6n7M0lVU6/iGObrV hKbnwpBI17grX5+N9HIUGFBVkx3AgDtToDU0+A7u9VfhQ= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220125_073723_970048_2D25A7D9 X-CRM114-Status: GOOD ( 11.67 ) 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 Avoid explicit literal loads and instead, use accessor macros that generate the optimal sequence depending on the architecture revision being targeted. Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/entry-ftrace.S | 27 ++++++++------------ 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/arch/arm/kernel/entry-ftrace.S b/arch/arm/kernel/entry-ftrace.S index 67548c38a567..99720064a4c5 100644 --- a/arch/arm/kernel/entry-ftrace.S +++ b/arch/arm/kernel/entry-ftrace.S @@ -35,23 +35,20 @@ .macro __mcount suffix mcount_enter - ldr r0, =ftrace_trace_function - ldr r2, [r0] + ldr_va r2, ftrace_trace_function badr r0, .Lftrace_stub cmp r0, r2 bne 1f #ifdef CONFIG_FUNCTION_GRAPH_TRACER - ldr r1, =ftrace_graph_return - ldr r2, [r1] - cmp r0, r2 - bne ftrace_graph_caller\suffix - - ldr r1, =ftrace_graph_entry - ldr r2, [r1] - ldr r0, =ftrace_graph_entry_stub - cmp r0, r2 - bne ftrace_graph_caller\suffix + ldr_va r2, ftrace_graph_return + cmp r0, r2 + bne ftrace_graph_caller\suffix + + ldr_va r2, ftrace_graph_entry + mov_l r0, ftrace_graph_entry_stub + cmp r0, r2 + bne ftrace_graph_caller\suffix #endif mcount_exit @@ -87,8 +84,7 @@ mov r3, sp @ struct pt_regs* - ldr r2, =function_trace_op - ldr r2, [r2] @ pointer to the current + ldr_va r2, function_trace_op @ pointer to the current @ function tracing op ldr r1, [sp, #S_LR] @ lr of instrumented func @@ -141,8 +137,7 @@ ftrace_graph_regs_call: mcount_adjust_addr r0, lr @ instrumented function #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS - ldr r2, =function_trace_op - ldr r2, [r2] @ pointer to the current + ldr_va r2, function_trace_op @ pointer to the current @ function tracing op mov r3, #0 @ regs is NULL #endif -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel