KVM: arm64: Filter out v8.1+ events on v8.0 HW
Subsystems (3)
Marc Zyngier
maintainerPATCH 1/1 KVM: arm64: Filter out v8.1+ events on v8.0 HW
When running on v8.0 HW, make sure we don't try to advertise events in the 0x4000-0x403f range.
Fixes 88865beca9062 ("KVM: arm64: Mask out filtered events in PCMEID{0,1}_EL1")
Signed-off-by Marc Zyngier <[email protected]>
--- arch/arm64/kvm/pmu-emul.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm64/kvm/pmu-emul.c +7 -3
@@ -788,7 +788,7 @@ u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1) {unsigned long *bmap = vcpu->kvm->arch.pmu_filter;u64 val, mask =0 ; -int base, i; +int base, i, nr_events;if (!pmceid1) { val =read_sysreg (pmceid0_el0);
@@ -801,13 +801,17 @@ u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1)if (!bmap)return val; + nr_events =kvm_pmu_event_mask (vcpu->kvm) +1 ; +for (i =0 ; i <32 ; i +=8 ) {u64 byte; byte =bitmap_get_value8 (bmap, base + i); mask |= byte << i; - byte =bitmap_get_value8 (bmap,0x4000 + base + i); - mask |= byte << (32 + i); +if (nr_events >= (0x4000 + base +32 )) { + byte =bitmap_get_value8 (bmap,0x4000 + base + i); + mask |= byte << (32 + i); + } }return val & mask;
Signature · 6 lines
2.29.2 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm