From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48PfBJYhTBQbdB9CZuoruQVjtMuyDesOGf5YGw9njWGM4AzG255PqRauhkTniGIWXsclR/C ARC-Seal: i=1; a=rsa-sha256; t=1523990331; cv=none; d=google.com; s=arc-20160816; b=vfuo6flh+truc+AS0mXTUY0Jf8tG0QFQ3f6zFLYh/rnMTB8sPifCwbicmlYRf36aH5 9c5wR64uA94lesRHwxcwZz/DueYssWEZMqcDwYrfQ8pMpkvpyFi/T4/AqLaO4c66fopj 0ZsNqSsfbrfeOFEKVxljzLrBaimmZZZRrVOdcGsTL5q+hiGFuoAlazdWRq1CHeSKzaXH xjfS6zNg/+AhZOzUualajeFBDRKFnAF7H7mT/Dw7ovhOvL7rFJyWi1S9MsxEZxJs5WyW aeMxYD9B3489hycuHU8nDsQsExPjIMhVgQ2YByucn0Oc6LhPbFvNCyd0LyMGH4csecjX CLoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :delivered-to:list-id:list-subscribe:list-unsubscribe:list-help :list-post:precedence:mailing-list:arc-authentication-results; bh=9MokD4Vczhq6ZyBMb42q4qiVtAiIrGFUOP4SNzShwx0=; b=CkewPUUomC7Ac/SFgVpmCkFwpDACp6xl+57fQAOE1s5A4VPgR39K7KX3YiFTlUdCXK a4qCccjF9VNN1KPlaEANg/58KGJB7Icr4EEi3X4x+Dy0SEON2Ee97gwVIKCNyMesAsOU SzzCoclvP5jfk1mVPqwvE93mwtYy+UliLmqpTzWXOqmYv5hfDS9525IdKVBg7Cdngiaj L6AyCNfQXjmQ9II0r90axd5bJqqV1prawrzqpxckWRmTI49Zv1AyEjwMyDAvQ3BKr7cD WpgSoKNfak3/l8jk47hTECtKVaJxDO7IfFdqty9n6MaM5DrLBS9jrXhSvtmdCWHPpDIm ZlTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of kernel-hardening-return-13019-gregkh=linuxfoundation.org@lists.openwall.com designates 195.42.179.200 as permitted sender) smtp.mailfrom=kernel-hardening-return-13019-gregkh=linuxfoundation.org@lists.openwall.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of kernel-hardening-return-13019-gregkh=linuxfoundation.org@lists.openwall.com designates 195.42.179.200 as permitted sender) smtp.mailfrom=kernel-hardening-return-13019-gregkh=linuxfoundation.org@lists.openwall.com Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm List-Post: List-Help: List-Unsubscribe: List-Subscribe: From: Mark Rutland To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, catalin.marinas@arm.com, cdall@kernel.org, drjones@redhat.com, kvmarm@lists.cs.columbia.edu, linux-arch@vger.kernel.org, marc.zyngier@arm.com, mark.rutland@arm.com, ramana.radhakrishnan@arm.com, suzuki.poulose@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, awallis@codeaurora.org, kernel-hardening@lists.openwall.com Subject: [PATCHv3 02/11] arm64/kvm: consistently handle host HCR_EL2 flags Date: Tue, 17 Apr 2018 19:37:26 +0100 Message-Id: <20180417183735.56985-3-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180417183735.56985-1-mark.rutland@arm.com> References: <20180417183735.56985-1-mark.rutland@arm.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1598019685895863114?= X-GMAIL-MSGID: =?utf-8?q?1598019685895863114?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: In KVM we define the configuration of HCR_EL2 for a VHE HOST in HCR_HOST_VHE_FLAGS, but we don't ahve a similar definition for the non-VHE host flags, and open-code HCR_RW. Further, in head.S we open-code the flags for VHE and non-VHE configurations. In future, we're going to want to configure more flags for the host, so lets add a HCR_HOST_NVHE_FLAGS defintion, adn consistently use both HCR_HOST_VHE_FLAGS and HCR_HOST_NVHE_FLAGS in the kvm code and head.S. We now use mov_q to generate the HCR_EL2 value, as we use when configuring other registers in head.S. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: Christoffer Dall Cc: Marc Zyngier Cc: Will Deacon Cc: kvmarm@lists.cs.columbia.edu --- arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/kernel/head.S | 5 ++--- arch/arm64/kvm/hyp/switch.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 6dd285e979c9..89b3dda7e3cb 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -86,6 +86,7 @@ HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \ HCR_FMO | HCR_IMO) #define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF) +#define HCR_HOST_NVHE_FLAGS (HCR_RW) #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) /* TCR_EL2 Registers bits */ diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index b0853069702f..651a06b1980f 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -494,10 +494,9 @@ ENTRY(el2_setup) #endif /* Hyp configuration. */ - mov x0, #HCR_RW // 64-bit EL1 + mov_q x0, HCR_HOST_NVHE_FLAGS cbz x2, set_hcr - orr x0, x0, #HCR_TGE // Enable Host Extensions - orr x0, x0, #HCR_E2H + mov_q x0, HCR_HOST_VHE_FLAGS set_hcr: msr hcr_el2, x0 isb diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index d9645236e474..cdae330e15e9 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -143,7 +143,7 @@ static void __hyp_text __deactivate_traps_nvhe(void) mdcr_el2 |= MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT; write_sysreg(mdcr_el2, mdcr_el2); - write_sysreg(HCR_RW, hcr_el2); + write_sysreg(HCR_HOST_NVHE_FLAGS, hcr_el2); write_sysreg(CPTR_EL2_DEFAULT, cptr_el2); } -- 2.11.0