From: Kui-Feng Lee <sinquersw@gmail.com>
To: Yafang Shao <laoar.shao@gmail.com>,
ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com,
andrii@kernel.org, martin.lau@linux.dev, song@kernel.org,
yhs@fb.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, quentin@isovalent.com,
rostedt@goodmis.org, mhiramat@kernel.org
Cc: bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: Re: [PATCH v3 bpf-next 03/10] bpftool: Show probed function in kprobe_multi link info
Date: Tue, 13 Jun 2023 15:36:04 -0700 [thread overview]
Message-ID: <06f219e8-9ae5-01a1-f955-25f556ad5077@gmail.com> (raw)
In-Reply-To: <20230612151608.99661-4-laoar.shao@gmail.com>
On 6/12/23 08:16, Yafang Shao wrote:
> Show the already expose kprobe_multi link info in bpftool. The result as
> follows,
>
> 52: kprobe_multi prog 381
> retprobe 0 func_cnt 7
> addrs ffffffff9ec44f20 funcs schedule_timeout_interruptible
> ffffffff9ec44f60 schedule_timeout_killable
> ffffffff9ec44fa0 schedule_timeout_uninterruptible
> ffffffff9ec44fe0 schedule_timeout_idle
> ffffffffc09468d0 xfs_trans_get_efd [xfs]
> ffffffffc0953a10 xfs_trans_get_buf_map [xfs]
> ffffffffc0957320 xfs_trans_get_dqtrx [xfs]
> pids kprobe_multi(559862)
> 53: kprobe_multi prog 381
> retprobe 1 func_cnt 7
> addrs ffffffff9ec44f20 funcs schedule_timeout_interruptible
> ffffffff9ec44f60 schedule_timeout_killable
> ffffffff9ec44fa0 schedule_timeout_uninterruptible
> ffffffff9ec44fe0 schedule_timeout_idle
> ffffffffc09468d0 xfs_trans_get_efd [xfs]
> ffffffffc0953a10 xfs_trans_get_buf_map [xfs]
> ffffffffc0957320 xfs_trans_get_dqtrx [xfs]
> pids kprobe_multi(559862)
>
> $ tools/bpf/bpftool/bpftool link show -j
> [{"id":52,"type":"kprobe_multi","prog_id":381,"retprobe":0,"func_cnt":7,"funcs":[{"addr":18446744072078249760,"func":"schedule_timeout_interruptible","module":""},{"addr":18446744072078249824,"func":"schedule_timeout_killable","module":""},{"addr":18446744072078249888,"func":"schedule_timeout_uninterruptible","module":""},{"addr":18446744072078249952,"func":"schedule_timeout_idle","module":""},{"addr":18446744072645535952,"func":"xfs_trans_get_efd","module":"[xfs]"},{"addr":18446744072645589520,"func":"xfs_trans_get_buf_map","module":"[xfs]"},{"addr":18446744072645604128,"func":"xfs_trans_get_dqtrx","module":"[xfs]"}],"pids":[{"pid":559862,"comm":"kprobe_multi"}]},{"id":53,"type":"kprobe_multi","prog_id":381,"retprobe":1,"func_cnt":7,"funcs":[{"addr":18446744072078249760,"func":"schedule_timeout_interruptible","module":""},{"addr":18446744072078249824,"func":"schedule_timeout_killable","module":""},{"addr":18446744072078249888,"func":"schedule_timeout_uninterruptible","module":""},{"addr":18446744072078249952,"func":"schedule_timeout_idle","module":""},{"addr":18446744072645535952,"func":"xfs_trans_get_efd","module":"[xfs]"},{"addr":18446744072645589520,"func":"xfs_trans_get_buf_map","module":"[xfs]"},{"addr":18446744072645604128,"func":"xfs_trans_get_dqtrx","module":"[xfs]"}],"pids":[{"pid":559862,"comm":"kprobe_multi"}]}]
>
> Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
> ---
> tools/bpf/bpftool/link.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 108 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bpf/bpftool/link.c b/tools/bpf/bpftool/link.c
> index 2d78607..0015582 100644
> --- a/tools/bpf/bpftool/link.c
> +++ b/tools/bpf/bpftool/link.c
> @@ -14,8 +14,10 @@
>
> #include "json_writer.h"
> #include "main.h"
> +#include "xlated_dumper.h"
>
> static struct hashmap *link_table;
> +static struct dump_data dd = {};
>
> static int link_parse_fd(int *argc, char ***argv)
> {
> @@ -166,6 +168,45 @@ static int get_prog_info(int prog_id, struct bpf_prog_info *info)
> return err;
> }
>
> +static int cmp_u64(const void *A, const void *B)
> +{
> + const __u64 *a = A, *b = B;
> +
> + return *a - *b;
> +}
> +
> +static void
> +show_kprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)
> +{
> + __u32 i, j = 0;
> + __u64 *addrs;
> +
> + jsonw_uint_field(json_wtr, "retprobe",
> + info->kprobe_multi.flags & BPF_F_KPROBE_MULTI_RETURN);
> + jsonw_uint_field(json_wtr, "func_cnt", info->kprobe_multi.count);
> + jsonw_name(json_wtr, "funcs");
> + jsonw_start_array(json_wtr);
> + addrs = (__u64 *)u64_to_ptr(info->kprobe_multi.addrs);
> + qsort((void *)addrs, info->kprobe_multi.count, sizeof(__u64), cmp_u64);
> +
> + /* Load it once for all. */
> + if (!dd.sym_count)
> + kernel_syms_load(&dd);
> + for (i = 0; i < dd.sym_count; i++) {
> + if (dd.sym_mapping[i].address != addrs[j])
> + continue;
> + jsonw_start_object(json_wtr);
> + jsonw_uint_field(json_wtr, "addr", dd.sym_mapping[i].address);
> + jsonw_string_field(json_wtr, "func", dd.sym_mapping[i].name);
> + /* Print none if it is vmlinux */
> + jsonw_string_field(json_wtr, "module", dd.sym_mapping[i].module);
> + jsonw_end_object(json_wtr);
> + if (j++ == info->kprobe_multi.count)
> + break;
> + }
> + jsonw_end_array(json_wtr);
> +}
> +
> static int show_link_close_json(int fd, struct bpf_link_info *info)
> {
> struct bpf_prog_info prog_info;
> @@ -218,6 +259,9 @@ static int show_link_close_json(int fd, struct bpf_link_info *info)
> jsonw_uint_field(json_wtr, "map_id",
> info->struct_ops.map_id);
> break;
> + case BPF_LINK_TYPE_KPROBE_MULTI:
> + show_kprobe_multi_json(info, json_wtr);
> + break;
> default:
> break;
> }
> @@ -351,6 +395,44 @@ void netfilter_dump_plain(const struct bpf_link_info *info)
> printf(" flags 0x%x", info->netfilter.flags);
> }
>
> +static void show_kprobe_multi_plain(struct bpf_link_info *info)
> +{
> + __u32 i, j = 0;
> + __u64 *addrs;
> +
> + if (!info->kprobe_multi.count)
> + return;
> +
> + printf("\n\tretprobe %d func_cnt %u ",
> + info->kprobe_multi.flags & BPF_F_KPROBE_MULTI_RETURN,
> + info->kprobe_multi.count);
> + addrs = (__u64 *)u64_to_ptr(info->kprobe_multi.addrs);
> + qsort((void *)addrs, info->kprobe_multi.count, sizeof(__u64), cmp_u64);
> +
> + /* Load it once for all. */
> + if (!dd.sym_count)
> + kernel_syms_load(&dd);
> + for (i = 0; i < dd.sym_count; i++) {
> + if (dd.sym_mapping[i].address != addrs[j])
> + continue;
> + if (!j)
> + printf("\n\taddrs %016lx funcs %s",
> + dd.sym_mapping[i].address,
> + dd.sym_mapping[i].name);
> + else
> + printf("\n\t %016lx %s",
> + dd.sym_mapping[i].address,
> + dd.sym_mapping[i].name);
> + if (dd.sym_mapping[i].module[0] != '\0')
> + printf(" %s ", dd.sym_mapping[i].module);
> + else
> + printf(" ");
Could you explain what these extra spaces after module names are for?
> +
> + if (j++ == info->kprobe_multi.count)
> + break;
> + }
> +}
> +
> static int show_link_close_plain(int fd, struct bpf_link_info *info)
> {
> struct bpf_prog_info prog_info;
> @@ -396,6 +478,9 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)
> case BPF_LINK_TYPE_NETFILTER:
> netfilter_dump_plain(info);
> break;
> + case BPF_LINK_TYPE_KPROBE_MULTI:
> + show_kprobe_multi_plain(info);
> + break;
> default:
> break;
> }
> @@ -417,7 +502,9 @@ static int do_show_link(int fd)
> {
> struct bpf_link_info info;
> __u32 len = sizeof(info);
> + __u64 *addrs = NULL;
> char buf[256];
> + int count;
> int err;
>
> memset(&info, 0, sizeof(info));
> @@ -441,12 +528,28 @@ static int do_show_link(int fd)
> info.iter.target_name_len = sizeof(buf);
> goto again;
> }
> + if (info.type == BPF_LINK_TYPE_KPROBE_MULTI &&
> + !info.kprobe_multi.addrs) {
> + count = info.kprobe_multi.count;
> + if (count) {
> + addrs = calloc(count, sizeof(__u64));
> + if (!addrs) {
> + p_err("mem alloc failed");
> + close(fd);
> + return -1;
> + }
> + info.kprobe_multi.addrs = (unsigned long)addrs;
> + goto again;
> + }
> + }
>
> if (json_output)
> show_link_close_json(fd, &info);
> else
> show_link_close_plain(fd, &info);
>
> + if (addrs)
> + free(addrs);
> close(fd);
> return 0;
> }
> @@ -471,7 +574,8 @@ static int do_show(int argc, char **argv)
> fd = link_parse_fd(&argc, &argv);
> if (fd < 0)
> return fd;
> - return do_show_link(fd);
> + do_show_link(fd);
> + goto out;
> }
>
> if (argc)
> @@ -510,6 +614,9 @@ static int do_show(int argc, char **argv)
> if (show_pinned)
> delete_pinned_obj_table(link_table);
>
> +out:
> + if (dd.sym_count)
> + kernel_syms_destroy(&dd);
> return errno == ENOENT ? 0 : -1;
> }
>
next prev parent reply other threads:[~2023-06-13 22:36 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 15:15 [PATCH v3 bpf-next 00/10] bpf: Support ->fill_link_info for kprobe_multi and perf_event links Yafang Shao
2023-06-12 15:15 ` [PATCH v3 bpf-next 01/10] bpf: Support ->fill_link_info for kprobe_multi Yafang Shao
2023-06-15 8:29 ` Jiri Olsa
2023-06-15 12:09 ` Yafang Shao
2023-06-16 17:24 ` Andrii Nakryiko
2023-06-17 2:48 ` Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 02/10] bpftool: Dump the kernel symbol's module name Yafang Shao
2023-06-13 13:41 ` Quentin Monnet
2023-06-13 14:56 ` Yafang Shao
2023-06-16 17:25 ` Andrii Nakryiko
2023-06-17 2:55 ` Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 03/10] bpftool: Show probed function in kprobe_multi link info Yafang Shao
2023-06-13 13:41 ` Quentin Monnet
2023-06-13 14:59 ` Yafang Shao
2023-06-13 22:36 ` Kui-Feng Lee [this message]
2023-06-14 2:42 ` Yafang Shao
2023-06-14 8:33 ` Quentin Monnet
2023-06-16 17:30 ` Andrii Nakryiko
2023-06-17 3:08 ` Yafang Shao
2023-06-20 17:17 ` Andrii Nakryiko
2023-06-21 1:29 ` Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 04/10] bpf: Protect probed address based on kptr_restrict setting Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 05/10] bpf: Clear the probe_addr for uprobe Yafang Shao
2023-06-12 17:22 ` Yonghong Song
2023-06-12 15:16 ` [PATCH v3 bpf-next 06/10] bpf: Expose symbol's respective address Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 07/10] bpf: Add a common helper bpf_copy_to_user() Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 08/10] bpf: Support ->fill_link_info for perf_event Yafang Shao
2023-06-12 17:36 ` Yonghong Song
2023-06-13 2:47 ` Yafang Shao
2023-06-14 2:34 ` Kui-Feng Lee
2023-06-14 2:45 ` Yafang Shao
2023-06-16 20:36 ` Andrii Nakryiko
2023-06-17 3:13 ` Yafang Shao
2023-06-15 10:21 ` Jiri Olsa
2023-06-15 12:10 ` Yafang Shao
2023-06-12 15:16 ` [PATCH v3 bpf-next 09/10] bpftool: Add perf event names Yafang Shao
2023-06-13 13:41 ` Quentin Monnet
2023-06-13 15:01 ` Yafang Shao
2023-06-15 10:23 ` Jiri Olsa
2023-06-12 15:16 ` [PATCH v3 bpf-next 10/10] bpftool: Show probed function in perf_event link info Yafang Shao
2023-06-13 13:42 ` Quentin Monnet
2023-06-13 15:11 ` Yafang Shao
2023-06-16 20:41 ` Andrii Nakryiko
2023-06-17 3:20 ` Yafang Shao
2023-06-17 3:29 ` Yafang Shao
2023-06-15 10:04 ` [PATCH v3 bpf-next 00/10] bpf: Support ->fill_link_info for kprobe_multi and perf_event links Jiri Olsa
2023-06-15 12:09 ` Yafang Shao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=06f219e8-9ae5-01a1-f955-25f556ad5077@gmail.com \
--to=sinquersw@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=laoar.shao@gmail.com \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mhiramat@kernel.org \
--cc=quentin@isovalent.com \
--cc=rostedt@goodmis.org \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).