perf/x86/intel: Fix static checker warning in lbr enable
Subsystems (3)
PATCH 1/1 perf/x86/intel: Fix static checker warning in lbr enable
From: Kan Liang <[email protected]>
The commit deb27519bf1f ("perf/x86/intel: Fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI") leads to the following Smatch complaint.
warn: variable dereferenced before check 'cpuc->lbr_sel' (see line 154)
This patch is to fix this warning.
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Kan Liang <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +3 -2
@@ -151,8 +151,9 @@ static void __intel_pmu_lbr_enable(bool pmi)* No need to reprogram LBR_SELECT in a PMI, as it * did not change. */ - lbr_select = cpuc->lbr_sel->config; -if (cpuc->lbr_sel && !pmi) +if (cpuc->lbr_sel) + lbr_select = cpuc->lbr_sel->config; +if (!pmi)wrmsrl (MSR_LBR_SELECT , lbr_select);rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl);
Signature · 1 line
1.8.3.1
tip-bot for Kan Liang
merge botperf/x86/intel: Fix static checker warning in lbr enable
Commit-ID: 96f3eda67fcf2598e9d2794398e0e7ab35138ea6 Gitweb: http://git.kernel.org/tip/96f3eda67fcf2598e9d2794398e0e7ab35138ea6 Author: Kan Liang <[email protected]> AuthorDate: Mon, 14 Sep 2015 10:14:07 -0400 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 18 Sep 2015 09:24:57 +0200
perf/x86/intel: Fix static checker warning in lbr enable
Commit deb27519bf1f ("perf/x86/intel: Fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI") leads to the following Smatch complaint:
warn: variable dereferenced before check 'cpuc->lbr_sel' (see line 154)
Fix the warning.
Reported-by Dan Carpenter <[email protected]>
Signed-off-by Kan Liang <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Fixes deb27519bf1f ("perf/x86/intel: Fix LBR callstack issue caused by FREEZE_LBRS_ON_PMI")
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +3 -2
@@ -151,8 +151,9 @@ static void __intel_pmu_lbr_enable(bool pmi)* No need to reprogram LBR_SELECT in a PMI, as it * did not change. */ - lbr_select = cpuc->lbr_sel->config; -if (cpuc->lbr_sel && !pmi) +if (cpuc->lbr_sel) + lbr_select = cpuc->lbr_sel->config; +if (!pmi)wrmsrl (MSR_LBR_SELECT , lbr_select);rdmsrl (MSR_IA32_DEBUGCTLMSR , debugctl);