Two new perf types, perf_kprobe and perf_uprobe, will be added to allow
creating [k,u]probe with perf_event_open. These [k,u]probe are associated
with the file decriptor created by perf_event_open, thus are easy to
clean when the file descriptor is destroyed.

kprobe_func and uprobe_path are added to union config1 for pointers to
function name for kprobe or binary path for uprobe.

kprobe_addr and probe_offset are added to union config2 for kernel
address (when kprobe_func is NULL), or [k,u]probe offset.

Signed-off-by: Song Liu <songliubrav...@fb.com>
Reviewed-by: Yonghong Song <y...@fb.com>
Reviewed-by: Josef Bacik <jba...@fb.com>
Acked-by: Alexei Starovoitov <a...@kernel.org>
---
 include/uapi/linux/perf_event.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 362493a..0f39b31 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -291,6 +291,16 @@ enum perf_event_read_format {
        PERF_FORMAT_MAX = 1U << 4,              /* non-ABI */
 };
 
+/*
+ * Flags in config, used by dynamic PMU kprobe and uprobe
+ *
+ * PERF_PROBE_CONFIG_IS_RETPROBE if set, create kretprobe/uretprobe
+ *                               if not set, create kprobe/uprobe
+ */
+enum perf_probe_config {
+       PERF_PROBE_CONFIG_IS_RETPROBE           = 1U << 0,  /* [k,u]retprobe */
+};
+
 #define PERF_ATTR_SIZE_VER0    64      /* sizeof first published struct */
 #define PERF_ATTR_SIZE_VER1    72      /* add: config2 */
 #define PERF_ATTR_SIZE_VER2    80      /* add: branch_sample_type */
@@ -380,10 +390,14 @@ struct perf_event_attr {
        __u32                   bp_type;
        union {
                __u64           bp_addr;
+               __u64           kprobe_func; /* for perf_kprobe */
+               __u64           uprobe_path; /* for perf_uprobe */
                __u64           config1; /* extension of config */
        };
        union {
                __u64           bp_len;
+               __u64           kprobe_addr; /* when kprobe_func == NULL */
+               __u64           probe_offset; /* for perf_[k,u]probe */
                __u64           config2; /* extension of config1 */
        };
        __u64   branch_sample_type; /* enum perf_branch_sample_type */
-- 
2.9.5

Reply via email to