diff options
| author | Will Deacon <will@kernel.org> | 2021-12-14 13:42:22 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-12-14 13:42:22 +0000 |
| commit | 8bd09b41b82f60a9a4439c2a641ffb542a10c237 (patch) | |
| tree | 786537ba75be02aff449e7c0d3e4d6324bbdfdfe /include/linux | |
| parent | 1879a61f4ad80c7b8cb27d52154ac253e74ebe82 (diff) | |
| parent | aa1005d15d2aee10e5b93a25db076c47e05c4efa (diff) | |
| download | lwn-8bd09b41b82f60a9a4439c2a641ffb542a10c237.tar.gz lwn-8bd09b41b82f60a9a4439c2a641ffb542a10c237.zip | |
Merge branch 'for-next/perf-user-counter-access' into for-next/perf
* for-next/perf-user-counter-access:
Documentation: arm64: Document PMU counters access from userspace
arm64: perf: Enable PMU counter userspace access for perf event
arm64: perf: Add userspace counter access disable switch
perf: Add a counter for number of user access events in context
x86: perf: Move RDPMC event flag to a common definition
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/perf_event.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 0dcfd265beed..411e34210fbf 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -130,6 +130,15 @@ struct hw_perf_event_extra { }; /** + * hw_perf_event::flag values + * + * PERF_EVENT_FLAG_ARCH bits are reserved for architecture-specific + * usage. + */ +#define PERF_EVENT_FLAG_ARCH 0x0000ffff +#define PERF_EVENT_FLAG_USER_READ_CNT 0x80000000 + +/** * struct hw_perf_event - performance event hardware details: */ struct hw_perf_event { @@ -822,6 +831,7 @@ struct perf_event_context { int nr_events; int nr_active; + int nr_user; int is_active; int nr_stat; int nr_freq; |