From patchwork Fri Nov 7 14:12:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 40408 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3952E24237 for ; Fri, 7 Nov 2014 14:17:21 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf3041128lam.0 for ; Fri, 07 Nov 2014 06:17:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=NTUlKRnMIIJhuGWkUiKy3GHrjRRWflE7lZCHyJCEeUw=; b=Vfz2HA2d1O1X7g3URsT2p4cdXGZ02fp3mia2AFqXRr/1icToG7NCxl5BBdmvS0KgFA ou1r5o4erKOiAzN/bn6qMEBocoxU2Al4FOHNmyMEmato5WViXTuLr+BP9wFEYmNPHiJ8 BkphSnJrtYtLIx/G+HQ/Jye5btn7vwjLZWDVyCxYY2pP57nxnYrpAlO+EUiQX13CL75D 3QlhMCyZmd6wL4pvIb8uP5C1xA5elJIUP29hNeY+H6QoejDxT7U3b6nAPDlPu2narq2o H/oBIKH6rN2s6J5/66704C81xfruRHTt23QY/QWgSWZljy5lhNinC1Zbgwc9u842c+lo pp/Q== X-Gm-Message-State: ALoCoQkFB0EbI9hJQ4ZvmEHPxzxs9iglFNxdTyeIGrrZHAovz2YHPlepZXl2RaBLSxkD9A09Y1CX X-Received: by 10.112.254.226 with SMTP id al2mr1981577lbd.1.1415369839864; Fri, 07 Nov 2014 06:17:19 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.133 with SMTP id r5ls190484laa.65.gmail; Fri, 07 Nov 2014 06:17:19 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr11673939laa.32.1415369839655; Fri, 07 Nov 2014 06:17:19 -0800 (PST) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id bn10si15150657lbc.108.2014.11.07.06.17.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 06:17:19 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id n15so2682803lbi.20 for ; Fri, 07 Nov 2014 06:17:19 -0800 (PST) X-Received: by 10.152.42.226 with SMTP id r2mr11477355lal.29.1415369839183; Fri, 07 Nov 2014 06:17:19 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp203934lbc; Fri, 7 Nov 2014 06:17:18 -0800 (PST) X-Received: by 10.66.162.37 with SMTP id xx5mr12574130pab.10.1415369837640; Fri, 07 Nov 2014 06:17:17 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id dr2si9213473pdb.66.2014.11.07.06.17.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Nov 2014 06:17:17 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmkJW-0002LC-UP; Fri, 07 Nov 2014 14:14:58 +0000 Received: from mail-wi0-f175.google.com ([209.85.212.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XmkHY-0008VG-Jt for linux-arm-kernel@lists.infradead.org; Fri, 07 Nov 2014 14:12:57 +0000 Received: by mail-wi0-f175.google.com with SMTP id ex7so4660295wid.8 for ; Fri, 07 Nov 2014 06:12:31 -0800 (PST) X-Received: by 10.194.89.161 with SMTP id bp1mr17207123wjb.114.1415369551101; Fri, 07 Nov 2014 06:12:31 -0800 (PST) Received: from ards-macbook-pro.local (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by mx.google.com with ESMTPSA id kn5sm4399444wjb.48.2014.11.07.06.12.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 06:12:30 -0800 (PST) From: Ard Biesheuvel To: will.deacon@arm.com, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com Subject: [PATCH 1/2] arm64: ftrace: eliminate literal pool entries Date: Fri, 7 Nov 2014 15:12:33 +0100 Message-Id: <1415369554-7444-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141107_061256_833178_1A93AEF3 X-CRM114-Status: UNSURE ( 7.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.175 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.175 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: marc.zyngier@arm.com, christoffer.dall@linaro.org, Ard Biesheuvel X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Replace ldr xN, = with adrp/add or adrp/ldr [as appropriate] in the implementation of _mcount(), which may be called very often. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/entry-ftrace.S | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/entry-ftrace.S b/arch/arm64/kernel/entry-ftrace.S index 38e704e597f7..08cafc518b9a 100644 --- a/arch/arm64/kernel/entry-ftrace.S +++ b/arch/arm64/kernel/entry-ftrace.S @@ -98,8 +98,8 @@ ENTRY(_mcount) mcount_enter - ldr x0, =ftrace_trace_function - ldr x2, [x0] + adrp x0, ftrace_trace_function + ldr x2, [x0, #:lo12:ftrace_trace_function] adr x0, ftrace_stub cmp x0, x2 // if (ftrace_trace_function b.eq skip_ftrace_call // != ftrace_stub) { @@ -115,14 +115,15 @@ skip_ftrace_call: // return; mcount_exit // return; // } skip_ftrace_call: - ldr x1, =ftrace_graph_return - ldr x2, [x1] // if ((ftrace_graph_return - cmp x0, x2 // != ftrace_stub) - b.ne ftrace_graph_caller - - ldr x1, =ftrace_graph_entry // || (ftrace_graph_entry - ldr x2, [x1] // != ftrace_graph_entry_stub)) - ldr x0, =ftrace_graph_entry_stub + adrp x1, ftrace_graph_return + ldr x2, [x1, #:lo12:ftrace_graph_return] + cmp x0, x2 // if ((ftrace_graph_return + b.ne ftrace_graph_caller // != ftrace_stub) + + adrp x1, ftrace_graph_entry // || (ftrace_graph_entry + adrp x0, ftrace_graph_entry_stub // != ftrace_graph_entry_stub)) + ldr x2, [x1, #:lo12:ftrace_graph_entry] + add x0, x0, #:lo12:ftrace_graph_entry_stub cmp x0, x2 b.ne ftrace_graph_caller // ftrace_graph_caller();