diff options
| author |   Dave Marchevsky <davemarchevsky@fb.com> | 2021-11-01 15:43:56 -0700 |
|---|---|---|
| committer |   Andrii Nakryiko <andrii@kernel.org> | 2021-11-03 11:25:36 -0700 |
| commit | 199e06fe832ddca80c2167661acab0e9dec657c4 (patch) | |
| tree | 5a1e5d4f7ac5267e5c96fe0100406b7c5683f603 /tools/perf/util/annotate.c | |
| parent | bpftool: Use bpf_obj_get_info_by_fd directly (diff) | |
| download | linux-dev-199e06fe832ddca80c2167661acab0e9dec657c4.tar.xz linux-dev-199e06fe832ddca80c2167661acab0e9dec657c4.zip | |
perf: Pull in bpf_program__get_prog_info_linear
To prepare for impending deprecation of libbpf's
bpf_program__get_prog_info_linear, pull in the function and associated
helpers into the perf codebase and migrate existing uses to the perf
copy.
Since libbpf's deprecated definitions will still be visible to perf, it
is necessary to rename perf's definitions.
Signed-off-by: Dave Marchevsky <davemarchevsky@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20211101224357.2651181-4-davemarchevsky@fb.com
Diffstat (limited to '')
| -rw-r--r-- | tools/perf/util/annotate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 0bae061b2d6d..f0e5a236b7e3 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -28,6 +28,7 @@ #include "evsel.h" #include "evlist.h" #include "bpf-event.h" +#include "bpf-utils.h" #include "block-range.h" #include "string2.h" #include "util/event.h" @@ -1700,12 +1701,12 @@ static int symbol__disassemble_bpf(struct symbol *sym, { struct annotation *notes = symbol__annotation(sym); struct annotation_options *opts = args->options; - struct bpf_prog_info_linear *info_linear; struct bpf_prog_linfo *prog_linfo = NULL; struct bpf_prog_info_node *info_node; int len = sym->end - sym->start; disassembler_ftype disassemble; struct map *map = args->ms.map; + struct perf_bpil *info_linear; struct disassemble_info info; struct dso *dso = map->dso; int pc = 0, count, sub_id; |