perf/x86/intel: Fix PT PMI handling
Subsystems (3)
Alexander Shishkin
reviewerPATCH 1/1 perf/x86/intel: Fix PT PMI handling
Commit:
ccbebba4c6bf ("perf/x86/intel/pt: Bypass PT vs. LBR exclusivity if the core supports it")
skips the PT/LBR exclusivity check on CPUs where PT and LBRs coexist, but also inadvertently skips the active_events bump for PT in that case, which is a bug. If there aren't any hardware events at the same time as PT, the PMI handler will ignore PT PMIs, as active_events reads zero in that case, resulting in the "Uhhuh" spurious NMI warning and PT data loss.
Fix this by always increasing active_events for PT events.
--- arch/x86/events/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/events/core.c +7 -2
@@ -375,7 +375,7 @@ int x86_add_exclusive(unsigned int what)* LBR and BTS are still mutually exclusive. */ if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt) -return 0 ; + goto out;if (!atomic_inc_not_zero (&x86_pmu.lbr_exclusive[what])) {mutex_lock (&pmc_reserve_mutex);
@@ -387,6 +387,7 @@ int x86_add_exclusive(unsigned int what)mutex_unlock (&pmc_reserve_mutex); } +out:atomic_inc (&active_events);return 0 ;
@@ -397,11 +398,15 @@ int x86_add_exclusive(unsigned int what)void x86_del_exclusive (unsigned int what) { +atomic_dec (&active_events); + +/* +* See the comment in x86_add_exclusive(). +*/ if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt)return ;atomic_dec (&x86_pmu.lbr_exclusive[what]); -atomic_dec (&active_events); }int x86_setup_perfctr (struct perf_event *event)
Signature · 1 line
2.24.0
Quoted 12 lines · Alexander Shishkin
Commit:
ccbebba4c6bf("perf/x86/intel/pt: Bypass PT vs. LBR exclusivity if the core supports it")skips the PT/LBR exclusivity check on CPUs where PT and LBRs coexist, but also inadvertently skips the
active_eventsbump for PT in that case, which is a bug. If there aren't any hardware events at the same time as PT, the PMI handler will ignore PT PMIs, asactive_eventsreads zero in that case, resulting in the "Uhhuh" spurious NMI warning and PT data loss.Fix this by always increasing
active_eventsfor PT events.
Quoted 7 lines
Signed-off-by Alexander Shishkin <[email protected]>Fixes ccbebba4c6bf ("perf/x86/intel/pt: Bypass PT vs. LBR exclusivity if the core supports it")Reported-by Vitaly Slobodskoy <[email protected]>Cc [email protected] # v4.7--- arch/x86/events/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Quoted 40 lines
arch/x86/events/core.c +7
-2@@ -375,7 +375,7 @@ int x86_add_exclusive(unsigned int what)* LBR and BTS are still mutually exclusive. */ if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt) -return 0 ; + goto out;if (!atomic_inc_not_zero (&x86_pmu.lbr_exclusive[what])) {mutex_lock (&pmc_reserve_mutex);@@ -387,6 +387,7 @@ int x86_add_exclusive(unsigned int what)mutex_unlock (&pmc_reserve_mutex); } +out:atomic_inc (&active_events);return 0 ;@@ -397,11 +398,15 @@ int x86_add_exclusive(unsigned int what)void x86_del_exclusive (unsigned int what) { +atomic_dec (&active_events); + +/* +* See the comment in x86_add_exclusive(). +*/ if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt)return ;atomic_dec (&x86_pmu.lbr_exclusive[what]); -atomic_dec (&active_events); }int x86_setup_perfctr (struct perf_event *event)
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 92ca7da4bdc24d63bb0bcd241c11441ddb63b80a Gitweb: https://git.kernel.org/tip/92ca7da4bdc24d63bb0bcd241c11441ddb63b80a Author: Alexander Shishkin <[email protected]> AuthorDate: Tue, 10 Dec 2019 12:51:01 +02:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Tue, 17 Dec 2019 13:32:46 +01:00
perf/x86/intel: Fix PT PMI handling
Commit:
ccbebba4c6bf ("perf/x86/intel/pt: Bypass PT vs. LBR exclusivity if the core supports it")
skips the PT/LBR exclusivity check on CPUs where PT and LBRs coexist, but also inadvertently skips the active_events bump for PT in that case, which is a bug. If there aren't any hardware events at the same time as PT, the PMI handler will ignore PT PMIs, as active_events reads zero in that case, resulting in the "Uhhuh" spurious NMI warning and PT data loss.
Fix this by always increasing active_events for PT events.
--- arch/x86/events/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/events/core.c +7 -2
@@ -376,7 +376,7 @@ int x86_add_exclusive(unsigned int what)* LBR and BTS are still mutually exclusive. */ if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt) -return 0 ; + goto out;if (!atomic_inc_not_zero (&x86_pmu.lbr_exclusive[what])) {mutex_lock (&pmc_reserve_mutex);
@@ -388,6 +388,7 @@ int x86_add_exclusive(unsigned int what)mutex_unlock (&pmc_reserve_mutex); } +out:atomic_inc (&active_events);return 0 ;
@@ -398,11 +399,15 @@ fail_unlock:void x86_del_exclusive (unsigned int what) { +atomic_dec (&active_events); + +/* +* See the comment in x86_add_exclusive(). +*/ if (x86_pmu.lbr_pt_coexist && what == x86_lbr_exclusive_pt)return ;atomic_dec (&x86_pmu.lbr_exclusive[what]); -atomic_dec (&active_events); }int x86_setup_perfctr (struct perf_event *event)