From patchwork Tue Feb 27 11:33:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10244903 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 9C74E60208 for ; Tue, 27 Feb 2018 11:36:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91A3828843 for ; Tue, 27 Feb 2018 11:36:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 866F728846; Tue, 27 Feb 2018 11:36:29 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBF3828843 for ; Tue, 27 Feb 2018 11:36:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752956AbeB0Lep (ORCPT ); Tue, 27 Feb 2018 06:34:45 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:53073 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932088AbeB0Lek (ORCPT ); Tue, 27 Feb 2018 06:34:40 -0500 Received: by mail-wm0-f67.google.com with SMTP id t3so23398241wmc.2 for ; Tue, 27 Feb 2018 03:34:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=christofferdall-dk.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=cDxy0xqmMalPFjt5Bc9PYKHeMzbcZ4R8NYuPgSFNL64=; b=HdrmyhaPMi2sunyf+2MtL3QtF9pSUWH7ZAZWoYqFLrBIzJJtj/raSEEv7eXfs78TkQ ZCotv/MAZvpzvJEznz4Qsm/d5bYwgwljNSxPg94GycXRn+gepcLy8QG1gqWj02hZLzLt 7nEjECZoaA8ODaRH/MJpUWWTzH6ZCSQ62o9hReYQwnfqvCUoS1GbFER4Bd19rslZWULC YH9XAMieAqui9N8lF0W+DVrp+KDRzK2x1o3H2dSUI9p3rre8r0ZTOlUO3GV3yiz3ra73 csEy/rpUA/caw5cDoeMeNhxDDEiVs1tnyXW0Hq1bzyY4Z/7WA5BqsplciZRIqDUmBVee 7UgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=cDxy0xqmMalPFjt5Bc9PYKHeMzbcZ4R8NYuPgSFNL64=; b=bdA095EYFn37/3zGpYKjfbkQC/NbEPSvh+AdVePPJoO7Ja2Q0m4YPUqh6P9xnmgr2L uh5pC/pOYy974zr1YHoyOVxWX33aOWyMzTUiJXp+/Dz3oP8+AEhXOZ6ryjbACgHgYrcH CfshB0o8M0PV3XFD9czk8ux4WS/NIsaB4bTSz124M1DceW8UUxbqhgE0TEmPoQw4BkL+ 0igeZX+NFCk1oDvyHI3SDhqmA62oDcFRHpz+xgASdY+F0rLPeKZX2SWTbwEuqbtLxuuE oHSzz9JQxYMSjcfdXm4LK93zU3+mXlbTrpo6K4L5yURzf3iORxDU7Q9XwEoyNXMHe6Gt sDug== X-Gm-Message-State: APf1xPCwm6LUQXsegiN6T14I+zsgnYrCsRRopv47c+ql1n85xYD5G4aY IyyHuA+Ng2Z8uF4IyAnE8E3OoA== X-Google-Smtp-Source: AH8x226bfpie/TSyDYT0hpP7DCJMrYTvOEsoIVnT7VsIxoEFOHptiBEj265looGSiNQxIxEXJW6+Tg== X-Received: by 10.80.137.215 with SMTP id h23mr18376213edh.302.1519731279476; Tue, 27 Feb 2018 03:34:39 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id m1sm9176786ede.39.2018.02.27.03.34.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 03:34:38 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kvm@vger.kernel.org, Marc Zyngier , Andrew Jones , Shih-Wei Li , Dave Martin , Julien Grall , Tomasz Nowicki , Yury Norov Subject: [PATCH v5 05/40] KVM: arm64: Move HCR_INT_OVERRIDE to default HCR_EL2 guest flag Date: Tue, 27 Feb 2018 12:33:54 +0100 Message-Id: <20180227113429.637-6-cdall@kernel.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180227113429.637-1-cdall@kernel.org> References: <20180227113429.637-1-cdall@kernel.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shih-Wei Li We always set the IMO and FMO bits in the HCR_EL2 when running the guest, regardless if we use the vgic or not. By moving these flags to HCR_GUEST_FLAGS we can avoid one of the extra save/restore operations of HCR_EL2 in the world switch code, and we can also soon get rid of the other one. This is safe, because even though the IMO and FMO bits control both taking the interrupts to EL2 and remapping ICC_*_EL1 to ICV_*_EL1 when executed at EL1, as long as we ensure that these bits are clear when running the EL1 host, we're OK, because we reset the HCR_EL2 to only have the HCR_RW bit set when returning to EL1 on non-VHE systems. Reviewed-by: Marc Zyngier Signed-off-by: Shih-Wei Li Signed-off-by: Christoffer Dall --- Notes: Changes since v3: - Slightly reworded the commit message arch/arm64/include/asm/kvm_arm.h | 4 ++-- arch/arm64/kvm/hyp/switch.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 1b438c334463..6dd285e979c9 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -83,9 +83,9 @@ */ #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \ HCR_TVM | HCR_BSU_IS | HCR_FB | HCR_TAC | \ - HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR) + 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_INT_OVERRIDE (HCR_FMO | HCR_IMO) #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) /* TCR_EL2 Registers bits */ diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index 579d9a263853..4117717548b0 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -174,8 +174,6 @@ static void __hyp_text __vgic_save_state(struct kvm_vcpu *vcpu) __vgic_v3_save_state(vcpu); else __vgic_v2_save_state(vcpu); - - write_sysreg(read_sysreg(hcr_el2) & ~HCR_INT_OVERRIDE, hcr_el2); } static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu) @@ -183,7 +181,6 @@ static void __hyp_text __vgic_restore_state(struct kvm_vcpu *vcpu) u64 val; val = read_sysreg(hcr_el2); - val |= HCR_INT_OVERRIDE; val |= vcpu->arch.irq_lines; write_sysreg(val, hcr_el2);