Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'perf-urgent-2021-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Boundary condition fixes for bugs unearthed by the perf fuzzer"
* tag 'perf-urgent-2021-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Fix unchecked MSR access error caused by VLBR_EVENT
perf/x86/intel: Fix a crash caused by zero PEBS status
+4
-1
+3
arch/x86/events/intel/core.c
+3
arch/x86/events/intel/core.c
···
3659
3659
return ret;
3660
3660
3661
3661
if (event->attr.precise_ip) {
3662
+
if ((event->attr.config & INTEL_ARCH_EVENT_MASK) == INTEL_FIXED_VLBR_EVENT)
3663
+
return -EINVAL;
3664
+
3662
3665
if (!(event->attr.freq || (event->attr.wakeup_events && !event->attr.watermark))) {
3663
3666
event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;
3664
3667
if (!(event->attr.sample_type &
+1
-1
arch/x86/events/intel/ds.c
+1
-1
arch/x86/events/intel/ds.c
···
2010
2010
*/
2011
2011
if (!pebs_status && cpuc->pebs_enabled &&
2012
2012
!(cpuc->pebs_enabled & (cpuc->pebs_enabled-1)))
2013
-
pebs_status = cpuc->pebs_enabled;
2013
+
pebs_status = p->status = cpuc->pebs_enabled;
2014
2014
2015
2015
bit = find_first_bit((unsigned long *)&pebs_status,
2016
2016
x86_pmu.max_pebs_events);