| From 98dd2f108e448988d91e296173e773b06fb978b8 Mon Sep 17 00:00:00 2001 |
| From: Like Xu <like.xu@linux.intel.com> |
| Date: Wed, 30 Dec 2020 16:19:16 +0800 |
| Subject: KVM: x86/pmu: Fix HW_REF_CPU_CYCLES event pseudo-encoding in intel_arch_events[] |
| |
| From: Like Xu <like.xu@linux.intel.com> |
| |
| commit 98dd2f108e448988d91e296173e773b06fb978b8 upstream. |
| |
| The HW_REF_CPU_CYCLES event on the fixed counter 2 is pseudo-encoded as |
| 0x0300 in the intel_perfmon_event_map[]. Correct its usage. |
| |
| Fixes: 62079d8a4312 ("KVM: PMU: add proper support for fixed counter 2") |
| Signed-off-by: Like Xu <like.xu@linux.intel.com> |
| Message-Id: <20201230081916.63417-1-like.xu@linux.intel.com> |
| Reviewed-by: Sean Christopherson <seanjc@google.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kvm/pmu_intel.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/kvm/pmu_intel.c |
| +++ b/arch/x86/kvm/pmu_intel.c |
| @@ -29,7 +29,7 @@ static struct kvm_event_hw_type_mapping |
| [4] = { 0x2e, 0x41, PERF_COUNT_HW_CACHE_MISSES }, |
| [5] = { 0xc4, 0x00, PERF_COUNT_HW_BRANCH_INSTRUCTIONS }, |
| [6] = { 0xc5, 0x00, PERF_COUNT_HW_BRANCH_MISSES }, |
| - [7] = { 0x00, 0x30, PERF_COUNT_HW_REF_CPU_CYCLES }, |
| + [7] = { 0x00, 0x03, PERF_COUNT_HW_REF_CPU_CYCLES }, |
| }; |
| |
| /* mapping between fixed pmc index and intel_arch_events array */ |
