diff options
| author | Like Xu | 2019-07-17 04:51:18 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-07-17 12:23:20 +0200 |
| commit | 4d1a082da968ff0c9d7b69a7ec44e6be6fc6e213 (patch) | |
| tree | 079aa0daaaaf32450418da87f729002342717ec4 /arch/x86/kvm | |
| parent | KVM: nVMX: Ignore segment base for VMX memory operand when segment not FS or GS (diff) | |
| download | kernel-qcow2-linux-4d1a082da968ff0c9d7b69a7ec44e6be6fc6e213.tar.gz kernel-qcow2-linux-4d1a082da968ff0c9d7b69a7ec44e6be6fc6e213.tar.xz kernel-qcow2-linux-4d1a082da968ff0c9d7b69a7ec44e6be6fc6e213.zip | |
KVM: x86/vPMU: reset pmc->counter to 0 for pmu fixed_counters
To avoid semantic inconsistency, the fixed_counters in Intel vPMU
need to be reset to 0 in intel_pmu_reset() as gp_counters does.
Signed-off-by: Like Xu <like.xu@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx/pmu_intel.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 68d231d49c7a..4dea0e0e7e39 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -337,17 +337,22 @@ static void intel_pmu_init(struct kvm_vcpu *vcpu) static void intel_pmu_reset(struct kvm_vcpu *vcpu) { struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); + struct kvm_pmc *pmc = NULL; int i; for (i = 0; i < INTEL_PMC_MAX_GENERIC; i++) { - struct kvm_pmc *pmc = &pmu->gp_counters[i]; + pmc = &pmu->gp_counters[i]; pmc_stop_counter(pmc); pmc->counter = pmc->eventsel = 0; } - for (i = 0; i < INTEL_PMC_MAX_FIXED; i++) - pmc_stop_counter(&pmu->fixed_counters[i]); + for (i = 0; i < INTEL_PMC_MAX_FIXED; i++) { + pmc = &pmu->fixed_counters[i]; + + pmc_stop_counter(pmc); + pmc->counter = 0; + } pmu->fixed_ctr_ctrl = pmu->global_ctrl = pmu->global_status = pmu->global_ovf_ctrl = 0; |