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 DE449C48BC3 for ; Tue, 20 Feb 2024 15:41:45 +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=7ru8K/HV5BkP2VLnr7RDB1YIYLGbQy36/Q73v+/LHj4=; b=jIcXNUcckyt9in FR+o2dEJ8Fq53sOBhqU128yNIybjty0Y08KV7Mc/JZsG5+jnBqhXpj5sv1Akwn9g66X1UwaLZ5N0e CagTeENhuSh/qjnmFCcF6GsEdMpr+Od0Z3JpADKFSOo7AxDeU2WgFYc8VNIfeKOUauw24gmgW/FO3 b9sL+U0DAwMgZj/8pX1W6Ik1XGd+rHfVtp2hd/W0yO/Nryzb2LpPbg8TQvleAWztdKq64QyF3yxAM pF3m/P0JXeRe/NK8ub/tq5rtT2GzGTVFMDZ/KlN/Q/p5VOxv5L4g5mGXJ5vxtawy62fZK/WKHmZSs jUtMhoxHoECJj/P8bR+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcSFP-0000000FIqJ-1MKv; Tue, 20 Feb 2024 15:41:31 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcSFM-0000000FIpx-0sH8 for linux-arm-kernel@lists.infradead.org; Tue, 20 Feb 2024 15:41:29 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 7D05D6119A; Tue, 20 Feb 2024 15:41:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF1A7C433C7; Tue, 20 Feb 2024 15:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708443686; bh=Rc2Iumg6kJhz1u6L7ZpPNjFfPAPoH7W2SUxWAqg8m5E=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=mZaPlmEQQUUiSUzRjJyIqol1tl/YTV7EUdYOyBExz5YqU2Y8xkUbTHsKQXwsYTwmc /frQrMYW0sxg3cqgUbi4AB7Ujl8MHeGlKKt0YJDHP425MJSls1seanDFz8n5ygo2eW ERelFApqfKztnMwqLGISv0XsHx+2h8XY8C3Du/jYba++eNhbaBnEx1O6VXY+yvf6JO lKrIUgUOe1HGNQwGZ+sqWqCclNcGiEjv3C7sdP5F5n5EfkW0J/CVN6bCjeUpH5KT+v I6O4Yqk3pv0V5VOJXgx6echjsquhdaRbwbel/sMCeFORX5Kud5WxR2y5ItxDfjqnui qplq8lljQqVSg== 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 1rcSFI-004xxT-8q; Tue, 20 Feb 2024 15:41:24 +0000 Date: Tue, 20 Feb 2024 15:41:23 +0000 Message-ID: <86y1bf2lek.wl-maz@kernel.org> From: Marc Zyngier To: Joey Gouly Cc: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Will Deacon , Catalin Marinas Subject: Re: [PATCH 04/13] KVM: arm64: nv: Configure HCR_EL2 for FEAT_NV2 In-Reply-To: <20240220151600.GC8575@e124191.cambridge.arm.com> References: <20240219092014.783809-1-maz@kernel.org> <20240219092014.783809-5-maz@kernel.org> <20240220151600.GC8575@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, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, will@kernel.org, catalin.marinas@arm.com 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-20240220_074128_362274_57DC355D X-CRM114-Status: GOOD ( 36.97 ) 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 Tue, 20 Feb 2024 15:16:00 +0000, Joey Gouly wrote: > > Hi, > > On Mon, Feb 19, 2024 at 09:20:05AM +0000, Marc Zyngier wrote: > > Add the HCR_EL2 configuration for FEAT_NV2, adding the required > > bits for running a guest hypervisor, and overall merging the > > allowed bits provided by the guest. > > > > This heavily replies on unavaliable features being sanitised > > when the HCR_EL2 shadow register is accessed, and only a couple > > of bits must be explicitly disabled. > > > > Non-NV guests are completely unaffected by any of this. > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/include/asm/sysreg.h | 1 + > > arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +-- > > arch/arm64/kvm/hyp/nvhe/switch.c | 2 +- > > arch/arm64/kvm/hyp/vhe/switch.c | 34 ++++++++++++++++++++++++- > > 4 files changed, 36 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h > > index 9e8999592f3a..a5361d9032a4 100644 > > --- a/arch/arm64/include/asm/sysreg.h > > +++ b/arch/arm64/include/asm/sysreg.h > > @@ -498,6 +498,7 @@ > > #define SYS_TCR_EL2 sys_reg(3, 4, 2, 0, 2) > > #define SYS_VTTBR_EL2 sys_reg(3, 4, 2, 1, 0) > > #define SYS_VTCR_EL2 sys_reg(3, 4, 2, 1, 2) > > +#define SYS_VNCR_EL2 sys_reg(3, 4, 2, 2, 0) > > > > #define SYS_TRFCR_EL2 sys_reg(3, 4, 1, 2, 1) > > #define SYS_VNCR_EL2 sys_reg(3, 4, 2, 2, 0) > > I'm seeing double! (SYS_VNCR_EL2 is already defined a few lines > down) Ah, it got added by Miguel and my rebase didn't weed it out. It also doesn't help that SYS_TRFCR_EL2 is out of sequence... Anyway, I'll drop this, thanks for spotting it. > > > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h > > index e3fcf8c4d5b4..f5f701f309a9 100644 > > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > > @@ -271,10 +271,8 @@ static inline void __deactivate_traps_common(struct kvm_vcpu *vcpu) > > __deactivate_traps_hfgxtr(vcpu); > > } > > > > -static inline void ___activate_traps(struct kvm_vcpu *vcpu) > > +static inline void ___activate_traps(struct kvm_vcpu *vcpu, u64 hcr) > > { > > - u64 hcr = vcpu->arch.hcr_el2; > > - > > if (cpus_have_final_cap(ARM64_WORKAROUND_CAVIUM_TX2_219_TVM)) > > hcr |= HCR_TVM; > > > > diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c > > index c50f8459e4fc..4103625e46c5 100644 > > --- a/arch/arm64/kvm/hyp/nvhe/switch.c > > +++ b/arch/arm64/kvm/hyp/nvhe/switch.c > > @@ -40,7 +40,7 @@ static void __activate_traps(struct kvm_vcpu *vcpu) > > { > > u64 val; > > > > - ___activate_traps(vcpu); > > + ___activate_traps(vcpu, vcpu->arch.hcr_el2); > > __activate_traps_common(vcpu); > > > > val = vcpu->arch.cptr_el2; > > diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c > > index 58415783fd53..29f59c374f7a 100644 > > --- a/arch/arm64/kvm/hyp/vhe/switch.c > > +++ b/arch/arm64/kvm/hyp/vhe/switch.c > > @@ -33,11 +33,43 @@ DEFINE_PER_CPU(struct kvm_host_data, kvm_host_data); > > DEFINE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); > > DEFINE_PER_CPU(unsigned long, kvm_hyp_vector); > > > > +/* > > + * HCR_EL2 bits that the NV guest can freely change (no RES0/RES1 > > + * semantics, irrespective of the configuration), but that cannot be > > + * applied to the actual HW as things would otherwise break badly. > > + * > > + * - TGE: we want to use EL1, which is incompatible with it being set > > Can you make this a bit clearer: > > we want the guest to use EL1 > > Assuming I've understood correctly. I first read it as 'we' == kvm. Sure thing, happy to update that. >> > + * > > + * - API/APK: for hysterical raisins, we enable PAuth lazily, which > > + * means that the guest's bits cannot be directly applied (we really > > + * want to see the traps). Revisit this at some point. > > + */ > > +#define NV_HCR_GUEST_EXCLUDE (HCR_TGE | HCR_API | HCR_APK) > > + > > +static u64 __compute_hcr(struct kvm_vcpu *vcpu) > > +{ > > + u64 hcr = vcpu->arch.hcr_el2; > > + > > + if (!vcpu_has_nv(vcpu)) > > + return hcr; > > + > > + if (is_hyp_ctxt(vcpu)) { > > + hcr |= HCR_NV | HCR_NV2 | HCR_AT | HCR_TTLB; > > + > > + if (!vcpu_el2_e2h_is_set(vcpu)) > > + hcr |= HCR_NV1; > > + > > + write_sysreg_s(vcpu->arch.ctxt.vncr_array, SYS_VNCR_EL2); > > + } > > + > > + return hcr | (__vcpu_sys_reg(vcpu, HCR_EL2) & ~NV_HCR_GUEST_EXCLUDE); > > +} > > + > > static void __activate_traps(struct kvm_vcpu *vcpu) > > { > > u64 val; > > > > - ___activate_traps(vcpu); > > + ___activate_traps(vcpu, __compute_hcr(vcpu)); > > > > if (has_cntpoff()) { > > struct timer_map map; > > Otherwise, > > Reviewed-by: Joey Gouly Thanks! 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