From patchwork Fri Aug 12 15:27:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 9277287 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 0F60060752 for ; Fri, 12 Aug 2016 15:28:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01CA928A52 for ; Fri, 12 Aug 2016 15:28:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA50128A56; Fri, 12 Aug 2016 15:28:39 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id A250128A56 for ; Fri, 12 Aug 2016 15:28:38 +0000 (UTC) Received: (qmail 32409 invoked by uid 550); 12 Aug 2016 15:28:22 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: kernel-hardening@lists.openwall.com Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 30717 invoked from network); 12 Aug 2016 15:28:09 -0000 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org Cc: kernel-hardening@lists.openwall.com, Will Deacon , James Morse , Kees Cook Date: Fri, 12 Aug 2016 16:27:41 +0100 Message-Id: <1471015666-23125-3-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471015666-23125-1-git-send-email-catalin.marinas@arm.com> References: <1471015666-23125-1-git-send-email-catalin.marinas@arm.com> Subject: [kernel-hardening] [PATCH 2/7] arm64: Factor out TTBR0_EL1 setting into a specific asm macro X-Virus-Scanned: ClamAV using ClamSMTP This patch takes the TTBR0_EL1 setting code out of cpu_do_switch_mm into a dedicated cpu_set_ttbr0 macro which will be reused in a subsequent patch. Cc: Will Deacon Cc: James Morse Cc: Kees Cook Signed-off-by: Catalin Marinas --- arch/arm64/include/asm/assembler.h | 25 +++++++++++++++++++++++++ arch/arm64/mm/proc.S | 16 +--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index bbed373f4ab7..039db634a693 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -352,6 +352,31 @@ alternative_endif .endm /* + * TTBR0_EL1 update macro. + */ + .macro cpu_set_ttbr0, ttbr0, errata = 0, ret = 0 + msr ttbr0_el1, \ttbr0 + isb + .if \errata +alternative_if_not ARM64_WORKAROUND_CAVIUM_27456 + .if \ret + ret + .endif + nop + nop + nop +alternative_else + ic iallu + dsb nsh + isb + .if \ret + ret + .endif +alternative_endif + .endif + .endm + +/* * User access enabling/disabling macros. */ .macro uaccess_disable, tmp1 diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 5bb61de23201..442ade0f44eb 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -25,8 +25,6 @@ #include #include #include -#include -#include #ifdef CONFIG_ARM64_64K_PAGES #define TCR_TG_FLAGS TCR_TG0_64K | TCR_TG1_64K @@ -123,19 +121,7 @@ ENDPROC(cpu_do_resume) ENTRY(cpu_do_switch_mm) mmid x1, x1 // get mm->context.id bfi x0, x1, #48, #16 // set the ASID - msr ttbr0_el1, x0 // set TTBR0 - isb -alternative_if_not ARM64_WORKAROUND_CAVIUM_27456 - ret - nop - nop - nop -alternative_else - ic iallu - dsb nsh - isb - ret -alternative_endif + cpu_set_ttbr0 x0, errata = 1, ret = 1 ENDPROC(cpu_do_switch_mm) .pushsection ".idmap.text", "ax"