Skip to content

Commit 066daa8

Browse files
Fuad Tabbaoupton
authored andcommitted
KVM: arm64: Initialize HCRX_EL2 traps in pKVM
Initialize and set the traps controlled by the HCRX_EL2 in pKVM. Reviewed-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Fuad Tabba <tabba@google.com> Link: https://lore.kernel.org/r/20250314111832.4137161-3-tabba@google.com Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
1 parent 44f979b commit 066daa8

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

arch/arm64/kvm/hyp/nvhe/pkvm.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,21 @@ static int pkvm_vcpu_init_traps(struct pkvm_hyp_vcpu *hyp_vcpu)
166166

167167
pkvm_vcpu_reset_hcr(vcpu);
168168

169-
if ((!pkvm_hyp_vcpu_is_protected(hyp_vcpu)))
169+
if ((!pkvm_hyp_vcpu_is_protected(hyp_vcpu))) {
170+
struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu;
171+
172+
/* Trust the host for non-protected vcpu features. */
173+
vcpu->arch.hcrx_el2 = host_vcpu->arch.hcrx_el2;
170174
return 0;
175+
}
171176

172177
ret = pkvm_check_pvm_cpu_features(vcpu);
173178
if (ret)
174179
return ret;
175180

176181
pvm_init_traps_hcr(vcpu);
177182
pvm_init_traps_mdcr(vcpu);
183+
vcpu_set_hcrx(vcpu);
178184

179185
return 0;
180186
}

0 commit comments

Comments
 (0)