KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset
Subsystems (2)
PATCH v2 1/1 KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset
commit 3837407c1aa1 upstream.
The specification says PMSWINC increments PMEVCNTR<n>_EL1 by 1 if PMEVCNTR<n>_EL0 is enabled and configured to count SW_INCR.
For PMEVCNTR<n>_EL0 to be enabled, we need both PMCNTENSET to be set for the corresponding event counter but we also need the PMCR.E bit to be set.
---
This is a backport of 3837407c1aa1 ("KVM: arm64: pmu: Don't increment SW_INCR if PMCR.E is unset") which did not apply on 4.9-stable and 4.14-stable trees. Compared to the original patch __vcpu_sys_reg() is replaced by vcpu_sys_reg().
v1 -> v2:
- this patch also is candidate for 4.9-stable
--- virt/kvm/arm/pmu.c | 3 +++ 1 file changed, 3 insertions(+)
virt/kvm/arm/pmu.c +3 -0
@@ -299,6 +299,9 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val)if (val ==0 )return ; +if (!(vcpu_sys_reg (vcpu,PMCR_EL0 ) &ARMV8_PMU_PMCR_E )) +return ; + enable =vcpu_sys_reg (vcpu,PMCNTENSET_EL0 );for (i =0 ; i <ARMV8_PMU_CYCLE_IDX ; i++) {if (!(val &BIT (i)))
Signature · 1 line
2.20.1
Quoted 5 lines · Eric Auger
commit
3837407c1aa1upstream.The specification says PMSWINC increments PMEVCNTR<n>_EL1 by 1 if PMEVCNTR<n>_EL0 is enabled and configured to count
SW_INCR.
Quoted 7 lines
For PMEVCNTR<n>_EL0 to be enabled, we need both PMCNTENSET to be set for the corresponding event counter but we also need the PMCR.E bit to be set.
Fixes 7a0adc7064b8 ("arm64: KVM: Add access handler for PMSWINC register")Signed-off-by Eric Auger <[email protected]>Cc <[email protected]> # 4.9 and 4.14 only
Quoted 29 lines
---
This is a backport of
3837407c1aa1("KVM: arm64: pmu: Don't incrementSW_INCRif PMCR.E is unset") which did not apply on 4.9-stable and 4.14-stable trees. Compared to the original patch__vcpu_sys_reg()is replaced byvcpu_sys_reg().v1 -> v2:
- this patch also is candidate for 4.9-stable--- virt/kvm/arm/pmu.c | 3 +++ 1 file changed, 3 insertions(+)virt/kvm/arm/pmu.c +3
-0@@ -299,6 +299,9 @@ void kvm_pmu_software_increment(struct kvm_vcpu *vcpu, u64 val)if (val ==0 )return ; +if (!(vcpu_sys_reg (vcpu,PMCR_EL0 ) &ARMV8_PMU_PMCR_E )) +return ; + enable =vcpu_sys_reg (vcpu,PMCNTENSET_EL0 );for (i =0 ; i <ARMV8_PMU_CYCLE_IDX ; i++) {if (!(val & BIT(i)))
Signature · 1 line
Jazz is not dead. It just smells funny...