diff mbox series

[v4,1/6] perf: prepare perf_event.h for new types perf_kprobe and perf_uprobe

Message ID 20171205012729.358860-4-songliubraving@fb.com
State Not Applicable, archived
Delegated to: BPF Maintainers
Headers show
Series enable creating [k,u]probe with perf_event_open | expand

Commit Message

Song Liu Dec. 5, 2017, 1:27 a.m. UTC 
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 <songliubraving@fb.com>
Reviewed-by: Yonghong Song <yhs@fb.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
---
 include/uapi/linux/perf_event.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

Comments

Peter Zijlstra Dec. 6, 2017, 10:17 a.m. UTC | #1 
On Mon, Dec 04, 2017 at 05:27:24PM -0800, Song Liu wrote:
> 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 */
> +};

This should not be in uapi; pmu's can describe their config format in
sysfs.

PMU_FORMAT_ATTR(retprobe, "config:0");

static struct attribute *kprobe_attr[] = {
	&format_attr_retprobe,
	NULL,
};

static struct attribute_group kprobe_format_group = {
	.name = "format",
	.attrs = kprobe_attrs,
};

static const struct attribute_group *kprobe_attr_groups[] = {
	&kprobe_format_group,
	NULL,
};

struct pmu perf_kprobe {
	...

	.attr_groups = kprobe_attr_groups,
};

Other than that, this series looks good to me. Thanks!
diff mbox series

Patch

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 */