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 5D871C433EF for ; Thu, 3 Feb 2022 08:24:57 +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=4rSXjgGXUMAFEa0B51bokWmhlGSgebymfZ/TU9AeMTM=; b=GhZ2pMzRxK/iN1 QMWk7MTZNAxFdh1Ir2VLpASGBNZLhCg1ew32qkXTClsH2508tnK2KbEuQGRZKvV3mx+dbNcCCkp65 hqqGU7cs4IJ91RCs4uLaPHleXB6Rjn0iOahOe4hVgDQNuBjBMuTFE9MIsVHSPgDlwS3PKCszcJCNK iwit26KzzWHIds1G/uQLOLDped3jcGydU20SRwWPs9Ptkz3efpj93RG4uJv9xB8Pnqu1hJqkm6iTK fFoWGDXf+tDAR597OQOPFyeeqw5Pz+KQPHf22gM+QqXbVoCD0fFXZWwZyOE1Ahap4Sd5CrLzpDrpN 2UqZKaU4cU2VXqNXtS3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nFXP1-000JjR-0s; Thu, 03 Feb 2022 08:23:39 +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 1nFXNs-000JIQ-Ja for linux-arm-kernel@lists.infradead.org; Thu, 03 Feb 2022 08:22:30 +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 E3095617CF; Thu, 3 Feb 2022 08:22:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10F0AC340F0; Thu, 3 Feb 2022 08:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1643876547; bh=xDpmpTHIQpLnmfSnsSvLLuOrgFpMbGex263COXIZT4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P+tZXYEIBX5/gZMDH29AafVgIpi2MmutSTytRlgViybxE0Rsxnl/NfIH9NwUg7gvj kXAPrlVNUrBCmpSoP28MChRkScMo/zyxlpjIjWjIbAzXOV5KiyRocitNNdeVMVnZ54 3A+e3wJ7rUXHjgu0S9bQmuXuWmkkYbNZAP0gMajaTYyBxfEOM7+uTQIdwyhOC6d1W9 +WJRoQybfjihONNvxm65JCpV6ZDLBj1B2AJoFaMp+UbfPpMX19dT39wjLygR0J2czz waWwLECAv1FZCS4YOGlPgzgHE+vVM/356GylszkwaaDmdu/m7U40MY080vytG6EJO0 cl9+R9Di5Feew== 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 v3 05/13] ARM: ftrace: avoid unnecessary literal loads Date: Thu, 3 Feb 2022 09:21:56 +0100 Message-Id: <20220203082204.1176734-6-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220203082204.1176734-1-ardb@kernel.org> References: <20220203082204.1176734-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2009; h=from:subject; bh=xDpmpTHIQpLnmfSnsSvLLuOrgFpMbGex263COXIZT4g=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBh+5CcJ6dPaf7+uBL/uYNMBwUbAVGYXSIFZLL/HE1h znzmAcKJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYfuQnAAKCRDDTyI5ktmPJP9mC/ 900iR4jhIFV00xG3vbFXA5VoEaMjjjIr/9jDW9kM3cGA3lcAWrGR+ltWV1EbIQUxAM5MO32kNxgmFk mEez0jlZVFLvwLsYaTvUkTAubPuznaJeoq708zKSyUhh79TJluZrVCK3TaSlA/JyG5HFaNLdOJL/9C 8K4UkiyeTAOeExBtzogohPkI3eOBCJyiw2N3oyTEtm28v0vdiPFRsZNxsDjqdNje3D0H/rPYfwlbRL 6uoOj/gnJGJ5eeKIGIT1Gr7OABjOr1QLNGZq2x8Bl+7SOMqHPmnbEmd5uqRxw+ajMjvJKJCsc0oOWV Bpu8xOM6UsOfKoh/gvyi7xYuG85IO5B8QZJxUiBgHM3g+YK7Wb0JLl0/ZuMdmhYjrdJ8gE5hLu9Met Of3LaZv4HlLgiCPKVOVKIXhbh4kQK+dSKoN6IVU6v5kQ4vko2DsWC2ALkR/wRWOl5kx5tcBjOAPz8y iApXCNL7jbt79ekMGtlCVNf6rDlbgxZvi94GCIB1+KLCU= 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-20220203_002228_768878_F0D99D9A X-CRM114-Status: GOOD ( 11.48 ) 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 Reviewed-by: Steven Rostedt (Google) --- 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