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 DFD77C433EF for ; Mon, 31 Jan 2022 17:20:32 +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=ytb0ibTPOPqc3KkAzdP0NU/BoJ3ZU9NH/3nCIKEWadE=; b=JdIP51B6TgLtkQ Rv7jMoG5byvrAJRTeGX2OS4cNZK2nifD7tExIZxPJr9DganOUxuYf8DdpC1BF6vA73THPR7wFnWgl Dcya89J8jzQpVBZoqlcWWdyg7KUFfx6d8/yhRBxz3zDp4XMuMzVmY+YzZJnNbMoqv9KoWvnYQ/y7H /n4kidaBqW/QiIiYZDQ/y9A475TLUGCi/Ci2VBZ2eqLtJ8bJNIHofTtAi6ZT7iIS2ZD7VZwt+CbXC 8GCZLv0eQORl9JmmSMoK26lxK3YcC38RQD+jxzX4kNavRbwqbPzccz8eTUivEore+R1fUYLbEo0s3 DBhp8VbPntLpTAoVxwCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nEaKK-00A3kZ-NL; Mon, 31 Jan 2022 17:18:53 +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 1nEa65-009zHG-1A for linux-arm-kernel@lists.infradead.org; Mon, 31 Jan 2022 17:04:11 +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 4CA4560C84; Mon, 31 Jan 2022 17:04:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDE71C340F4; Mon, 31 Jan 2022 17:04:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643648648; bh=i+qZfuPbJSRYxt+Bc4EnZ6uv7lO4HGz90HkVzD07Vp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHQCYZUkTu+8ltDBCA177jiQDZ816GQc6dK8ukEKx2/DTmP9GXUM7k30gkHfWUjR+ fxICdIeefP8cFuMvvCVyBgnxp3eCAqCRuKzmM1u40vr5oXa5lnVWicC/znHNm0UhG7 NWYNqn78rRNEguQY3Rw8zGu6B9cbkUDWcJwC2AaKpu6pBN+no7O4ITi+iEWnPP6mAV HKO87H7AzPw7QocOQ/FXe6Ufky7kN7RGnZC2RE+m6P8frX3Rq9XRTto2lXoKhEhL3T bQNqOuN0sXqKQEDynBPSx5m3o8/MJdG3ty5uek+Z69XHLAwuEtHjJKdfmARP1UjyJt zaVRYV9fgQkLA== From: Ard Biesheuvel To: linux@armlinux.org.uk Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Steven Rostedt , Sudeep Holla , Cristian Marussi , Nathan Chancellor , Nick Desaulniers , Arnd Bergmann , Linus Walleij , Masami Hiramatsu Subject: [PATCH v2 05/12] ARM: ftrace: avoid unnecessary literal loads Date: Mon, 31 Jan 2022 18:03:40 +0100 Message-Id: <20220131170347.381551-6-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220131170347.381551-1-ardb@kernel.org> References: <20220131170347.381551-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1949; h=from:subject; bh=i+qZfuPbJSRYxt+Bc4EnZ6uv7lO4HGz90HkVzD07Vp8=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh+BZkfcr01Fih32niE9OJMxTeB/fym07LvfVU1GPn ACvydUqJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYfgWZAAKCRDDTyI5ktmPJL8fC/ wIvEX9hf/qo32DPRSGPsVkI+4fXmfzKAfrQuEeCU/mRefoF8YgSgF0el+fX+OP1M+SsqOQmvI8EZVB jCo8aZ/5QUUrhmkDvR/moFJ1X6+IlxgoQODWKoJCcmsNirRvgyrAeJQjUPEmhUlVyOfmSVJUmwJqW8 crcMnpPudRfj4F+x5Eh/voN8Qmd6sPdf7aMe6L42yopyDnMCJcVYHNXCuJABw1EN5GhlE2ZSPHfs4p fPtgklzskbViR5YSDdTP0bxFj41gfC/Hfcwgu5jvImMCyqdg13IRQzJepuIbY0l6CVqH/N4LolIKnO WEB94w7yomZi4DgkdhJTCtngIgfEXYBiaMTxKrYfbqUjvRKQZUf9cuKqGWKHEwnqnHoJ3yo6B0fC75 c3a/XbSFuN6USXM7M0Na1jQymCF9NsRYBUxBr3CRIZFK9KuUOgriOjV67lFvIuy7OukKwhjg90VDpu T9ZivdLsTsZcr4RD33b5dDgRL01rT72/67RWuKdpwlxTs= 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-20220131_090409_207208_BA83162D X-CRM114-Status: GOOD ( 11.53 ) 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 Reviewed-by: Nick Desaulniers --- 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