From patchwork Mon Aug 14 12:53:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9898843 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BE3DC602BA for ; Mon, 14 Aug 2017 12:58:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2981285E3 for ; Mon, 14 Aug 2017 12:58:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7729285FD; Mon, 14 Aug 2017 12:58:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2CDE9285E3 for ; Mon, 14 Aug 2017 12:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=jaI6QQaS8982abMEPSCY/XBSiw38zFxdP2bZVVfGCGk=; b=KJ48CLC6lTLgz3q/mfbOpX1WOZ xtLQsHYH9InYiXJFN5kawfUD5sigNfLf/Dt97BNxigjncKp7G+Q5J2M3O7me9LEsB+RvEeV9HY5GM NVMnTkST/x4zo+wcc31Smh95SmchSz7b5T0G6DzHkIWRjvtr2Vniq2uxf1+1MrhTWdW+CkmL3o0ja qGmFgjDPqVqNqvP4s9D2dFxPf6rN3jZtzZPdGv8C0aqLk5elc4WkYzRr2Ta0ZZcTINegYj70Vejda /2W1MPtvLjbtCBbHlwm2IIzE6/Ckr4/Zq6IxKrddaFwU9aht0QW40JQwXHs1xfGWUoPAEfslupL5L KgoPnsjw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dhEwx-0001UM-M0; Mon, 14 Aug 2017 12:58:31 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dhEtk-0006LM-Tx for linux-arm-kernel@lists.infradead.org; Mon, 14 Aug 2017 12:55:17 +0000 Received: by mail-wm0-x236.google.com with SMTP id k20so16908247wmg.0 for ; Mon, 14 Aug 2017 05:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qVwwZv5cVJLFrFIZWKPDugl12/5aWWtNTrDvraSpoBo=; b=euzTBZLGRFamWmAo9ypy7cr4i1BdxKMJ7mrXHArNNZprR9g5/1JgIkSfWmd0qT48i+ vVQaOHDG2YRAZqwY002gT5bZz6M1oASeXrPXX6KdDqH8uhUefuZwlpo2o0KgDfkyQgGs maQidx9KeR8h10YUH+/9OUAmdI2myaMbhavGw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qVwwZv5cVJLFrFIZWKPDugl12/5aWWtNTrDvraSpoBo=; b=nmippuElj+jRCJo7GdcyXzi0zq95mA1ab0lgu74r/LEn52dnduLxEA4D85DMiqJ/pW 0GiOkU+VoFcY76qc6TZTtorvymHDBjI6TIfm7XzAthOKoQDv9hl7BHUwTHUwmccaI9CT Q0hLJSNAPjTfUYsOojKCpbDziD+VRamYdH33QPkGfvLj7ErCbr2s0IUjFVrwVooxKleT 83TjZZCtRPG4ihFjNBj2MfSAe/KMLcF4Tz+anFaviPkwI8zfh9J1xxVVULNFlEVAVAiu dAX1oruvFfhiCwt1uxwLiEmz5a7i3vv0wddiOsbtseU1GwbGMBt9W81mNJAOHXAw5YFw gXjg== X-Gm-Message-State: AHYfb5g15Pb87kEONgWLwTLQ/WqNbCJMWAg+RPB0Vn1bgJEeK0wXssxS hdXF5VZAZd3TsMOR X-Received: by 10.28.32.208 with SMTP id g199mr3587531wmg.180.1502715291537; Mon, 14 Aug 2017 05:54:51 -0700 (PDT) Received: from localhost.localdomain ([154.146.161.128]) by smtp.gmail.com with ESMTPSA id 91sm7981360wrg.83.2017.08.14.05.54.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Aug 2017 05:54:50 -0700 (PDT) From: Ard Biesheuvel To: kernel-hardening@lists.openwall.com Subject: [PATCH 08/30] ARM: sleep.S: use PC-relative insn sequence for sleep_save_sp/mpidr_hash Date: Mon, 14 Aug 2017 13:53:49 +0100 Message-Id: <20170814125411.22604-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814125411.22604-1-ard.biesheuvel@linaro.org> References: <20170814125411.22604-1-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170814_055513_372368_7ADA6A0C X-CRM114-Status: GOOD ( 10.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Arnd Bergmann , Nicolas Pitre , Marc Zyngier , Ard Biesheuvel , Russell King , Dave Martin , Tony Lindgren , Matt Fleming , Thomas Garnier , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Replace the open coded PC relative offset calculations with adr_l and ldr_l invocations. Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/sleep.S | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 0f6c1000582c..3026b119d3ff 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -137,9 +137,8 @@ ARM_BE8(setend be) @ ensure we are in BE mode mov r1, #0 ALT_SMP(mrc p15, 0, r0, c0, c0, 5) ALT_UP_B(1f) - adr r2, mpidr_hash_ptr - ldr r3, [r2] - add r2, r2, r3 @ r2 = struct mpidr_hash phys address + adr_l r2, mpidr_hash @ r2 = struct mpidr_hash phys address + /* * This ldmia relies on the memory layout of the mpidr_hash * struct mpidr_hash. @@ -147,10 +146,7 @@ ARM_BE8(setend be) @ ensure we are in BE mode ldmia r2, { r3-r6 } @ r3 = mpidr mask (r4,r5,r6) = l[0,1,2] shifts compute_mpidr_hash r1, r4, r5, r6, r0, r3 1: - adr r0, _sleep_save_sp - ldr r2, [r0] - add r0, r0, r2 - ldr r0, [r0, #SLEEP_SAVE_SP_PHYS] + ldr_l r0, sleep_save_sp + SLEEP_SAVE_SP_PHYS ldr r0, [r0, r1, lsl #2] @ load phys pgd, stack, resume fn @@ -164,12 +160,6 @@ ENDPROC(cpu_resume) ENDPROC(cpu_resume_arm) #endif - .align 2 -_sleep_save_sp: - .long sleep_save_sp - . -mpidr_hash_ptr: - .long mpidr_hash - . @ mpidr_hash struct offset - .data .type sleep_save_sp, #object ENTRY(sleep_save_sp)