Skip to content

Commit 26db2e0

Browse files
kimphillamdIngo Molnar
authored andcommitted
perf/x86/amd/ibs: Work around erratum torvalds#1197
Erratum torvalds#1197 "IBS (Instruction Based Sampling) Register State May be Incorrect After Restore From CC6" is published in a document: "Revision Guide for AMD Family 19h Models 00h-0Fh Processors" 56683 Rev. 1.04 July 2021 https://bugzilla.kernel.org/show_bug.cgi?id=206537 Implement the erratum's suggested workaround and ignore IBS samples if MSRC001_1031 == 0. Signed-off-by: Kim Phillips <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0b3a873 commit 26db2e0

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

arch/x86/events/amd/ibs.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ struct perf_ibs {
9090
unsigned long offset_mask[1];
9191
int offset_max;
9292
unsigned int fetch_count_reset_broken : 1;
93+
unsigned int fetch_ignore_if_zero_rip : 1;
9394
struct cpu_perf_ibs __percpu *pcpu;
9495

9596
struct attribute **format_attrs;
@@ -672,6 +673,10 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs)
672673
if (check_rip && (ibs_data.regs[2] & IBS_RIP_INVALID)) {
673674
regs.flags &= ~PERF_EFLAGS_EXACT;
674675
} else {
676+
/* Workaround for erratum #1197 */
677+
if (perf_ibs->fetch_ignore_if_zero_rip && !(ibs_data.regs[1]))
678+
goto out;
679+
675680
set_linear_ip(&regs, ibs_data.regs[1]);
676681
regs.flags |= PERF_EFLAGS_EXACT;
677682
}
@@ -769,6 +774,9 @@ static __init void perf_event_ibs_init(void)
769774
if (boot_cpu_data.x86 >= 0x16 && boot_cpu_data.x86 <= 0x18)
770775
perf_ibs_fetch.fetch_count_reset_broken = 1;
771776

777+
if (boot_cpu_data.x86 == 0x19 && boot_cpu_data.x86_model < 0x10)
778+
perf_ibs_fetch.fetch_ignore_if_zero_rip = 1;
779+
772780
perf_ibs_pmu_init(&perf_ibs_fetch, "ibs_fetch");
773781

774782
if (ibs_caps & IBS_CAPS_OPCNT) {

0 commit comments

Comments
 (0)