[PATCH v2 2/6] perf: copy new perf_event.h to tools/include/uapi
From: Song Liu <hidden>
Date: 2017-11-30 01:45:04
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
perf_event.h is updated in previous patch, this patch applies same changes to the tools/ version. This is part is put in a separate patch in case the two files are back ported separately. Signed-off-by: Song Liu <redacted> Reviewed-by: Yonghong Song <redacted> Reviewed-by: Josef Bacik <redacted> Acked-by: Alexei Starovoitov <ast@kernel.org> --- tools/include/uapi/linux/perf_event.h | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index b9a4953..c361442 100644
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h@@ -33,6 +33,8 @@ enum perf_type_id { PERF_TYPE_HW_CACHE = 3, PERF_TYPE_RAW = 4, PERF_TYPE_BREAKPOINT = 5, + PERF_TYPE_KPROBE = 6, + PERF_TYPE_UPROBE = 7, PERF_TYPE_MAX, /* non-ABI */ };
@@ -299,6 +301,8 @@ enum perf_event_read_format { #define PERF_ATTR_SIZE_VER4 104 /* add: sample_regs_intr */ #define PERF_ATTR_SIZE_VER5 112 /* add: aux_watermark */ +#define MAX_PROBE_FUNC_NAME_LEN 64 + /* * Hardware event_id to monitor via a performance monitoring event: *
@@ -380,10 +384,14 @@ struct perf_event_attr { __u32 bp_type; union { __u64 bp_addr; + __u64 kprobe_func; /* for PERF_TYPE_KPROBE */ + __u64 uprobe_path; /* for PERF_TYPE_UPROBE */ __u64 config1; /* extension of config */ }; union { __u64 bp_len; + __u64 kprobe_addr; /* for PERF_TYPE_KPROBE, with kprobe_func == NULL */ + __u64 probe_offset; /* for PERF_TYPE_[K,U]PROBE */ __u64 config2; /* extension of config1 */ }; __u64 branch_sample_type; /* enum perf_branch_sample_type */
--
2.9.5