Commit ce1b98a3 authored by Stephane Eranian's avatar Stephane Eranian Committed by Greg Kroah-Hartman

perf/x86: Fix LBR related crashes on Intel Atom

commit 6fc2e830 upstream.

This patches fixes the LBR kernel crashes on Intel Atom.

The kernel was assuming that if the CPU supports 64-bit format
LBR, then it has an LBR_SELECT MSR. Atom uses 64-bit LBR format
but does not have LBR_SELECT. That was causing NULL pointer
dereferences in a couple of places.
Signed-off-by: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: kan.liang@intel.com
Fixes: 96f3eda6 ("perf/x86/intel: Fix static checker warning in lbr enable")
Link: http://lkml.kernel.org/r/1449182000-31524-2-git-send-email-eranian@google.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarDenys Zagorui <dzagorui@cisco.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b4cf4902
...@@ -153,7 +153,7 @@ static void __intel_pmu_lbr_enable(bool pmi) ...@@ -153,7 +153,7 @@ static void __intel_pmu_lbr_enable(bool pmi)
*/ */
if (cpuc->lbr_sel) if (cpuc->lbr_sel)
lbr_select = cpuc->lbr_sel->config; lbr_select = cpuc->lbr_sel->config;
if (!pmi) if (!pmi && cpuc->lbr_sel)
wrmsrl(MSR_LBR_SELECT, lbr_select); wrmsrl(MSR_LBR_SELECT, lbr_select);
rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl); rdmsrl(MSR_IA32_DEBUGCTLMSR, debugctl);
...@@ -432,8 +432,10 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) ...@@ -432,8 +432,10 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)
int out = 0; int out = 0;
int num = x86_pmu.lbr_nr; int num = x86_pmu.lbr_nr;
if (cpuc->lbr_sel) {
if (cpuc->lbr_sel->config & LBR_CALL_STACK) if (cpuc->lbr_sel->config & LBR_CALL_STACK)
num = tos; num = tos;
}
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
unsigned long lbr_idx = (tos - i) & mask; unsigned long lbr_idx = (tos - i) & mask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment