Commit a7795698 authored by Jiri Olsa's avatar Jiri Olsa Committed by Andrii Nakryiko
Browse files

bpftool: Add support to display uprobe_multi links 



Adding support to display details for uprobe_multi links,
both plain:

  # bpftool link -p
  ...
  24: uprobe_multi  prog 126
          uprobe.multi  path /home/jolsa/bpf/test_progs  func_cnt 3  pid 4143
          offset             ref_ctr_offset     cookies
          0xd1f88            0xf5d5a8           0xdead
          0xd1f8f            0xf5d5aa           0xbeef
          0xd1f96            0xf5d5ac           0xcafe

and json:

  # bpftool link -p
  [{
  ...
      },{
          "id": 24,
          "type": "uprobe_multi",
          "prog_id": 126,
          "retprobe": false,
          "path": "/home/jolsa/bpf/test_progs",
          "func_cnt": 3,
          "pid": 4143,
          "funcs": [{
                  "offset": 860040,
                  "ref_ctr_offset": 16111016,
                  "cookie": 57005
              },{
                  "offset": 860047,
                  "ref_ctr_offset": 16111018,
                  "cookie": 48879
              },{
                  "offset": 860054,
                  "ref_ctr_offset": 16111020,
                  "cookie": 51966
              }
          ]
      }
  ]

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarQuentin Monnet <quentin@isovalent.com>
Acked-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/bpf/20231125193130.834322-7-jolsa@kernel.org
parent 147c6930

tools/bpf/bpftool/link.c

+103 −2
Original line number Diff line number Diff line
@@ -294,6 +294,37 @@ show_kprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr) 
	jsonw_end_array(json_wtr);

}



static __u64 *u64_to_arr(__u64 val)

{

	return (__u64 *) u64_to_ptr(val);

}



static void

show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)

{

	__u32 i;



	jsonw_bool_field(json_wtr, "retprobe",

			 info->uprobe_multi.flags & BPF_F_UPROBE_MULTI_RETURN);

	jsonw_string_field(json_wtr, "path", (char *) u64_to_ptr(info->uprobe_multi.path));

	jsonw_uint_field(json_wtr, "func_cnt", info->uprobe_multi.count);

	jsonw_int_field(json_wtr, "pid", (int) info->uprobe_multi.pid);

	jsonw_name(json_wtr, "funcs");

	jsonw_start_array(json_wtr);



	for (i = 0; i < info->uprobe_multi.count; i++) {

		jsonw_start_object(json_wtr);

		jsonw_uint_field(json_wtr, "offset",

				 u64_to_arr(info->uprobe_multi.offsets)[i]);

		jsonw_uint_field(json_wtr, "ref_ctr_offset",

				 u64_to_arr(info->uprobe_multi.ref_ctr_offsets)[i]);

		jsonw_uint_field(json_wtr, "cookie",

				 u64_to_arr(info->uprobe_multi.cookies)[i]);

		jsonw_end_object(json_wtr);

	}

	jsonw_end_array(json_wtr);

}



static void

show_perf_event_kprobe_json(struct bpf_link_info *info, json_writer_t *wtr)

{
@@ -465,6 +496,9 @@ static int show_link_close_json(int fd, struct bpf_link_info *info) 
	case BPF_LINK_TYPE_KPROBE_MULTI:

		show_kprobe_multi_json(info, json_wtr);

		break;

	case BPF_LINK_TYPE_UPROBE_MULTI:

		show_uprobe_multi_json(info, json_wtr);

		break;

	case BPF_LINK_TYPE_PERF_EVENT:

		switch (info->perf_event.type) {

		case BPF_PERF_EVENT_EVENT:
@@ -674,6 +708,33 @@ static void show_kprobe_multi_plain(struct bpf_link_info *info) 
	}

}



static void show_uprobe_multi_plain(struct bpf_link_info *info)

{

	__u32 i;



	if (!info->uprobe_multi.count)

		return;



	if (info->uprobe_multi.flags & BPF_F_UPROBE_MULTI_RETURN)

		printf("\n\turetprobe.multi  ");

	else

		printf("\n\tuprobe.multi  ");



	printf("path %s  ", (char *) u64_to_ptr(info->uprobe_multi.path));

	printf("func_cnt %u  ", info->uprobe_multi.count);



	if (info->uprobe_multi.pid)

		printf("pid %d  ", info->uprobe_multi.pid);



	printf("\n\t%-16s   %-16s   %-16s", "offset", "ref_ctr_offset", "cookies");

	for (i = 0; i < info->uprobe_multi.count; i++) {

		printf("\n\t0x%-16llx 0x%-16llx 0x%-16llx",

			u64_to_arr(info->uprobe_multi.offsets)[i],

			u64_to_arr(info->uprobe_multi.ref_ctr_offsets)[i],

			u64_to_arr(info->uprobe_multi.cookies)[i]);

	}

}



static void show_perf_event_kprobe_plain(struct bpf_link_info *info)

{

	const char *buf;
@@ -807,6 +868,9 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info) 
	case BPF_LINK_TYPE_KPROBE_MULTI:

		show_kprobe_multi_plain(info);

		break;

	case BPF_LINK_TYPE_UPROBE_MULTI:

		show_uprobe_multi_plain(info);

		break;

	case BPF_LINK_TYPE_PERF_EVENT:

		switch (info->perf_event.type) {

		case BPF_PERF_EVENT_EVENT:
@@ -846,8 +910,10 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info) 


static int do_show_link(int fd)

{

	__u64 *ref_ctr_offsets = NULL, *offsets = NULL, *cookies = NULL;

	struct bpf_link_info info;

	__u32 len = sizeof(info);

	char path_buf[PATH_MAX];

	__u64 *addrs = NULL;

	char buf[PATH_MAX];

	int count;
@@ -889,6 +955,39 @@ static int do_show_link(int fd) 
			goto again;

		}

	}

	if (info.type == BPF_LINK_TYPE_UPROBE_MULTI &&

	    !info.uprobe_multi.offsets) {

		count = info.uprobe_multi.count;

		if (count) {

			offsets = calloc(count, sizeof(__u64));

			if (!offsets) {

				p_err("mem alloc failed");

				close(fd);

				return -ENOMEM;

			}

			info.uprobe_multi.offsets = ptr_to_u64(offsets);

			ref_ctr_offsets = calloc(count, sizeof(__u64));

			if (!ref_ctr_offsets) {

				p_err("mem alloc failed");

				free(offsets);

				close(fd);

				return -ENOMEM;

			}

			info.uprobe_multi.ref_ctr_offsets = ptr_to_u64(ref_ctr_offsets);

			cookies = calloc(count, sizeof(__u64));

			if (!cookies) {

				p_err("mem alloc failed");

				free(cookies);

				free(offsets);

				close(fd);

				return -ENOMEM;

			}

			info.uprobe_multi.cookies = ptr_to_u64(cookies);

			info.uprobe_multi.path = ptr_to_u64(path_buf);

			info.uprobe_multi.path_size = sizeof(path_buf);

			goto again;

		}

	}

	if (info.type == BPF_LINK_TYPE_PERF_EVENT) {

		switch (info.perf_event.type) {

		case BPF_PERF_EVENT_TRACEPOINT:
@@ -924,7 +1023,9 @@ static int do_show_link(int fd) 
	else

		show_link_close_plain(fd, &info);



	if (addrs)

	free(ref_ctr_offsets);

	free(cookies);

	free(offsets);

	free(addrs);

	close(fd);

	return 0;