trace_uprobe: support reference counter in fd-based uprobe
Subsystems (2)
Steven Rostedt
maintainerPATCH 1/1 trace_uprobe: support reference counter in fd-based uprobe
Added for the 4.20/5.0 queue.
-- Steve
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: a6ca88b241d5e929e6e60b12ad8cd288f0ffa256
Song Liu (1):
trace_uprobe: support reference counter in fd-based uprobe
----
include/linux/trace_events.h | 3 ++- kernel/events/core.c | 49 ++++++++++++++++++++++++++++++++--------- kernel/trace/trace_event_perf.c | 7 +++--- kernel/trace/trace_probe.h | 3 ++- kernel/trace/trace_uprobe.c | 4 +++- 5 files changed, 50 insertions(+), 16 deletions(-) --------------------------- commit a6ca88b241d5e929e6e60b12ad8cd288f0ffa256 Author: Song Liu <[email protected]> Date: Mon Oct 1 22:36:36 2018 -0700
trace_uprobe: support reference counter in fd-based uprobe
This patch enables uprobes with reference counter in fd-based uprobe. Highest 32 bits of perf_event_attr.config is used to stored offset of the reference count (semaphore).
Format information in /sys/bus/event_source/devices/uprobe/format/ is updated to reflect this new feature.
Cc Oleg Nesterov <[email protected]>
Reviewed-and-tested-by Ravi Bangoria <[email protected]>
Signed-off-by Song Liu <[email protected]>
Signed-off-by Steven Rostedt (VMware) <[email protected]>
include/linux/trace_events.h +2 -1
@@ -575,7 +575,8 @@ extern int bpf_get_kprobe_info(const struct perf_event *event, bool perf_type_tracepoint);#endif #ifdef CONFIG_UPROBE_EVENTS -extern int perf_uprobe_init (struct perf_event *event,bool is_retprobe); +extern int perf_uprobe_init (struct perf_event *event, +unsigned long ref_ctr_offset,bool is_retprobe);extern void perf_uprobe_destroy (struct perf_event *event); extern int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type, const char **filename,
kernel/events/core.c +39 -10
101 lines not on this page · raw message
kernel/trace/trace_event_perf.c +4 -3
@@ -290,7 +290,8 @@ void perf_kprobe_destroy(struct perf_event *p_event)#endif /* CONFIG_KPROBE_EVENTS */ #ifdef CONFIG_UPROBE_EVENTS -int perf_uprobe_init (struct perf_event *p_event,bool is_retprobe) +int perf_uprobe_init (struct perf_event *p_event, +unsigned long ref_ctr_offset,bool is_retprobe) {int ret;char *path =NULL ;
@@ -312,8 +313,8 @@ int perf_uprobe_init(struct perf_event *p_event, bool is_retprobe) goto out; } - tp_event =create_local_trace_uprobe ( - path, p_event->attr.probe_offset, is_retprobe); + tp_event =create_local_trace_uprobe (path, p_event->attr.probe_offset, + ref_ctr_offset, is_retprobe);if (IS_ERR (tp_event)) { ret =PTR_ERR (tp_event); goto out;
kernel/trace/trace_probe.h +2 -1
@@ -412,6 +412,7 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs,extern void destroy_local_trace_kprobe (struct trace_event_call *event_call);extern struct trace_event_call * -create_local_trace_uprobe (char *name,unsigned long offs,bool is_return); +create_local_trace_uprobe (char *name,unsigned long offs, +unsigned long ref_ctr_offset,bool is_return);extern void destroy_local_trace_uprobe (struct trace_event_call *event_call);#endif
kernel/trace/trace_uprobe.c +3 -1
@@ -1405,7 +1405,8 @@ static int unregister_uprobe_event(struct trace_uprobe *tu)#ifdef CONFIG_PERF_EVENTS struct trace_event_call * -create_local_trace_uprobe (char *name,unsigned long offs,bool is_return) +create_local_trace_uprobe (char *name,unsigned long offs, +unsigned long ref_ctr_offset,bool is_return) {struct trace_uprobe *tu;struct path path;
@@ -1437,6 +1438,7 @@ create_local_trace_uprobe(char *name, unsigned long offs, bool is_return) tu->offset = offs; tu->path = path; + tu->ref_ctr_offset = ref_ctr_offset; tu->filename =kstrdup (name,GFP_KERNEL );init_trace_event_call (tu, &tu->tp.call);