On Wed, Jul 5, 2023 at 4:54 PM Daniel Borkmann <daniel@xxxxxxxxxxxxx> wrote:
>
> On 6/28/23 1:53 PM, Yafang Shao wrote:
> [...]
> > +
> > +static void
> > +show_perf_event_event_json(struct bpf_link_info *info, json_writer_t *wtr)
> > +{
> > + __u64 config = info->perf_event.event.config;
> > + __u32 type = info->perf_event.event.type;
> > + const char *perf_type, *perf_config;
> > +
> > + perf_type = perf_event_name(perf_type_name, type);
> > + if (perf_type)
> > + jsonw_string_field(wtr, "event_type", perf_type);
> > + else
> > + jsonw_uint_field(wtr, "event_type", type);
> > +
> > + perf_config = perf_config_str(type, config);
> > + if (perf_config)
> > + jsonw_string_field(wtr, "event_config", perf_config);
> > + else
> > + jsonw_uint_field(wtr, "event_config", config);
> > +
> > + if (type == PERF_TYPE_HW_CACHE && perf_config)
> > + free((void *)perf_config);
>
> nit no need to cast
It will discard the 'const', so we have to do the cast here, otherwise
the compiler will complain.
>
> > +}
> > +
> > static int show_link_close_json(int fd, struct bpf_link_info *info)
> > {
> > struct bpf_prog_info prog_info;
> > @@ -334,6 +440,26 @@ 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_PERF_EVENT:
> > + switch (info->perf_event.type) {
> > + case BPF_PERF_EVENT_EVENT:
> > + show_perf_event_event_json(info, json_wtr);
> > + break;
> > + case BPF_PERF_EVENT_TRACEPOINT:
> > + show_perf_event_tracepoint_json(info, json_wtr);
> > + break;
> > + case BPF_PERF_EVENT_KPROBE:
> > + case BPF_PERF_EVENT_KRETPROBE:
> > + show_perf_event_kprobe_json(info, json_wtr);
> > + break;
> > + case BPF_PERF_EVENT_UPROBE:
> > + case BPF_PERF_EVENT_URETPROBE:
> > + show_perf_event_uprobe_json(info, json_wtr);
> > + break;
> > + default:
> > + break;
> > + }
> > + break;
> > default:
> > break;
> > }
> > @@ -505,6 +631,75 @@ static void show_kprobe_multi_plain(struct bpf_link_info *info)
> > }
> > }
> >
> > +static void show_perf_event_kprobe_plain(struct bpf_link_info *info)
> > +{
> > + const char *buf;
> > +
> > + buf = (const char *)u64_to_ptr(info->perf_event.kprobe.func_name);
>
> ditto, same for the other occurrences further below
Agree.
>
> > + if (buf[0] == '\0' && !info->perf_event.kprobe.addr)
> > + return;
> > +
> > + if (info->perf_event.type == BPF_PERF_EVENT_KRETPROBE)
> > + printf("\n\tkretprobe ");
> > + else
> > + printf("\n\tkprobe ");
> > + if (info->perf_event.kprobe.addr)
> > + printf("%llx ", info->perf_event.kprobe.addr);
> > + printf("%s", buf);
> > + if (info->perf_event.kprobe.offset)
> > + printf("+%#x", info->perf_event.kprobe.offset);
> > + printf(" ");
> > +}
> > +
> > +static void show_perf_event_uprobe_plain(struct bpf_link_info *info)
> > +{
> > + const char *buf;
> > +
> > + buf = (const char *)u64_to_ptr(info->perf_event.uprobe.file_name);
> > + if (buf[0] == '\0')
> > + return;
> > +
> > + if (info->perf_event.type == BPF_PERF_EVENT_URETPROBE)
> > + printf("\n\turetprobe ");
> > + else
> > + printf("\n\tuprobe ");
> > + printf("%s+%#x ", buf, info->perf_event.uprobe.offset);
> > +}
> > +
> > +static void show_perf_event_tracepoint_plain(struct bpf_link_info *info)
> > +{
> > + const char *buf;
> > +
> > + buf = (const char *)u64_to_ptr(info->perf_event.tracepoint.tp_name);
> > + if (buf[0] == '\0')
> > + return;
> > +
> > + printf("\n\ttracepoint %s ", buf);
> > +}
> > +
> > +static void show_perf_event_event_plain(struct bpf_link_info *info)
> > +{
> > + __u64 config = info->perf_event.event.config;
> > + __u32 type = info->perf_event.event.type;
> > + const char *perf_type, *perf_config;
> > +
> > + printf("\n\tevent ");
> > + perf_type = perf_event_name(perf_type_name, type);
> > + if (perf_type)
> > + printf("%s:", perf_type);
> > + else
> > + printf("%u :", type);
> > +
> > + perf_config = perf_config_str(type, config);
> > + if (perf_config)
> > + printf("%s ", perf_config);
> > + else
> > + printf("%llu ", config);
> > +
> > + if (type == PERF_TYPE_HW_CACHE && perf_config)
> > + free((void *)perf_config);
>
> same
>
> > +}
> > +
> > static int show_link_close_plain(int fd, struct bpf_link_info *info)
> > {
> > struct bpf_prog_info prog_info;
> > @@ -553,6 +748,26 @@ 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_PERF_EVENT:
> > + switch (info->perf_event.type) {
> > + case BPF_PERF_EVENT_EVENT:
> > + show_perf_event_event_plain(info);
> > + break;
> > + case BPF_PERF_EVENT_TRACEPOINT:
> > + show_perf_event_tracepoint_plain(info);
> > + break;
> > + case BPF_PERF_EVENT_KPROBE:
> > + case BPF_PERF_EVENT_KRETPROBE:
> > + show_perf_event_kprobe_plain(info);
> > + break;
> > + case BPF_PERF_EVENT_UPROBE:
> > + case BPF_PERF_EVENT_URETPROBE:
> > + show_perf_event_uprobe_plain(info);
> > + break;
> > + default:
> > + break;
> > + }
> > + break;
> > default:
> > break;
> > }
> > @@ -575,11 +790,12 @@ static int do_show_link(int fd)
> > struct bpf_link_info info;
> > __u32 len = sizeof(info);
> > __u64 *addrs = NULL;
> > - char buf[256];
> > + char buf[PATH_MAX];
> > int count;
> > int err;
> >
> > memset(&info, 0, sizeof(info));
> > + buf[0] = '\0';
> > again:
> > err = bpf_link_get_info_by_fd(fd, &info, &len);
> > if (err) {
> > @@ -614,6 +830,35 @@ static int do_show_link(int fd)
> > goto again;
> > }
> > }
> > + if (info.type == BPF_LINK_TYPE_PERF_EVENT) {
> > + switch (info.perf_event.type) {
> > + case BPF_PERF_EVENT_TRACEPOINT:
> > + if (!info.perf_event.tracepoint.tp_name) {
> > + info.perf_event.tracepoint.tp_name = (unsigned long)&buf;
>
> lets use ptr_to_u64() in all these cases
Agree.
>
> > + info.perf_event.tracepoint.name_len = sizeof(buf);
> > + goto again;
> > + }
> > + break;
> > + case BPF_PERF_EVENT_KPROBE:
> > + case BPF_PERF_EVENT_KRETPROBE:
> > + if (!info.perf_event.kprobe.func_name) {
> > + info.perf_event.kprobe.func_name = (unsigned long)&buf;
> > + info.perf_event.kprobe.name_len = sizeof(buf);
> > + goto again;
> > + }
> > + break;
> > + case BPF_PERF_EVENT_UPROBE:
> > + case BPF_PERF_EVENT_URETPROBE:
> > + if (!info.perf_event.uprobe.file_name) {
> > + info.perf_event.uprobe.file_name = (unsigned long)&buf;
> > + info.perf_event.uprobe.name_len = sizeof(buf);
> > + goto again;
> > + }
> > + break;
> > + default:
> > + break;
> > + }
> > + }
> >
> > if (json_output)
> > show_link_close_json(fd, &info);
> >
>
--
Regards
Yafang
