From: Greg Kroah-Hartman Date: Mon, 1 Feb 2021 12:51:13 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.4.255~47 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=476d15eb0089afec81041a08352868c240e06471;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: kvm-x86-pmu-fix-hw_ref_cpu_cycles-event-pseudo-encoding-in-intel_arch_events.patch --- diff --git a/queue-4.4/kvm-x86-pmu-fix-hw_ref_cpu_cycles-event-pseudo-encoding-in-intel_arch_events.patch b/queue-4.4/kvm-x86-pmu-fix-hw_ref_cpu_cycles-event-pseudo-encoding-in-intel_arch_events.patch new file mode 100644 index 00000000000..6f5ddfe7ba3 --- /dev/null +++ b/queue-4.4/kvm-x86-pmu-fix-hw_ref_cpu_cycles-event-pseudo-encoding-in-intel_arch_events.patch @@ -0,0 +1,35 @@ +From 98dd2f108e448988d91e296173e773b06fb978b8 Mon Sep 17 00:00:00 2001 +From: Like Xu +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 + +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 +Message-Id: <20201230081916.63417-1-like.xu@linux.intel.com> +Reviewed-by: Sean Christopherson +Cc: stable@vger.kernel.org +Signed-off-by: Paolo Bonzini +Signed-off-by: Greg Kroah-Hartman + +--- + 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 */ diff --git a/queue-4.4/series b/queue-4.4/series index f9452e13d72..37682760dca 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -1,3 +1,4 @@ acpi-sysfs-prefer-compatible-modalias.patch wext-fix-null-ptr-dereference-with-cfg80211-s-lack-of-commit.patch net-usb-qmi_wwan-added-support-for-thales-cinterion-plsx3-modem-family.patch +kvm-x86-pmu-fix-hw_ref_cpu_cycles-event-pseudo-encoding-in-intel_arch_events.patch