|
@@ -85,7 +85,13 @@ static void __hyp_text __activate_traps(struct kvm_vcpu *vcpu)
|
|
|
write_sysreg(val, hcr_el2);
|
|
|
/* Trap on AArch32 cp15 c15 accesses (EL1 or EL0) */
|
|
|
write_sysreg(1 << 15, hstr_el2);
|
|
|
- /* Make sure we trap PMU access from EL0 to EL2 */
|
|
|
+ /*
|
|
|
+ * Make sure we trap PMU access from EL0 to EL2. Also sanitize
|
|
|
+ * PMSELR_EL0 to make sure it never contains the cycle
|
|
|
+ * counter, which could make a PMXEVCNTR_EL0 access UNDEF at
|
|
|
+ * EL1 instead of being trapped to EL2.
|
|
|
+ */
|
|
|
+ write_sysreg(0, pmselr_el0);
|
|
|
write_sysreg(ARMV8_PMU_USERENR_MASK, pmuserenr_el0);
|
|
|
write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2);
|
|
|
__activate_traps_arch()();
|