Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DB1080056 for ; Tue, 23 Jan 2024 17:51:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706032267; cv=none; b=J7k0DErKsib8Jgd5Ez0Ra687sWuYJRBYgIO6y7mzkf7zqmBQut3C+LyU8mnOYbo+1BVhlujK7ICPHPH7TjXL/9Pg2Ml11fMd8gE29mjGifjb4lmBcLbHik+gkgChATir6aTzNfJ8v5Kz7FAiPDQf/VM5ePwNcbG7s360Sl9WiJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706032267; c=relaxed/simple; bh=ZA93uUf4beZQzrMSYOnNWGgILljsW3Qv9sFJiHqaGuM=; h=Date:Message-ID:From:To:Cc:Subject:In-Reply-To:References: MIME-Version:Content-Type; b=ahhS/XjQ0m9KqaxxKH9AWJD4A+XBDblAZzsxuLnrJ/rzPzc9mOBua8SNMZgUiFsJssvR0RfrTrLYw/5E/ZgOx8cvKJsAJd9g1RufxVoxTyfZSWMLyoKUO3u8K2BTJdEST0RP11qyH9VxyCKNTZxo+6MCMiHFxtau6/3cs3yRj84= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pc7XGE1/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pc7XGE1/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B3A3C433C7; Tue, 23 Jan 2024 17:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706032267; bh=ZA93uUf4beZQzrMSYOnNWGgILljsW3Qv9sFJiHqaGuM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=pc7XGE1/AY0odCr2LK4xfrel0A/aDUcsrzHbn6TXTvrpLP5v/iRE5m8qHc/rB4ObD ZiChQ0gVe22cVQxzGG6K9KRKvXjqF0/ZziKqrNcHSS5lpiHCjigbxF5E2hvPcrOs9T 2sqAtY/GUmaYVqPUgzvQPBqzehHTBU2OUDA6niIGyX9wFhJVnGcfCTfls9Sc6Q96xK 2wMtpYbtVV5696rryrmxePaALAonm6pzIyKbJHkPwkvKEm4EaxR+uMcKvL9cGsB+BO Z6jrSTC/D3FZdu5bDjolJVqUmufdqfLNFVrLPa6QI+FeWxFDg93o94v4Wj1AISdLIb A/rEnDnRN7c/A== 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 1rSKvQ-00E4cu-Jl; Tue, 23 Jan 2024 17:51:04 +0000 Date: Tue, 23 Jan 2024 17:51:03 +0000 Message-ID: <86fryo7xbs.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 22/25] KVM: arm64: Make PIR{,E0}_EL1 UNDEF if S1PIE is not advertised to the guest In-Reply-To: <20240123114810.GA1283334@e124191.cambridge.arm.com> References: <20240122201852.262057-1-maz@kernel.org> <20240122201852.262057-23-maz@kernel.org> <20240123114810.GA1283334@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) Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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 On Tue, 23 Jan 2024 11:48:10 +0000, Joey Gouly wrote: > > Hello, > > On Mon, Jan 22, 2024 at 08:18:49PM +0000, Marc Zyngier wrote: > > As part of the ongoing effort to honor the guest configuration, > > add the necessary checks to make PIR_EL1 and co UNDEF if not > > advertised to the guest, and avoid context switching them. > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 15 ++++++++++++++- > > arch/arm64/kvm/sys_regs.c | 4 ++++ > > 2 files changed, 18 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h > > index bb6b571ec627..b34743292ca7 100644 > > --- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h > > +++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h > > @@ -37,6 +37,19 @@ static inline bool ctxt_has_mte(struct kvm_cpu_context *ctxt) > > return kvm_has_mte(kern_hyp_va(vcpu->kvm)); > > } > > > > +static inline bool ctxt_has_s1pie(struct kvm_cpu_context *ctxt) > > +{ > > + struct kvm_vcpu *vcpu = ctxt->__hyp_running_vcpu; > > + > > + if (!cpus_have_final_cap(ARM64_HAS_S1PIE)) > > + return false; > > + > > + if (!vcpu) > > + vcpu = container_of(ctxt, struct kvm_vcpu, arch.ctxt); > > + > > + return kvm_has_feat(kern_hyp_va(vcpu->kvm), ID_AA64MMFR3_EL1, S1PIE, IMP); > > +} > > + > > static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) > > { > > ctxt_sys_reg(ctxt, SCTLR_EL1) = read_sysreg_el1(SYS_SCTLR); > > @@ -55,7 +68,7 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) > > ctxt_sys_reg(ctxt, CONTEXTIDR_EL1) = read_sysreg_el1(SYS_CONTEXTIDR); > > ctxt_sys_reg(ctxt, AMAIR_EL1) = read_sysreg_el1(SYS_AMAIR); > > ctxt_sys_reg(ctxt, CNTKCTL_EL1) = read_sysreg_el1(SYS_CNTKCTL); > > - if (cpus_have_final_cap(ARM64_HAS_S1PIE)) { > > + if (ctxt_has_s1pie(ctxt)) { > > ctxt_sys_reg(ctxt, PIR_EL1) = read_sysreg_el1(SYS_PIR); > > ctxt_sys_reg(ctxt, PIRE0_EL1) = read_sysreg_el1(SYS_PIRE0); > > } > > Missing the corresponding change in __sysreg_restore_el1_state(). Gah. Thanks for spotting it. I'm pretty sure I had it at some point, and somehow lost it. Probably on another machine somewhere... Cheers, M. -- Without deviation from the norm, progress is not possible.