perf/x86/pebs: fix handling of PEBS buffer overflows
Subsystems (2)
PATCH 1/1 perf/x86/pebs: fix handling of PEBS buffer overflows
This patch solves a race condition between PEBS and the PMU handler.
In case multiple PEBS events are sampled at the same time, it is possible to have GLOBAL_STATUS bit 62 set indicating PEBS buffer overflow and also seeing at most 3 PEBS counters having their bits set in the status register. This is a sign that there was at least one PEBS record pending at the time of the PMU interrupt. PEBS counters must only be processed via the drain_pebs() calls, and not via the regular sample processing loop coming after that the function, otherwise phony regular samples may be generated in the sampling buffer not marked with the EXACT tag.
Another possibility is to have one PEBS event and at least one non-PEBS event whic hoverflows while PEBS has armed. In this case, bit 62 of GLOBAL_STATUS will not be set, yet the overflow status bit for the PEBS counter will be on Skylake.
To avoid this problem, we systematically ignore the PEBS-enabled counters from the GLOBAL_STATUS mask and we always process PEBS events via drain_pebs().
The problem manifested itself by having non-exact samples when sampling only PEBS events, i.e., the PERF_SAMPLE_RECORD would not have the EXACT flag set.
Note that this problem is only present on Skylake processor. This fix is harmless on older processors.
--- arch/x86/events/intel/core.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
arch/x86/events/intel/core.c +21 -9
@@ -2110,6 +2110,27 @@ static int intel_pmu_handle_irq(struct pt_regs *regs) GLOBAL_STATUS_LBRS_FROZEN);if (!status) goto done; +/* +* In case multiple PEBS events are sampled at the same time, +* it is possible to have GLOBAL_STATUS bit 62 set indicating +* PEBS buffer overflow and also seeing at most 3 PEBS counters +* having their bits set in the status register. This is a sign +* that there was at least one PEBS record pending at the time +* of the PMU interrupt. PEBS counters must only be processed +* via the drain_pebs() calls and not via the regular sample +* processing loop coming after that the function, otherwise +* phony regular samples may be generated in the sampling buffer +* not marked with the EXACT tag. Another possibility is to have +* one PEBS event and at least one non-PEBS event whic hoverflows +* while PEBS has armed. In this case, bit 62 of GLOBAL_STATUS will +* not be set, yet the overflow status bit for the PEBS counter will +* be on Skylake. +* +* To avoid this problem, we systematically ignore the PEBS-enabled +* counters from the GLOBAL_STATUS mask and we always process PEBS +* events via drain_pebs(). +*/ + status &= ~cpuc->pebs_enabled;/* * PEBS overflow sets bit 62 in the global status register
@@ -2117,15 +2138,6 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)if (__test_and_clear_bit (62 , (unsigned long *)&status)) { handled++; x86_pmu.drain_pebs (regs); -/* -* There are cases where, even though, the PEBS ovfl bit is set -* in GLOBAL_OVF_STATUS, the PEBS events may also have their -* overflow bits set for their counters. We must clear them -* here because they have been processed as exact samples in -* the drain_pebs() routine. They must not be processed again -* in the for_each_bit_set() loop for regular samples below. -*/ - status &= ~cpuc->pebs_enabled; status &= x86_pmu.intel_ctrl |GLOBAL_STATUS_TRACE_TOPAPMI ; }
Signature · 1 line
2.5.0
Peter Zijlstra
maintainerQuoted 26 lines · Stephane Eranian
This patch solves a race condition between PEBS and the PMU handler.
In case multiple PEBS events are sampled at the same time, it is possible to have
GLOBAL_STATUSbit 62 set indicating PEBS buffer overflow and also seeing at most 3 PEBS counters having their bits set in the status register. This is a sign that there was at least one PEBS record pending at the time of the PMU interrupt. PEBS counters must only be processed via thedrain_pebs()calls, and not via the regular sample processing loop coming after that the function, otherwise phony regular samples may be generated in the sampling buffer not marked with the EXACT tag.Another possibility is to have one PEBS event and at least one non-PEBS event whic hoverflows while PEBS has armed. In this case, bit 62 of
GLOBAL_STATUSwill not be set, yet the overflow status bit for the PEBS counter will be on Skylake.To avoid this problem, we systematically ignore the PEBS-enabled counters from the
GLOBAL_STATUSmask and we always process PEBS events viadrain_pebs().The problem manifested itself by having non-exact samples when sampling only PEBS events, i.e., the
PERF_SAMPLE_RECORDwould not have the EXACT flag set.
Quoted 6 lines
Note that this problem is only present on Skylake processor. This fix is harmless on older processors.
Reported-by Peter Zijlstra <[email protected]>Signed-off-by Stephane Eranian <[email protected]>---
Thanks!
tip-bot for Stephane Eranian
merge bot[tip:perf/urgent] perf/x86/pebs: Fix handling of PEBS buffer overflows
In reply to Stephane Eranianperf/x86/pebs: Fix handling of PEBS buffer overflows
Commit-ID: daa864b8f8e34477bde817f26d736d89dc6032f3 Gitweb: http://git.kernel.org/tip/daa864b8f8e34477bde817f26d736d89dc6032f3 Author: Stephane Eranian <[email protected]> AuthorDate: Thu, 22 Dec 2016 00:29:26 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 22 Dec 2016 17:45:36 +0100
perf/x86/pebs: Fix handling of PEBS buffer overflows
This patch solves a race condition between PEBS and the PMU handler.
In case multiple PEBS events are sampled at the same time, it is possible to have GLOBAL_STATUS bit 62 set indicating PEBS buffer overflow and also seeing at most 3 PEBS counters having their bits set in the status register. This is a sign that there was at least one PEBS record pending at the time of the PMU interrupt. PEBS counters must only be processed via the drain_pebs() calls, and not via the regular sample processing loop coming after that the function, otherwise phony regular samples may be generated in the sampling buffer not marked with the EXACT tag.
Another possibility is to have one PEBS event and at least one non-PEBS event whic hoverflows while PEBS has armed. In this case, bit 62 of GLOBAL_STATUS will not be set, yet the overflow status bit for the PEBS counter will be on Skylake.
To avoid this problem, we systematically ignore the PEBS-enabled counters from the GLOBAL_STATUS mask and we always process PEBS events via drain_pebs().
The problem manifested itself by having non-exact samples when sampling only PEBS events, i.e., the PERF_SAMPLE_RECORD would not have the EXACT flag set.
Note that this problem is only present on Skylake processor. This fix is harmless on older processors.
--- arch/x86/events/intel/core.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
arch/x86/events/intel/core.c +21 -9
@@ -2110,6 +2110,27 @@ again: GLOBAL_STATUS_LBRS_FROZEN);if (!status) goto done; +/* +* In case multiple PEBS events are sampled at the same time, +* it is possible to have GLOBAL_STATUS bit 62 set indicating +* PEBS buffer overflow and also seeing at most 3 PEBS counters +* having their bits set in the status register. This is a sign +* that there was at least one PEBS record pending at the time +* of the PMU interrupt. PEBS counters must only be processed +* via the drain_pebs() calls and not via the regular sample +* processing loop coming after that the function, otherwise +* phony regular samples may be generated in the sampling buffer +* not marked with the EXACT tag. Another possibility is to have +* one PEBS event and at least one non-PEBS event whic hoverflows +* while PEBS has armed. In this case, bit 62 of GLOBAL_STATUS will +* not be set, yet the overflow status bit for the PEBS counter will +* be on Skylake. +* +* To avoid this problem, we systematically ignore the PEBS-enabled +* counters from the GLOBAL_STATUS mask and we always process PEBS +* events via drain_pebs(). +*/ + status &= ~cpuc->pebs_enabled;/* * PEBS overflow sets bit 62 in the global status register
@@ -2117,15 +2138,6 @@ again:if (__test_and_clear_bit (62 , (unsigned long *)&status)) { handled++; x86_pmu.drain_pebs (regs); -/* -* There are cases where, even though, the PEBS ovfl bit is set -* in GLOBAL_OVF_STATUS, the PEBS events may also have their -* overflow bits set for their counters. We must clear them -* here because they have been processed as exact samples in -* the drain_pebs() routine. They must not be processed again -* in the for_each_bit_set() loop for regular samples below. -*/ - status &= ~cpuc->pebs_enabled; status &= x86_pmu.intel_ctrl |GLOBAL_STATUS_TRACE_TOPAPMI ; }