tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'perf-urgent-2024-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 perf event fixes from Ingo Molnar:

- Work around AMD erratum to filter out bogus LBR stack entries

- Fix incorrect PMU reset that can result in warnings (or worse)
during suspend/hibernation

* tag 'perf-urgent-2024-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/amd/core: Avoid register reset when CPU is dead
perf/x86/amd/lbr: Discard erroneous branch entries

Linus Torvalds b463a3c3 032e22fe

+4 -3
-1
arch/x86/events/amd/core.c
··· 604 604 605 605 kfree(cpuhw->lbr_sel); 606 606 cpuhw->lbr_sel = NULL; 607 - amd_pmu_cpu_reset(cpu); 608 607 609 608 if (!x86_pmu.amd_nb_constraints) 610 609 return;
+4 -2
arch/x86/events/amd/lbr.c
··· 173 173 174 174 /* 175 175 * Check if a branch has been logged; if valid = 0, spec = 0 176 - * then no branch was recorded 176 + * then no branch was recorded; if reserved = 1 then an 177 + * erroneous branch was recorded (see Erratum 1452) 177 178 */ 178 - if (!entry.to.split.valid && !entry.to.split.spec) 179 + if ((!entry.to.split.valid && !entry.to.split.spec) || 180 + entry.to.split.reserved) 179 181 continue; 180 182 181 183 perf_clear_branch_entry_bitfields(br + out);