perf/x86/intel: Fix a warning on x86_pmu_stop() with large PEBS
Subsystems (2)
Namhyung Kim
maintainerPATCH 1/2 perf/x86/intel: Fix a warning on x86_pmu_stop() with large PEBS
The commit 3966c3feca3f ("x86/perf/amd: Remove need to check "running" bit in NMI handler") introduced this. It seems x86_pmu_stop can be called recursively (like when it losts some samples) like below:
x86_pmu_stop
intel_pmu_disable_event (x86_pmu_disable)
intel_pmu_pebs_disable
intel_pmu_drain_pebs_nhm (x86_pmu_drain_pebs_buffer)
x86_pmu_stopWhile commit 35d1ce6bec13 ("perf/x86/intel/ds: Fix x86_pmu_stop warning for large PEBS") fixed it for the normal cases, there's another path to call x86_pmu_stop() recursively when a PEBS error was detected (like two or more counters overflowed at the same time).
Like in the Kan's previous fix, we can skip the interrupt accounting for large PEBS, so check the iregs which is set for PMI only.
--- arch/x86/events/intel/ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/ds.c +1 -1
@@ -1940,7 +1940,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_dif (error[bit]) {perf_log_lost_samples (event, error[bit]); -if (perf_event_account_interrupt (event)) +if (iregs &&perf_event_account_interrupt (event))x86_pmu_stop (event,0 ); }
Signature · 1 line
2.29.2.454.gaff20da3a2-goog
Namhyung Kim
maintainerPATCH 2/2 perf/x86/intel: Check PEBS status correctly
From: Stephane Eranian <[email protected]>
The kernel cannot disambiguate when 2+ PEBS counters overflow at the same time. This is what the comment for this code suggests. However, I see the comparison is done with the unfiltered p->status which is a copy of IA32_PERF_GLOBAL_STATUS at the time of the sample. This register contains more than the PEBS counter overflow bits. It also includes many other bits which could also be set.
--- arch/x86/events/intel/ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/ds.c +1 -1
@@ -1916,7 +1916,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_d* that caused the PEBS record. It's called collision. * If collision happened, the record will be dropped. */ -if (p->status != (1ULL << bit)) { +if (pebs_status != (1ULL << bit)) {for_each_set_bit (i, (unsigned long *)&pebs_status, size) error[i]++;continue ;
Signature · 1 line
2.29.2.454.gaff20da3a2-goog
[tip: perf/urgent] perf/x86/intel: Check PEBS status correctly
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: fc17db8aa4c53cbd2d5469bb0521ea0f0a6dbb27 Gitweb: https://git.kernel.org/tip/fc17db8aa4c53cbd2d5469bb0521ea0f0a6dbb27 Author: Stephane Eranian <[email protected]> AuthorDate: Thu, 26 Nov 2020 20:09:22 +09:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 03 Dec 2020 10:00:26 +01:00
perf/x86/intel: Check PEBS status correctly
The kernel cannot disambiguate when 2+ PEBS counters overflow at the same time. This is what the comment for this code suggests. However, I see the comparison is done with the unfiltered p->status which is a copy of IA32_PERF_GLOBAL_STATUS at the time of the sample. This register contains more than the PEBS counter overflow bits. It also includes many other bits which could also be set.
--- arch/x86/events/intel/ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/ds.c +1 -1
@@ -1916,7 +1916,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_d* that caused the PEBS record. It's called collision. * If collision happened, the record will be dropped. */ -if (p->status != (1ULL << bit)) { +if (pebs_status != (1ULL << bit)) {for_each_set_bit (i, (unsigned long *)&pebs_status, size) error[i]++;continue ;
Peter Zijlstra
maintainerQuoted 18 lines · Namhyung Kim
The commit
3966c3feca3f("x86/perf/amd: Remove need to check "running" bit in NMI handler") introduced this. It seemsx86_pmu_stopcan be called recursively (like when it losts some samples) like below:
x86_pmu_stopintel_pmu_disable_event (x86_pmu_disable) intel_pmu_pebs_disable intel_pmu_drain_pebs_nhm (x86_pmu_drain_pebs_buffer) x86_pmu_stopWhile commit
35d1ce6bec13("perf/x86/intel/ds: Fixx86_pmu_stopwarning for large PEBS") fixed it for the normal cases, there's another path to callx86_pmu_stop()recursively when a PEBS error was detected (like two or more counters overflowed at the same time).Like in the Kan's previous fix, we can skip the interrupt accounting for large PEBS, so check the iregs which is set for PMI only.
Quoted 6 lines
Fixes 3966c3feca3f ("x86/perf/amd: Remove need to check "running" bit in NMI handler")Reported-by John Sperbeck <[email protected]>Suggested-by Peter Zijlstra <[email protected]>Cc "Lendacky, Thomas" <[email protected]>Cc Kan Liang <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
Thanks for both!
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: 5debf02131227d39988e44adf5090fb796fa8466 Gitweb: https://git.kernel.org/tip/5debf02131227d39988e44adf5090fb796fa8466 Author: Namhyung Kim <[email protected]> AuthorDate: Thu, 26 Nov 2020 20:09:21 +09:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 03 Dec 2020 10:00:26 +01:00
perf/x86/intel: Fix a warning on x86_pmu_stop() with large PEBS
The commit 3966c3feca3f ("x86/perf/amd: Remove need to check "running" bit in NMI handler") introduced this. It seems x86_pmu_stop can be called recursively (like when it losts some samples) like below:
x86_pmu_stop
intel_pmu_disable_event (x86_pmu_disable)
intel_pmu_pebs_disable
intel_pmu_drain_pebs_nhm (x86_pmu_drain_pebs_buffer)
x86_pmu_stopWhile commit 35d1ce6bec13 ("perf/x86/intel/ds: Fix x86_pmu_stop warning for large PEBS") fixed it for the normal cases, there's another path to call x86_pmu_stop() recursively when a PEBS error was detected (like two or more counters overflowed at the same time).
Like in the Kan's previous fix, we can skip the interrupt accounting for large PEBS, so check the iregs which is set for PMI only.
--- arch/x86/events/intel/ds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/ds.c +1 -1
@@ -1940,7 +1940,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_dif (error[bit]) {perf_log_lost_samples (event, error[bit]); -if (perf_event_account_interrupt (event)) +if (iregs &&perf_event_account_interrupt (event))x86_pmu_stop (event,0 ); }