History

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar: "Bigger kernel side changes: - Add backwards writing capability to the perf ring-buffer code, which is preparation for future advanced features like robust 'overwrite support' and snapshot mode. (Wang Nan) - Add pause and resume ioctls for the perf ringbuffer (Wang Nan) - x86 Intel cstate code cleanups and reorgnization (Thomas Gleixner) - x86 Intel uncore and CPU PMU driver updates (Kan Liang, Peter Zijlstra) - x86 AUX (Intel PT) related enhancements and updates (Alexander Shishkin) - x86 MSR PMU driver enhancements and updates (Huang Rui) - ... and lots of other changes spread out over 40+ commits. Biggest tooling side changes: - 'perf trace' features and enhancements. (Arnaldo Carvalho de Melo) - BPF tooling updates (Wang Nan) - 'perf sched' updates (Jiri Olsa) - 'perf probe' updates (Masami Hiramatsu) - ... plus 200+ other enhancements, fixes and cleanups to tools/ The merge commits, the shortlog and the changelogs contain a lot more details" * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (249 commits) perf/core: Disable the event on a truncated AUX record perf/x86/intel/pt: Generate PMI in the STOP region as well perf buildid-cache: Use lsdir() for looking up buildid caches perf symbols: Use lsdir() for the search in kcore cache directory perf tools: Use SBUILD_ID_SIZE where applicable perf tools: Fix lsdir to set errno correctly perf trace: Move seccomp args beautifiers to tools/perf/trace/beauty/ perf trace: Move flock op beautifier to tools/perf/trace/beauty/ perf build: Add build-test for debug-frame on arm/arm64 perf build: Add build-test for libunwind cross-platforms support perf script: Fix export of callchains with recursion in db-export perf script: Fix callchain addresses in db-export perf script: Fix symbol insertion behavior in db-export perf symbols: Add dso__insert_symbol function perf scripting python: Use Py_FatalError instead of die() perf tools: Remove xrealloc and ALLOC_GROW perf help: Do not use ALLOC_GROW in add_cmd_list perf pmu: Make pmu_formats_string to check return value of strbuf perf header: Make topology checkers to check return value of strbuf perf tools: Make alias handler to check return value of strbuf ...

Linus Torvalds committed 10 years ago

Commit 36db1712 parents 3469d26 3f56e68217 files · +8328 −2731Browse files

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

Unified · Split

include/uapi/linux/perf_event.h+3−1
@@ -340,7 +340,8 @@ struct perf_event_attr { · 339 unmodified lines
340340 comm_exec : 1, /* flag comm events that are due to an exec */
341341 use_clockid : 1, /* use @clockid for time fields */
342342 context_switch : 1, /* context switch data */
343− __reserved_1 : 37;
343+ write_backward : 1, /* Write ring buffer from end to beginning */
344+ __reserved_1 : 36;
344345
345346 union {
346347 __u32 wakeup_events; /* wakeup every n events */
@@ -401,6 +402,7 @@ struct perf_event_attr { · 54 unmodified lines
401402 #define PERF_EVENT_IOC_SET_FILTER _IOW('$', 6, char *)
402403 #define PERF_EVENT_IOC_ID _IOR('$', 7, __u64 *)
403404 #define PERF_EVENT_IOC_SET_BPF _IOW('$', 8, __u32)
405+#define PERF_EVENT_IOC_PAUSE_OUTPUT _IOW('$', 9, __u32)
404406
405407 enum perf_event_ioc_flags {
406408 PERF_IOC_FLAG_GROUP = 1U << 0,