On Sun, Feb 17, 2019 at 10:57:44PM +0100, Jiri Olsa wrote: > On Fri, Feb 15, 2019 at 01:53:43PM -0800, Song Liu wrote: > > Changes v2 to v3: > > 1. Remove unnecessary include in header files; > > 2. Improved error handling; > > 3. Better naming of functions, variables, etc.; > > 4. Enable bpf events by default for perf-top. > > > > Changes v1 to v2: > > 1. Fix compilation error with different feature-disassembler-four-args; > > 2. Fix a segfault in perf-record; > > 3. Split patches 5/9 and 6/9 so that perf_env changes and perf.data changes > > are in separate patches. > > > > This series enables annotation of BPF programs in perf. > > > > perf tool gathers information via sys_bpf and (optionally) stores them in > > perf.data as headers. > > > > Patch 1/11 fixes a minor issue in kernel; > > Patch 2/11 to 4/11 introduce new helper functions and use them in perf and > > bpftool; > > Patch 5/11 to 8/11 saves information of bpf program in perf_env; > > Patch 9/11 adds --bpf-event options to perf-top; > > Patch 10/11 enables annotation of bpf programs based on information > > gathered in 5/11 to 8/11; > > Patch 11/11 handles information of short living BPF program that are loaded > > during perf-record or perf-top. > > > > Commands tested during developments are perf-top, perf-record, perf-report, > > and perf-annotate. > > > > ===================== Note on patch dependency ======================== > > This set has dependency in both bpf-next tree and tip/perf/core. Current > > version is developed on bpf-next tree with the following commits > > cherry-picked from tip/perf/core: > > > > (from 1/10 to 10/10) > > commit 76193a94522f ("perf, bpf: Introduce PERF_RECORD_KSYMBOL") > > commit d764ac646491 ("tools headers uapi: Sync > > tools/include/uapi/linux/perf_event.h") > > commit 6ee52e2a3fe4 ("perf, bpf: Introduce PERF_RECORD_BPF_EVENT") > > commit df063c83aa2c ("tools headers uapi: Sync > > tools/include/uapi/linux/perf_event.h") > > commit 9aa0bfa370b2 ("perf tools: Handle PERF_RECORD_KSYMBOL") > > commit 45178a928a4b ("perf tools: Handle PERF_RECORD_BPF_EVENT") > > commit 7b612e291a5a ("perf tools: Synthesize PERF_RECORD_* for loaded BPF > > programs") > > commit a40b95bcd30c ("perf top: Synthesize BPF events for pre-existing > > loaded BPF programs") > > commit 6934058d9fb6 ("bpf: Add module name [bpf] to ksymbols for bpf > > programs") > > commit 811184fb6977 ("perf bpf: Fix synthesized > > PERF_RECORD_KSYMBOL/BPF_EVENT") > > ======================================================================== > > > > This set is also available at: > > > > https://github.com/liu-song-6/linux/tree/bpf-annotation > > I'm getting same compilation error as last time, > maybe it wasnt updated?
I also applied manualy (with some conflicts) your patches from emails on bpf/next/master with merged tip/perf/core and got following compilation error: CC util/find_bit.o util/annotate.c: In function ‘symbol__disassemble_bpf’: util/annotate.c:1771:29: error: incompatible type for argument 1 of ‘disassembler’ disassemble = disassembler(bfdf); ^~~~ In file included from util/annotate.c:36: /usr/include/dis-asm.h:276:63: note: expected ‘enum bfd_architecture’ but argument is of type ‘bfd *’ {aka ‘struct bfd *’} extern disassembler_ftype disassembler (enum bfd_architecture arc, ~~~~~~~~~~~~~~~~~~~~~~^~~ util/annotate.c:1771:16: error: too few arguments to function ‘disassembler’ disassemble = disassembler(bfdf); ^~~~~~~~~~~~ In file included from util/annotate.c:36: /usr/include/dis-asm.h:276:27: note: declared here extern disassembler_ftype disassembler (enum bfd_architecture arc, ^~~~~~~~~~~~ thanks, jirka