Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <songliubraving@fb.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stanislav Fomichev <sdf@google.com>
Link: http://lkml.kernel.org/r/20190319165454.1298742-3-songliubraving@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Song Liu and committed by
Arnaldo Carvalho de Melo
f8dfeae0 fc462ac7

+53 -3
+40
tools/perf/util/bpf-event.c
··· 438 438 439 439 return perf_evlist__add_sb_event(evlist, &attr, bpf_event__sb_cb, env); 440 440 } 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 + }
+10 -1
tools/perf/util/bpf-event.h
··· 7 7 #include <pthread.h> 8 8 #include <api/fd/array.h> 9 9 #include "event.h" 10 + #include <stdio.h> 10 11 11 12 struct machine; 12 13 union perf_event; ··· 39 38 struct record_opts *opts); 40 39 int bpf_event__add_sb_event(struct perf_evlist **evlist, 41 40 struct perf_env *env); 42 - 41 + void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info, 42 + struct perf_env *env, 43 + FILE *fp); 43 44 #else 44 45 static inline int machine__process_bpf_event(struct machine *machine __maybe_unused, 45 46 union perf_event *event __maybe_unused, ··· 64 61 return 0; 65 62 } 66 63 64 + static inline void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info __maybe_unused, 65 + struct perf_env *env __maybe_unused, 66 + FILE *fp __maybe_unused) 67 + { 68 + 69 + } 67 70 #endif // HAVE_LIBBPF_SUPPORT 68 71 #endif
+3 -2
tools/perf/util/header.c
··· 1468 1468 1469 1469 node = rb_entry(next, struct bpf_prog_info_node, rb_node); 1470 1470 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); 1473 1474 } 1474 1475 1475 1476 up_read(&env->bpf_progs.lock);