From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Wang Subject: [PATCH v1 8/8] KVM/x86/vPMU: return the counters to host if guest is torn down Date: Thu, 1 Nov 2018 18:04:08 +0800 Message-ID: <1541066648-40690-9-git-send-email-wei.w.wang@intel.com> References: <1541066648-40690-1-git-send-email-wei.w.wang@intel.com> Cc: mingo@redhat.com, rkrcmar@redhat.com, like.xu@intel.com, wei.w.wang@intel.com To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, pbonzini@redhat.com, ak@linux.intel.com, peterz@infradead.org Return-path: In-Reply-To: <1541066648-40690-1-git-send-email-wei.w.wang@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org Return the assigned counters to host in the case the guest is torn down unexpectedly. Signed-off-by: Wei Wang Cc: Andi Kleen Cc: Paolo Bonzini Cc: Peter Zijlstra --- arch/x86/kvm/pmu_intel.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/pmu_intel.c b/arch/x86/kvm/pmu_intel.c index 9eb5230..30fa8eb 100644 --- a/arch/x86/kvm/pmu_intel.c +++ b/arch/x86/kvm/pmu_intel.c @@ -410,7 +410,7 @@ static void intel_pmu_reset(struct kvm_vcpu *vcpu) { struct kvm_pmu *pmu = vcpu_to_pmu(vcpu); struct kvm_pmc *pmc; - int i; + u32 i, bit; for (i = 0; i < INTEL_PMC_MAX_GENERIC; i++) { pmc = &pmu->gp_counters[i]; @@ -422,6 +422,10 @@ static void intel_pmu_reset(struct kvm_vcpu *vcpu) pmc->counter = 0; } + for_each_set_bit(bit, (unsigned long *)&pmu->assigned_pmc_bitmap, + X86_PMC_IDX_MAX) + intel_pmu_put_pmc(pmu, bit); + pmu->fixed_ctr_ctrl = 0; pmu->global_ctrl = 0; pmu->global_status = 0; -- 2.7.4