From nobody Wed Dec 17 10:44:28 2025 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 208927E1; Fri, 21 Mar 2025 00:10:41 +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=1742515843; cv=none; b=oFtdNtKF8RumGPTatspbAnOCqS3UBks/BiV9jNNRMFm7NHNMkJaHTO6HbH2lDkAil4afkhPwOAgfdvZOsHHRGU7bZyKTIRPCKrrMTbwXZuIhLe7OLbsxSQGPCJKeh++L+WHYDO5ltAezieU4hVYvKbSXsTppPBTXUn5eFwG3XyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742515843; c=relaxed/simple; bh=DsuzL5d+FWDPkIB2OfoSKH9+2zOmH96rLhi5fPoGYRE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ksXiM8lieZwjzAhjtkOEydXGjHNXIMMgcKeOtqdsDU2wNOkNgwnbBwlcGPXMb7vXQ8ELpLenlWAfyfa3wQ7gexpTauoi/IqoIlyhIeVNKR+ykO3nYY8dGYF4m2FhlfARMORkq+yZ0qWWQZ4+DAKWn11HTdfx4rbcBUhDWEAqVhA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sEoDBCp8; 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="sEoDBCp8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B784C4CEEA; Fri, 21 Mar 2025 00:10:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742515841; bh=DsuzL5d+FWDPkIB2OfoSKH9+2zOmH96rLhi5fPoGYRE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=sEoDBCp8Opot2VTK9ewTsTZ76hHP3CEhvm+CIL0kydDSTfvQ0aScO4AImRG1Z1js/ LqnW9UBJxpmYUz0hCDKbxulVL4Zm4l6j0BY9VY86NMDMTyFDKgjj4o9qrcS7keRZZt R4PSV1ORmiryrnSmD9na9JXFxnUoocviUKpa8qX/78bzYFIrDKk17izbKtZmCgXByp Iqd4pxvuw6yJ2wGn0+4spVw18S5UudHohOLegE4k20mUWGk6UsJLfXhFY9LiPZVFz5 WdDfCzn5DCXtxtIKbUzcs072ZNlLkqwZyYykPp3tsOUR41PbIRAliFQGgnkT7IhESU kq6zzCtnDJWvQ== From: Mark Brown Date: Fri, 21 Mar 2025 00:10:10 +0000 Subject: [PATCH 6.13 v2 1/8] KVM: arm64: Calculate cptr_el2 traps on activating traps Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250321-stable-sve-6-13-v2-1-3150e3370c40@kernel.org> References: <20250321-stable-sve-6-13-v2-0-3150e3370c40@kernel.org> In-Reply-To: <20250321-stable-sve-6-13-v2-0-3150e3370c40@kernel.org> To: Greg Kroah-Hartman , Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Mark Brown , Fuad Tabba , James Clark X-Mailer: b4 0.15-dev-1b0d6 X-Developer-Signature: v=1; a=openpgp-sha256; l=7022; i=broonie@kernel.org; h=from:subject:message-id; bh=Q+UuVlKjNzo07rKv9ONYZ0AiJSCiuDy2BQeY+ELpVSM=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBn3K50AaI1BRRAzjH1OcAmYjgxLDhtRdBWhvWQT5e0 OWmGHQyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZ9yudAAKCRAk1otyXVSH0BHqB/ 4oil2ZJp6zQRHWQZOPxtTSsOY03+zuDi1y0Ix2y2SIv/sMc97sb1sFff2FokjugZGVzAhATMk7Dk4x 6w5Kk1f7ETS9V6gMXczbgSk1w7P5Bt9pVCiL1DXccPcWvobcvmcWjxjlC9/erRL1qR8GF7rO/C3zSg dROIcf18bx+dudnDgRCeI+Ohob/SWM6Qrjpjl98Mirpy62/nH0hJpEB2zfUJQL8q5A4SBuNYLwradh k4RWUKU5dK7nRcr3OGjzTbLQpo64cJPA+wci44SqFD6pnZsv92oDsZNWIXYGLoduGsaUCMoCxp+QrJ d008/SBf0hgdNluU7tb54TL0yzQPYg X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB From: Fuad Tabba [ Upstream commit 2fd5b4b0e7b440602455b79977bfa64dea101e6c ] Similar to VHE, calculate the value of cptr_el2 from scratch on activate traps. This removes the need to store cptr_el2 in every vcpu structure. Moreover, some traps, such as whether the guest owns the fp registers, need to be set on every vcpu run. Reported-by: James Clark Fixes: 5294afdbf45a ("KVM: arm64: Exclude FP ownership from kvm_vcpu_arch") Signed-off-by: Fuad Tabba Link: https://lore.kernel.org/r/20241216105057.579031-13-tabba@google.com Signed-off-by: Marc Zyngier Signed-off-by: Mark Brown --- arch/arm64/include/asm/kvm_host.h | 1 - arch/arm64/kvm/arm.c | 1 - arch/arm64/kvm/hyp/nvhe/pkvm.c | 30 ----------------------- arch/arm64/kvm/hyp/nvhe/switch.c | 51 ++++++++++++++++++++++++-----------= ---- 4 files changed, 32 insertions(+), 51 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm= _host.h index c85aa4f1def810a08e7bfa4ab181760839521c25..6762dadce45deb657b6e8df3e14= dc9fbef884f1d 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -708,7 +708,6 @@ struct kvm_vcpu_arch { u64 hcr_el2; u64 hcrx_el2; u64 mdcr_el2; - u64 cptr_el2; =20 /* Exception Information */ struct kvm_vcpu_fault_info fault; diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 3b3ecfed294f2be5bf545f4e89ba6e53415625f5..591f512ab072963424f4b2287a1= a572fc72bd639 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1569,7 +1569,6 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_v= cpu *vcpu, } =20 vcpu_reset_hcr(vcpu); - vcpu->arch.cptr_el2 =3D kvm_get_reset_cptr_el2(vcpu); =20 /* * Handle the "start in power-off" case. diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 071993c16de81ca0b0181c56d0598b1b026ae018..6405fa30f961723c0da0761be07= 9e09f91b7e8e1 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -31,8 +31,6 @@ static void pvm_init_traps_aa64pfr0(struct kvm_vcpu *vcpu) const u64 feature_ids =3D pvm_read_id_reg(vcpu, SYS_ID_AA64PFR0_EL1); u64 hcr_set =3D HCR_RW; u64 hcr_clear =3D 0; - u64 cptr_set =3D 0; - u64 cptr_clear =3D 0; =20 /* Protected KVM does not support AArch32 guests. */ BUILD_BUG_ON(FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_EL0), @@ -62,21 +60,10 @@ static void pvm_init_traps_aa64pfr0(struct kvm_vcpu *vc= pu) /* Trap AMU */ if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_AMU), feature_ids)) { hcr_clear |=3D HCR_AMVOFFEN; - cptr_set |=3D CPTR_EL2_TAM; - } - - /* Trap SVE */ - if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64PFR0_EL1_SVE), feature_ids)) { - if (has_hvhe()) - cptr_clear |=3D CPACR_ELx_ZEN; - else - cptr_set |=3D CPTR_EL2_TZ; } =20 vcpu->arch.hcr_el2 |=3D hcr_set; vcpu->arch.hcr_el2 &=3D ~hcr_clear; - vcpu->arch.cptr_el2 |=3D cptr_set; - vcpu->arch.cptr_el2 &=3D ~cptr_clear; } =20 /* @@ -106,7 +93,6 @@ static void pvm_init_traps_aa64dfr0(struct kvm_vcpu *vcp= u) const u64 feature_ids =3D pvm_read_id_reg(vcpu, SYS_ID_AA64DFR0_EL1); u64 mdcr_set =3D 0; u64 mdcr_clear =3D 0; - u64 cptr_set =3D 0; =20 /* Trap/constrain PMU */ if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_PMUVer), feature_ids)) { @@ -133,21 +119,12 @@ static void pvm_init_traps_aa64dfr0(struct kvm_vcpu *= vcpu) if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_TraceFilt), feature_ids= )) mdcr_set |=3D MDCR_EL2_TTRF; =20 - /* Trap Trace */ - if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_TraceVer), feature_ids)= ) { - if (has_hvhe()) - cptr_set |=3D CPACR_EL1_TTA; - else - cptr_set |=3D CPTR_EL2_TTA; - } - /* Trap External Trace */ if (!FIELD_GET(ARM64_FEATURE_MASK(ID_AA64DFR0_EL1_ExtTrcBuff), feature_id= s)) mdcr_clear |=3D MDCR_EL2_E2TB_MASK; =20 vcpu->arch.mdcr_el2 |=3D mdcr_set; vcpu->arch.mdcr_el2 &=3D ~mdcr_clear; - vcpu->arch.cptr_el2 |=3D cptr_set; } =20 /* @@ -198,10 +175,6 @@ static void pvm_init_trap_regs(struct kvm_vcpu *vcpu) /* Clear res0 and set res1 bits to trap potential new features. */ vcpu->arch.hcr_el2 &=3D ~(HCR_RES0); vcpu->arch.mdcr_el2 &=3D ~(MDCR_EL2_RES0); - if (!has_hvhe()) { - vcpu->arch.cptr_el2 |=3D CPTR_NVHE_EL2_RES1; - vcpu->arch.cptr_el2 &=3D ~(CPTR_NVHE_EL2_RES0); - } } =20 static void pkvm_vcpu_reset_hcr(struct kvm_vcpu *vcpu) @@ -236,7 +209,6 @@ static void pkvm_vcpu_reset_hcr(struct kvm_vcpu *vcpu) */ static void pkvm_vcpu_init_traps(struct kvm_vcpu *vcpu) { - vcpu->arch.cptr_el2 =3D kvm_get_reset_cptr_el2(vcpu); vcpu->arch.mdcr_el2 =3D 0; =20 pkvm_vcpu_reset_hcr(vcpu); @@ -693,8 +665,6 @@ int __pkvm_init_vcpu(pkvm_handle_t handle, struct kvm_v= cpu *host_vcpu, return ret; } =20 - hyp_vcpu->vcpu.arch.cptr_el2 =3D kvm_get_reset_cptr_el2(&hyp_vcpu->vcpu); - return 0; } =20 diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/swi= tch.c index cc69106734ca732ba9276ac1eaf84be3e7381648..81d933a71310fd1132b2450cd08= 108e071a2cf78 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -36,33 +36,46 @@ DEFINE_PER_CPU(unsigned long, kvm_hyp_vector); =20 extern void kvm_nvhe_prepare_backtrace(unsigned long fp, unsigned long pc); =20 -static void __activate_traps(struct kvm_vcpu *vcpu) +static void __activate_cptr_traps(struct kvm_vcpu *vcpu) { - u64 val; + u64 val =3D CPTR_EL2_TAM; /* Same bit irrespective of E2H */ =20 - ___activate_traps(vcpu, vcpu->arch.hcr_el2); - __activate_traps_common(vcpu); + if (has_hvhe()) { + val |=3D CPACR_ELx_TTA; =20 - val =3D vcpu->arch.cptr_el2; - val |=3D CPTR_EL2_TAM; /* Same bit irrespective of E2H */ - val |=3D has_hvhe() ? CPACR_EL1_TTA : CPTR_EL2_TTA; - if (cpus_have_final_cap(ARM64_SME)) { - if (has_hvhe()) - val &=3D ~CPACR_ELx_SMEN; - else - val |=3D CPTR_EL2_TSM; - } + if (guest_owns_fp_regs()) { + val |=3D CPACR_ELx_FPEN; + if (vcpu_has_sve(vcpu)) + val |=3D CPACR_ELx_ZEN; + } + } else { + val |=3D CPTR_EL2_TTA | CPTR_NVHE_EL2_RES1; =20 - if (!guest_owns_fp_regs()) { - if (has_hvhe()) - val &=3D ~(CPACR_ELx_FPEN | CPACR_ELx_ZEN); - else - val |=3D CPTR_EL2_TFP | CPTR_EL2_TZ; + /* + * Always trap SME since it's not supported in KVM. + * TSM is RES1 if SME isn't implemented. + */ + val |=3D CPTR_EL2_TSM; =20 - __activate_traps_fpsimd32(vcpu); + if (!vcpu_has_sve(vcpu) || !guest_owns_fp_regs()) + val |=3D CPTR_EL2_TZ; + + if (!guest_owns_fp_regs()) + val |=3D CPTR_EL2_TFP; } =20 + if (!guest_owns_fp_regs()) + __activate_traps_fpsimd32(vcpu); + kvm_write_cptr_el2(val); +} + +static void __activate_traps(struct kvm_vcpu *vcpu) +{ + ___activate_traps(vcpu, vcpu->arch.hcr_el2); + __activate_traps_common(vcpu); + __activate_cptr_traps(vcpu); + write_sysreg(__this_cpu_read(kvm_hyp_vector), vbar_el2); =20 if (cpus_have_final_cap(ARM64_WORKAROUND_SPECULATIVE_AT)) { --=20 2.39.5