perf/urgent fixes
Arnaldo Carvalho de Melo
maintainerHi Ingo/Thomas,
Please consider pulling,
Best regards,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit 4c45945aa418f5e2f31cdaf0b1484e146e29f72f:
Merge tag 'perf-urgent-for-mingo-5.6-20200220' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2020-02-26 15:18:05 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-5.6-20200228
for you to fetch changes up to e0560ba6d92f06dbe13e9d11c921a60c07ea6fcc:
perf annotate: Fix segfault with source toggle (2020-02-27 11:47:23 -0300)
----------------------------------------------------------------
perf/urgent fixes:
perf annotate:
Ravi Bangoria:
- Fix segfault with source toggle.
- Fix --show-total-period and --show-nr-samples for tui/stdio2.
- Fix handling of settings in ~/.perfconfig versus the ones passed in the command line
- Re-render title bar after switching back from script browser.
- Fix options man page, document some missing ones.
perf probe:
He Zhe:
- Check return value of strlist__add() for -ENOMEM.
tools UAPI:
Arnaldo Carvalho de Melo:
- Sync x86's msr-index.h copy with the kernel sources.
- Update tools's copy of x86's kvm.h headers.
----------------------------------------------------------------
Arnaldo Carvalho de Melo (2):
tools arch x86: Sync the msr-index.h copy with the kernel sources tools headers UAPI: Update tools's copy of kvm.h headers
He Zhe (1):
perf probe: Check return value of strlist__add() for -ENOMEM
Ravi Bangoria (12):
perf annotate/tui: Re-render title bar after switching back from script browser perf annotate: Fix --show-total-period for tui/stdio2
perf annotate: Fix --show-nr-samples for tui/stdio2
perf config: Introduce perf_config_u8()
perf annotate: Make perf config effective
perf annotate: Prefer cmdline option over default config
perf annotate: Fix perf config option description
perf config: Document missing config options
perf annotate: Remove privsize from symbol__annotate() args
perf annotate: Simplify disasm_line allocation and freeing code perf annotate: Align struct annotate_args
perf annotate: Fix segfault with source toggle
tools/arch/x86/include/asm/msr-index.h | 2 + tools/arch/x86/include/uapi/asm/kvm.h | 1 + tools/perf/Documentation/perf-config.txt | 74 +++++++++++- tools/perf/builtin-annotate.c | 4 +- tools/perf/builtin-probe.c | 6 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 4 +- tools/perf/ui/browsers/annotate.c | 19 ++- tools/perf/ui/gtk/annotate.c | 2 +- tools/perf/util/annotate.c | 194 ++++++++++++------------------- tools/perf/util/annotate.h | 9 +- tools/perf/util/config.c | 12 ++ tools/perf/util/config.h | 1 + tools/perf/util/probe-file.c | 28 ++++- 14 files changed, 210 insertions(+), 148 deletions(-)
Test results:
The first ones are container based builds of tools/perf with and without libelf support. Where clang is available, it is also used to build perf with/without libelf, and building with LIBCLANGLLVM=1 (built-in clang) with gcc and clang when clang and its devel libraries are installed.
The objtool and samples/bpf/ builds are disabled now that I'm switching from using the sources in a local volume to fetching them from a http server to build it inside the container, to make it easier to build in a container cluster. Those will come back later.
Several are cross builds, the ones with -x-ARCH and the android one, and those may not have all the features built, due to lack of multi-arch devel packages, available and being used so far on just a few, like debian:experimental-x-{arm64,mipsel}.
The 'perf test' one will perform a variety of tests exercising tools/perf/util/, tools/lib/{bpf,traceevent,etc}, as well as run perf commands with a variety of command line event specifications to then intercept the sys_perf_event syscall to check that the perf_event_attr fields are set up as expected, among a variety of other unit tests.
Then there is the 'make -C tools/perf build-test' ones, that build tools/perf/ with a variety of feature sets, exercising the build with an incomplete set of features as well as with a complete one. It is planned to have it run on each of the containers mentioned above, using some container orchestration infrastructure. Get in contact if interested in helping having this in place.
Clearlinux is failing when due to:
.gnu.debuglto_.debug_macro' referenced in section .gnu.debuglto_.debug_macro' of /tmp/build/perf/util/scripting-engines/perf-in.o: defined in discarded section `.gnu.debuglto_.debug_macro[wm4.stdcpredef.h.19.8dc41bed5d9037ff9622e015fb5f0ce3]' of /tmp/build/perf/util/scripting-engines/perf-in.o
Ubuntu 19.10 is failing when linking against libllvm, which isn't the default, needs to be investigated, haven't tested with CC=gcc, but should be the same problem:
+ make ARCH= CROSS_COMPILE= EXTRA_CFLAGS= LIBCLANGLLVM=1 -C /git/linux/tools/perf O=/tmp/build/perf CC=clang
.../usr/bin/ld: /usr/lib/llvm-9/lib/libclangAnalysis.a(ExprMutationAnalyzer.cpp.o): in function `clang::ast_matchers::internal::matcher_ignoringImpCasts0Matcher::matches(clang::Expr const&, clang::ast_matchers::internal::ASTMatchFinder*, clang::ast_matchers::internal::BoundNodesTreeBuilder*) const':
(.text._ZNK5clang12ast_matchers8internal32matcher_ignoringImpCasts0Matcher7matchesERKNS_4ExprEPNS1_14ASTMatchFinderEPNS1_21BoundNodesTreeBuilderE[_ZNK5clang12ast_matchers8internal32matcher_ignoringImpCasts0Matcher7matchesERKNS_4ExprEPNS1_14ASTMatchFinderEPNS1_21BoundNodesTreeBuilderE]+0x43): undefined reference to `clang::ast_matchers::internal::DynTypedMatcher::matches(clang::ast_type_traits::DynTypedNode const&, clang::ast_matchers::internal::ASTMatchFinder*, clang::ast_matchers::internal::BoundNodesTreeBuilder*) const' /usr/bin/ld: /usr/lib/llvm-9/lib/libclangAnalysis.a(ExprMutationAnalyzer.cpp.o): in function `clang::ast_matchers::internal::matcher_hasLoopVariable0Matcher::matches(clang::CXXForRangeStmt const&, clang::ast_matchers::internal::ASTMatchFinder*, clang::ast_matchers::internal::BoundNodesTreeBuilder*) const':
(.text._ZNK5clang12ast_matchers8internal31matcher_hasLoopVariable0Matcher7matchesERKNS_15CXXForRangeStmtEPNS1_14ASTMatchFinderEPNS1_21BoundNodesTreeBuilderE[_ZNK5clang12ast_matchers8internal31matcher_hasLoopVariable0Matcher7matchesERKNS_15CXXForRangeStmtEPNS1_14ASTMatchFinderEPNS1_21BoundNodesTreeBuilderE]+0x48): undefined reference to `clang::ast_matchers::internal::DynTypedMatcher::matches(clang::ast_type_traits::DynTypedNode const&, clang::ast_matchers::internal::ASTMatchFinder*, clang::ast_matchers::internal::BoundNodesTreeBuilder*) const'
...
It builds ok with the default set of options.
fedora:32, fedora:rawhide and openmandriva:cooker have a new gcc version that found a problem with -Werror=return-local-addr, fix will come soon.
# export PERF_TARBALL=http://192.168.124.1/perf/perf-5.6.0-rc3.tar.xz # dm 1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0, clang version 3.8.0 (tags/RELEASE_380/final) 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822, clang version 3.8.1 (tags/RELEASE_381/final) 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0, clang version 4.0.0 (tags/RELEASE_400/final) 4 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0, Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0) 5 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0, Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1) 6 alpine:3.9 : Ok gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1) 7 alpine:3.10 : Ok gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0) 8 alpine:3.11 : Ok gcc (Alpine 9.2.0) 9.2.0, Alpine clang version 9.0.0 (https://git.alpinelinux.org/aports f7f0d2c2b8bcd6a5843401a9a702029556492689) (based on LLVM 9.0.0) 9 alpine:edge : Ok gcc (Alpine 9.2.0) 9.2.0, Alpine clang version 9.0.1 (git://git.alpinelinux.org/aports 7c78441134e54efbb34618f457d88c783c913361) (based on LLVM 9.0.1) 10 alt:p8 : Ok x86_64-alt-linux-gcc (GCC) 5.3.1 20151207 (ALT p8 5.3.1-alt3.M80P.1), clang version 3.8.0 (tags/RELEASE_380/final) 11 alt:p9 : Ok x86_64-alt-linux-gcc (GCC) 8.3.1 20190507 (ALT p9 8.3.1-alt5), clang version 7.0.1 12 alt:sisyphus : Ok x86_64-alt-linux-gcc (GCC) 9.2.1 20190827 (ALT Sisyphus 9.2.1-alt2), clang version 7.0.1 13 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2), clang version 3.6.2 (tags/RELEASE_362/final) 14 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 7.0.1 (Amazon Linux 2 7.0.1-1.amzn2.0.2) 15 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 16 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 17 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 18 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) 19 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39) 20 centos:8 : Ok gcc (GCC) 8.3.1 20190507 (Red Hat 8.3.1-4), clang version 8.0.1 (Red Hat 8.0.1-1.module_el8.1.0+215+a01033fb) 21 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 9.2.1 20200214 gcc_9_2_0_release-615-g7866f9ebf1, clang version 9.0.1 22 debian:8 : Ok gcc (Debian 4.9.2-10+deb8u2) 4.9.2, Debian clang version 3.5.0-10 (tags/RELEASE_350/final) (based on LLVM 3.5.0) 23 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, clang version 3.8.1-24 (tags/RELEASE_381/final) 24 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final) 25 debian:experimental : Ok gcc (Debian 9.2.1-28) 9.2.1 20200203, clang version 8.0.1-7 (tags/RELEASE_801/final) 26 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 27 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 28 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 9.2.1-24) 9.2.1 20200117 29 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 9.2.1-8) 9.2.1 20190909 30 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7) 31 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.5.0 (tags/RELEASE_350/final) 32 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.7.0 (tags/RELEASE_370/final) 33 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1), clang version 3.8.1 (tags/RELEASE_381/final) 34 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 35 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1), clang version 3.9.1 (tags/RELEASE_391/final) 36 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2), clang version 4.0.1 (tags/RELEASE_401/final) 37 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 5.0.2 (tags/RELEASE_502/final) 38 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 6.0.1 (tags/RELEASE_601/final) 39 fedora:29 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 7.0.1 (Fedora 7.0.1-6.fc29) 40 fedora:30 : Ok gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 8.0.0 (Fedora 8.0.0-3.fc30) 41 fedora:30-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 42 fedora:30-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 43 fedora:31 : Ok gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.1 (Fedora 9.0.1-2.fc31) 44 fedora:32 : FAIL gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8), clang version 10.0.0 (Fedora 10.0.0-0.1.rc2.fc32) 45 fedora:rawhide : FAIL gcc (GCC) 10.0.1 20200216 (Red Hat 10.0.1-0.8), clang version 10.0.0 (Fedora 10.0.0-0.3.rc2.fc33) 46 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 9.2.0-r2 p3) 9.2.0 47 mageia:5 : Ok gcc (GCC) 4.9.2, clang version 3.5.2 (tags/RELEASE_352/final) 48 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0, clang version 3.9.1 (tags/RELEASE_391/final) 49 mageia:7 : Ok gcc (Mageia 8.3.1-0.20190524.1.mga7) 8.3.1 20190524, clang version 8.0.0 (Mageia 8.0.0-1.mga7) 50 manjaro:latest : Ok gcc (GCC) 9.2.0, clang version 9.0.0 (tags/RELEASE_900/final) 51 openmandriva:cooker : FAIL gcc (GCC) 10.0.0 20200216 (OpenMandriva), clang version 10.0.0 52 opensuse:15.0 : Ok gcc (SUSE Linux) 7.4.1 20190424 [gcc-7-branch revision 270538], clang version 5.0.1 (tags/RELEASE_501/final 312548) 53 opensuse:15.1 : Ok gcc (SUSE Linux) 7.5.0, clang version 7.0.1 (tags/RELEASE_701/final 349238) 54 opensuse:15.2 : Ok gcc (SUSE Linux) 7.5.0, clang version 7.0.1 (tags/RELEASE_701/final 349238) 55 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5, clang version 3.8.0 (tags/RELEASE_380/final 262553) 56 opensuse:tumbleweed : Ok gcc (SUSE Linux) 9.2.1 20200128 [revision 83f65674e78d97d27537361de1a9d74067ff228d], clang version 9.0.1 57 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1) 58 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39.0.3) 59 oraclelinux:8 : Ok gcc (GCC) 8.3.1 20190507 (Red Hat 8.3.1-4.5.0.5), clang version 8.0.1 (Red Hat 8.0.1-1.0.1.module+el8.1.0+5428+345cee14) 60 ubuntu:12.04 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3, Ubuntu clang version 3.0-6ubuntu3 (tags/RELEASE_30/final) (based on LLVM 3.0) 61 ubuntu:14.04 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4 62 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609, clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final) 63 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 64 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 65 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 66 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 67 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 68 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 69 ubuntu:18.04 : Ok gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0, clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final) 70 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 71 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 72 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 73 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 74 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 75 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 76 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 77 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 78 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 79 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 80 ubuntu:18.10 : Ok gcc (Ubuntu 8.3.0-6ubuntu1~18.10.1) 8.3.0, clang version 7.0.0-3 (tags/RELEASE_700/final) 81 ubuntu:19.04 : Ok gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0, clang version 8.0.0-3 (tags/RELEASE_800/final) 82 ubuntu:19.04-x-alpha : Ok alpha-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 83 ubuntu:19.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 8.3.0-6ubuntu1) 8.3.0 84 ubuntu:19.04-x-hppa : Ok hppa-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 85 ubuntu:19.10 : FAIL gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008, clang version 9.0.0-2 (tags/RELEASE_900/final) #
# uname -a
Linux five 5.5.5-200.fc31.x86_64 #1 SMP Wed Feb 19 23:28:07 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
e0560ba6d92f perf annotate: Fix segfault with source toggle
# perf version --build-options
perf version 5.6.rc3.ge0560ba6d92f
dwarf: [ on ] # HAVE_DWARF_SUPPORT
dwarf_getlocations: [ on ] # HAVE_DWARF_GETLOCATIONS_SUPPORT
glibc: [ on ] # HAVE_GLIBC_SUPPORT
gtk2: [ on ] # HAVE_GTK2_SUPPORT
syscall_table: [ on ] # HAVE_SYSCALL_TABLE_SUPPORT
libbfd: [ on ] # HAVE_LIBBFD_SUPPORT
libelf: [ on ] # HAVE_LIBELF_SUPPORT
libnuma: [ on ] # HAVE_LIBNUMA_SUPPORT
numa_num_possible_cpus: [ on ] # HAVE_LIBNUMA_SUPPORT
libperl: [ on ] # HAVE_LIBPERL_SUPPORT
libpython: [ on ] # HAVE_LIBPYTHON_SUPPORT
libslang: [ on ] # HAVE_SLANG_SUPPORT
libcrypto: [ on ] # HAVE_LIBCRYPTO_SUPPORT
libunwind: [ on ] # HAVE_LIBUNWIND_SUPPORT
libdw-dwarf-unwind: [ on ] # HAVE_DWARF_SUPPORT
zlib: [ on ] # HAVE_ZLIB_SUPPORT
lzma: [ on ] # HAVE_LZMA_SUPPORT
get_cpuid: [ on ] # HAVE_AUXTRACE_SUPPORT
bpf: [ on ] # HAVE_LIBBPF_SUPPORT
aio: [ on ] # HAVE_AIO_SUPPORT
zstd: [ on ] # HAVE_ZSTD_SUPPORT
# perf test
1: vmlinux symtab matches kallsyms : Ok
2: Detect openat syscall event : Ok
3: Detect openat syscall event on all cpus : Ok
4: Read samples using the mmap interface : Ok
5: Test data source output : Ok
6: Parse event definition strings : Ok
7: Simple expression parser : Ok
8: PERF_RECORD_* events & perf_sample fields : Ok
9: Parse perf pmu format : Ok
10: DSO data read : Ok
11: DSO data cache : Ok
12: DSO data reopen : Ok
13: Roundtrip evsel->name : Ok
14: Parse sched tracepoints fields : Ok
15: syscalls:sys_enter_openat event fields : Ok
16: Setup struct perf_event_attr : Ok
17: Match and link multiple hists : Ok
18: 'import perf' in python : Ok
19: Breakpoint overflow signal handler : Ok
20: Breakpoint overflow sampling : Ok
21: Breakpoint accounting : Ok
22: Watchpoint :
22.1: Read Only Watchpoint : Skip
22.2: Write Only Watchpoint : Ok
22.3: Read / Write Watchpoint : Ok
22.4: Modify Watchpoint : Ok
23: Number of exit events of a simple workload : Ok
24: Software clock events period values : Ok
25: Object code reading : Ok
26: Sample parsing : Ok
27: Use a dummy software event to keep tracking : Ok
28: Parse with no sample_id_all bit set : Ok
29: Filter hist entries : Ok
30: Lookup mmap thread : Ok
31: Share thread maps : Ok
32: Sort output of hist entries : Ok
33: Cumulate child hist entries : Ok
34: Track with sched_switch : Ok
35: Filter fds with revents mask in a fdarray : Ok
36: Add fd to a fdarray, making it autogrow : Ok
37: kmod_path__parse : Ok
38: Thread map : Ok
39: LLVM search and compile :
39.1: Basic BPF llvm compile : Ok
39.2: kbuild searching : Ok
39.3: Compile source for BPF prologue generation : Ok
39.4: Compile source for BPF relocation : Ok
40: Session topology : Ok
41: BPF filter :
41.1: Basic BPF filtering : Ok
41.2: BPF pinning : Ok
41.3: BPF prologue generation : Ok
41.4: BPF relocation checker : Ok
42: Synthesize thread map : Ok
43: Remove thread map : Ok
44: Synthesize cpu map : Ok
45: Synthesize stat config : Ok
46: Synthesize stat : Ok
47: Synthesize stat round : Ok
48: Synthesize attr update : Ok
49: Event times : Ok
50: Read backward ring buffer : Ok
51: Print cpu map : Ok
52: Merge cpu map : Ok
53: Probe SDT events : Ok
54: is_printable_array : Ok
55: Print bitmap : Ok
56: perf hooks : Ok
57: builtin clang support : Skip (not compiled in)
58: unit_number__scnprintf : Ok
59: mem2node : Ok
60: time utils : Ok
61: Test jit_write_elf : Ok
62: maps__merge_in : Ok
63: x86 rdpmc : Ok
64: Convert perf time to TSC : Ok
65: DWARF unwind : Ok
66: x86 instruction decoder - new instructions : Ok
67: Intel PT packet decoder : Ok
68: x86 bp modify : Ok
69: probe libc's inet_pton & backtrace it with ping : Ok
70: Use vfs_getname probe to get syscall args filenames : Ok
71: Check open filename arg using perf trace + vfs_getname: Ok
72: Zstd perf.data compression/decompression : Ok
73: Add vfs_getname probe to get syscall args filenames : Ok $ make -C tools/perf build-test
make: Entering directory '/home/acme/git/perf/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_no_demangle_O: make NO_DEMANGLE=1
make_doc_O: make doc
make_tags_O: make tags
make_install_O: make install
make_static_O: make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_no_libperl_O: make NO_LIBPERL=1
make_clean_all_O: make clean all
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_help_O: make help
make_install_prefix_O: make install prefix=/tmp/krava
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_no_libpython_O: make NO_LIBPYTHON=1
make_no_backtrace_O: make NO_BACKTRACE=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_no_libnuma_O: make NO_LIBNUMA=1
make_debug_O: make DEBUG=1
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_install_bin_O: make install-bin
make_pure_O: make
make_with_babeltrace_O: make LIBBABELTRACE=1
make_no_libelf_O: make NO_LIBELF=1
make_no_libaudit_O: make NO_LIBAUDIT=1
make_no_slang_O: make NO_SLANG=1
make_no_auxtrace_O: make NO_AUXTRACE=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_no_gtk2_O: make NO_GTK2=1
make_perf_o_O: make perf.o
make_no_newt_O: make NO_NEWT=1
make_util_map_o_O: make util/map.o
make_no_libbpf_O: make NO_LIBBPF=1
make_minimal_O: make NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1 NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1 NO_LIBCAP=1
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/15 tools arch x86: Sync the msr-index.h copy with the kernel sources
From: Arnaldo Carvalho de Melo <[email protected]>
To pick up the changes from these csets:
21b5ee59ef18 ("x86/cpu/amd: Enable the fixed Instructions Retired counter IRPERF")
$ tools/perf/trace/beauty/tracepoints/x86_msr.sh > before $ cp arch/x86/include/asm/msr-index.h tools/arch/x86/include/asm/msr-index.h $ git diff diff --git a/tools/arch/x86/include/asm/msr-index.h b/tools/arch/x86/include/asm/msr-index.h index ebe1685e92dd..d5e517d1c3dd 100644 --- a/tools/arch/x86/include/asm/msr-index.h +++ b/tools/arch/x86/include/asm/msr-index.h @@ -512,6 +512,8 @@ #define MSR_K7_HWCR 0xc0010015 #define MSR_K7_HWCR_SMMLOCK_BIT 0 #define MSR_K7_HWCR_SMMLOCK BIT_ULL(MSR_K7_HWCR_SMMLOCK_BIT) +#define MSR_K7_HWCR_IRPERF_EN_BIT 30 +#define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT) #define MSR_K7_FID_VID_CTL 0xc0010041 #define MSR_K7_FID_VID_STATUS 0xc0010042 $
That don't result in any change in tooling:
$ tools/perf/trace/beauty/tracepoints/x86_msr.sh > after $ diff -u before after $
To silence this perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/msr-index.h' differs from latest version at 'arch/x86/include/asm/msr-index.h' diff -u tools/arch/x86/include/asm/msr-index.h arch/x86/include/asm/msr-index.h
--- tools/arch/x86/include/asm/msr-index.h | 2 ++ 1 file changed, 2 insertions(+)
tools/arch/x86/include/asm/msr-index.h +2 -0
@@ -512,6 +512,8 @@#define MSR_K7_HWCR 0xc0010015#define MSR_K7_HWCR_SMMLOCK_BIT 0#define MSR_K7_HWCR_SMMLOCK BIT_ULL(MSR_K7_HWCR_SMMLOCK_BIT) +#define MSR_K7_HWCR_IRPERF_EN_BIT 30 +#define MSR_K7_HWCR_IRPERF_EN BIT_ULL(MSR_K7_HWCR_IRPERF_EN_BIT)#define MSR_K7_FID_VID_CTL 0xc0010041#define MSR_K7_FID_VID_STATUS 0xc0010042
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 2/15 tools headers UAPI: Update tools's copy of kvm.h headers
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Picking the changes from:
5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing instruction emulation")
Silencing this perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs from latest version at 'arch/x86/include/uapi/asm/kvm.h' diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h
No change in tooling ensues, just the x86 kvm tooling gets rebuilt as those headers are included in its build:
$ cp arch/x86/include/uapi/asm/kvm.h tools/arch/x86/include/uapi/asm/kvm.h
$ make -C tools/perf
make: Entering directory '/home/acme/git/perf/tools/perf'
BUILD: Doing 'make -j12' parallel build Auto-detecting system features:
... dwarf: [ on ]
<SNIP>
... disassembler-four-args: [ on ]
DESCEND plugins
CC /tmp/build/perf/arch/x86/util/kvm-stat.o
<SNIP>
LD /tmp/build/perf/arch/x86/util/perf-in.o
LD /tmp/build/perf/arch/x86/perf-in.o
LD /tmp/build/perf/arch/perf-in.o
LD /tmp/build/perf/perf-in.o
LINK /tmp/build/perf/perf <SNIP>
$
As it doesn't seem to be used there:
$ grep STATE tools/perf/arch/x86/util/kvm-stat.c $
And the 'perf trace' beautifier table generator isn't interested in these things:
$ grep regex= tools/perf/trace/beauty/kvm_ioctl.sh regex='^#[[:space:]]*define[[:space:]]+KVM_(\w+)[[:space:]]+_IO[RW]*\([[:space:]]*KVMIO[[:space:]]*,[[:space:]]*(0x[[:xdigit:]]+).*' $
--- tools/arch/x86/include/uapi/asm/kvm.h | 1 + 1 file changed, 1 insertion(+)
tools/arch/x86/include/uapi/asm/kvm.h +1 -0
@@ -390,6 +390,7 @@ struct kvm_sync_regs {#define KVM_STATE_NESTED_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_RUN_PENDING 0x00000002#define KVM_STATE_NESTED_EVMCS 0x00000004 +#define KVM_STATE_NESTED_MTF_PENDING 0x00000008#define KVM_STATE_NESTED_SMM_GUEST_MODE 0x00000001#define KVM_STATE_NESTED_SMM_VMXON 0x00000002
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 3/15 perf annotate/tui: Re-render title bar after switching back from script browser
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
The 'perf annotate' TUI browser provides a 'r' hot key to switch to a script browser. But the annotate browser title bar becomes hidden while switching back from script browser. Fix it.
--- tools/perf/ui/browsers/annotate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
tools/perf/ui/browsers/annotate.c +3 -4
@@ -754,10 +754,9 @@ static int annotate_browser__run(struct annotate_browser *browser, "? Search string backwards\n");continue ;case 'r' : - { -script_browse (NULL ,NULL ); -continue ; - } +script_browse (NULL ,NULL ); +annotate_browser__show (&browser->b, title, help); +continue ;case 'k' : notes->options->show_linenr = !notes->options->show_linenr;break ;
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 4/15 perf annotate: Fix --show-total-period for tui/stdio2
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
perf annotate --show-total-period does not really show total period.
The reason is we have two separate variables for the same purpose.
One is in symbol_conf.show_total_period and another is annotation_options.show_total_period.
We save command line option in symbol_conf.show_total_period but uses annotation_option.show_total_period while rendering tui/stdio2 browser.
Though, we copy symbol_conf.show_total_period to annotation__default_options.show_total_period but that is not really effective as we don't use annotation__default_options once we copy default options to dynamic variable annotate.opts in cmd_annotate().
Instead of all these complication, keep only one variable and use it all over. symbol_conf.show_total_period is used by perf report/top as well. So let's kill annotation_options.show_total_period.
On a side note, I've kept annotation_options.show_total_period definition because it's still used by perf-config code. Follow up patch to fix perf-config for annotate will remove annotation_options.show_total_period.
--- tools/perf/ui/browsers/annotate.c | 6 +++--- tools/perf/util/annotate.c | 5 ++--- tools/perf/util/annotate.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-)
tools/perf/ui/browsers/annotate.c +3 -3
@@ -833,13 +833,13 @@ static int annotate_browser__run(struct annotate_browser *browser,map_symbol__annotation_dump (ms, evsel, browser->opts);continue ;case 't' : -if (notes->options->show_total_period) { - notes->options->show_total_period = false; +if (symbol_conf.show_total_period) { + symbol_conf.show_total_period = false; notes->options->show_nr_samples = true; }else if (notes->options->show_nr_samples) notes->options->show_nr_samples = false;else - notes->options->show_total_period = true; + symbol_conf.show_total_period = true;annotation__update_column_widths (notes);continue ;case 'c' :
tools/perf/util/annotate.c +2 -3
@@ -2915,7 +2915,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati percent =annotation_data__percent (&al->data[i], percent_type);obj__set_percent_color (obj, percent, current_entry); -if (notes->options->show_total_period) { +if (symbol_conf.show_total_period) {obj__printf (obj,"%11" PRIu64" " , al->data[i].he.period); }else if (notes->options->show_nr_samples) { obj__printf(obj, "%6" PRIu64 " ",
@@ -2931,7 +2931,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotatiobj__printf (obj,"%-*s" , pcnt_width," " ); else {obj__printf (obj,"%-*s" , pcnt_width, - notes->options->show_total_period ?"Period" : + symbol_conf.show_total_period ?"Period" : notes->options->show_nr_samples ?"Samples" :"Percent" ); } }
@@ -3155,7 +3155,6 @@ void annotation_config__init(void) {perf_config (annotation__config,NULL ); - annotation__default_options.show_total_period = symbol_conf.show_total_period; annotation__default_options.show_nr_samples = symbol_conf.show_nr_samples; }
tools/perf/util/annotate.h +1 -1
@@ -309,7 +309,7 @@ static inline int annotation__cycles_width(struct annotation *notes)static inline int annotation__pcnt_width (struct annotation *notes) { -return (notes->options->show_total_period ?12 :7 ) * notes->nr_events; +return (symbol_conf.show_total_period ?12 :7 ) * notes->nr_events; }static inline bool annotation_line__filter (struct annotation_line *al,struct annotation *notes)
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 5/15 perf annotate: Fix --show-nr-samples for tui/stdio2
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
perf annotate --show-nr-samples does not really show number of samples.
The reason is we have two separate variables for the same purpose.
One is in symbol_conf.show_nr_samples and another is annotation_options.show_nr_samples.
We save command line option in symbol_conf.show_nr_samples but uses annotation_option.show_nr_samples while rendering tui/stdio2 browser.
Though, we copy symbol_conf.show_nr_samples to annotation__default_options.show_nr_samples but that is not really effective as we don't use annotation__default_options once we copy default options to dynamic variable annotate.opts in cmd_annotate().
Instead of all these complication, keep only one variable and use it all over. symbol_conf.show_nr_samples is used by perf report/top as well. So let's kill annotation_options.show_nr_samples.
On a side note, I've kept annotation_options.show_nr_samples definition because it's still used by perf-config code. Follow up patch to fix perf-config for annotate will remove annotation_options.show_nr_samples.
--- tools/perf/ui/browsers/annotate.c | 6 +++--- tools/perf/util/annotate.c | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-)
tools/perf/ui/browsers/annotate.c +3 -3
@@ -835,9 +835,9 @@ static int annotate_browser__run(struct annotate_browser *browser,case 't' :if (symbol_conf.show_total_period) { symbol_conf.show_total_period = false; - notes->options->show_nr_samples = true; - }else if (notes->options->show_nr_samples) - notes->options->show_nr_samples = false; + symbol_conf.show_nr_samples = true; + }else if (symbol_conf.show_nr_samples) + symbol_conf.show_nr_samples = false;else symbol_conf.show_total_period = true;annotation__update_column_widths (notes);
tools/perf/util/annotate.c +2 -4
@@ -2917,7 +2917,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotatiobj__set_percent_color (obj, percent, current_entry);if (symbol_conf.show_total_period) {obj__printf (obj,"%11" PRIu64" " , al->data[i].he.period); - }else if (notes->options->show_nr_samples) { + }else if (symbol_conf.show_nr_samples) {obj__printf (obj,"%6" PRIu64" " , al->data[i].he.nr_samples); }else {
@@ -2932,7 +2932,7 @@ static void __annotation_line__write(struct annotation_line *al, struct annotatielse {obj__printf (obj,"%-*s" , pcnt_width, symbol_conf.show_total_period ?"Period" : - notes->options->show_nr_samples ?"Samples" :"Percent" ); + symbol_conf.show_nr_samples ?"Samples" :"Percent" ); } }
@@ -3154,8 +3154,6 @@ static int annotation__config(const char *var, const char *value,void annotation_config__init (void ) {perf_config (annotation__config,NULL ); - - annotation__default_options.show_nr_samples = symbol_conf.show_nr_samples; }static unsigned int parse_percent_type (char *str1,char *str2)
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 6/15 perf config: Introduce perf_config_u8()
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
Introduce perf_config_u8() utility function to convert char * input into u8 destination. We will utilize it in followup patch.
--- tools/perf/util/config.c | 12 ++++++++++++ tools/perf/util/config.h | 1 + 2 files changed, 13 insertions(+)
tools/perf/util/config.c +12 -0
@@ -374,6 +374,18 @@ int perf_config_int(int *dest, const char *name, const char *value)return 0 ; } +int perf_config_u8 (u8 *dest,const char *name,const char *value) +{ +long ret =0 ; + +if (!perf_parse_long (value, &ret)) { +bad_config (name); +return -1 ; + } + *dest = ret; +return 0 ; +} +static int perf_config_bool_or_int (const char *name,const char *value,int *is_bool) {int ret;
tools/perf/util/config.h +1 -0
@@ -29,6 +29,7 @@ typedef int (*config_fn_t)(const char *, const char *, void *);int perf_default_config (const char *,const char *,void *);int perf_config (config_fn_t fn,void *);int perf_config_int (int *dest,const char *,const char *); +int perf_config_u8 (u8 *dest,const char *name,const char *value);int perf_config_u64 (u64 *dest,const char *,const char *);int perf_config_bool (const char *,const char *);int config_error_nonbool (const char *);
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 7/15 perf annotate: Make perf config effective
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
perf default config set by user in [annotate] section is totally ignored by annotate code. Fix it.
Before:
$ ./perf config annotate.hide_src_code=true annotate.show_nr_jumps=true annotate.show_nr_samples=true
$ ./perf annotate shash
│ unsigned h = 0;
│ movl $0x0,-0xc(%rbp)
│ while (*s)
│ ↓ jmp 44
│ h = 65599 * h + *s++;
11.33 │24: mov -0xc(%rbp),%eax
43.50 │ imul $0x1003f,%eax,%ecx
│ mov -0x18(%rbp),%raxAfter:
│ movl $0x0,-0xc(%rbp)
│ ↓ jmp 44
1 │1 24: mov -0xc(%rbp),%eax
4 │ imul $0x1003f,%eax,%ecx
│ mov -0x18(%rbp),%raxNote that we have removed show_nr_samples and show_total_period from annotation_options because they are not used. Instead of them we use symbol_conf.show_nr_samples and symbol_conf.show_total_period.
Committer testing:
Using 'perf annotate --stdio2' to use the TUI rendering but emitting the output to stdio:
# perf config # # perf config annotate.hide_src_code=true # perf config annotate.hide_src_code=true # # perf config annotate.show_nr_jumps=true # perf config annotate.show_nr_samples=true # perf config annotate.hide_src_code=true annotate.show_nr_jumps=true annotate.show_nr_samples=true # #
Before:
# perf annotate --stdio2 ObjectInstance::weak_pointer_was_finalized
Samples: 1 of event 'cycles', 4000 Hz, Event count (approx.): 830873, [percent: local period]
ObjectInstance::weak_pointer_was_finalized() /usr/lib64/libgjs.so.0.0.0
Percent
00000000000609f0 <ObjectInstance::weak_pointer_was_finalized()@@Base>:
endbr64
cmpq $0x0,0x20(%rdi)
↓ je 10
xor %eax,%eax
← retq
xchg %ax,%ax
100.00 10: push %rbp
cmpq $0x0,0x18(%rdi)
mov %rdi,%rbp
↓ jne 20
1b: xor %eax,%eax
pop %rbp
← retq
nop
20: lea 0x18(%rdi),%rdi
→ callq JS_UpdateWeakPointerAfterGC(JS::Heap<JSObject*
cmpq $0x0,0x18(%rbp)
↑ jne 1b
mov %rbp,%rdi
→ callq ObjectBase::jsobj_addr() const@plt
mov $0x1,%eax
pop %rbp
← retq
#After:
# perf annotate --stdio2 ObjectInstance::weak_pointer_was_finalized 2> /dev/null
Samples: 1 of event 'cycles', 4000 Hz, Event count (approx.): 830873, [percent: local period]
ObjectInstance::weak_pointer_was_finalized() /usr/lib64/libgjs.so.0.0.0
Samples endbr64
cmpq $0x0,0x20(%rdi)
↓ je 10
xor %eax,%eax
← retq
xchg %ax,%ax
1 1 10: push %rbp
cmpq $0x0,0x18(%rdi)
mov %rdi,%rbp
↓ jne 20
1 1b: xor %eax,%eax
pop %rbp
← retq
nop
1 20: lea 0x18(%rdi),%rdi
→ callq JS_UpdateWeakPointerAfterGC(JS::Heap<JSObject*
cmpq $0x0,0x18(%rbp)
↑ jne 1b
mov %rbp,%rdi
→ callq ObjectBase::jsobj_addr() const@plt
mov $0x1,%eax
pop %rbp
← retq
#
# perf config annotate.show_nr_jumps
annotate.show_nr_jumps=true
# perf config annotate.show_nr_jumps=false
# perf config annotate.show_nr_jumps
annotate.show_nr_jumps=false
#
# perf annotate --stdio2 ObjectInstance::weak_pointer_was_finalized 2> /dev/null
Samples: 1 of event 'cycles', 4000 Hz, Event count (approx.): 830873, [percent: local period]
ObjectInstance::weak_pointer_was_finalized() /usr/lib64/libgjs.so.0.0.0
Samples endbr64
cmpq $0x0,0x20(%rdi)
↓ je 10
xor %eax,%eax
← retq
xchg %ax,%ax
1 10: push %rbp
cmpq $0x0,0x18(%rdi)
mov %rdi,%rbp
↓ jne 20
1b: xor %eax,%eax
pop %rbp
← retq
nop
20: lea 0x18(%rdi),%rdi
→ callq JS_UpdateWeakPointerAfterGC(JS::Heap<JSObject*
cmpq $0x0,0x18(%rbp)
↑ jne 1b
mov %rbp,%rdi
→ callq ObjectBase::jsobj_addr() const@plt
mov $0x1,%eax
pop %rbp
← retq
#--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/util/annotate.c | 78 +++++++++++++---------------------- tools/perf/util/annotate.h | 4 +- 5 files changed, 33 insertions(+), 55 deletions(-)
tools/perf/builtin-annotate.c +1 -1
@@ -605,7 +605,7 @@ int cmd_annotate(int argc, const char **argv)if (ret <0 ) goto out_delete; -annotation_config__init (); +annotation_config__init (&annotate.opts); symbol_conf.try_vmlinux_path = true;
tools/perf/builtin-report.c +1 -1
@@ -1507,7 +1507,7 @@ int cmd_report(int argc, const char **argv) symbol_conf.priv_size +=sizeof (u32); symbol_conf.sort_by_name = true; } -annotation_config__init (); +annotation_config__init (&report.annotation_opts); }if (symbol__init (&session->header.env) <0 )
tools/perf/builtin-top.c +1 -1
@@ -1683,7 +1683,7 @@ int cmd_top(int argc, const char **argv)if (status <0 ) goto out_delete_evlist; -annotation_config__init (); +annotation_config__init (&top.annotation_opts); symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name ==NULL ); status =symbol__init (NULL );
tools/perf/util/annotate.c +29 -49
95 lines not on this page · raw message
tools/perf/util/annotate.h +1 -3
@@ -83,8 +83,6 @@ struct annotation_options { full_path, show_linenr, show_nr_jumps, - show_nr_samples, - show_total_period, show_minmax_cycle, show_asm_raw, annotate_src;
@@ -413,7 +411,7 @@ static inline int symbol__tui_annotate(struct map_symbol *ms __maybe_unused, }#endif -void annotation_config__init (void ); +void annotation_config__init (struct annotation_options *opt);int annotate_parse_percent_type (const struct option *opt,const char *_str,int unset);
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 8/15 perf annotate: Prefer cmdline option over default config
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
For all the perf-config options that can also be set from command line option, the preference is given to command line version in case of any conflict. But that's opposite in case of perf annotate. i.e. the more preference is given to default option rather than command line option. Fix it.
Before:
$ ./perf config annotate.show_nr_samples=false
$ ./perf annotate shash --show-nr-samples
Percent│
│24: mov -0xc(%rbp),%eax
49.19 │ imul $0x1003f,%eax,%ecx
│ mov -0x18(%rbp),%raxAfter:
Samples│
│24: mov -0xc(%rbp),%eax
1 │ imul $0x1003f,%eax,%ecx
│ mov -0x18(%rbp),%rax--- tools/perf/builtin-annotate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/builtin-annotate.c +2 -2
@@ -566,6 +566,8 @@ int cmd_annotate(int argc, const char **argv)if (ret <0 )return ret; +annotation_config__init (&annotate.opts); + argc =parse_options (argc, argv, options, annotate_usage,0 );if (argc) {/*
@@ -605,8 +607,6 @@ int cmd_annotate(int argc, const char **argv)if (ret <0 ) goto out_delete; -annotation_config__init (&annotate.opts); - symbol_conf.try_vmlinux_path = true; ret =symbol__init (&annotate.session->header.env);
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 9/15 perf annotate: Fix perf config option description
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
perf config annotate options says it works only with TUI, which is wrong. Most of the TUI options are applicable to stdio2 as well. So remove that generic line and add individual line with each option stating which browsers supports that option. Also, annotate.show_nr_samples config is missing in Documentation. Describe it.
--- tools/perf/Documentation/perf-config.txt | 30 +++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-config.txt +29 -1
@@ -239,7 +239,6 @@ buildid.*:: set buildid.dir to /dev/null. The default is $HOME/.debug annotate.*:: - These options work only for TUI. These are in control of addresses, jump function, source code in lines of assembly code from a specific program.
@@ -269,6 +268,8 @@ annotate.*:: │ mov (%rdi),%rdx │ return n; + This option works with tui, stdio2 browsers. + annotate.use_offset:: Basing on a first address of a loaded function, offset can be used. Instead of using original addresses of assembly code,
@@ -287,6 +288,8 @@ annotate.*:: 368:│ mov 0x8(%r14),%rdi + This option works with tui, stdio2 browsers. + annotate.jump_arrows:: There can be jump instruction among assembly code. Depending on a boolean value of jump_arrows,
@@ -306,6 +309,8 @@ annotate.*:: │1330: mov %r15,%r10 │1333: cmp %r15,%r14 + This option works with tui browser. + annotate.show_linenr:: When showing source code if this option is 'true', line numbers are printed as below.
@@ -325,6 +330,8 @@ annotate.*:: │ array++; │ } + This option works with tui, stdio2 browsers. + annotate.show_nr_jumps:: Let's see a part of assembly code.
@@ -335,6 +342,8 @@ annotate.*:: │1 1382: movb $0x1,-0x270(%rbp) + This option works with tui, stdio2 browsers. + annotate.show_total_period:: To compare two records on an instruction base, with this option provided, display total number of samples that belong to a line
@@ -348,11 +357,30 @@ annotate.*:: 99.93 │ mov %eax,%eax + This option works with tui, stdio2, stdio browsers. + + annotate.show_nr_samples:: + By default perf annotate shows percentage of samples. This option + can be used to print absolute number of samples. Ex, when set as + false: + + Percent│ + 74.03 │ mov %fs:0x28,%rax + + When set as true: + + Samples│ + 6 │ mov %fs:0x28,%rax + + This option works with tui, stdio2, stdio browsers. + annotate.offset_level:: Default is '1', meaning just jump targets will have offsets show right beside the instruction. When set to '2' 'call' instructions will also have its offsets shown, 3 or higher will show offsets for all instructions. + This option works with tui, stdio2 browsers. + hist.*:: hist.percentage:: This option control the way to calculate overhead of filtered entries -
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 10/15 perf config: Document missing config options
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
While documenting annotate.show_nr_samples config option, I found many other config options missing in perf-config documentation. Add them.
--- tools/perf/Documentation/perf-config.txt | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
tools/perf/Documentation/perf-config.txt +44 -0
@@ -518,6 +518,12 @@ top.*:: column by default. The default is 'true'. + top.call-graph:: + This is identical to 'call-graph.record-mode', except it is + applicable only for 'top' subcommand. This option ONLY setup + the unwind method. To enable 'perf top' to actually use it, + the command line option -g must be specified. + man.*:: man.viewer:: This option can assign a tool to view manual pages when 'help'
@@ -545,6 +551,16 @@ record.*:: But if this option is 'no-cache', it will not update the build-id cache. 'skip' skips post-processing and does not update the cache. + record.call-graph:: + This is identical to 'call-graph.record-mode', except it is + applicable only for 'record' subcommand. This option ONLY setup + the unwind method. To enable 'perf record' to actually use it, + the command line option -g must be specified. + + record.aio:: + Use 'n' control blocks in asynchronous (Posix AIO) trace writing + mode ('n' default: 1, max: 4). + diff.*:: diff.order:: This option sets the number of columns to sort the result.
@@ -594,6 +610,11 @@ trace.*:: "libbeauty", the default, to use the same argument beautifiers used in the strace-like sys_enter+sys_exit lines. +ftrace.*:: + ftrace.tracer:: + Can be used to select the default tracer. Possible values are + 'function' and 'function_graph'. + llvm.*:: llvm.clang-path:: Path to clang. If omit, search it from $PATH.
@@ -638,6 +659,29 @@ scripts.*:: The script gets the same options passed as a full perf script, in particular -i perfdata file, --cpu, --tid +convert.*:: + + convert.queue-size:: + Limit the size of ordered_events queue, so we could control + allocation size of perf data files without proper finished + round events. + +intel-pt.*:: + + intel-pt.cache-divisor:: + + intel-pt.mispred-all:: + If set, Intel PT decoder will set the mispred flag on all + branches. + +auxtrace.*:: + + auxtrace.dumpdir:: + s390 only. The directory to save the auxiliary trace buffer + can be changed using this option. Ex, auxtrace.dumpdir=/tmp. + If the directory does not exist or has the wrong file type, + the current directory is used. + SEE ALSO -------- linkperf:perf[1]
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 11/15 perf probe: Check return value of strlist__add() for -ENOMEM
In reply to Arnaldo Carvalho de MeloFrom: He Zhe <[email protected]>
strlist__add() may fail with -ENOMEM. Check it and give debugging hint in advance.
--- tools/perf/builtin-probe.c | 6 ++++-- tools/perf/util/probe-file.c | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-)
tools/perf/builtin-probe.c +4 -2
@@ -449,7 +449,8 @@ static int perf_del_probe_events(struct strfilter *filter) ret =probe_file__del_strlist (kfd, klist);if (ret <0 ) goto error; - } + }else if (ret == -ENOMEM ) + goto error; ret2 =probe_file__get_events (ufd, filter, ulist);if (ret2 ==0 ) {
@@ -459,7 +460,8 @@ static int perf_del_probe_events(struct strfilter *filter) ret2 =probe_file__del_strlist (ufd, ulist);if (ret2 <0 ) goto error; - } + }else if (ret2 == -ENOMEM ) + goto error;if (ret == -ENOENT && ret2 == -ENOENT )pr_warning ("\"%s\" does not hit any event.\n" , str);
tools/perf/util/probe-file.c +24 -4
@@ -301,10 +301,15 @@ int probe_file__get_events(int fd, struct strfilter *filter, p =strchr (ent->s,':' );if ((p &&strfilter__compare (filter, p +1 )) ||strfilter__compare (filter, ent->s)) { -strlist__add (plist, ent->s); + ret =strlist__add (plist, ent->s); +if (ret == -ENOMEM ) { +pr_err ("strlist__add failed with -ENOMEM\n" ); + goto out; + } ret =0 ; } } +out:strlist__delete (namelist);return ret;
@@ -511,7 +516,11 @@ static int probe_cache__load(struct probe_cache *pcache) ret = -EINVAL ; goto out; } -strlist__add (entry->tevlist, buf); + ret =strlist__add (entry->tevlist, buf); +if (ret == -ENOMEM ) { +pr_err ("strlist__add failed with -ENOMEM\n" ); + goto out; + } } } out:
@@ -672,7 +681,12 @@ int probe_cache__add_entry(struct probe_cache *pcache, command =synthesize_probe_trace_command (&tevs[i]);if (!command) goto out_err; -strlist__add (entry->tevlist, command); + ret =strlist__add (entry->tevlist, command); +if (ret == -ENOMEM ) { +pr_err ("strlist__add failed with -ENOMEM\n" ); + goto out_err; + } +free (command); }list_add_tail (&entry->node, &pcache->entries);
@@ -853,9 +867,15 @@ int probe_cache__scan_sdt(struct probe_cache *pcache, const char *pathname)break ; } -strlist__add (entry->tevlist, buf); + ret =strlist__add (entry->tevlist, buf); +free (buf); entry =NULL ; + +if (ret == -ENOMEM ) { +pr_err ("strlist__add failed with -ENOMEM\n" ); +break ; + } }if (entry) {list_del_init (&entry->node);
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 12/15 perf annotate: Remove privsize from symbol__annotate() args
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
privsize is passed as 0 from all the symbol__annotate() callers. Remove it from argument list.
--- tools/perf/builtin-top.c | 2 +- tools/perf/ui/gtk/annotate.c | 2 +- tools/perf/util/annotate.c | 7 ++++--- tools/perf/util/annotate.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-)
tools/perf/builtin-top.c +1 -1
@@ -143,7 +143,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)return err; } - err =symbol__annotate (&he->ms, evsel,0 , &top->annotation_opts,NULL ); + err =symbol__annotate (&he->ms, evsel, &top->annotation_opts,NULL );if (err ==0 ) { top->sym_filter_entry = he; }else {
tools/perf/ui/gtk/annotate.c +1 -1
@@ -174,7 +174,7 @@ static int symbol__gtk_annotate(struct map_symbol *ms, struct evsel *evsel,if (ms->map->dso->annotate_warned)return -1 ; - err =symbol__annotate (ms, evsel,0 , &annotation__default_options,NULL ); + err =symbol__annotate (ms, evsel, &annotation__default_options,NULL );if (err) {char msg[BUFSIZ ];symbol__strerror_disassemble (ms, err, msg,sizeof (msg));
tools/perf/util/annotate.c +4 -3
@@ -2149,9 +2149,10 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel)annotation__calc_percent (notes, evsel,symbol__size (sym)); } -int symbol__annotate (struct map_symbol *ms,struct evsel *evsel,size_t privsize, +int symbol__annotate (struct map_symbol *ms,struct evsel *evsel,struct annotation_options *options,struct arch **parch) { +size_t privsize =0 ;struct symbol *sym = ms->sym;struct annotation *notes =symbol__annotation (sym);struct annotate_args args = {
@@ -2790,7 +2791,7 @@ int symbol__tty_annotate(struct map_symbol *ms, struct evsel *evsel,struct symbol *sym = ms->sym;struct rb_root source_line =RB_ROOT ; -if (symbol__annotate (ms, evsel,0 , opts,NULL ) <0 ) +if (symbol__annotate (ms, evsel, opts,NULL ) <0 )return -1 ;symbol__calc_percent (sym, evsel);
@@ -3070,7 +3071,7 @@ int symbol__annotate2(struct map_symbol *ms, struct evsel *evsel,if (perf_evsel__is_group_event (evsel)) nr_pcnt = evsel->core.nr_members; - err =symbol__annotate (ms, evsel,0 , options, parch); + err =symbol__annotate (ms, evsel, options, parch);if (err) goto out_free_offsets;
tools/perf/util/annotate.h +1 -1
@@ -350,7 +350,7 @@ struct annotated_source *symbol__hists(struct symbol *sym, int nr_hists);void symbol__annotate_zero_histograms (struct symbol *sym);int symbol__annotate (struct map_symbol *ms, -struct evsel *evsel,size_t privsize, +struct evsel *evsel,struct annotation_options *options,struct arch **parch); int symbol__annotate2(struct map_symbol *ms,
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 13/15 perf annotate: Simplify disasm_line allocation and freeing code
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
We are allocating disasm_line object in annotation_line__new() instead of disasm_line__new(). Similarly annotation_line__delete() is actually freeing disasm_line object as well. This complexity is because of privsize. But we don't need privsize anymore so get rid of privsize and simplify disasm_line allocation and freeing code.
--- tools/perf/util/annotate.c | 86 ++++++++++++++------------------------ tools/perf/util/annotate.h | 1 - 2 files changed, 31 insertions(+), 56 deletions(-)
tools/perf/util/annotate.c +31 -55
@@ -1143,7 +1143,6 @@ static int disasm_line__parse(char *line, const char **namep, char **rawp) }struct annotate_args { -size_t privsize;struct arch *arch;struct map_symbol ms;struct evsel *evsel;
@@ -1153,83 +1152,61 @@ struct annotate_args {int line_nr; }; -static void annotation_line__delete (struct annotation_line *al) +static void annotation_line__init (struct annotation_line *al, +struct annotate_args *args, +int nr) { -void *ptr = (void *) al - al->privsize; + al->offset = args->offset; + al->line =strdup (args->line); + al->line_nr = args->line_nr; + al->data_nr = nr; +} +static void annotation_line__exit (struct annotation_line *al) +{free_srcline (al->path);zfree (&al->line); -free (ptr); } -/* -* Allocating the annotation line data with following -* structure: -* -* -------------------------------------- -* private space | struct annotation_line -* -------------------------------------- -* -* Size of the private space is stored in 'struct annotation_line'. -* -*/ -static struct annotation_line * -annotation_line__new (struct annotate_args *args,size_t privsize) +static size_t disasm_line_size (int nr) {struct annotation_line *al; -struct evsel *evsel = args->evsel; -size_t size = privsize +sizeof (*al); -int nr =1 ; - -if (perf_evsel__is_group_event (evsel)) - nr = evsel->core.nr_members; - - size +=sizeof (al->data[0 ]) * nr; - al =zalloc (size); -if (al) { - al = (void *) al + privsize; - al->privsize = privsize; - al->offset = args->offset; - al->line =strdup (args->line); - al->line_nr = args->line_nr; - al->data_nr = nr; - } - -return al; +return (sizeof (struct disasm_line ) + (sizeof (al->data[0 ]) * nr)); }/* * Allocating the disasm annotation line data with * following structure: * -* ------------------------------------------------------------ -* privsize space | struct disasm_line | struct annotation_line -* ------------------------------------------------------------ +* ------------------------------------------- +* struct disasm_line | struct annotation_line +* ------------------------------------------- * * We have 'struct annotation_line' member as last member * of 'struct disasm_line' to have an easy access. -* */ static struct disasm_line *disasm_line__new (struct annotate_args *args) {struct disasm_line *dl =NULL ; -struct annotation_line *al; -size_t privsize = args->privsize + offsetof(struct disasm_line , al); +int nr =1 ; - al =annotation_line__new (args, privsize); -if (al !=NULL ) { - dl =disasm_line (al); +if (perf_evsel__is_group_event (args->evsel)) + nr = args->evsel->core.nr_members; -if (dl->al.line ==NULL ) - goto out_delete; + dl =zalloc (disasm_line_size (nr)); +if (!dl) +return NULL ; -if (args->offset !=-1 ) { -if (disasm_line__parse (dl->al.line, &dl->ins.name, &dl->ops.raw) <0 ) - goto out_free_line; +annotation_line__init (&dl->al, args, nr); +if (dl->al.line ==NULL ) + goto out_delete; -disasm_line__init_ins (dl, args->arch, &args->ms); - } +if (args->offset !=-1 ) { +if (disasm_line__parse (dl->al.line, &dl->ins.name, &dl->ops.raw) <0 ) + goto out_free_line; + +disasm_line__init_ins (dl, args->arch, &args->ms); }return dl;
@@ -1248,7 +1225,8 @@ void disasm_line__free(struct disasm_line *dl)else ins__delete (&dl->ops);zfree (&dl->ins.name); -annotation_line__delete (&dl->al); +annotation_line__exit (&dl->al); +free (dl); }int disasm_line__scnprintf (struct disasm_line *dl,char *bf,size_t size,bool raw,int max_ins_name)
@@ -2152,11 +2130,9 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel)int symbol__annotate (struct map_symbol *ms,struct evsel *evsel,struct annotation_options *options,struct arch **parch) { -size_t privsize =0 ;struct symbol *sym = ms->sym;struct annotation *notes =symbol__annotation (sym);struct annotate_args args = { - .privsize = privsize, .evsel = evsel, .options = options, };
tools/perf/util/annotate.h +0 -1
@@ -139,7 +139,6 @@ struct annotation_line {u64 cycles;u64 cycles_max;u64 cycles_min; -size_t privsize;char *path;u32 idx;int idx_asm;
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 14/15 perf annotate: Align struct annotate_args
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
Align fields of struct annotate_args.
--- tools/perf/util/annotate.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/perf/util/annotate.c +6 -6
@@ -1143,13 +1143,13 @@ static int disasm_line__parse(char *line, const char **namep, char **rawp) }struct annotate_args { -struct arch *arch; -struct map_symbol ms; -struct evsel *evsel; +struct arch *arch; +struct map_symbol ms; +struct evsel *evsel;struct annotation_options *options; -s64 offset; -char *line; -int line_nr; +s64 offset; +char *line; +int line_nr; }; static void annotation_line__init(struct annotation_line *al,
Signature · 1 line
2.21.1
Arnaldo Carvalho de Melo
maintainerPATCH 15/15 perf annotate: Fix segfault with source toggle
In reply to Arnaldo Carvalho de MeloFrom: Ravi Bangoria <[email protected]>
While rendering annotate browser from perf report tui, we keep track of total number of lines(asm + source) in annotation->nr_entries and total number of asm lines in annotation->nr_asm_entries. But we don't reset them before starting. Thus if user annotates same function multiple times, we restart incrementing these fields with old values.
This causes a segfault when user tries to toggle source code after annotating same function multiple times. Fix it.
--- tools/perf/util/annotate.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/annotate.c +2 -0
@@ -2621,6 +2621,8 @@ void annotation__set_offsets(struct annotation *notes, s64 size)struct annotation_line *al; notes->max_line_len =0 ; + notes->nr_entries =0 ; + notes->nr_asm_entries =0 ;list_for_each_entry (al, ¬es->src->source, node) {size_t line_len =strlen (al->line);
Signature · 1 line
2.21.1
Quoted 78 lines · Arnaldo Carvalho de Melo
Hi Ingo/Thomas,
Please consider pulling,
Best regards,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit
4c45945aa418f5e2f31cdaf0b1484e146e29f72f:Merge tag 'perf-urgent-for-mingo-5.6-20200220' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/urgent (2020-02-26 15:18:05 +0100)are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-urgent-for-mingo-5.6-20200228for you to fetch changes up to
e0560ba6d92f06dbe13e9d11c921a60c07ea6fcc:perf annotate: Fix segfault with source toggle (2020-02-27 11:47:23 -0300)
----------------------------------------------------------------
perf/urgent fixes:perf annotate:
Ravi Bangoria:
- Fix segfault with source toggle.
- Fix --show-total-period and --show-nr-samples for tui/stdio2.
- Fix handling of settings in ~/.perfconfig versus the ones passed in the command line
- Re-render title bar after switching back from script browser.
- Fix options man page, document some missing ones.
perf probe:
He Zhe:
- Check return value of
strlist__add()for-ENOMEM.tools UAPI:
Arnaldo Carvalho de Melo:
- Sync x86's
msr-index.hcopy with the kernel sources.- Update tools's copy of x86's
kvm.hheaders.Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Arnaldo Carvalho de Melo (2):
tools arch x86: Sync themsr-index.hcopy with the kernel sources tools headers UAPI: Update tools's copy ofkvm.hheadersHe Zhe (1):
perf probe: Check return value ofstrlist__add()for-ENOMEMRavi Bangoria (12):
perf annotate/tui: Re-render title bar after switching back from script browser perf annotate: Fix --show-total-period for tui/stdio2
perf annotate: Fix --show-nr-samples for tui/stdio2
perf config: Introduceperf_config_u8()
perf annotate: Make perf config effective
perf annotate: Prefer cmdline option over default config
perf annotate: Fix perf config option description
perf config: Document missing config options
perf annotate: Remove privsize fromsymbol__annotate()args
perf annotate: Simplifydisasm_lineallocation and freeing code perf annotate: Align structannotate_args
perf annotate: Fix segfault with source toggle
Quoted 15 lines
tools/arch/x86/include/asm/msr-index.h | 2 + tools/arch/x86/include/uapi/asm/kvm.h | 1 + tools/perf/Documentation/perf-config.txt | 74 +++++++++++- tools/perf/builtin-annotate.c | 4 +- tools/perf/builtin-probe.c | 6 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 4 +- tools/perf/ui/browsers/annotate.c | 19 ++- tools/perf/ui/gtk/annotate.c | 2 +- tools/perf/util/annotate.c | 194 ++++++++++++------------------- tools/perf/util/annotate.h | 9 +- tools/perf/util/config.c | 12 ++ tools/perf/util/config.h | 1 + tools/perf/util/probe-file.c | 28 ++++- 14 files changed, 210 insertions(+), 148 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo