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 BF067C47258 for ; Tue, 23 Jan 2024 17:51:39 +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=XgavWxiglX8FF9wZ75bxhsR8BZZsdZdYr73TmubWhOk=; b=L0P/PsKXScIpPW umfxde/mh/K9ReHMoaljW9F/2cFWUeQRqUg6E1yOaCfzqKcEDOW0MTa+Ii3fDEr24zAPQCaT2RNmf hCpu4cBLp26OpzFW4puKhYNbAn9GQTLOc/gdZoNkL2RoKpr3bZsEnWnJEufTupgPBYI6NIdeyI1/r FvZWpwvZwZasZZ0mOZET4Sr5Tr4VrEVucMbDQ7Gnt70UaVqn7nTQAbwXDm1J3CYqL6YWeBN2pFtRw UdvpYSBFq1u8EeS1EsD5lZeHsy0+aMOo8tQnCcEHp2lyWXemD8tlEGp+OVhe7SzRA0tC545X5yJJN +W8N/nV56SC8Ad4G7BBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSKvY-00HaR4-2g; Tue, 23 Jan 2024 17:51:12 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSKvV-00HaP1-2w for linux-arm-kernel@lists.infradead.org; Tue, 23 Jan 2024 17:51:11 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D18EFCE2FB4; Tue, 23 Jan 2024 17:51:07 +0000 (UTC) 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) 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-20240123_095110_292060_BFDC849B X-CRM114-Status: GOOD ( 23.51 ) 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, 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. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel