Skip to content

Commit f8dfeae

Browse files
liu-song-6acmel
authored andcommitted
perf bpf: Show more BPF program info in print_bpf_prog_info()
This patch enables showing bpf program name, address, and size in the header. Before the patch: perf report --header-only ... # bpf_prog_info of id 9 # bpf_prog_info of id 10 # bpf_prog_info of id 13 After the patch: # bpf_prog_info 9: bpf_prog_7be49e3934a125ba addr 0xffffffffa0024947 size 229 # bpf_prog_info 10: bpf_prog_2a142ef67aaad174 addr 0xffffffffa007c94d size 229 # bpf_prog_info 13: bpf_prog_47368425825d7384_task__task_newt addr 0xffffffffa0251137 size 369 Committer notes: Fix the fallback definition when HAVE_LIBBPF_SUPPORT is not defined, i.e. add the missing 'static inline' and add the __maybe_unused to the args. Also add stdio.h since we now use FILE * in bpf-event.h. Signed-off-by: Song Liu <[email protected]> Tested-by: Arnaldo Carvalho de Melo <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Daniel Borkmann <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stanislav Fomichev <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent fc462ac commit f8dfeae

File tree

3 files changed

+53
-3
lines changed

3 files changed

+53
-3
lines changed

tools/perf/util/bpf-event.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,3 +438,43 @@ int bpf_event__add_sb_event(struct perf_evlist **evlist,
438438

439439
return perf_evlist__add_sb_event(evlist, &attr, bpf_event__sb_cb, env);
440440
}
441+
442+
void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,
443+
struct perf_env *env,
444+
FILE *fp)
445+
{
446+
__u32 *prog_lens = (__u32 *)(uintptr_t)(info->jited_func_lens);
447+
__u64 *prog_addrs = (__u64 *)(uintptr_t)(info->jited_ksyms);
448+
char name[KSYM_NAME_LEN];
449+
struct btf *btf = NULL;
450+
u32 sub_prog_cnt, i;
451+
452+
sub_prog_cnt = info->nr_jited_ksyms;
453+
if (sub_prog_cnt != info->nr_prog_tags ||
454+
sub_prog_cnt != info->nr_jited_func_lens)
455+
return;
456+
457+
if (info->btf_id) {
458+
struct btf_node *node;
459+
460+
node = perf_env__find_btf(env, info->btf_id);
461+
if (node)
462+
btf = btf__new((__u8 *)(node->data),
463+
node->data_size);
464+
}
465+
466+
if (sub_prog_cnt == 1) {
467+
synthesize_bpf_prog_name(name, KSYM_NAME_LEN, info, btf, 0);
468+
fprintf(fp, "# bpf_prog_info %u: %s addr 0x%llx size %u\n",
469+
info->id, name, prog_addrs[0], prog_lens[0]);
470+
return;
471+
}
472+
473+
fprintf(fp, "# bpf_prog_info %u:\n", info->id);
474+
for (i = 0; i < sub_prog_cnt; i++) {
475+
synthesize_bpf_prog_name(name, KSYM_NAME_LEN, info, btf, i);
476+
477+
fprintf(fp, "# \tsub_prog %u: %s addr 0x%llx size %u\n",
478+
i, name, prog_addrs[i], prog_lens[i]);
479+
}
480+
}

tools/perf/util/bpf-event.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <pthread.h>
88
#include <api/fd/array.h>
99
#include "event.h"
10+
#include <stdio.h>
1011

1112
struct machine;
1213
union perf_event;
@@ -38,7 +39,9 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,
3839
struct record_opts *opts);
3940
int bpf_event__add_sb_event(struct perf_evlist **evlist,
4041
struct perf_env *env);
41-
42+
void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,
43+
struct perf_env *env,
44+
FILE *fp);
4245
#else
4346
static inline int machine__process_bpf_event(struct machine *machine __maybe_unused,
4447
union perf_event *event __maybe_unused,
@@ -61,5 +64,11 @@ static inline int bpf_event__add_sb_event(struct perf_evlist **evlist __maybe_un
6164
return 0;
6265
}
6366

67+
static inline void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info __maybe_unused,
68+
struct perf_env *env __maybe_unused,
69+
FILE *fp __maybe_unused)
70+
{
71+
72+
}
6473
#endif // HAVE_LIBBPF_SUPPORT
6574
#endif

tools/perf/util/header.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,8 +1468,9 @@ static void print_bpf_prog_info(struct feat_fd *ff, FILE *fp)
14681468

14691469
node = rb_entry(next, struct bpf_prog_info_node, rb_node);
14701470
next = rb_next(&node->rb_node);
1471-
fprintf(fp, "# bpf_prog_info of id %u\n",
1472-
node->info_linear->info.id);
1471+
1472+
bpf_event__print_bpf_prog_info(&node->info_linear->info,
1473+
env, fp);
14731474
}
14741475

14751476
up_read(&env->bpf_progs.lock);

0 commit comments

Comments
 (0)