perf/core improvements and fixes
Subsystems (5)
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 cfb104ca8a26affb28d81720a4ed49c30b2a3b01:
Merge tag 'perf-core-for-mingo-5.4-20190816' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2019-08-16 22:43:42 +0200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo-5.4-20190820
for you to fetch changes up to b81d39c7a1efb83caa3f4419939a46e96191abb6:
libperf: Fix arch include paths (2019-08-20 12:29:36 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
callchains:
Alexey Budankov:
- Allow collecting LBR together with DWARF callchains, for workloads where the userspace stack size collected is not big enough for pure DWARF based unwinding.
- Dump the LBR call stack in 'perf report -D'.
perf top:
Arnaldo Carvalho de Melo:
- Show visual cue at start to state that the minimal set of samples are being collected prior to sorting/bucketizing/displaying.
CoreSight (ARM hardware tracing):
Leo Yan:
- Support sample flags 'insn' and 'insnlen'.
core:
Adrian Hunter:
- Add comment for 'idx' member in 'struct perf_sample_id.
tools headers:
Arnaldo Carvalho de Melo:
- Synchronize linux/bits.h, which required grabbing a copy of the kernel const.h headers and some changes in the ordering of header directories.
- Sync x86's asm/cpufeatures.h with the with the kernel, no change in any of the tools.
libperf:
Jiri Olsa:
- Fix arch include paths.
libtraceevent:
Steven Rostedt (VMware):
- Fix "robust" test of do_generate_dynamic_list_file.
----------------------------------------------------------------
Adrian Hunter (1):
perf evsel: Add comment for 'idx' member in 'struct perf_sample_id
Alexey Budankov (3):
perf record: Enable LBR callstack capture jointly with thread stack perf report: Dump LBR callstack data by -D jointly with thread stack perf report: Prefer DWARF callstacks to LBR ones when captured both
Arnaldo Carvalho de Melo (10):
tools headers: Add limits.h to access __WORDSIZE
perf tools: tools/include should come before tools/uapi/include
tools headers: Grab copy of linux/const.h, needed by linux/bits.h
tools headers: Synchronize linux/bits.h with the kernel sources
tools arch x86: Sync asm/cpufeatures.h with the with the kernel
perf ui: Make 'exit_msg' optional in ui__question_window()
perf ui: Introduce non-interactive ui__info_window() function
perf ui browser: Allow specifying message to show when no samples are available to display perf top: Show info message while collecting samples
tools headers: Fixup bitsperlong per arch includes
Jiri Olsa (1):
libperf: Fix arch include paths
Leo Yan (1):
perf cs-etm: Support sample flags 'insn' and 'insnlen'
Steven Rostedt (VMware) (1):
tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file
tools/arch/x86/include/asm/cpufeatures.h | 3 +++ tools/include/linux/bitops.h | 1 + tools/include/linux/bits.h | 17 +++++++++------ tools/include/linux/const.h | 9 ++++++++ tools/include/uapi/asm/bitsperlong.h | 18 ++++++++-------- tools/include/uapi/linux/const.h | 31 ++++++++++++++++++++++++++ tools/lib/traceevent/Makefile | 4 ++-- tools/perf/Makefile.config | 2 +- tools/perf/builtin-report.c | 2 ++ tools/perf/check-headers.sh | 2 ++ tools/perf/lib/Makefile | 2 +- tools/perf/ui/browser.c | 2 ++ tools/perf/ui/browser.h | 1 + tools/perf/ui/browsers/hists.c | 3 +++ tools/perf/ui/tui/util.c | 37 ++++++++++++++++++++++---------- tools/perf/ui/util.h | 2 ++ tools/perf/util/cs-etm.c | 35 +++++++++++++++++++++++++++++- tools/perf/util/evsel.h | 7 ++++++ tools/perf/util/parse-branch-options.c | 1 + tools/perf/util/session.c | 31 +++++++++++++++----------- 20 files changed, 166 insertions(+), 44 deletions(-) create mode 100644 tools/include/linux/const.h create mode 100644 tools/include/uapi/linux/const.h
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 building with libpython, but that is not a perf regression, will try to remove one compiler warning that is causing the problem when building some of the glue code files in the python files, outside perf.
# export PERF_TARBALL=http://192.168.124.1/perf/perf-5.3.0-rc4.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:edge : Ok gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 8.0.1 (tags/RELEASE_801/final) (based on LLVM 8.0.1) 9 amazonlinux:1 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2), clang version 3.6.2 (tags/RELEASE_362/final) 10 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5), clang version 7.0.1 (Amazon Linux 2 7.0.1-1.amzn2.0.2) 11 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 12 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 13 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 14 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) 15 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-36), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 16 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 9.1.1 20190808 gcc-9-branch@274204, clang version 8.0.0 (tags/RELEASE_800/final) 17 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) 18 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, clang version 3.8.1-24 (tags/RELEASE_381/final) 19 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final) 20 debian:experimental : Ok gcc (Debian 8.3.0-19) 8.3.0, clang version 7.0.1-9 (tags/RELEASE_701/final) 21 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 22 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 23 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 8.3.0-7) 8.3.0 24 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 25 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 26 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.5.0 (tags/RELEASE_350/final) 27 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.7.0 (tags/RELEASE_370/final) 28 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1), clang version 3.8.1 (tags/RELEASE_381/final) 29 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 30 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1), clang version 3.9.1 (tags/RELEASE_391/final) 31 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2), clang version 4.0.1 (tags/RELEASE_401/final) 32 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 5.0.2 (tags/RELEASE_502/final) 33 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 6.0.1 (tags/RELEASE_601/final) 34 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) 35 fedora:30 : Ok gcc (GCC) 9.1.1 20190503 (Red Hat 9.1.1-1), clang version 8.0.0 (Fedora 8.0.0-1.fc30) 36 fedora:30-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 37 fedora:30-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 38 fedora:31 : Ok gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2), clang version 8.0.0 (Fedora 8.0.0-3.fc31.1) 39 fedora:rawhide : Ok gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2), clang version 8.0.0 (Fedora 8.0.0-3.fc31.1) 40 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 8.3.0-r1 p1.1) 8.3.0 41 mageia:5 : Ok gcc (GCC) 4.9.2, clang version 3.5.2 (tags/RELEASE_352/fi 42 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0, clang version 3.9.1 (tags/RELEASE_391/final) 43 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) 44 manjaro:latest : Ok gcc (GCC) 9.1.0, clang version 8.0.1 (tags/RELEASE_801/final) 45 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) 46 opensuse:15.1 : Ok gcc (SUSE Linux) 7.4.0, clang version 7.0.1 (tags/RELEASE_701/final 349238) 47 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5, clang version 3.8.0 (tags/RELEASE_380/final 262553) 48 opensuse:tumbleweed : Ok gcc (SUSE Linux) 9.1.1 20190723 [gcc-9-branch revision 273734], clang version 8.0.1 (tags/RELEASE_801/final 366581) 49 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1) 50 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39.0.1), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 51 oraclelinux:8 : Ok gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3.0.1), clang version 7.0.1 (tags/RELEASE_701/final) 52 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) 53 ubuntu:14.04 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4, Ubuntu clang version 3.4-1ubuntu3 (tags/RELEASE_34/final) (based on LLVM 3.4) 54 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609, clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final) 55 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 56 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 57 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 58 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 59 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 60 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 61 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) 62 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 63 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 64 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 65 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 66 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 67 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 68 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 69 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 70 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 71 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 72 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) 73 ubuntu:19.04 : Ok gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0, clang version 8.0.0-3 (tags/RELEASE_800/final) 74 ubuntu:19.04-x-alpha : Ok alpha-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 75 ubuntu:19.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 8.3.0-6ubuntu1) 8.3.0 76 ubuntu:19.04-x-hppa : Ok hppa-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 77 ubuntu:19.10 : Ok gcc (Ubuntu 9.1.0-9ubuntu2) 9.1.0, clang version 8.0.1-+rc4-1 (tags/RELEASE_801/rc4) #
# uname -a
Linux quaco 5.2.6-200.fc30.x86_64 #1 SMP Mon Aug 5 13:20:47 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
b81d39c7a1ef libperf: Fix arch include paths
# perf version --build-options
perf version 5.3.rc4.gb81d39c7a1ef
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 mg : 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: Probe SDT events : Ok
53: is_printable_array : Ok
54: Print bitmap : Ok
55: perf hooks : Ok
56: builtin clang support : Skip (not compiled in)
57: unit_number__scnprintf : Ok
58: mem2node : Ok
59: time utils : Ok
60: map_groups__merge_in : Ok
61: x86 rdpmc : Ok
62: Convert perf time to TSC : Ok
63: DWARF unwind : Ok
64: x86 instruction decoder - new instructions : Ok
65: Intel PT packet decoder : Ok
66: x86 bp modify : Ok
67: probe libc's inet_pton & backtrace it with ping : Ok
68: Use vfs_getname probe to get syscall args filenames : Ok
69: Add vfs_getname probe to get syscall args filenames : Ok
70: Check open filename arg using perf trace + vfs_getname: Ok
71: Zstd perf.data compression/decompression : Ok
# $ make -C tools/perf build-test
make: Entering directory `/home/acme/git/linux/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_no_libelf_O: make NO_LIBELF=1
make_util_map_o_O: make util/map.o
make_debug_O: make DEBUG=1
make_no_libperl_O: make NO_LIBPERL=1
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_no_backtrace_O: make NO_BACKTRACE=1
make_install_O: make install
make_perf_o_O: make perf.o
make_pure_O: make
make_no_gtk2_O: make NO_GTK2=1
make_no_libaudit_O: make NO_LIBAUDIT=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_no_libnuma_O: make NO_LIBNUMA=1
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_doc_O: make doc
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_help_O: make help
make_install_bin_O: make install-bin
make_no_demangle_O: make NO_DEMANGLE=1
make_no_newt_O: make NO_NEWT=1
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=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
make_install_prefix_O: make install prefix=/tmp/krava
make_static_O: make LDFLAGS=-static
make_no_auxtrace_O: make NO_AUXTRACE=1
make_no_slang_O: make NO_SLANG=1
make_cscope_O: make cscope
make_with_babeltrace_O: make LIBBABELTRACE=1
make_clean_all_O: make clean all
make_no_libbpf_O: make NO_LIBBPF=1
make_tags_O: make tags
make_no_libpython_O: make NO_LIBPYTHON=1
OK
make: Leaving directory `/home/acme/git/linux/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/17 tools headers: Add limits.h to access __WORDSIZE
From: Arnaldo Carvalho de Melo <[email protected]>
We need to make sure limits.h is included before checking if we can use __WORDSIZE, do it.
--- tools/include/linux/bitops.h | 1 + 1 file changed, 1 insertion(+)
tools/include/linux/bitops.h +1 -0
@@ -3,6 +3,7 @@#define _TOOLS_LINUX_BITOPS_H_#include <asm/types.h> +#include <limits.h> #ifndef __WORDSIZE#define __WORDSIZE (__SIZEOF_LONG__ * 8)#endif
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/17 perf tools: tools/include should come before tools/uapi/include
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
The next cset will grap const.h copies from the kernel to keep bits.h in sync as it started to use linux/const.h, that in turn includes uapi/linux/const.h.
So now we have a file with the same name in tools/include and tools/uapi/include, and one includes the other, we need to have tools/include/uapi/ after tools/include/ for this to work, fix it.
--- tools/perf/Makefile.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/Makefile.config +1 -1
@@ -280,9 +280,9 @@ endif INC_FLAGS += -I$(src-perf)/lib/include INC_FLAGS += -I$(src-perf)/util/include INC_FLAGS += -I$(src-perf)/arch/$(SRCARCH)/include -INC_FLAGS += -I$(srctree)/tools/include/uapi INC_FLAGS += -I$(srctree)/tools/include/ INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi +INC_FLAGS += -I$(srctree)/tools/include/uapi INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/include/ INC_FLAGS += -I$(srctree)/tools/arch/$(SRCARCH)/
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 3/17 tools headers: Grab copy of linux/const.h, needed by linux/bits.h
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
So that can update the copy of linux/bits.h that now uses macros defined in const.h and that are not available in older systems.
--- tools/include/linux/const.h | 9 +++++++++ tools/include/uapi/linux/const.h | 31 +++++++++++++++++++++++++++++++ tools/perf/check-headers.sh | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 tools/include/linux/const.h create mode 100644 tools/include/uapi/linux/const.h
tools/include/linux/const.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef _LINUX_CONST_H +#define _LINUX_CONST_H + +#include <uapi/linux/const.h> + +#define UL (x) (_UL(x)) +#define ULL (x) (_ULL(x)) + +#endif /* _LINUX_CONST_H */
tools/include/uapi/linux/const.h new file +31 -0
@@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* const.h: Macros for dealing with constants. */ + +#ifndef _UAPI_LINUX_CONST_H +#define _UAPI_LINUX_CONST_H + +/* Some constant macros are used in both assembler and +* C code. Therefore we cannot annotate them always with +* 'UL' and other type specifiers unilaterally. We +* use the following macros to deal with this. +* +* Similarly, _AT() will cast an expression with a type in C, but +* leave it unchanged in asm. +*/ + +#ifdef __ASSEMBLY__ +#define _AC (X ,Y ) X +#define _AT (T ,X ) X +#else +#define __AC (X ,Y ) (X##Y) +#define _AC (X ,Y ) __AC(X,Y) +#define _AT (T ,X ) ((T)(X)) +#endif + +#define _UL (x) (_AC(x, UL)) +#define _ULL (x) (_AC(x, ULL)) + +#define _BITUL (x) (_UL(1) << (x)) +#define _BITULL (x) (_ULL(1) << (x)) + +#endif /* _UAPI_LINUX_CONST_H */
tools/perf/check-headers.sh +2 -0
@@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 HEADERS=' +include/uapi/linux/const.h include/uapi/drm/drm.h include/uapi/drm/i915_drm.h include/uapi/linux/fadvise.h
@@ -19,6 +20,7 @@ include/uapi/linux/usbdevice_fs.h include/uapi/linux/vhost.h include/uapi/sound/asound.h include/linux/bits.h +include/linux/const.h include/linux/hash.h include/uapi/linux/hw_breakpoint.h arch/x86/include/asm/disabled-features.h
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 4/17 tools headers: Synchronize linux/bits.h with the kernel sources
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
To pick up the changes in this cset:
95b980d62d52 ("linux/bits.h: make BIT(), GENMASK(), and friends available in assembly")
To address this tools/perf build warning:
Warning: Kernel ABI header at 'tools/include/linux/bits.h' differs from latest version at 'include/linux/bits.h' diff -u tools/include/linux/bits.h include/linux/bits.h
--- tools/include/linux/bits.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
tools/include/linux/bits.h +10 -7
@@ -1,13 +1,15 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __LINUX_BITS_H#define __LINUX_BITS_H + +#include <linux/const.h> #include <asm/bitsperlong.h> -#define BIT (nr) (1UL << (nr)) -#define BIT_ULL (nr) (1ULL << (nr)) -#define BIT_MASK (nr) (1UL << ((nr) % BITS_PER_LONG)) +#define BIT (nr) (UL(1) << (nr)) +#define BIT_ULL (nr) (ULL(1) << (nr)) +#define BIT_MASK (nr) (UL(1) << ((nr) % BITS_PER_LONG))#define BIT_WORD (nr) ((nr) / BITS_PER_LONG) -#define BIT_ULL_MASK (nr) (1ULL << ((nr) % BITS_PER_LONG_LONG)) +#define BIT_ULL_MASK (nr) (ULL(1) << ((nr) % BITS_PER_LONG_LONG))#define BIT_ULL_WORD (nr) ((nr) / BITS_PER_LONG_LONG)#define BITS_PER_BYTE 8
@@ -17,10 +19,11 @@* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. */ #define GENMASK (h, l) \ - (((~0UL) - (1UL << (l)) + 1) & (~0UL >> (BITS_PER_LONG - 1 - (h)))) + (((~UL(0)) - (UL(1) << (l)) + 1) & \ + (~UL(0) >> (BITS_PER_LONG - 1 - (h))))#define GENMASK_ULL (h, l) \ - (((~0ULL) - (1ULL << (l)) + 1) & \ - (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h)))) + (((~ULL(0)) - (ULL(1) << (l)) + 1) & \ + (~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))#endif /* __LINUX_BITS_H */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 5/17 tools arch x86: Sync asm/cpufeatures.h with the with the kernel
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
To pick up the changes in:
f36cf386e3fe ("x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS") 18ec54fdd6d1 ("x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations")
That don't affect anything in tools/.
This silences this perf build warning:
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h
--- tools/arch/x86/include/asm/cpufeatures.h | 3 +++ 1 file changed, 3 insertions(+)
tools/arch/x86/include/asm/cpufeatures.h +3 -0
@@ -281,6 +281,8 @@#define X86_FEATURE_CQM_OCCUP_LLC (11*32+ 1)/* LLC occupancy monitoring */ #define X86_FEATURE_CQM_MBM_TOTAL (11*32+ 2)/* LLC Total MBM monitoring */ #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3)/* LLC Local MBM monitoring */ +#define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4)/* "" LFENCE in user entry SWAPGS path */ +#define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5)/* "" LFENCE in kernel entry SWAPGS path */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5)/* AVX512 BFLOAT16 instructions */
@@ -394,5 +396,6 @@#define X86_BUG_L1TF X86_BUG(18)/* CPU is affected by L1 Terminal Fault */ #define X86_BUG_MDS X86_BUG(19)/* CPU is affected by Microarchitectural data sampling */ #define X86_BUG_MSBDS_ONLY X86_BUG(20)/* CPU is only affected by the MSDBS variant of BUG_MDS */ +#define X86_BUG_SWAPGS X86_BUG(21)/* CPU is affected by speculation through SWAPGS */ #endif /* _ASM_X86_CPUFEATURES_H */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 6/17 perf evsel: Add comment for 'idx' member in 'struct perf_sample_id
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
The 'idx' member was added as preparation for AUX area sampling. Add a comment to describe why.
--- tools/perf/util/evsel.h | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/util/evsel.h +7 -0
@@ -23,6 +23,13 @@ struct perf_sample_id {struct hlist_node node;u64 id;struct evsel *evsel; +/* +* 'idx' will be used for AUX area sampling. A sample will have AUX area +* data that will be queued for decoding, where there are separate +* queues for each CPU (per-cpu tracing) or task (per-thread tracing). +* The sample ID can be used to lookup 'idx' which is effectively the +* queue number. +*/ int idx;int cpu;pid_t tid;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 7/17 tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file
In reply to Arnaldo Carvalho de MeloFrom: "Steven Rostedt (VMware)" <[email protected]>
The tools/lib/traceevent/Makefile had a test added to it to detect a failure of the "nm" when making the dynamic list file (whatever that is). The problem is that the test sorts the values "U W w" and some versions of sort will place "w" ahead of "W" (even though it has a higher ASCII value, and break the test.
Add 'tr "w" "W"' to merge the two and not worry about the ordering.
--- tools/lib/traceevent/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/traceevent/Makefile +2 -2
@@ -266,8 +266,8 @@ endef define do_generate_dynamic_list_file symbol_type=`$(NM) -u -D $1 | awk 'NF>1 {print $$1}' | \ - xargs echo "U W w" | tr ' ' '\n' | sort -u | xargs echo`;\ - if [ "$$symbol_type" = "U W w" ];then \ + xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ + if [ "$$symbol_type" = "U W" ];then \ (echo '{'; \ $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ echo '};'; \
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 8/17 perf record: Enable LBR callstack capture jointly with thread stack
In reply to Arnaldo Carvalho de MeloFrom: Alexey Budankov <[email protected]>
Enable '-j stack' applicability together with '--call-graph dwarf' option so thread stack data and LBR call stack could be captured jointly:
$ perf record -g --call-graph dwarf,1024 -j stack,u -- stack_test
Collected LBR call stack can be used to augment DWARF call stack calculated from the raw thread stack data and to provide more comprehensive call stack information for cases when collected SIZE is not enough to cover complete thread stack.
Such cases are typical for workloads that allocate large arrays of data on its threads stacks or the possible SIZE to collect can't be large enough due to workload nature or system configuration and this is where hardware captured LBR call stacks can provide missing stack frames. Possible DWARF plus LBR call stacks consolidation algorithm description follows.
With this patch set perf report command UI currently ignores collected LBR call stack data and still provides DWARF based call stacks information.
===========================================================================
Overview:
Legend:
THS - thread stack
CTX - thread register context
SWS - software stack
SSF - skipped stack frames
PSS - Perf sample stack
ip,sp,bp - HW registers values
d - allocated stack regions kip - ip address in the kernel space K - captured thread stack size
THS
-----
| |<-stack bottom
...
|---|
|ip4|
|---| PSS = SWS(THS(K))
| |
--> | |
| |d3 | user/
| |---| user PSS kernel PSS
| |ip3| ------ ------
| |---| |SSF | |SSF |
| | | .... ....
| | | ------ ------
| |d2 | | -1 | | -1 |
|---| user ------ ------
K |ip2| CTX |ip3 | |ip3 |
|---| |----| |----|
| |d1 | ... |ip2 | , |ip2 |
| |---| |---| |----| |----|
| |ip1| |bp0| |ip1 | |ip1 |
| |---| |---| |----| |----|
| | | |ip0|->|ip0 | |ip0 |<-user stack top
| | | |---| ------ ------
| | |<-|sp0|<-stack |kip0|<-kernel stack bottom
--> ----- ----- top |----|
|kip1|
|----|
|kip2|
|----|
....
| |<-kernel stack top
------Algorithm details:
Legend:
HWS - hardware stack
K-SWS - kernel software stack
BRANCH TABLE HWS ip ip from to ------ ----------- |ip7`| |ip7`| | |----| |----|----| |ip6`| |ip6`| | user PSS |----| |----|----| |ip5`| |ip5`| | ------ |----| |----|----| | -1 | |ip4`| |ip4`| | ------ |----| |----|----| |ip3 |~~~|ip3`| |ip3`| | |----| |----| |----|----| |ip2 |~~~|ip2`| |ip2`| | |----| |----| |----|----| |ip1 |~~~|ip1`| |ip1`|ip0`| |----| |----| ----------- |ip0 |~~~|ip0`|<---------' ------ ------ 1. if (sym(ipj) == sym(ipj`)), j=0-3 ===> user PSS 2. ipj` , j=4-7 ===> user PSS
Augmented PSS = A_SWS(SWS(THS(K)), HWS):
user/
user PSS kernel PSS
------ ------
|ip7`| |ip7`|<-user PSS bottom
|----| |----|
|ip6`| |ip6`|
|----| |----|
HWS |ip5`| |ip5`|
|----| |----|
|ip4`| |ip4`|
------ ------
|ip3 | |ip3 |
|----| |----|
SWS |ip2 | |ip2 |
|----| |----|
|ip1 | |ip1 |
|----| |----|
|ip0 | |ip0 |<-user PSS top
------ ------
|kip0|<-kernel PSS bottom
|----|
|kip1|
K-SWS |----|
|kip2|
|----|
|kip3|<-kernel PSS top
------
APSSCommitter testing:
Before:
# perf record -g --call-graph dwarf,1024 -j stack,u ls > /dev/null unknown branch filter stack, check man page
Usage: perf record [<options>] [<command>]
or: perf record [<options>] -- <command> [<options>]
-j, --branch-filter <branch filter mask>
branch stack filter modes
# perf record -g --call-graph dwarf,1024 -j u ls > /dev/null
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.054 MB perf.data (12 samples) ]
# perf evlist -v
cycles: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|ADDR|CALLCHAIN|PERIOD|BRANCH_STACK|REGS_USER|STACK_USER|DATA_SRC, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, freq: 1, enable_on_exec: 1, task: 1, precise_ip: 3, mmap_data: 1, sample_id_all: 1, exclude_guest: 1, exclude_callchain_user: 1, mmap2: 1, comm_exec: 1, ksymbol: 1, bpf_event: 1, branch_sample_type: ANY, sample_regs_user: 0xff0fff, sample_stack_user: 1024
#After:
# perf record -g --call-graph dwarf,1024 -j stack,u ls > /dev/null
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.044 MB perf.data (11 samples) ]
[root@quaco ~]# perf evlist -v
cycles: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|ADDR|CALLCHAIN|PERIOD|BRANCH_STACK|REGS_USER|STACK_USER|DATA_SRC, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, freq: 1, enable_on_exec: 1, task: 1, precise_ip: 3, mmap_data: 1, sample_id_all: 1, exclude_guest: 1, exclude_callchain_user: 1, mmap2: 1, comm_exec: 1, ksymbol: 1, bpf_event: 1, branch_sample_type: USER|CALL_STACK, sample_regs_user: 0xff0fff, sample_stack_user: 1024
#--- tools/perf/util/parse-branch-options.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/parse-branch-options.c +1 -0
@@ -30,6 +30,7 @@ static const struct branch_mode branch_modes[] = {BRANCH_OPT ("ind_jmp" ,PERF_SAMPLE_BRANCH_IND_JUMP ),BRANCH_OPT ("call" ,PERF_SAMPLE_BRANCH_CALL ),BRANCH_OPT ("save_type" ,PERF_SAMPLE_BRANCH_TYPE_SAVE ), +BRANCH_OPT ("stack" ,PERF_SAMPLE_BRANCH_CALL_STACK ), BRANCH_END };
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 9/17 perf report: Dump LBR callstack data by -D jointly with thread stack
In reply to Arnaldo Carvalho de MeloFrom: Alexey Budankov <[email protected]>
Make perf report -D command print captured LBR callstack chain when it is collected together with raw thread stack data:
2752673087247083 0x5d10 [0x548]: PERF_RECORD_SAMPLE(IP, 0x4002): 5841/5841: 0x40121f period: 1543862 addr: 0 ... FP chain: nr:0
... branch callstack: nr:3
..... 0: 00000000004011d0 ..... 1: 00007f393c388411 ..... 2: 0000000000401098 ... user regs: mask 0xff0fff ABI 64-bit .... AX 0x34e7 .... BX 0x7fff5f6dd3c0 .... CX 0xffffffff .... DX 0x34e6 .... SI 0x7f393c5268d0 .... DI 0x0 .... BP 0x401260 .... SP 0x7fff5f6dd3c0 .... IP 0x40121f .... FLAGS 0x29f .... CS 0x33 .... SS 0x2b .... R8 0x7f393c526800 .... R9 0x7f393c525da0 .... R10 0xfffffffffffff70a .... R11 0x246 .... R12 0x401070 .... R13 0x7fff5f6ddcb0 .... R14 0x0 .... R15 0x0
... ustack: size 1024, offset 0x130
. data_src: 0x5080021
... thread: stack_test:5841
...... dso: /root/abudanko/stacks/stack_test
Committer testing:
# perf record -g --call-graph dwarf,1024 -j stack,u ls > /dev/null [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.042 MB perf.data (10 samples) ] #
Before:
# perf report -D |& grep PERF_RECORD_SAMPLE -A28 | tail -29 67538909824483 0xa7a0 [0x560]: PERF_RECORD_SAMPLE(IP, 0x4002): 9721/9721: 0x7f441b2b1e20 period: 1376095 addr: 0 ... FP chain: nr:0 ... user regs: mask 0xff0fff ABI 64-bit .... AX 0x7f441b2b1000 .... BX 0x7f441b55b970 .... CX 0x7fff6e2db218 .... DX 0x7fff6e2db218 .... SI 0x7fff6e2db208 .... DI 0x1 .... BP 0x1 .... SP 0x7fff6e2db178 .... IP 0x7f441b2b1e20 .... FLAGS 0x20a .... CS 0x33 .... SS 0x2b .... R8 0x1 .... R9 0x7f441b371c18 .... R10 0x7f441b5a5f10 .... R11 0x202 .... R12 0x7fff6e2db208 .... R13 0x7fff6e2db218 .... R14 0x7f441b5a7150 .... R15 0x0 ... ustack: size 1024, offset 0x148 . data_src: 0x5080021 ... thread: ls:9721 ...... dso: /usr/lib64/libpthread-2.29.so
0xad00 [0x60]: event: 10
#
After:
# perf report -D |& grep PERF_RECORD_SAMPLE -A31 | tail -32 67538909824483 0xa7a0 [0x560]: PERF_RECORD_SAMPLE(IP, 0x4002): 9721/9721: 0x7f441b2b1e20 period: 1376095 addr: 0 ... FP chain: nr:0 ... branch callstack: nr:4 ..... 0: 00007f441b2b1e20 ..... 1: 00007f441b58af1a ..... 2: 00007f441b58b0e1 ..... 3: 00007f441b57c145 ... user regs: mask 0xff0fff ABI 64-bit .... AX 0x7f441b2b1000 .... BX 0x7f441b55b970 .... CX 0x7fff6e2db218 .... DX 0x7fff6e2db218 .... SI 0x7fff6e2db208 .... DI 0x1 .... BP 0x1 .... SP 0x7fff6e2db178 .... IP 0x7f441b2b1e20 .... FLAGS 0x20a .... CS 0x33 .... SS 0x2b .... R8 0x1 .... R9 0x7f441b371c18 .... R10 0x7f441b5a5f10 .... R11 0x202 .... R12 0x7fff6e2db208 .... R13 0x7fff6e2db218 .... R14 0x7f441b5a7150 .... R15 0x0 ... ustack: size 1024, offset 0x148 . data_src: 0x5080021 ... thread: ls:9721 ...... dso: /usr/lib64/libpthread-2.29.so #
--- tools/perf/util/session.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
tools/perf/util/session.c +19 -12
@@ -1051,23 +1051,30 @@ static void callchain__printf(struct evsel *evsel, i, callchain->ips[i]); } -static void branch_stack__printf (struct perf_sample *sample) +static void branch_stack__printf (struct perf_sample *sample,bool callstack) {uint64_t i; -printf ("... branch stack: nr:%" PRIu64"\n" , sample->branch_stack->nr); +printf ("%s: nr:%" PRIu64"\n" , + !callstack ?"... branch stack" :"... branch callstack" , + sample->branch_stack->nr);for (i =0 ; i < sample->branch_stack->nr; i++) {struct branch_entry *e = &sample->branch_stack->entries[i]; -printf ("..... %2" PRIu64": %016" PRIx64" -> %016" PRIx64" %hu cycles %s%s%s%s %x\n" , - i, e->from, e->to, - (unsigned short )e->flags.cycles, - e->flags.mispred ?"M" :" " , - e->flags.predicted ?"P" :" " , - e->flags.abort ?"A" :" " , - e->flags.in_tx ?"T" :" " , - (unsigned )e->flags.reserved); +if (!callstack) { +printf ("..... %2" PRIu64": %016" PRIx64" -> %016" PRIx64" %hu cycles %s%s%s%s %x\n" , + i, e->from, e->to, + (unsigned short )e->flags.cycles, + e->flags.mispred ?"M" :" " , + e->flags.predicted ?"P" :" " , + e->flags.abort ?"A" :" " , + e->flags.in_tx ?"T" :" " , + (unsigned )e->flags.reserved); + }else { +printf ("..... %2" PRIu64": %016" PRIx64"\n" , + i, i >0 ? e->from : e->to); + } } }
@@ -1217,8 +1224,8 @@ static void dump_sample(struct evsel *evsel, union perf_event *event,if (evsel__has_callchain (evsel))callchain__printf (evsel, sample); -if ((sample_type &PERF_SAMPLE_BRANCH_STACK ) && !perf_evsel__has_branch_callstack (evsel)) -branch_stack__printf (sample); +if (sample_type &PERF_SAMPLE_BRANCH_STACK ) +branch_stack__printf (sample,perf_evsel__has_branch_callstack (evsel));if (sample_type &PERF_SAMPLE_REGS_USER )regs_user__printf (sample);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 10/17 perf report: Prefer DWARF callstacks to LBR ones when captured both
In reply to Arnaldo Carvalho de MeloFrom: Alexey Budankov <[email protected]>
Display DWARF based callchains when the perf.data file contains raw thread stack data as LBR callstack data.
Commiter testing:
This changes the output from the branch stack based one, i.e. without this patch, for the same file as in the previous csets:
# perf report --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 13 of event 'cycles'
# Event count (approx.): 13
#
# Overhead Command Source Shared Object Source Symbol Target Symbol Basic Block Cycles
# ........ ....... .................... ........................... ......................................... ..................
#
7.69% ls libpthread-2.29.so [.] _init [.] __pthread_initialize_minimal_internal 6827
7.69% ls ld-2.29.so [k] _start [k] _dl_start -
7.69% ls ld-2.29.so [.] _dl_start_user [.] _dl_init -24790
7.69% ls ld-2.29.so [k] _dl_start [k] _dl_sysdep_start 278
7.69% ls ld-2.29.so [k] dl_main [k] _dl_map_object_deps 15581
7.69% ls ld-2.29.so [k] open_verify.constprop.0 [k] lseek64 4228
7.69% ls ld-2.29.so [k] _dl_map_object [k] open_verify.constprop.0 55
7.69% ls ld-2.29.so [k] openaux [k] _dl_map_object 67
7.69% ls ld-2.29.so [k] _dl_map_object_deps [k] 0x00007f441b57c090 112
7.69% ls ld-2.29.so [.] call_init.part.0 [.] _init 334
7.69% ls ld-2.29.so [.] _dl_init [.] call_init.part.0 383
7.69% ls ld-2.29.so [k] _dl_sysdep_start [k] dl_main 45
7.69% ls ld-2.29.so [k] _dl_catch_exception [k] openaux 116 #
# (Tip: For memory address profiling, try: perf mem record / perf mem report) #
To the one that shows call chains:
# perf report --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 10 of event 'cycles'
# Event count (approx.): 3204047
#
# Children Self Command Shared Object Symbol
# ........ ........ ....... .................. .........................................
#
55.01% 0.00% ls [kernel.vmlinux] [k] entry_SYSCALL_64_after_hwframe
|
---entry_SYSCALL_64_after_hwframe
do_syscall_64
|
--16.01%--__x64_sys_execve
__do_execve_file.isra.0
search_binary_handler
load_elf_binary
elf_map
vm_mmap_pgoff
do_mmap
mmap_region
perf_event_mmap
perf_iterate_sb
perf_iterate_ctx
perf_event_mmap_output
perf_output_copy
memcpy_erms 55.01% 39.00% ls [kernel.vmlinux] [k] do_syscall_64
|
|--39.00%--0xffffffffffffffff
| _dl_map_object
| open_verify.constprop.0
| __lseek64 (inlined)
| entry_SYSCALL_64_after_hwframe
| do_syscall_64
|
--16.01%--do_syscall_64
__x64_sys_execve
__do_execve_file.isra.0
search_binary_handler
load_elf_binary
elf_map
vm_mmap_pgoff
do_mmap
mmap_region
perf_event_mmap
perf_iterate_sb
perf_iterate_ctx
perf_event_mmap_output
perf_output_copy
memcpy_erms
42.95% 42.95% ls libpthread-2.29.so [.] __pthread_initialize_minimal_internal
|
---_init
__pthread_initialize_minimal_internal
42.95% 0.00% ls libpthread-2.29.so [.] _init
|
---_init
__pthread_initialize_minimal_internal<SNIP>
#
# (Tip: Profiling branch (mis)predictions with: perf record -b / perf report) #
#
The branch stack view be explicitely selected using:
# perf report -h branch-stack
Usage: perf report [<options>]
-b, --branch-stack use branch records for per branch histogram filling
#
I.e. after this patch:
# perf report -b --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 13 of event 'cycles'
# Event count (approx.): 13
#
# Overhead Command Source Shared Object Source Symbol Target Symbol Basic Block Cycles
# ........ ....... .................... ........................... ......................................... ..................
#
7.69% ls libpthread-2.29.so [.] _init [.] __pthread_initialize_minimal_internal 6827
7.69% ls ld-2.29.so [k] _start [k] _dl_start -
7.69% ls ld-2.29.so [.] _dl_start_user [.] _dl_init -24790
7.69% ls ld-2.29.so [k] _dl_start [k] _dl_sysdep_start 278
7.69% ls ld-2.29.so [k] dl_main [k] _dl_map_object_deps 15581
7.69% ls ld-2.29.so [k] open_verify.constprop.0 [k] lseek64 4228
7.69% ls ld-2.29.so [k] _dl_map_object [k] open_verify.constprop.0 55
7.69% ls ld-2.29.so [k] openaux [k] _dl_map_object 67
7.69% ls ld-2.29.so [k] _dl_map_object_deps [k] 0x00007f441b57c090 112
7.69% ls ld-2.29.so [.] call_init.part.0 [.] _init 334
7.69% ls ld-2.29.so [.] _dl_init [.] call_init.part.0 383
7.69% ls ld-2.29.so [k] _dl_sysdep_start [k] dl_main 45
7.69% ls ld-2.29.so [k] _dl_catch_exception [k] openaux 116 #
# (Tip: Show current config key-value pairs: perf config --list) #
#
--- tools/perf/builtin-report.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/builtin-report.c +2 -0
@@ -1281,6 +1281,8 @@ int cmd_report(int argc, const char **argv) has_br_stack =perf_header__has_feat (&session->header,HEADER_BRANCH_STACK ); +if (perf_evlist__combined_sample_type (session->evlist) &PERF_SAMPLE_STACK_USER ) + has_br_stack = false;setup_forced_leader (&report, session->evlist);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 11/17 perf cs-etm: Support sample flags 'insn' and 'insnlen'
In reply to Arnaldo Carvalho de MeloFrom: Leo Yan <[email protected]>
The synthetic branch and instruction samples are missed to set instruction related info, thus the perf tool fails to display samples with flags '-F,+insn,+insnlen'.
The CoreSight trace decoder provides sufficient information to decide the instruction size based on the ISA type: A64/A32 instructions are 32-bit size, but one exception is the T32 instruction size, which might be 32-bit or 16-bit.
This patch handles these cases and it reads the instruction values from DSO file; thus can support the flags '-F,+insn,+insnlen'.
Before:
# perf script -F,insn,insnlen,ip,sym
0 [unknown] ilen: 0
ffff97174044 _start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0
ffff97174938 _dl_start ilen: 0[...]
After:
# perf script -F,insn,insnlen,ip,sym
0 [unknown] ilen: 0
ffff97174044 _start ilen: 4 insn: 2f 02 00 94
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54
ffff97174938 _dl_start ilen: 4 insn: c1 ff ff 54[...]
--- tools/perf/util/cs-etm.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
tools/perf/util/cs-etm.c +34 -1
@@ -1076,6 +1076,35 @@ bool cs_etm__etmq_is_timeless(struct cs_etm_queue *etmq)return !!etmq->etm->timeless_decoding; } +static void cs_etm__copy_insn (struct cs_etm_queue *etmq, +u64 trace_chan_id, +const struct cs_etm_packet *packet, +struct perf_sample *sample) +{ +/* +* It's pointless to read instructions for the CS_ETM_DISCONTINUITY +* packet, so directly bail out with 'insn_len' = 0. +*/ +if (packet->sample_type ==CS_ETM_DISCONTINUITY ) { + sample->insn_len =0 ; +return ; + } + +/* +* T32 instruction size might be 32-bit or 16-bit, decide by calling +* cs_etm__t32_instr_size(). +*/ +if (packet->isa ==CS_ETM_ISA_T32 ) + sample->insn_len =cs_etm__t32_instr_size (etmq, trace_chan_id, + sample->ip); +/* Otherwise, A64 and A32 instruction size are always 32-bit. */ +else + sample->insn_len =4 ; + +cs_etm__mem_access (etmq, trace_chan_id, sample->ip, + sample->insn_len, (void *)sample->insn); +} +static int cs_etm__synth_instruction_sample (struct cs_etm_queue *etmq,struct cs_etm_traceid_queue *tidq,u64 addr,u64 period)
@@ -1097,9 +1126,10 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq, sample.period = period; sample.cpu = tidq->packet->cpu; sample.flags = tidq->prev_packet->flags; - sample.insn_len =1 ; sample.cpumode = event->sample.header.misc; +cs_etm__copy_insn (etmq, tidq->trace_chan_id, tidq->packet, &sample); +if (etm->synth_opts.last_branch) {cs_etm__copy_last_branch_rb (etmq, tidq); sample.branch_stack = tidq->last_branch;
@@ -1159,6 +1189,9 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq, sample.flags = tidq->prev_packet->flags; sample.cpumode = event->sample.header.misc; +cs_etm__copy_insn (etmq, tidq->trace_chan_id, tidq->prev_packet, + &sample); +/* * perf report cannot handle events without a branch stack */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 12/17 perf ui: Make 'exit_msg' optional in ui__question_window()
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We will not need it when refactoring this function to be non-interactive, so make it optional.
--- tools/perf/ui/tui/util.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
tools/perf/ui/tui/util.c +11 -3
@@ -188,7 +188,9 @@ int ui__question_window(const char *title, const char *text,pthread_mutex_lock (&ui__lock); max_len +=2 ; - nr_lines +=4 ; + nr_lines +=2 ; +if (exit_msg) + nr_lines +=2 ; y = SLtt_Screen_Rows /2 - nr_lines /2 , x = SLtt_Screen_Cols /2 - max_len /2 ;
@@ -199,14 +201,20 @@ int ui__question_window(const char *title, const char *text,SLsmg_write_string ((char *)title); }SLsmg_gotorc (++y, x); - nr_lines -=2 ; +if (exit_msg) + nr_lines -=2 ; max_len -=2 ;SLsmg_write_wrapped_string ((unsigned char *)text, y, x, nr_lines, max_len,1 );SLsmg_gotorc (y + nr_lines -2 , x);SLsmg_write_nstring ((char *)" " , max_len);SLsmg_gotorc (y + nr_lines -1 , x); -SLsmg_write_nstring ((char *)exit_msg, max_len); +if (exit_msg) { +SLsmg_gotorc (y + nr_lines -2 , x); +SLsmg_write_nstring ((char *)" " , max_len); +SLsmg_gotorc (y + nr_lines -1 , x); +SLsmg_write_nstring ((char *)exit_msg, max_len); + }SLsmg_refresh ();pthread_mutex_unlock (&ui__lock);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 13/17 perf ui: Introduce non-interactive ui__info_window() function
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Sometimes we want just to print a message on the center of the screen, like in 'perf top' while we wait for the minimum amount of samples to be collected before sorting and showing them.
Also expose __ui__info_window() as an optimization for cases where such message is to be printed while holding the ui lock.
--- tools/perf/ui/tui/util.c | 23 +++++++++++++++-------- tools/perf/ui/util.h | 2 ++ 2 files changed, 17 insertions(+), 8 deletions(-)
tools/perf/ui/tui/util.c +15 -8
@@ -162,8 +162,7 @@ int ui_browser__input_window(const char *title, const char *text, char *input,return key; } -int ui__question_window (const char *title,const char *text, -const char *exit_msg,int delay_secs) +void __ui__info_window (const char *title,const char *text,const char *exit_msg) {int x, y;int max_len =0 , nr_lines =0 ;
@@ -185,8 +184,6 @@ int ui__question_window(const char *title, const char *text, t = sep +1 ; } -pthread_mutex_lock (&ui__lock); - max_len +=2 ; nr_lines +=2 ;if (exit_msg)
@@ -206,19 +203,29 @@ int ui__question_window(const char *title, const char *text, max_len -=2 ;SLsmg_write_wrapped_string ((unsigned char *)text, y, x, nr_lines, max_len,1 ); -SLsmg_gotorc (y + nr_lines -2 , x); -SLsmg_write_nstring ((char *)" " , max_len); -SLsmg_gotorc (y + nr_lines -1 , x);if (exit_msg) {SLsmg_gotorc (y + nr_lines -2 , x);SLsmg_write_nstring ((char *)" " , max_len);SLsmg_gotorc (y + nr_lines -1 , x);SLsmg_write_nstring ((char *)exit_msg, max_len); } -SLsmg_refresh (); +} +void ui__info_window (const char *title,const char *text) +{ +pthread_mutex_lock (&ui__lock); +__ui__info_window (title, text,NULL ); +SLsmg_refresh ();pthread_mutex_unlock (&ui__lock); +} +int ui__question_window (const char *title,const char *text, +const char *exit_msg,int delay_secs) +{ +pthread_mutex_lock (&ui__lock); +__ui__info_window (title, text, exit_msg); +SLsmg_refresh (); +pthread_mutex_unlock (&ui__lock);return ui__getch (delay_secs); }
tools/perf/ui/util.h +2 -0
@@ -8,6 +8,8 @@ int ui__getch(int delay_secs);int ui__popup_menu (int argc,char *const argv[]);int ui__help_window (const char *text);int ui__dialog_yesno (const char *msg); +void __ui__info_window (const char *title,const char *text,const char *exit_msg); +void ui__info_window (const char *title,const char *text);int ui__question_window (const char *title,const char *text,const char *exit_msg,int delay_secs);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 14/17 perf ui browser: Allow specifying message to show when no samples are available to display
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
The 'perf top' tool will use that to avoid having a initial blank screen while collecting the minimum number of samples to sort and display.
--- tools/perf/ui/browser.c | 2 ++ tools/perf/ui/browser.h | 1 + 2 files changed, 3 insertions(+)
tools/perf/ui/browser.c +2 -0
@@ -347,6 +347,8 @@ static int __ui_browser__refresh(struct ui_browser *browser)SLsmg_fill_region (browser->y + row + browser->extra_title_lines, browser->x, browser->rows - row, width,' ' ); +if (browser->nr_entries ==0 && browser->no_samples_msg) +__ui__info_window (NULL , browser->no_samples_msg,NULL );return 0 ; }
tools/perf/ui/browser.h +1 -0
@@ -23,6 +23,7 @@ struct ui_browser {void *priv;const char *title;char *helpline; +const char *no_samples_msg;void (*refresh_dimensions)(struct ui_browser *browser);unsigned int (*refresh)(struct ui_browser *browser);void (*write)(struct ui_browser *browser,void *entry,int row);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 15/17 perf top: Show info message while collecting samples
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Give visual cue about what is happening while initially collecting the minimal set of samples to collect/sort/display.
--- tools/perf/ui/browsers/hists.c | 3 +++ 1 file changed, 3 insertions(+)
tools/perf/ui/browsers/hists.c +3 -0
@@ -2894,6 +2894,9 @@ static int perf_evsel__hists_browse(struct evsel *evsel, int nr_events,if (symbol_conf.col_width_list_str)perf_hpp__set_user_width (symbol_conf.col_width_list_str); +if (!is_report_browser (hbt)) + browser->b.no_samples_msg ="Collecting samples..." ; +while (1 ) {struct thread *thread =NULL ;struct map *map =NULL ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 16/17 tools headers: Fixup bitsperlong per arch includes
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We were getting the file by luck, from one of the paths in -I, fix it to get it from the proper place:
$ cd tools/include/uapi/asm/ [acme@quaco asm]$ grep include bitsperlong.h #include "../../arch/x86/include/uapi/asm/bitsperlong.h" #include "../../arch/arm64/include/uapi/asm/bitsperlong.h" #include "../../arch/powerpc/include/uapi/asm/bitsperlong.h" #include "../../arch/s390/include/uapi/asm/bitsperlong.h" #include "../../arch/sparc/include/uapi/asm/bitsperlong.h" #include "../../arch/mips/include/uapi/asm/bitsperlong.h" #include "../../arch/ia64/include/uapi/asm/bitsperlong.h" #include "../../arch/riscv/include/uapi/asm/bitsperlong.h" #include "../../arch/alpha/include/uapi/asm/bitsperlong.h" #include <asm-generic/bitsperlong.h> $ ls -la ../../arch/x86/include/uapi/asm/bitsperlong.h ls: cannot access '../../arch/x86/include/uapi/asm/bitsperlong.h': No such file or directory $ ls -la ../../../arch/*/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 237 ../../../arch/alpha/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 841 ../../../arch/arm64/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 966 ../../../arch/hexagon/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 234 ../../../arch/ia64/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 100 ../../../arch/microblaze/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 244 ../../../arch/mips/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 352 ../../../arch/parisc/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 312 ../../../arch/powerpc/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 353 ../../../arch/riscv/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 292 ../../../arch/s390/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 323 ../../../arch/sparc/include/uapi/asm/bitsperlong.h -rw-rw-r--. 1 320 ../../../arch/x86/include/uapi/asm/bitsperlong.h $
Found while fixing some other problem, before it was escaping the tools/ chroot and using stuff in the kernel sources:
CC /tmp/build/perf/util/find_bit.o
In file included from /git/linux/tools/include/../../arch/x86/include/uapi/asm/bitsperlong.h:11,
from /git/linux/tools/include/uapi/asm/bitsperlong.h:3,
from /git/linux/tools/include/linux/bits.h:6,
from /git/linux/tools/include/linux/bitops.h:13,
from ../lib/find_bit.c:17:# cd /git/linux/tools/include/../../arch/x86/include/uapi/asm/ # pwd /git/linux/arch/x86/include/uapi/asm #
Now it is getting the one we want it to, i.e. the one inside tools/:
CC /tmp/build/perf/util/find_bit.o
In file included from /git/linux/tools/arch/x86/include/uapi/asm/bitsperlong.h:11,
from /git/linux/tools/include/linux/bits.h:6,
from /git/linux/tools/include/linux/bitops.h:13,
--- tools/include/uapi/asm/bitsperlong.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
tools/include/uapi/asm/bitsperlong.h +9 -9
@@ -1,22 +1,22 @@/* SPDX-License-Identifier: GPL-2.0 */ #if defined(__i386__) || defined(__x86_64__) -#include "../../arch/x86/include/uapi/asm/bitsperlong.h" +#include "../../../arch/x86/include/uapi/asm/bitsperlong.h" #elif defined(__aarch64__) -#include "../../arch/arm64/include/uapi/asm/bitsperlong.h" +#include "../../../arch/arm64/include/uapi/asm/bitsperlong.h" #elif defined(__powerpc__) -#include "../../arch/powerpc/include/uapi/asm/bitsperlong.h" +#include "../../../arch/powerpc/include/uapi/asm/bitsperlong.h" #elif defined(__s390__) -#include "../../arch/s390/include/uapi/asm/bitsperlong.h" +#include "../../../arch/s390/include/uapi/asm/bitsperlong.h" #elif defined(__sparc__) -#include "../../arch/sparc/include/uapi/asm/bitsperlong.h" +#include "../../../arch/sparc/include/uapi/asm/bitsperlong.h" #elif defined(__mips__) -#include "../../arch/mips/include/uapi/asm/bitsperlong.h" +#include "../../../arch/mips/include/uapi/asm/bitsperlong.h" #elif defined(__ia64__) -#include "../../arch/ia64/include/uapi/asm/bitsperlong.h" +#include "../../../arch/ia64/include/uapi/asm/bitsperlong.h" #elif defined(__riscv) -#include "../../arch/riscv/include/uapi/asm/bitsperlong.h" +#include "../../../arch/riscv/include/uapi/asm/bitsperlong.h" #elif defined(__alpha__) -#include "../../arch/alpha/include/uapi/asm/bitsperlong.h" +#include "../../../arch/alpha/include/uapi/asm/bitsperlong.h" #else #include <asm-generic/bitsperlong.h> #endif
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 17/17 libperf: Fix arch include paths
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Guenter Roeck reported problem with compilation when the ARCH is specified:
$ make ARCH=x86_64
In file included from tools/include/asm/atomic.h:6:0,
from include/linux/atomic.h:5,
from tools/include/linux/refcount.h:41,
from cpumap.c:4: tools/include/asm/../../arch/x86/include/asm/atomic.h:11:10:
fatal error: asm/cmpxchg.h: No such file or directoryThe problem is that we don't use SRCARCH (the sanitized ARCH version) and we don't get the proper include path.
--- tools/perf/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/lib/Makefile +1 -1
@@ -59,7 +59,7 @@ else CFLAGS := -g -Wall endif -INCLUDES = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/ -I$(srctree)/tools/arch/$(ARCH)/include/uapi -I$(srctree)/tools/include/uapi +INCLUDES = -I$(srctree)/tools/perf/lib/include -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/ -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi # Append required CFLAGS override CFLAGS += $(EXTRA_WARNINGS)
Signature · 1 line
2.21.0
Quoted 123 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
cfb104ca8a26affb28d81720a4ed49c30b2a3b01:Merge tag 'perf-core-for-mingo-5.4-20190816' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/core (2019-08-16 22:43:42 +0200)are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-core-for-mingo-5.4-20190820for you to fetch changes up to
b81d39c7a1efb83caa3f4419939a46e96191abb6:libperf: Fix arch include paths (2019-08-20 12:29:36 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:callchains:
Alexey Budankov:
- Allow collecting LBR together with DWARF callchains, for workloads where the userspace stack size collected is not big enough for pure DWARF based unwinding.
- Dump the LBR call stack in 'perf report -D'.
perf top:
Arnaldo Carvalho de Melo:
- Show visual cue at start to state that the minimal set of samples are being collected prior to sorting/bucketizing/displaying.
CoreSight (ARM hardware tracing):
Leo Yan:
- Support sample flags 'insn' and 'insnlen'.
core:
Adrian Hunter:
- Add comment for 'idx' member in 'struct
perf_sample_id.tools headers:
Arnaldo Carvalho de Melo:
- Synchronize
linux/bits.h, which required grabbing a copy of the kernelconst.hheaders and some changes in the ordering of header directories.- Sync x86's
asm/cpufeatures.hwith the with the kernel, no change in any of the tools.libperf:
Jiri Olsa:
- Fix arch include paths.
libtraceevent:
Steven Rostedt (VMware):
- Fix "robust" test of
do_generate_dynamic_list_file.Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Adrian Hunter (1):
perf evsel: Add comment for 'idx' member in 'structperf_sample_idAlexey Budankov (3):
perf record: Enable LBR callstack capture jointly with thread stack perf report: Dump LBR callstack data by -D jointly with thread stack perf report: Prefer DWARF callstacks to LBR ones when captured bothArnaldo Carvalho de Melo (10):
tools headers: Addlimits.hto access__WORDSIZE
perf tools:tools/includeshould come beforetools/uapi/include
tools headers: Grab copy oflinux/const.h, needed bylinux/bits.h
tools headers: Synchronizelinux/bits.hwith the kernel sources
tools arch x86: Syncasm/cpufeatures.hwith the with the kernel
perf ui: Make 'exit_msg' optional inui__question_window()
perf ui: Introduce non-interactiveui__info_window()function
perf ui browser: Allow specifying message to show when no samples are available to display perf top: Show info message while collecting samples
tools headers: Fixup bitsperlong per arch includesJiri Olsa (1):
libperf: Fix arch include pathsLeo Yan (1):
perf cs-etm: Support sample flags 'insn' and 'insnlen'Steven Rostedt (VMware) (1):
tools lib traceevent: Fix "robust" test ofdo_generate_dynamic_list_filetools/arch/x86/include/asm/cpufeatures.h | 3 +++ tools/include/linux/bitops.h | 1 + tools/include/linux/bits.h | 17 +++++++++------ tools/include/linux/const.h | 9 ++++++++ tools/include/uapi/asm/bitsperlong.h | 18 ++++++++-------- tools/include/uapi/linux/const.h | 31 ++++++++++++++++++++++++++ tools/lib/traceevent/Makefile | 4 ++-- tools/perf/Makefile.config | 2 +- tools/perf/builtin-report.c | 2 ++ tools/perf/check-headers.sh | 2 ++ tools/perf/lib/Makefile | 2 +- tools/perf/ui/browser.c | 2 ++ tools/perf/ui/browser.h | 1 + tools/perf/ui/browsers/hists.c | 3 +++ tools/perf/ui/tui/util.c | 37 ++++++++++++++++++++++----------
Quoted 8 lines
tools/perf/ui/util.h | 2 ++ tools/perf/util/cs-etm.c | 35 +++++++++++++++++++++++++++++- tools/perf/util/evsel.h | 7 ++++++ tools/perf/util/parse-branch-options.c | 1 + tools/perf/util/session.c | 31 +++++++++++++++----------- 20 files changed, 166 insertions(+), 44 deletions(-) create mode 100644 tools/include/linux/const.h create mode 100644 tools/include/uapi/linux/const.h
Pulled, thanks a lot Arnaldo!
This one's very nice:
Quoted 2 lines
Arnaldo Carvalho de Melo (10):
perf top: Show info message while collecting samples
:-)
Ingo
Em Tue, Aug 20, 2019 at 09:39:53PM +0200, Ingo Molnar escreveu:
Quoted 1 line
Pulled, thanks a lot Arnaldo!
Wow, that was fast, thanks!
Quoted 6 lines
This one's very nice:
Quoted 2 lines
Arnaldo Carvalho de Melo (10):
perf top: Show info message while collecting samples:-)
Yeah, we need to polish these kind of little details, pressing 'C' and getting callchains enabled/disabled would be nice as well in 'perf top', just thought about that :-)
- Arnaldo