Commit 5a8cb231 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'bpf-retrieve-ref_ctr_offset-from-uprobe-perf-link' 

Jiri Olsa says:

====================
bpf: Retrieve ref_ctr_offset from uprobe perf link

hi,
adding ref_ctr_offset retrieval for uprobe perf link info.

v2 changes:
  - display ref_ctr_offset as hex number [Andrii]
  - added acks

thanks,
jirka
---
====================

Link: https://patch.msgid.link/20250509153539.779599-1-jolsa@kernel.org


Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents cb4a1192 97596edf

include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -6724,6 +6724,7 @@ struct bpf_link_info { 
					__u32 name_len;

					__u32 offset; /* offset from file_name */

					__u64 cookie;

					__u64 ref_ctr_offset;

				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */

				struct {

					__aligned_u64 func_name; /* in/out */

kernel/bpf/syscall.c

+3 −2
Original line number Diff line number Diff line
@@ -3800,14 +3800,14 @@ static int bpf_perf_link_fill_kprobe(const struct perf_event *event, 
static int bpf_perf_link_fill_uprobe(const struct perf_event *event,

				     struct bpf_link_info *info)

{

	u64 ref_ctr_offset, offset;

	char __user *uname;

	u64 addr, offset;

	u32 ulen, type;

	int err;



	uname = u64_to_user_ptr(info->perf_event.uprobe.file_name);

	ulen = info->perf_event.uprobe.name_len;

	err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &addr,

	err = bpf_perf_link_fill_common(event, uname, &ulen, &offset, &ref_ctr_offset,

					&type, NULL);

	if (err)

		return err;
@@ -3819,6 +3819,7 @@ static int bpf_perf_link_fill_uprobe(const struct perf_event *event, 
	info->perf_event.uprobe.name_len = ulen;

	info->perf_event.uprobe.offset = offset;

	info->perf_event.uprobe.cookie = event->bpf_cookie;

	info->perf_event.uprobe.ref_ctr_offset = ref_ctr_offset;

	return 0;

}

#endif

kernel/trace/trace_uprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ int bpf_get_uprobe_info(const struct perf_event *event, u32 *fd_type, 
				    : BPF_FD_TYPE_UPROBE;

	*filename = tu->filename;

	*probe_offset = tu->offset;

	*probe_addr = 0;

	*probe_addr = tu->ref_ctr_offset;

	return 0;

}

#endif	/* CONFIG_PERF_EVENTS */

tools/bpf/bpftool/link.c

+3 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ show_perf_event_uprobe_json(struct bpf_link_info *info, json_writer_t *wtr) 
			   u64_to_ptr(info->perf_event.uprobe.file_name));

	jsonw_uint_field(wtr, "offset", info->perf_event.uprobe.offset);

	jsonw_uint_field(wtr, "cookie", info->perf_event.uprobe.cookie);

	jsonw_uint_field(wtr, "ref_ctr_offset", info->perf_event.uprobe.ref_ctr_offset);

}



static void
@@ -823,6 +824,8 @@ static void show_perf_event_uprobe_plain(struct bpf_link_info *info) 
	printf("%s+%#x  ", buf, info->perf_event.uprobe.offset);

	if (info->perf_event.uprobe.cookie)

		printf("cookie %llu  ", info->perf_event.uprobe.cookie);

	if (info->perf_event.uprobe.ref_ctr_offset)

		printf("ref_ctr_offset 0x%llx  ", info->perf_event.uprobe.ref_ctr_offset);

}



static void show_perf_event_tracepoint_plain(struct bpf_link_info *info)

tools/include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -6724,6 +6724,7 @@ struct bpf_link_info { 
					__u32 name_len;

					__u32 offset; /* offset from file_name */

					__u64 cookie;

					__u64 ref_ctr_offset;

				} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */

				struct {

					__aligned_u64 func_name; /* in/out */