Merge tag 'perf_urgent_for_v5.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Borislav Petkov: - Intel/PT: filters could crash the kernel - Intel: default disable the PMU for SMM, some new-ish EFI firmware has started using CPL3 and the PMU CPL filters don't discriminate against SMM, meaning that CPL3 (userspace only) events now also count EFI/SMM cycles. - Fixup for perf_event_attr::sig_data * tag 'perf_urgent_for_v5.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel/pt: Fix crash with stop filters in single-range mode perf: uapi: Document perf_event_attr::sig_data truncation on 32 bit architectures selftests/perf_events: Test modification of perf_event_attr::sig_data perf: Copy perf_event_attr::sig_data on modification x86/perf: Default set FREEZE_ON_SMI for all

Linus Torvalds committed 4 years ago

Commit c3bf8a12 parents aeabe1e 1d909345 files · +43 −10Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/perf_event.h+2−0

@@ -465,6 +465,8 @@ struct perf_event_attr { · 464 unmodified lines
465	465	/*
466	466	* User provided data if sigtrap=1, passed back to user via
467	467	* siginfo_t::si_perf_data, e.g. to permit user to identify the event.
	468	+ * Note, siginfo_t::si_perf_data is long-sized, and sig_data will be
	469	+ * truncated accordingly on 32 bit architectures.
468	470	*/
469	471	__u64 sig_data;
470	472	};