perf/x86/intel: fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI
Subsystems (2)
PATCH 1/1 perf/x86/intel: fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI
From: Kan Liang <[email protected]>
This patch fixes an issue which introduced by commit 1a78d93750bb5f61abdc59a91fc3bd06a214542a ("perf/x86/intel: Streamline LBR MSR handling in PMI").
The old patch not only avoids writing LBR_SELECT MSR in PMI, but also avoids updating lbr_select variable. So in PMI, FREEZE_LBRS_ON_PMI bit is always mistakenly set for IA32_DEBUGCTLMSR MSR, which causes superfluous increase/decrease of LBR_TOS when collecting LBR callstack.
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +2 -3
@@ -151,10 +151,9 @@ static void __intel_pmu_lbr_enable(bool pmi)* No need to reprogram LBR_SELECT in a PMI, as it * did not change. */ -if (cpuc->lbr_sel && !pmi) { - lbr_select = cpuc->lbr_sel->config; + lbr_select = cpuc->lbr_sel->config; +if (cpuc->lbr_sel && !pmi)wrmsrl (MSR_LBR_SELECT , lbr_select); - }rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); orig_debugctl = debugctl;
Signature · 1 line
1.8.3.1
tip-bot for Kan Liang
merge bot[tip:perf/core] perf/x86/intel: Fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI
perf/x86/intel: Fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI
Commit-ID: deb27519bf1f4b21a761c0675dbdf1196df7d72a Gitweb: http://git.kernel.org/tip/deb27519bf1f4b21a761c0675dbdf1196df7d72a Author: Kan Liang <[email protected]> AuthorDate: Mon, 17 Aug 2015 08:37:31 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 13 Sep 2015 11:27:22 +0200
perf/x86/intel: Fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI
This patch fixes an issue which introduced by commit 1a78d93750bb5f61abdc59a91fc3bd06a214542a ("perf/x86/intel: Streamline LBR MSR handling in PMI").
The old patch not only avoids writing LBR_SELECT MSR in PMI, but also avoids updating lbr_select variable. So in PMI, FREEZE_LBRS_ON_PMI bit is always mistakenly set for IA32_DEBUGCTLMSR MSR, which causes superfluous increase/decrease of LBR_TOS when collecting LBR callstack.
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +2 -3
@@ -151,10 +151,9 @@ static void __intel_pmu_lbr_enable(bool pmi)* No need to reprogram LBR_SELECT in a PMI, as it * did not change. */ -if (cpuc->lbr_sel && !pmi) { - lbr_select = cpuc->lbr_sel->config; + lbr_select = cpuc->lbr_sel->config; +if (cpuc->lbr_sel && !pmi)wrmsrl (MSR_LBR_SELECT , lbr_select); - }rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl); orig_debugctl = debugctl;