From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9F93C47422 for ; Fri, 26 Jan 2024 09:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xzccjYO4visXLp23/T83VIl+oTKszDhFohYLHi6AOF4=; b=H2LN//PqVapKGi YSTTic2Ko21urzV2ODn2JZIZFAwRUPRkgtCz42L4qKROwMMw6czYhQLKFcO+ZtocJdUOYTyfqMQpD aXi8Zo+5HbDtqWgb60KBbybFuueeXDE4EuWatI8p+sDExZooVKxzdenGtOV4VNnBRn4YURqPy6mpT rZd0ypM+UsX1m9HjGIzt1ZMvgWaoTLQXRPtuBCojmG6K/eytgU5lqvvXT15ZRKmo5bOv0PKz0YXXh Hx1vSsrfa6wAdhuZu+dQRA7AeDfKXCzz8a4+/e+OPQ/7i+qTH88q5Dvs7Xrq4rpRQMcs/BGYY6Hg+ PEwUv27Tpz2GTDnX94yw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTIKr-00000003cDt-1MQK; Fri, 26 Jan 2024 09:17:17 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTIKo-00000003cBk-3j5J for linux-arm-kernel@lists.infradead.org; Fri, 26 Jan 2024 09:17:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 26CA4CE369E; Fri, 26 Jan 2024 09:17:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 765E3C433C7; Fri, 26 Jan 2024 09:17:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706260627; bh=1Hr0IDqCophLPAljtjPEqz3Du6URIPG9nybTZtoKW/g=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=dSPGu/9Iw3Su4/RzWYsYjlBbWpAWDyC+eNKLehLUnn0uv2URSMek/2c+3sHjqq6FY vDm8zsCpr0a8vqFv6XYkJvQE7KMOBKtBg6r7vTahtQy6wetKz4RQcrP6Uqfa+2gEzD QB90r50XwRCXsLPeMLWFcwNDgx4D3wxxM66V/njGuce/YqJsoxHdaTicjL3WfKSTGO PkuvkVQC3Xg7p66tMeF/ZkUYUlYtdbnbx18WPQrltQGsxQUM0F/lSwwdfpXBhFX576 EmDTmhY3s5B7qfzDlnGho59OdaSulz+9vdqAW4eiDuWVaBmhKd3L/Jf7TbVBoNlsl3 YIW0wTQw/rIew== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rTIKf-00Ezch-7K; Fri, 26 Jan 2024 09:17:05 +0000 Date: Fri, 26 Jan 2024 09:17:04 +0000 Message-ID: <86wmrw78tr.wl-maz@kernel.org> From: Marc Zyngier To: Joey Gouly Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Catalin Marinas , Will Deacon , Mark Brown Subject: Re: [PATCH 24/25] KVM: arm64: Make FEAT_MOPS UNDEF if not advertised to the guest In-Reply-To: <20240125162538.GF1535978@e124191.cambridge.arm.com> References: <20240122201852.262057-1-maz@kernel.org> <20240122201852.262057-25-maz@kernel.org> <20240125162538.GF1535978@e124191.cambridge.arm.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: joey.gouly@arm.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, broonie@kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240126_011715_313955_B5F3D24A X-CRM114-Status: GOOD ( 26.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 25 Jan 2024 16:25:38 +0000, Joey Gouly wrote: > > On Mon, Jan 22, 2024 at 08:18:51PM +0000, Marc Zyngier wrote: > > We unconditionally enable FEAT_MOPS, which is obviously wrong. > > > > So let's only do that when it is advertised to the guest. > > Which means we need to rely on a per-vcpu HCRX_EL2 shadow register. > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/include/asm/kvm_arm.h | 4 +--- > > arch/arm64/include/asm/kvm_host.h | 1 + > > arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- > > arch/arm64/kvm/sys_regs.c | 8 ++++++++ > > 4 files changed, 11 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h > > index 3c6f8ba1e479..a1769e415d72 100644 > > --- a/arch/arm64/include/asm/kvm_arm.h > > +++ b/arch/arm64/include/asm/kvm_arm.h > > @@ -102,9 +102,7 @@ > > #define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC) > > #define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) > > > > -#define HCRX_GUEST_FLAGS \ > > - (HCRX_EL2_SMPME | HCRX_EL2_TCR2En | \ > > - (cpus_have_final_cap(ARM64_HAS_MOPS) ? (HCRX_EL2_MSCEn | HCRX_EL2_MCE2) : 0)) > > +#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME | HCRX_EL2_TCR2En) > > #define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En) > > > > /* TCR_EL2 Registers bits */ > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > > index fe5ed4bcded0..22343354db3e 100644 > > --- a/arch/arm64/include/asm/kvm_host.h > > +++ b/arch/arm64/include/asm/kvm_host.h > > @@ -584,6 +584,7 @@ struct kvm_vcpu_arch { > > > > /* Values of trap registers for the guest. */ > > u64 hcr_el2; > > + u64 hcrx_el2; > > u64 mdcr_el2; > > u64 cptr_el2; > > > > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h > > index 2d5891518006..e3fcf8c4d5b4 100644 > > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > > @@ -236,7 +236,7 @@ static inline void __activate_traps_common(struct kvm_vcpu *vcpu) > > write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2); > > > > if (cpus_have_final_cap(ARM64_HAS_HCX)) { > > - u64 hcrx = HCRX_GUEST_FLAGS; > > + u64 hcrx = vcpu->arch.hcrx_el2; > > if (vcpu_has_nv(vcpu) && !is_hyp_ctxt(vcpu)) { > > u64 clr = 0, set = 0; > > > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > > index afe6975fcf5c..b7977e08e4ef 100644 > > --- a/arch/arm64/kvm/sys_regs.c > > +++ b/arch/arm64/kvm/sys_regs.c > > @@ -3952,6 +3952,14 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) > > if (!kvm_has_feat(kvm, ID_AA64ISAR0_EL1, TLB, OS)) > > vcpu->arch.hcr_el2 |= HCR_TTLBOS; > > > > + if (cpus_have_final_cap(ARM64_HAS_HCX)) { > > + vcpu->arch.hcrx_el2 = HCRX_GUEST_FLAGS; > > + > > + if (kvm_has_feat(kern_hyp_va(vcpu->kvm), > > Not sure if the use of kern_hyp_va is intentional, seems out of place since we > use the bare `kvm` variable everyone else. That's totally wrong. No idea where that came from... Thanks for spotting it! M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel