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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D0DAC3DA4A for ; Fri, 16 Aug 2024 14:55:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D63468D0084; Fri, 16 Aug 2024 10:55:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CEA008D007E; Fri, 16 Aug 2024 10:55:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3E488D0084; Fri, 16 Aug 2024 10:55:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 97ACF8D007E for ; Fri, 16 Aug 2024 10:55:19 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 172771A1B24 for ; Fri, 16 Aug 2024 14:55:19 +0000 (UTC) X-FDA: 82458406758.06.57AE570 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 1915012000A for ; Fri, 16 Aug 2024 14:55:16 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JyEiBPl3; spf=pass (imf29.hostedemail.com: domain of maz@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=maz@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723820043; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MbQEMgLmVIMUepSNS2Vx+wleGlSfwNmKGp71uBtz9no=; b=zbQqCNb6y25L7MlKv6eqBq2wYnZiAr9UVSeuJUBRlbG6Int/FeH7omtnXzmGVhKHLg51+G wkw5PKyp2JlZb8SuIoQNiy6p/FYzzeX+9DeZjp49qPKdfgyJiW+zwrGK12lPWPYzA4w4jN XZvzrtJewEyntXcuVTxBONDUnQ6EX+g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723820043; a=rsa-sha256; cv=none; b=q3OLcsmQqMLI9PDfLSfy1n9FjW6CmiI2H+wVQ511zureyEc8Kwry60AC5FySB9Sx8Xm6xr VtfqIXZvLPOmt2GFkUhq97CsHhznggQivOzxVplVp6QJY3YjbnopI7OCExXQPFyPyYTQqK zn/CfKxKy+UyOzPMPf3y9rbQPAEjw5Q= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JyEiBPl3; spf=pass (imf29.hostedemail.com: domain of maz@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=maz@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 48DCE621F9; Fri, 16 Aug 2024 14:55:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C954BC32782; Fri, 16 Aug 2024 14:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723820116; bh=bYtlUyfEW4UQCA052w/rCM0SWf2EWY5Q9Ki9PbroHxE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=JyEiBPl3rzQ1CsXkhZb1NtQc33N+/6CcwX1zhxLPCl6Oz2HWKQb7Rn1YDKdiE5YTr MZlLryH7YBV08sQCoon3k+/Rm1ZYyLkHJIHaBSlbez/ZhxQ/FapXTOQIWaxvDonbpT 54wbSd9ggMkaVWYXZEEf1cvKygxGCMNRhIwmlDkPwoDsszSjfiqtF7bvJOBLc0lPwA PLiVkhUSe9uqIdftlQBa++sYzz51bknJNoevIDwSS5w9glmzdTAE2RaOSZyia9QhEV w3lR0Rs5XCPshZ6vm2InA7F5JfsDieuFs8pEIz4Aj6ZITPkxODhNaA5NbM/4bkoayG q9jYjIWv8gSGA== 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 1seyMC-004JGf-Be; Fri, 16 Aug 2024 15:55:13 +0100 Date: Fri, 16 Aug 2024 15:55:11 +0100 Message-ID: <86ed6ozfe8.wl-maz@kernel.org> From: Marc Zyngier To: Joey Gouly Cc: linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: Re: [PATCH v4 07/29] KVM: arm64: Save/restore POE registers In-Reply-To: <20240503130147.1154804-8-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> <20240503130147.1154804-8-joey.gouly@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.4 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) 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, linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 1915012000A X-Stat-Signature: 3gpyrm6hrdd7i7pn8wpicj8injdfbw5i X-HE-Tag: 1723820116-122878 X-HE-Meta: U2FsdGVkX194UFWGQWTSH0pL1KHByXD5yHSJsMr5M7BCo7LZk0dGGsdH+Sia7rYVrNq9ql4vxt5uzAQocKFsInG+GLGVOSjdAJyAjgaXxs6qwSEflzf+2xkj/F1XvkFxaiHI0pBdycAC82fS/iiz/o7Dou+RZ/c+daSi9BwNHeLalEKxLPTxfwMKG4lJQbPNO72abQji+5ulR73hPEMbtOJ1HqmSkiq4O+lOcChXFFzYzvRjywL/6VS8C9KYyKUzleYBc9pZBH3nSCX48gyGrzieK0HX5n2tUw1dzfoWt5esoiYqZ1OW1xWtv3LSAtG2LwvwaCficwlabakRo11xyYX2WJk8QCPXi9hDfbDGEe44c3mP7zV3bMyHFAtcn9DMBLsed6iiaWa7VpCInF+F7YzLFe1d5k6QaVN0zLpn2BvvbwC1kSRqcPvUsh7GiT7C5M9V0Drj2j+8pZ7UNvp3+9fltfo+tJmPJ36MlNfJPdTiOOKZ/q8TpwtQVU7uPSRidkzVGdQr8b/2FOvHMqNOGJ1m/T8TsqVAq0HHyLa744y6DOBkT4KTRzhmSvGE2rjBOxRurSlrjWUY8BX8E6gRawkwmnX+FJCF0hkGIA+uycS3zMqSBtu1Z9wsMMgzBPnHBlDZ8nkUsvgE2B6pH7tBynpmYgsxRf+X3Ile5p977rmi9rAiMG54oW8Qd3a+fj1QAR/LSGtCKc6RyCCgkP42zBvrOmKM+BtIHwoew8QZ+iYzQ/PiBqdmArlwNV2ZTYbI1GW58epeqZ2GLPqGtkWtnV1Y+XdWV8eR45H05c02i7BTNzl5vJyHWPOxxN7O3/Ja6HmbIIq5MWG5gQ9IeCdo0kUws+Pdr56vQLt1gWl5sHs3HwYzRp8CaUHx2ZYn5nCOb24ijY5rQcbllhjZrO8vFUvt1yxH5g/QI8WqPWrBVEG1qIBWRVBkafJ8aLfeqDQ8eWTtkt8426oshkm7OFS bHgy0r1w aRggOqxBSbyonBFnASq0Ar8Q6Zgs3o7rEqIk1aqwW49RbpY5pNWa9LqgkELk72XlqUm+qJGvsT8REj29M05XgfYuzUTbvCmOWcUL1J26fQc5JaK5tT5VX1eOGHkcOUdUF76iY8yJEi04UxPdece723QQgYyumaGUREsNWFgyyCGidRRWiogRpoQTd/rhyQgmdM0GTrR144+3AhaFVVhhd14twCghuT+0wmTy3hBB1CtatvGVQaipksVr94SBgNzuysiJLoA8WyEVM3lN7l3WyNVQ6qtJRRST0XhXAZx4rFlxZbVK9BrrrUsZjOw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, 03 May 2024 14:01:25 +0100, Joey Gouly wrote: > > Define the new system registers that POE introduces and context switch them. > > Signed-off-by: Joey Gouly > Cc: Marc Zyngier > Cc: Oliver Upton > Cc: Catalin Marinas > Cc: Will Deacon > --- > arch/arm64/include/asm/kvm_host.h | 4 +++ > arch/arm64/include/asm/vncr_mapping.h | 1 + > arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 29 ++++++++++++++++++++++ > arch/arm64/kvm/sys_regs.c | 8 ++++-- > 4 files changed, 40 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 9e8a496fb284..28042da0befd 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -419,6 +419,8 @@ enum vcpu_sysreg { > GCR_EL1, /* Tag Control Register */ > TFSRE0_EL1, /* Tag Fault Status Register (EL0) */ > > + POR_EL0, /* Permission Overlay Register 0 (EL0) */ > + > /* 32bit specific registers. */ > DACR32_EL2, /* Domain Access Control Register */ > IFSR32_EL2, /* Instruction Fault Status Register */ > @@ -489,6 +491,8 @@ enum vcpu_sysreg { > VNCR(PIR_EL1), /* Permission Indirection Register 1 (EL1) */ > VNCR(PIRE0_EL1), /* Permission Indirection Register 0 (EL1) */ > > + VNCR(POR_EL1), /* Permission Overlay Register 1 (EL1) */ > + > VNCR(HFGRTR_EL2), > VNCR(HFGWTR_EL2), > VNCR(HFGITR_EL2), > diff --git a/arch/arm64/include/asm/vncr_mapping.h b/arch/arm64/include/asm/vncr_mapping.h > index df2c47c55972..06f8ec0906a6 100644 > --- a/arch/arm64/include/asm/vncr_mapping.h > +++ b/arch/arm64/include/asm/vncr_mapping.h > @@ -52,6 +52,7 @@ > #define VNCR_PIRE0_EL1 0x290 > #define VNCR_PIRE0_EL2 0x298 > #define VNCR_PIR_EL1 0x2A0 > +#define VNCR_POR_EL1 0x2A8 > #define VNCR_ICH_LR0_EL2 0x400 > #define VNCR_ICH_LR1_EL2 0x408 > #define VNCR_ICH_LR2_EL2 0x410 > diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h > index 4be6a7fa0070..1c9536557bae 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h > +++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h > @@ -16,9 +16,15 @@ > #include > #include > > +static inline bool ctxt_has_s1poe(struct kvm_cpu_context *ctxt); > + > static inline void __sysreg_save_common_state(struct kvm_cpu_context *ctxt) > { > ctxt_sys_reg(ctxt, MDSCR_EL1) = read_sysreg(mdscr_el1); > + > + // POR_EL0 can affect uaccess, so must be saved/restored early. > + if (ctxt_has_s1poe(ctxt)) > + ctxt_sys_reg(ctxt, POR_EL0) = read_sysreg_s(SYS_POR_EL0); > } > > static inline void __sysreg_save_user_state(struct kvm_cpu_context *ctxt) > @@ -55,6 +61,17 @@ static inline bool ctxt_has_s1pie(struct kvm_cpu_context *ctxt) > return kvm_has_feat(kern_hyp_va(vcpu->kvm), ID_AA64MMFR3_EL1, S1PIE, IMP); > } > > +static inline bool ctxt_has_s1poe(struct kvm_cpu_context *ctxt) > +{ > + struct kvm_vcpu *vcpu; > + > + if (!system_supports_poe()) > + return false; > + > + vcpu = ctxt_to_vcpu(ctxt); > + return kvm_has_feat(kern_hyp_va(vcpu->kvm), ID_AA64MMFR3_EL1, S1POE, IMP); > +} > + > static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) > { > ctxt_sys_reg(ctxt, SCTLR_EL1) = read_sysreg_el1(SYS_SCTLR); > @@ -77,6 +94,10 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) > ctxt_sys_reg(ctxt, PIR_EL1) = read_sysreg_el1(SYS_PIR); > ctxt_sys_reg(ctxt, PIRE0_EL1) = read_sysreg_el1(SYS_PIRE0); > } > + > + if (ctxt_has_s1poe(ctxt)) > + ctxt_sys_reg(ctxt, POR_EL1) = read_sysreg_el1(SYS_POR); > + > ctxt_sys_reg(ctxt, PAR_EL1) = read_sysreg_par(); > ctxt_sys_reg(ctxt, TPIDR_EL1) = read_sysreg(tpidr_el1); > > @@ -107,6 +128,10 @@ static inline void __sysreg_save_el2_return_state(struct kvm_cpu_context *ctxt) > static inline void __sysreg_restore_common_state(struct kvm_cpu_context *ctxt) > { > write_sysreg(ctxt_sys_reg(ctxt, MDSCR_EL1), mdscr_el1); > + > + // POR_EL0 can affect uaccess, so must be saved/restored early. > + if (ctxt_has_s1poe(ctxt)) > + write_sysreg_s(ctxt_sys_reg(ctxt, POR_EL0), SYS_POR_EL0); > } > > static inline void __sysreg_restore_user_state(struct kvm_cpu_context *ctxt) > @@ -153,6 +178,10 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt) > write_sysreg_el1(ctxt_sys_reg(ctxt, PIR_EL1), SYS_PIR); > write_sysreg_el1(ctxt_sys_reg(ctxt, PIRE0_EL1), SYS_PIRE0); > } > + > + if (ctxt_has_s1poe(ctxt)) > + write_sysreg_el1(ctxt_sys_reg(ctxt, POR_EL1), SYS_POR); > + > write_sysreg(ctxt_sys_reg(ctxt, PAR_EL1), par_el1); > write_sysreg(ctxt_sys_reg(ctxt, TPIDR_EL1), tpidr_el1); > > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index c9f4f387155f..be04fae35afb 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -2423,6 +2423,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { > { SYS_DESC(SYS_MAIR_EL1), access_vm_reg, reset_unknown, MAIR_EL1 }, > { SYS_DESC(SYS_PIRE0_EL1), NULL, reset_unknown, PIRE0_EL1 }, > { SYS_DESC(SYS_PIR_EL1), NULL, reset_unknown, PIR_EL1 }, > + { SYS_DESC(SYS_POR_EL1), NULL, reset_unknown, POR_EL1 }, > { SYS_DESC(SYS_AMAIR_EL1), access_vm_reg, reset_amair_el1, AMAIR_EL1 }, > > { SYS_DESC(SYS_LORSA_EL1), trap_loregion }, > @@ -2506,6 +2507,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { > .access = access_pmovs, .reg = PMOVSSET_EL0, > .get_user = get_pmreg, .set_user = set_pmreg }, > > + { SYS_DESC(SYS_POR_EL0), NULL, reset_unknown, POR_EL0 }, > { SYS_DESC(SYS_TPIDR_EL0), NULL, reset_unknown, TPIDR_EL0 }, > { SYS_DESC(SYS_TPIDRRO_EL0), NULL, reset_unknown, TPIDRRO_EL0 }, > { SYS_DESC(SYS_TPIDR2_EL0), undef_access }, > @@ -4057,8 +4059,6 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) > kvm->arch.fgu[HFGxTR_GROUP] = (HFGxTR_EL2_nAMAIR2_EL1 | > HFGxTR_EL2_nMAIR2_EL1 | > HFGxTR_EL2_nS2POR_EL1 | > - HFGxTR_EL2_nPOR_EL1 | > - HFGxTR_EL2_nPOR_EL0 | > HFGxTR_EL2_nACCDATA_EL1 | > HFGxTR_EL2_nSMPRI_EL1_MASK | > HFGxTR_EL2_nTPIDR2_EL0_MASK); > @@ -4093,6 +4093,10 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) > kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPIRE0_EL1 | > HFGxTR_EL2_nPIR_EL1); > > + if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1POE, IMP)) > + kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPOR_EL1 | > + HFGxTR_EL2_nPOR_EL0); > + As Broonie pointed out in a separate thread, this cannot work, short of making ID_AA64MMFR3_EL1 writable. This can be done in a separate patch, but it needs doing as it otherwise breaks migration. Thanks, M. -- Without deviation from the norm, progress is not possible.