perf/core improvements and fixes
Subsystems (5)
Arnaldo Carvalho de Melo
maintainerHi Ingo,
Please consider pulling,
Best regards,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit 3ce5aceb5dee298b082adfa2baa0df5a447c1b0b:
Merge tag 'perf-core-for-mingo-5.3-20190611' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2019-06-17 20:48:14 +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.3-20190621
for you to fetch changes up to 3469fa84c1631face938efc42b3f488a2c2504e0:
tools build: Fix the zstd test in the test-all.c common case feature test (2019-06-18 18:44:24 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
perf trace:
Arnaldo Carvalho de Melo:
- Fix exclusion of not available syscall names from selector list.
- Fixup pointer arithmetic when consuming augmented syscall args.
Intel PT:
Adrian Hunter:
- Add support for decoding PEBS via PT packets. See:
https://software.intel.com/en-us/articles/intel-sdm
May 2019 version: Vol. 3B 18.5.5.2 PEBS output to Intel® Processor Trace
for more details about it.
ARM64:
John Garry:
- Fix uncore PMU alias list for ARM64
Raphael Gault:
- Compile tests unconditionally.
cs-etm:
Mathieu Poirier:
- Optimize option setup for CPU-wide sessions.
build:
Florian Fainelli:
- Don't hardcode host include path for libslang, fixing up building with it in cross build environments.
Arnaldo Carvalho de Melo:
- Check if gettid() is available before providing helper, fixing the build when using the latest glibc version, where a helper for gettid() is finally present.
- Fix building with libslang in systems where it is located in slang/slang.h.
- Fix fast path test for zstd library.
----------------------------------------------------------------
Adrian Hunter (11):
perf intel-pt: Add new packets for PEBS via PT
perf intel-pt: Add Intel PT packet decoder test
perf intel-pt: Add decoder support for PEBS via PT perf intel-pt: Prepare to synthesize PEBS samples perf intel-pt: Factor out common sample preparation for re-use perf intel-pt: Synthesize PEBS sample basic information perf intel-pt: Add gp registers to synthesized PEBS sample perf intel-pt: Add XMM registers to synthesized PEBS sample perf intel-pt: Add LBR information to synthesized PEBS sample perf intel-pt: Add memory information to synthesized PEBS sample perf intel-pt: Add callchain to synthesized PEBS sample
Arnaldo Carvalho de Melo (10):
tools build: Check if gettid() is available before providing helper perf trace: Fix exclusion of not available syscall names from selector list perf trace: Streamline validation of select syscall names list tools build feature tests: Add missing SPDX headers
perf tests: Add missing SPDX headers
perf trace: Fixup pointer arithmetic when consuming augmented syscall args perf evsel: Make perf_evsel__name() accept a NULL argument tools build: Add test to check if slang.h is in /usr/include/slang/ perf build: Handle slang being in /usr/include and in /usr/include/slang/ tools build: Fix the zstd test in the test-all.c common case feature test
Florian Fainelli (1):
perf tools: Don't hardcode host include path for libslang
John Garry (1):
perf pmu: Fix uncore PMU alias list for ARM64
Mathieu Poirier (1):
perf: cs-etm: Optimize option setup for CPU-wide sessions
Raphael Gault (1):
perf tests arm64: Compile tests unconditionally
tools/build/Makefile.feature | 3 +- tools/build/feature/Makefile | 10 +- tools/build/feature/test-all.c | 7 +- tools/build/feature/test-fortify-source.c | 1 + tools/build/feature/test-gettid.c | 11 + tools/build/feature/test-hello.c | 1 + tools/build/feature/test-libslang-include-subdir.c | 7 + tools/build/feature/test-setns.c | 1 + tools/perf/Makefile.config | 16 +- tools/perf/arch/arm/util/cs-etm.c | 20 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/tests/Build | 2 +- tools/perf/arch/x86/include/arch-tests.h | 1 + tools/perf/arch/x86/tests/Build | 2 +- tools/perf/arch/x86/tests/arch-tests.c | 4 + .../arch/x86/tests/intel-pt-pkt-decoder-test.c | 304 +++++++++++++++++++++ tools/perf/builtin-trace.c | 20 +- tools/perf/jvmti/jvmti_agent.c | 2 + tools/perf/tests/Build | 2 + tools/perf/tests/bp_account.c | 1 + tools/perf/tests/bpf-script-example.c | 1 + tools/perf/tests/bpf-script-test-kbuild.c | 1 + tools/perf/tests/bpf-script-test-prologue.c | 1 + tools/perf/tests/bpf-script-test-relocation.c | 1 + tools/perf/tests/bpf.c | 1 + tools/perf/tests/map_groups.c | 1 + tools/perf/tests/mem.c | 1 + tools/perf/tests/mem2node.c | 1 + tools/perf/tests/shell/lib/probe.sh | 1 + tools/perf/tests/shell/probe_vfs_getname.sh | 3 +- .../tests/shell/record+probe_libc_inet_pton.sh | 1 + .../tests/shell/record+script_probe_vfs_getname.sh | 1 + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 + tools/perf/ui/libslang.h | 5 + tools/perf/util/evsel.c | 8 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 114 +++++++- .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 137 ++++++++++ .../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 140 +++++++++- .../util/intel-pt-decoder/intel-pt-pkt-decoder.h | 21 +- tools/perf/util/intel-pt.c | 296 +++++++++++++++++++- tools/perf/util/pmu.c | 28 +- 42 files changed, 1115 insertions(+), 68 deletions(-) create mode 100644 tools/build/feature/test-gettid.c create mode 100644 tools/build/feature/test-libslang-include-subdir.c create mode 100644 tools/perf/arch/x86/tests/intel-pt-pkt-decoder-test.c
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.
$ export PERF_TARBALL=http://192.168.124.1/perf/perf-5.2.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 7.0.1 (tags/RELEASE_701/final) (based on LLVM 7.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) 16 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 9.1.1 20190611 gcc-9-branch@272162 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:experimental : Ok gcc (Debian 8.3.0-7) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final) 20 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.3.0-7) 8.3.0 21 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.3.0-7) 8.3.0 22 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 8.3.0-7) 8.3.0 23 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 8.3.0-7) 8.3.0 24 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) 25 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) 26 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.7.0 (tags/RELEASE_370/final) 27 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1), clang version 3.8.1 (tags/RELEASE_381/final) 28 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 29 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1), clang version 3.9.1 (tags/RELEASE_391/final) 30 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2), clang version 4.0.1 (tags/RELEASE_401/final) 31 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 5.0.2 (tags/RELEASE_502/final) 32 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 6.0.1 (tags/RELEASE_601/final) 33 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) 34 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) 35 fedora:30-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 36 fedora:30-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 37 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) 38 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) 39 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 8.3.0-r1 p1.1) 8.3.0 40 mageia:5 : Ok gcc (GCC) 4.9.2, clang version 3.5.2 (tags/RELEASE_352/final) 41 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0, clang version 3.9.1 (tags/RELEASE_391/final) 42 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) 43 manjaro:latest : Ok gcc (GCC) 8.3.0, clang version 8.0.0 (tags/RELEASE_800/final) 44 openmandriva:cooker : Ok gcc (GCC) 9.1.0 20190503 (OpenMandriva) 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 20190520 [gcc-9-branch revision 271396], clang version 7.0.1 (tags/RELEASE_701/final 349238) 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-36.0.1), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 51 ubuntu:12.04 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 52 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) 53 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) 54 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 55 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 56 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 57 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 58 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 59 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 60 ubuntu:18.04 : Ok gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0, clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final) 61 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04) 7.4.0 62 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04) 7.4.0 63 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 64 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 65 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 66 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 67 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 68 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 69 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 70 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 71 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) 72 ubuntu:19.04 : Ok gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0, clang version 8.0.0-3 (tags/RELEASE_800/final) 73 ubuntu:19.04-x-alpha : Ok alpha-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 74 ubuntu:19.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 8.3.0-6ubuntu1) 8.3.0 75 ubuntu:19.04-x-hppa : Ok hppa-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 $
# uname -a
Linux quaco 5.2.0-rc4+ #1 SMP Tue Jun 11 11:21:27 -03 2019 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
3469fa84c163 tools build: Fix the zstd test in the test-all.c common case feature test
# perf version --build-options
perf version 5.2.rc4.gd1d5628fa057
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/perf/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_install_prefix_O: make install prefix=/tmp/krava
make_install_prefix_slash_O: make install prefix=/tmp/krava/
- /home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP_STATIC: make FEATURE_DUMP_COPY=/home/acme/git/perf/tools/perf/BUILD_TEST_FEATURE_DUMP_STATIC LDFLAGS='-static' feature-dump
make_static_O: make LDFLAGS=-static
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_with_babeltrace_O: make LIBBABELTRACE=1
make_help_O: make help
make_no_backtrace_O: make NO_BACKTRACE=1
make_install_bin_O: make install-bin
make_no_libpython_O: make NO_LIBPYTHON=1
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_clean_all_O: make clean all
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_libunwind_O: make NO_LIBUNWIND=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
make_debug_O: make DEBUG=1
make_no_libperl_O: make NO_LIBPERL=1
make_no_gtk2_O: make NO_GTK2=1
make_no_slang_O: make NO_SLANG=1
make_no_libbpf_O: make NO_LIBBPF=1
make_no_libelf_O: make NO_LIBELF=1
make_no_libaudit_O: make NO_LIBAUDIT=1
make_util_map_o_O: make util/map.o
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_cscope_O: make cscope
make_no_libnuma_O: make NO_LIBNUMA=1
make_perf_o_O: make perf.o
make_no_newt_O: make NO_NEWT=1
make_no_auxtrace_O: make NO_AUXTRACE=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_install_O: make install
make_tags_O: make tags
make_doc_O: make doc
make_no_demangle_O: make NO_DEMANGLE=1
make_pure_O: make
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/25 perf tests arm64: Compile tests unconditionally
From: Raphael Gault <[email protected]>
In order to subsequently add more tests for the arm64 architecture we compile the tests target for arm64 systematically.
Further explanation provided by Mark Rutland:
Given prior questions regarding this commit, it's probably worth spelling things out more explicitly, e.g.
Currently we only build the arm64/tests directory if CONFIG_DWARF_UNWIND is selected, which is fine as the only test we have is arm64/tests/dwarf-unwind.o.
So that we can add more tests to the test directory, let's unconditionally build the directory, but conditionally build dwarf-unwind.o depending on CONFIG_DWARF_UNWIND.
There should be no functional change as a result of this patch.
--- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/tests/Build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/arch/arm64/Build +1 -1
@@ -1,2 +1,2 @@ perf-y += util/ -perf-$(CONFIG_DWARF_UNWIND) += tests/ +perf-y += tests/
tools/perf/arch/arm64/tests/Build +1 -1
@@ -1,4 +1,4 @@ perf-y += regs_load.o -perf-y += dwarf-unwind.o +perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o perf-y += arch-tests.o
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 2/25 perf: cs-etm: Optimize option setup for CPU-wide sessions
In reply to Arnaldo Carvalho de MeloFrom: Mathieu Poirier <[email protected]>
Call function cs_etm_set_option() once with all relevant options set rather than multiple times to avoid going through the list of CPU more than once.
--- tools/perf/arch/arm/util/cs-etm.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-)
tools/perf/arch/arm/util/cs-etm.c +8 -12
@@ -162,20 +162,19 @@ static int cs_etm_set_option(struct auxtrace_record *itr, !cpu_map__has(online_cpus, i))continue ; -switch (option) { -case ETM_OPT_CTXTID : +if (option &ETM_OPT_CTXTID ) { err =cs_etm_set_context_id (itr, evsel, i);if (err) goto out; -break ; -case ETM_OPT_TS : + } +if (option &ETM_OPT_TS ) { err =cs_etm_set_timestamp (itr, evsel, i);if (err) goto out; -break ; -default : - goto out; } +if (option & ~(ETM_OPT_CTXTID |ETM_OPT_TS )) +/* Nothing else is currently supported */ + goto out; } err =0 ;
@@ -398,11 +397,8 @@ static int cs_etm_recording_options(struct auxtrace_record *itr,if (!cpu_map__empty (cpus)) {perf_evsel__set_sample_bit (cs_etm_evsel,CPU ); - err =cs_etm_set_option (itr, cs_etm_evsel,ETM_OPT_CTXTID ); -if (err) - goto out; - - err =cs_etm_set_option (itr, cs_etm_evsel,ETM_OPT_TS ); + err =cs_etm_set_option (itr, cs_etm_evsel, +ETM_OPT_CTXTID |ETM_OPT_TS );if (err) goto out; }
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 3/25 perf intel-pt: Add new packets for PEBS via PT
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add 3 new packets to supports PEBS via PT, namely Block Begin Packet (BBP), Block Item Packet (BIP) and Block End Packet (BEP). PEBS data is encoded into multiple BIP packets that come between BBP and BEP. The BEP packet might be associated with a FUP packet. That is indicated by using a separate packet type (INTEL_PT_BEP_IP) similar to other packets types with the _IP suffix.
Refer to the Intel SDM for more information about PEBS via PT:
https://software.intel.com/en-us/articles/intel-sdm
May 2019 version: Vol. 3B 18.5.5.2 PEBS output to Intel® Processor Trace
Decoding of BIP packets conflicts with single-byte TNT packets. Since BIP packets only occur in the context of a block (i.e. between BBP and BEP), that context must be recorded and passed to the packet decoder.
--- .../util/intel-pt-decoder/intel-pt-decoder.c | 38 ++++- .../intel-pt-decoder/intel-pt-pkt-decoder.c | 140 +++++++++++++++++- .../intel-pt-decoder/intel-pt-pkt-decoder.h | 21 ++- tools/perf/util/intel-pt.c | 3 +- 4 files changed, 193 insertions(+), 9 deletions(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +34 -4
@@ -133,6 +133,7 @@ struct intel_pt_decoder {int mtc_shift;struct intel_pt_stack stack;enum intel_pt_pkt_state pkt_state; +enum intel_pt_pkt_ctx pkt_ctx;struct intel_pt_pkt packet;struct intel_pt_pkt tnt;int pkt_step;
@@ -559,7 +560,7 @@ static int intel_pt_get_split_packet(struct intel_pt_decoder *decoder)memcpy (buf + len, decoder->buf, n); len += n; - ret =intel_pt_get_packet (buf, len, &decoder->packet); + ret =intel_pt_get_packet (buf, len, &decoder->packet, &decoder->pkt_ctx);if (ret < (int )old_len) { decoder->next_buf = decoder->buf; decoder->next_len = decoder->len;
@@ -594,6 +595,7 @@ static int intel_pt_pkt_lookahead(struct intel_pt_decoder *decoder, {struct intel_pt_pkt_info pkt_info;const unsigned char *buf = decoder->buf; +enum intel_pt_pkt_ctx pkt_ctx = decoder->pkt_ctx;size_t len = decoder->len;int ret;
@@ -612,7 +614,8 @@ static int intel_pt_pkt_lookahead(struct intel_pt_decoder *decoder,if (!len)return INTEL_PT_NEED_MORE_BYTES ; - ret =intel_pt_get_packet (buf, len, &pkt_info.packet); + ret =intel_pt_get_packet (buf, len, &pkt_info.packet, + &pkt_ctx);if (!ret)return INTEL_PT_NEED_MORE_BYTES ;if (ret <0 )
@@ -687,6 +690,10 @@ static int intel_pt_calc_cyc_cb(struct intel_pt_pkt_info *pkt_info)case INTEL_PT_MNT :case INTEL_PT_PTWRITE :case INTEL_PT_PTWRITE_IP : +case INTEL_PT_BBP : +case INTEL_PT_BIP : +case INTEL_PT_BEP : +case INTEL_PT_BEP_IP :return 0 ;case INTEL_PT_MTC :
@@ -879,7 +886,7 @@ static int intel_pt_get_next_packet(struct intel_pt_decoder *decoder) } ret =intel_pt_get_packet (decoder->buf, decoder->len, - &decoder->packet); + &decoder->packet, &decoder->pkt_ctx);if (ret ==INTEL_PT_NEED_MORE_BYTES &&BITS_PER_LONG ==32 && decoder->len <INTEL_PT_PKT_MAX_SZ && !decoder->next_buf) { ret =intel_pt_get_split_packet (decoder);
@@ -1633,6 +1640,10 @@ static int intel_pt_walk_psbend(struct intel_pt_decoder *decoder)case INTEL_PT_MWAIT :case INTEL_PT_PWRE :case INTEL_PT_PWRX : +case INTEL_PT_BBP : +case INTEL_PT_BIP : +case INTEL_PT_BEP : +case INTEL_PT_BEP_IP : decoder->have_tma = false;intel_pt_log ("ERROR: Unexpected packet\n" ); err = -EAGAIN ;
@@ -1726,6 +1737,10 @@ static int intel_pt_walk_fup_tip(struct intel_pt_decoder *decoder)case INTEL_PT_MWAIT :case INTEL_PT_PWRE :case INTEL_PT_PWRX : +case INTEL_PT_BBP : +case INTEL_PT_BIP : +case INTEL_PT_BEP : +case INTEL_PT_BEP_IP :intel_pt_log ("ERROR: Missing TIP after FUP\n" ); decoder->pkt_state =INTEL_PT_STATE_ERR3 ; decoder->pkt_step =0 ;
@@ -2047,6 +2062,12 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder) decoder->state.pwrx_payload = decoder->packet.payload;return 0 ; +case INTEL_PT_BBP : +case INTEL_PT_BIP : +case INTEL_PT_BEP : +case INTEL_PT_BEP_IP : +break ; +default :return intel_pt_bug (decoder); }
@@ -2085,6 +2106,10 @@ static int intel_pt_walk_psb(struct intel_pt_decoder *decoder)case INTEL_PT_MWAIT :case INTEL_PT_PWRE :case INTEL_PT_PWRX : +case INTEL_PT_BBP : +case INTEL_PT_BIP : +case INTEL_PT_BEP : +case INTEL_PT_BEP_IP :intel_pt_log ("ERROR: Unexpected packet\n" ); err = -ENOENT ; goto out;
@@ -2291,6 +2316,10 @@ static int intel_pt_walk_to_ip(struct intel_pt_decoder *decoder)case INTEL_PT_MWAIT :case INTEL_PT_PWRE :case INTEL_PT_PWRX : +case INTEL_PT_BBP : +case INTEL_PT_BIP : +case INTEL_PT_BEP : +case INTEL_PT_BEP_IP :default :break ; }
@@ -2641,11 +2670,12 @@ static unsigned char *intel_pt_last_psb(unsigned char *buf, size_t len)static bool intel_pt_next_tsc (unsigned char *buf,size_t len,uint64_t *tsc,size_t *rem) { +enum intel_pt_pkt_ctx ctx =INTEL_PT_NO_CTX ;struct intel_pt_pkt packet;int ret;while (len) { - ret =intel_pt_get_packet (buf, len, &packet); + ret =intel_pt_get_packet (buf, len, &packet, &ctx);if (ret <=0 )return false;if (packet.type ==INTEL_PT_TSC ) {
tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c +137 -3
197 lines not on this page · raw message
tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.h +20 -1
@@ -50,6 +50,10 @@ enum intel_pt_pkt_type {INTEL_PT_MWAIT ,INTEL_PT_PWRE ,INTEL_PT_PWRX , +INTEL_PT_BBP , +INTEL_PT_BIP , +INTEL_PT_BEP , + INTEL_PT_BEP_IP, }; struct intel_pt_pkt {
@@ -58,10 +62,25 @@ struct intel_pt_pkt {uint64_t payload; }; +/* +* Decoding of BIP packets conflicts with single-byte TNT packets. Since BIP +* packets only occur in the context of a block (i.e. between BBP and BEP), that +* context must be recorded and passed to the packet decoder. +*/ +enum intel_pt_pkt_ctx { +INTEL_PT_NO_CTX ,/* BIP packets are invalid */ +INTEL_PT_BLK_4_CTX ,/* 4-byte BIP packets */ +INTEL_PT_BLK_8_CTX ,/* 8-byte BIP packets */ +}; +const char *intel_pt_pkt_name (enum intel_pt_pkt_type );int intel_pt_get_packet (const unsigned char *buf,size_t len, -struct intel_pt_pkt *packet); +struct intel_pt_pkt *packet, +enum intel_pt_pkt_ctx *ctx); + +void intel_pt_upd_pkt_ctx (const struct intel_pt_pkt *packet, +enum intel_pt_pkt_ctx *ctx);int intel_pt_pkt_desc (const struct intel_pt_pkt *packet,char *buf,size_t len);
tools/perf/util/intel-pt.c +2 -1
@@ -177,13 +177,14 @@ static void intel_pt_dump(struct intel_pt *pt __maybe_unused,int ret, pkt_len, i;char desc[INTEL_PT_PKT_DESC_MAX ];const char *color =PERF_COLOR_BLUE ; +enum intel_pt_pkt_ctx ctx =INTEL_PT_NO_CTX ;color_fprintf (stdout, color,". ... Intel Processor Trace data: size %zu bytes\n" , len);while (len) { - ret =intel_pt_get_packet (buf, len, &packet); + ret =intel_pt_get_packet (buf, len, &packet, &ctx);if (ret >0 ) pkt_len = ret;else
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 4/25 perf intel-pt: Add Intel PT packet decoder test
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add Intel PT packet decoder test. This test feeds byte sequences to the Intel PT packet decoder and checks the results. Changes to the packet context are also checked.
Committer testing:
# perf test "Intel PT" 65: Intel PT packet decoder : Ok # perf test -v "Intel PT" 65: Intel PT packet decoder : --- start --- test child forked, pid 6360 Decoded ok: 00 PAD Decoded ok: 04 TNT N (1) Decoded ok: 06 TNT T (1) Decoded ok: 80 TNT NNNNNN (6) Decoded ok: fe TNT TTTTTT (6) Decoded ok: 02 a3 02 00 00 00 00 00 TNT N (1) Decoded ok: 02 a3 03 00 00 00 00 00 TNT T (1) Decoded ok: 02 a3 00 00 00 00 00 80 TNT NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN (47) Decoded ok: 02 a3 ff ff ff ff ff ff TNT TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT (47) Decoded ok: 0d TIP no ip Decoded ok: 2d 01 02 TIP 0x201 Decoded ok: 4d 01 02 03 04 TIP 0x4030201 Decoded ok: 6d 01 02 03 04 05 06 TIP 0x60504030201 Decoded ok: 8d 01 02 03 04 05 06 TIP 0x60504030201 Decoded ok: cd 01 02 03 04 05 06 07 08 TIP 0x807060504030201 Decoded ok: 11 TIP.PGE no ip Decoded ok: 31 01 02 TIP.PGE 0x201 Decoded ok: 51 01 02 03 04 TIP.PGE 0x4030201 Decoded ok: 71 01 02 03 04 05 06 TIP.PGE 0x60504030201 Decoded ok: 91 01 02 03 04 05 06 TIP.PGE 0x60504030201 Decoded ok: d1 01 02 03 04 05 06 07 08 TIP.PGE 0x807060504030201 Decoded ok: 01 TIP.PGD no ip Decoded ok: 21 01 02 TIP.PGD 0x201 Decoded ok: 41 01 02 03 04 TIP.PGD 0x4030201 Decoded ok: 61 01 02 03 04 05 06 TIP.PGD 0x60504030201 Decoded ok: 81 01 02 03 04 05 06 TIP.PGD 0x60504030201 Decoded ok: c1 01 02 03 04 05 06 07 08 TIP.PGD 0x807060504030201 Decoded ok: 1d FUP no ip Decoded ok: 3d 01 02 FUP 0x201 Decoded ok: 5d 01 02 03 04 FUP 0x4030201 Decoded ok: 7d 01 02 03 04 05 06 FUP 0x60504030201 Decoded ok: 9d 01 02 03 04 05 06 FUP 0x60504030201 Decoded ok: dd 01 02 03 04 05 06 07 08 FUP 0x807060504030201 Decoded ok: 02 43 02 04 06 08 0a 0c PIP 0x60504030201 (NR=0) Decoded ok: 02 43 03 04 06 08 0a 0c PIP 0x60504030201 (NR=1) Decoded ok: 99 00 MODE.Exec 16 Decoded ok: 99 01 MODE.Exec 64 Decoded ok: 99 02 MODE.Exec 32 Decoded ok: 99 20 MODE.TSX TXAbort:0 InTX:0 Decoded ok: 99 21 MODE.TSX TXAbort:0 InTX:1 Decoded ok: 99 22 MODE.TSX TXAbort:1 InTX:0 Decoded ok: 02 83 TraceSTOP Decoded ok: 02 03 12 00 CBR 0x12 Decoded ok: 19 01 02 03 04 05 06 07 TSC 0x7060504030201 Decoded ok: 59 12 MTC 0x12 Decoded ok: 02 73 00 00 00 00 00 TMA CTC 0x0 FC 0x0 Decoded ok: 02 73 01 02 00 00 00 TMA CTC 0x201 FC 0x0 Decoded ok: 02 73 00 00 00 ff 01 TMA CTC 0x0 FC 0x1ff Decoded ok: 02 73 80 c0 00 ff 01 TMA CTC 0xc080 FC 0x1ff Decoded ok: 03 CYC 0x0 Decoded ok: 0b CYC 0x1 Decoded ok: fb CYC 0x1f Decoded ok: 07 02 CYC 0x20 Decoded ok: ff fe CYC 0xfff Decoded ok: 07 01 02 CYC 0x1000 Decoded ok: ff ff fe CYC 0x7ffff Decoded ok: 07 01 01 02 CYC 0x80000 Decoded ok: ff ff ff fe CYC 0x3ffffff Decoded ok: 07 01 01 01 02 CYC 0x4000000 Decoded ok: ff ff ff ff fe CYC 0x1ffffffff Decoded ok: 07 01 01 01 01 02 CYC 0x200000000 Decoded ok: ff ff ff ff ff fe CYC 0xffffffffff Decoded ok: 07 01 01 01 01 01 02 CYC 0x10000000000 Decoded ok: ff ff ff ff ff ff fe CYC 0x7fffffffffff Decoded ok: 07 01 01 01 01 01 01 02 CYC 0x800000000000 Decoded ok: ff ff ff ff ff ff ff fe CYC 0x3fffffffffffff Decoded ok: 07 01 01 01 01 01 01 01 02 CYC 0x40000000000000 Decoded ok: ff ff ff ff ff ff ff ff fe CYC 0x1fffffffffffffff Decoded ok: 07 01 01 01 01 01 01 01 01 02 CYC 0x2000000000000000 Decoded ok: ff ff ff ff ff ff ff ff ff 0e CYC 0xffffffffffffffff Decoded ok: 02 c8 01 02 03 04 05 VMCS 0x504030201 Decoded ok: 02 f3 OVF Decoded ok: 02 f3 OVF Decoded ok: 02 f3 OVF Decoded ok: 02 82 02 82 02 82 02 82 02 82 02 82 02 82 02 82 PSB Decoded ok: 02 82 02 82 02 82 02 82 02 82 02 82 02 82 02 82 PSB Decoded ok: 02 82 02 82 02 82 02 82 02 82 02 82 02 82 02 82 PSB Decoded ok: 02 23 PSBEND Decoded ok: 02 c3 88 01 02 03 04 05 06 07 00 MNT 0x7060504030201 Decoded ok: 02 12 01 02 03 04 PTWRITE 0x4030201 IP:0 Decoded ok: 02 32 01 02 03 04 05 06 07 08 PTWRITE 0x807060504030201 IP:0 Decoded ok: 02 92 01 02 03 04 PTWRITE 0x4030201 IP:1 Decoded ok: 02 b2 01 02 03 04 05 06 07 08 PTWRITE 0x807060504030201 IP:1 Decoded ok: 02 62 EXSTOP IP:0 Decoded ok: 02 e2 EXSTOP IP:1 Decoded ok: 02 c2 00 00 00 00 00 00 00 00 MWAIT 0x0 Hints 0x0 Extensions 0x0 Decoded ok: 02 c2 01 02 03 04 05 06 07 08 MWAIT 0x807060504030201 Hints 0x1 Extensions 0x1 Decoded ok: 02 c2 ff 02 03 04 07 06 07 08 MWAIT 0x8070607040302ff Hints 0xff Extensions 0x3 Decoded ok: 02 22 00 00 PWRE 0x0 HW:0 CState:0 Sub-CState:0 Decoded ok: 02 22 01 02 PWRE 0x201 HW:0 CState:0 Sub-CState:2 Decoded ok: 02 22 80 34 PWRE 0x3480 HW:1 CState:3 Sub-CState:4 Decoded ok: 02 22 00 56 PWRE 0x5600 HW:0 CState:5 Sub-CState:6 Decoded ok: 02 a2 00 00 00 00 00 PWRX 0x0 Last CState:0 Deepest CState:0 Wake Reason 0x0 Decoded ok: 02 a2 01 02 03 04 05 PWRX 0x504030201 Last CState:0 Deepest CState:1 Wake Reason 0x2 Decoded ok: 02 a2 ff ff ff ff ff PWRX 0xffffffffff Last CState:15 Deepest CState:15 Wake Reason 0xf Decoded ok: 02 63 00 BBP SZ 8-byte Type 0x0 Decoded ok: 02 63 80 BBP SZ 4-byte Type 0x0 Decoded ok: 02 63 1f BBP SZ 8-byte Type 0x1f Decoded ok: 02 63 9f BBP SZ 4-byte Type 0x1f Decoded ok: 04 00 00 00 00 BIP ID 0x00 Value 0x0 Decoded ok: fc 00 00 00 00 BIP ID 0x1f Value 0x0 Decoded ok: 04 01 02 03 04 BIP ID 0x00 Value 0x4030201 Decoded ok: fc 01 02 03 04 BIP ID 0x1f Value 0x4030201 Decoded ok: 04 00 00 00 00 00 00 00 00 BIP ID 0x00 Value 0x0 Decoded ok: fc 00 00 00 00 00 00 00 00 BIP ID 0x1f Value 0x0 Decoded ok: 04 01 02 03 04 05 06 07 08 BIP ID 0x00 Value 0x807060504030201 Decoded ok: fc 01 02 03 04 05 06 07 08 BIP ID 0x1f Value 0x807060504030201 Decoded ok: 02 33 BEP IP:0 Decoded ok: 02 b3 BEP IP:1 Decoded ok: 02 33 BEP IP:0 Decoded ok: 02 b3 BEP IP:1 test child finished with 0 ---- end ---- Intel PT packet decoder: Ok #
--- tools/perf/arch/x86/include/arch-tests.h | 1 + tools/perf/arch/x86/tests/Build | 2 +- tools/perf/arch/x86/tests/arch-tests.c | 4 + .../x86/tests/intel-pt-pkt-decoder-test.c | 304 ++++++++++++++++++ 4 files changed, 310 insertions(+), 1 deletion(-) create mode 100644 tools/perf/arch/x86/tests/intel-pt-pkt-decoder-test.c
tools/perf/arch/x86/include/arch-tests.h +1 -0
@@ -9,6 +9,7 @@ struct test;int test__rdpmc (struct test *test__maybe_unused ,int subtest);int test__perf_time_to_tsc (struct test *test__maybe_unused ,int subtest);int test__insn_x86 (struct test *test__maybe_unused ,int subtest); +int test__intel_pt_pkt_decoder (struct test *test,int subtest);int test__bp_modify (struct test *test,int subtest);#ifdef HAVE_DWARF_UNWIND_SUPPORT
tools/perf/arch/x86/tests/Build +1 -1
@@ -4,5 +4,5 @@ perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o perf-y += arch-tests.o perf-y += rdpmc.o perf-y += perf-time-to-tsc.o -perf-$(CONFIG_AUXTRACE) += insn-x86.o +perf-$(CONFIG_AUXTRACE) += insn-x86.o intel-pt-pkt-decoder-test.o perf-$(CONFIG_X86_64) += bp-modify.o
tools/perf/arch/x86/tests/arch-tests.c +4 -0
@@ -23,6 +23,10 @@ struct test arch_tests[] = { .desc = "x86 instruction decoder - new instructions", .func = test__insn_x86, }, + { + .desc = "Intel PT packet decoder", + .func = test__intel_pt_pkt_decoder, + },#endif #if defined(__x86_64__) {
tools/perf/arch/x86/tests/intel-pt-pkt-decoder-test.c new file +304 -0
304 lines not on this page · raw message
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 5/25 perf intel-pt: Add decoder support for PEBS via PT
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
PEBS data is encoded in Block Item Packets (BIP). Populate a new structure intel_pt_blk_items with the values and, upon a Block End Packet (BEP), report them as a new Intel PT sample type INTEL_PT_BLK_ITEMS.
--- .../util/intel-pt-decoder/intel-pt-decoder.c | 78 +++++++++- .../util/intel-pt-decoder/intel-pt-decoder.h | 137 ++++++++++++++++++ 2 files changed, 214 insertions(+), 1 deletion(-)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +77 -1
@@ -134,6 +134,9 @@ struct intel_pt_decoder {struct intel_pt_stack stack;enum intel_pt_pkt_state pkt_state;enum intel_pt_pkt_ctx pkt_ctx; +enum intel_pt_pkt_ctx prev_pkt_ctx; +enum intel_pt_blk_type blk_type; +int blk_type_pos;struct intel_pt_pkt packet;struct intel_pt_pkt tnt;int pkt_step;
@@ -167,6 +170,7 @@ struct intel_pt_decoder {bool set_fup_mwait;bool set_fup_pwre;bool set_fup_exstop; +bool set_fup_bep;bool sample_cyc;unsigned int fup_tx_flags;unsigned int tx_flags;
@@ -560,6 +564,7 @@ static int intel_pt_get_split_packet(struct intel_pt_decoder *decoder)memcpy (buf + len, decoder->buf, n); len += n; + decoder->prev_pkt_ctx = decoder->pkt_ctx; ret =intel_pt_get_packet (buf, len, &decoder->packet, &decoder->pkt_ctx);if (ret < (int )old_len) { decoder->next_buf = decoder->buf;
@@ -885,6 +890,7 @@ static int intel_pt_get_next_packet(struct intel_pt_decoder *decoder)return ret; } + decoder->prev_pkt_ctx = decoder->pkt_ctx; ret =intel_pt_get_packet (decoder->buf, decoder->len, &decoder->packet, &decoder->pkt_ctx); if (ret == INTEL_PT_NEED_MORE_BYTES && BITS_PER_LONG == 32 &&
@@ -1124,6 +1130,14 @@ static bool intel_pt_fup_event(struct intel_pt_decoder *decoder) decoder->state.to_ip =0 ; ret = true; } +if (decoder->set_fup_bep) { + decoder->set_fup_bep = false; + decoder->state.type |=INTEL_PT_BLK_ITEMS ; + decoder->state.type &= ~INTEL_PT_BRANCH ; + decoder->state.from_ip = decoder->ip; + decoder->state.to_ip =0 ; + ret = true; + }return ret; }
@@ -1609,6 +1623,46 @@ static void intel_pt_calc_cyc_timestamp(struct intel_pt_decoder *decoder)intel_pt_log_to ("Setting timestamp" , decoder->timestamp); } +static void intel_pt_bbp (struct intel_pt_decoder *decoder) +{ +if (decoder->prev_pkt_ctx ==INTEL_PT_NO_CTX ) { +memset (decoder->state.items.mask,0 ,sizeof (decoder->state.items.mask)); + decoder->state.items.is_32_bit = false; + } + decoder->blk_type = decoder->packet.payload; + decoder->blk_type_pos =intel_pt_blk_type_pos (decoder->blk_type); +if (decoder->blk_type ==INTEL_PT_GP_REGS ) + decoder->state.items.is_32_bit = decoder->packet.count; +if (decoder->blk_type_pos <0 ) { +intel_pt_log ("WARNING: Unknown block type %u\n" , + decoder->blk_type); + }else if (decoder->state.items.mask[decoder->blk_type_pos]) { +intel_pt_log ("WARNING: Duplicate block type %u\n" , + decoder->blk_type); + } +} + +static void intel_pt_bip (struct intel_pt_decoder *decoder) +{ +uint32_t id = decoder->packet.count; +uint32_t bit =1 << id; +int pos = decoder->blk_type_pos; + +if (pos <0 || id >=INTEL_PT_BLK_ITEM_ID_CNT ) { +intel_pt_log ("WARNING: Unknown block item %u type %d\n" , + id, decoder->blk_type); +return ; + } + +if (decoder->state.items.mask[pos] & bit) { +intel_pt_log ("WARNING: Duplicate block item %u type %d\n" , + id, decoder->blk_type); + } + + decoder->state.items.mask[pos] |= bit; + decoder->state.items.val[pos][id] = decoder->packet.payload; +} +/* Walk PSB+ packets when already in sync. */ static int intel_pt_walk_psbend (struct intel_pt_decoder *decoder) {
@@ -2063,10 +2117,31 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)return 0 ;case INTEL_PT_BBP : +intel_pt_bbp (decoder); +break ; +case INTEL_PT_BIP : +intel_pt_bip (decoder); +break ; +case INTEL_PT_BEP : + decoder->state.type =INTEL_PT_BLK_ITEMS ; + decoder->state.from_ip = decoder->ip; + decoder->state.to_ip =0 ; +return 0 ; +case INTEL_PT_BEP_IP : -break ; + err =intel_pt_get_next_packet (decoder); +if (err) +return err; +if (decoder->packet.type ==INTEL_PT_FUP ) { + decoder->set_fup_bep = true; + no_tip = true; + }else { +intel_pt_log_at ("ERROR: Missing FUP after BEP" , + decoder->pos); + } + goto next;default :return intel_pt_bug (decoder);
@@ -2335,6 +2410,7 @@ static int intel_pt_sync_ip(struct intel_pt_decoder *decoder) decoder->set_fup_mwait = false; decoder->set_fup_pwre = false; decoder->set_fup_exstop = false; + decoder->set_fup_bep = false;if (!decoder->branch_enable) { decoder->pkt_state =INTEL_PT_STATE_IN_SYNC ;
tools/perf/util/intel-pt-decoder/intel-pt-decoder.h +137 -0
155 lines not on this page · raw message
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 6/25 perf intel-pt: Prepare to synthesize PEBS samples
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add infrastructure to prepare for synthesizing PEBS samples but leave the actual synthesis to later patches.
--- tools/perf/util/intel-pt.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tools/perf/util/intel-pt.c +18 -0
@@ -101,6 +101,9 @@ struct intel_pt {u64 pwrx_id;u64 cbr_id; +bool sample_pebs; +struct perf_evsel *pebs_evsel; +u64 tsc_bit;u64 mtc_bit;u64 mtc_freq_bits;
@@ -1535,6 +1538,11 @@ static int intel_pt_synth_pwrx_sample(struct intel_pt_queue *ptq) pt->pwr_events_sample_type); } +static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq__maybe_unused ) +{ +return 0 ; +} +static int intel_pt_synth_error (struct intel_pt *pt,int code,int cpu,pid_t pid,pid_t tid,u64 ip,u64 timestamp) {
@@ -1622,6 +1630,16 @@ static int intel_pt_sample(struct intel_pt_queue *ptq) ptq->ipc_cyc_cnt = ptq->state->tot_cyc_cnt; } +/* +* Do PEBS first to allow for the possibility that the PEBS timestamp +* precedes the current timestamp. +*/ +if (pt->sample_pebs && state->type &INTEL_PT_BLK_ITEMS ) { + err =intel_pt_synth_pebs_sample (ptq); +if (err) +return err; + } +if (pt->sample_pwr_events && (state->type &INTEL_PT_PWR_EVT )) {if (state->type &INTEL_PT_CBR_CHG ) { err =intel_pt_synth_cbr_sample (ptq);
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 7/25 perf intel-pt: Factor out common sample preparation for re-use
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Factor out common sample preparation for re-use when synthesizing PEBS samples.
--- tools/perf/util/intel-pt.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
tools/perf/util/intel-pt.c +16 -7
@@ -1182,28 +1182,37 @@ static inline bool intel_pt_skip_event(struct intel_pt *pt) pt->num_events++ < pt->synth_opts.initial_skip; } +static void intel_pt_prep_a_sample (struct intel_pt_queue *ptq, +union perf_event *event, +struct perf_sample *sample) +{ + event->sample.header.type =PERF_RECORD_SAMPLE ; + event->sample.header.size =sizeof (struct perf_event_header ); + + sample->pid = ptq->pid; + sample->tid = ptq->tid; + sample->cpu = ptq->cpu; + sample->insn_len = ptq->insn_len; +memcpy (sample->insn, ptq->insn,INTEL_PT_INSN_BUF_SZ ); +} +static void intel_pt_prep_b_sample (struct intel_pt *pt,struct intel_pt_queue *ptq,union perf_event *event,struct perf_sample *sample) { +intel_pt_prep_a_sample (ptq, event, sample); +if (!pt->timeless_decoding) sample->time =tsc_to_perf_time (ptq->timestamp, &pt->tc); sample->ip = ptq->state->from_ip; sample->cpumode =intel_pt_cpumode (pt, sample->ip); - sample->pid = ptq->pid; - sample->tid = ptq->tid; sample->addr = ptq->state->to_ip; sample->period =1 ; - sample->cpu = ptq->cpu; sample->flags = ptq->flags; - sample->insn_len = ptq->insn_len; -memcpy (sample->insn, ptq->insn,INTEL_PT_INSN_BUF_SZ ); - event->sample.header.type =PERF_RECORD_SAMPLE ; event->sample.header.misc = sample->cpumode; - event->sample.header.size =sizeof (struct perf_event_header ); } static int intel_pt_inject_event(union perf_event *event,
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 8/25 perf intel-pt: Synthesize PEBS sample basic information
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Synthesize a PEBS sample using basic information (ip, timestamp) only. Other PEBS information will be added in later patches.
--- tools/perf/util/intel-pt.c | 52 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-)
tools/perf/util/intel-pt.c +50 -2
@@ -1547,9 +1547,57 @@ static int intel_pt_synth_pwrx_sample(struct intel_pt_queue *ptq) pt->pwr_events_sample_type); } -static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq__maybe_unused ) +static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq) { -return 0 ; +const struct intel_pt_blk_items *items = &ptq->state->items; +struct perf_sample sample = { .ip =0 , }; +union perf_event *event = ptq->event_buf; +struct intel_pt *pt = ptq->pt; +struct perf_evsel *evsel = pt->pebs_evsel; +u64 sample_type = evsel->attr.sample_type; +u64 id = evsel->id[0 ]; +u8 cpumode; + +if (intel_pt_skip_event (pt)) +return 0 ; + +intel_pt_prep_a_sample (ptq, event, &sample); + + sample.id = id; + sample.stream_id = id; + +if (!evsel->attr.freq) + sample.period = evsel->attr.sample_period; + +/* No support for non-zero CS base */ +if (items->has_ip) + sample.ip = items->ip; +else if (items->has_rip) + sample.ip = items->rip; +else + sample.ip = ptq->state->from_ip; + +/* No support for guest mode at this time */ + cpumode = sample.ip < ptq->pt->kernel_start ? +PERF_RECORD_MISC_USER : +PERF_RECORD_MISC_KERNEL ; + + event->sample.header.misc = cpumode |PERF_RECORD_MISC_EXACT_IP ; + + sample.cpumode = cpumode; + +if (sample_type &PERF_SAMPLE_TIME ) { +u64 timestamp =0 ; + +if (items->has_timestamp) + timestamp = items->timestamp; +else if (!pt->timeless_decoding) + timestamp = ptq->timestamp; +if (timestamp) + sample.time =tsc_to_perf_time (timestamp, &pt->tc); + } + +return intel_pt_deliver_synth_event (pt, ptq, event, &sample, sample_type); } static int intel_pt_synth_error(struct intel_pt *pt, int code, int cpu,
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 9/25 perf intel-pt: Add gp registers to synthesized PEBS sample
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add general purpose register information from PEBS data in the Intel PT trace to the synthesized PEBS sample.
--- tools/perf/util/intel-pt.c | 69 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+)
tools/perf/util/intel-pt.c +69 -0
@@ -35,6 +35,8 @@#include "config.h" #include "time-utils.h" +#include "../arch/x86/include/uapi/asm/perf_regs.h" +#include "intel-pt-decoder/intel-pt-log.h" #include "intel-pt-decoder/intel-pt-decoder.h" #include "intel-pt-decoder/intel-pt-insn-decoder.h"
@@ -1547,6 +1549,60 @@ static int intel_pt_synth_pwrx_sample(struct intel_pt_queue *ptq) pt->pwr_events_sample_type); } +/* +* PEBS gp_regs array indexes plus 1 so that 0 means not present. Refer +* intel_pt_add_gp_regs(). +*/ +static const int pebs_gp_regs[] = { + [PERF_REG_X86_FLAGS ] =1 , + [PERF_REG_X86_IP ] =2 , + [PERF_REG_X86_AX ] =3 , + [PERF_REG_X86_CX ] =4 , + [PERF_REG_X86_DX ] =5 , + [PERF_REG_X86_BX ] =6 , + [PERF_REG_X86_SP ] =7 , + [PERF_REG_X86_BP ] =8 , + [PERF_REG_X86_SI ] =9 , + [PERF_REG_X86_DI ] =10 , + [PERF_REG_X86_R8 ] =11 , + [PERF_REG_X86_R9 ] =12 , + [PERF_REG_X86_R10 ] =13 , + [PERF_REG_X86_R11 ] =14 , + [PERF_REG_X86_R12 ] =15 , + [PERF_REG_X86_R13 ] =16 , + [PERF_REG_X86_R14 ] =17 , + [PERF_REG_X86_R15 ] =18 , +}; + +static u64 *intel_pt_add_gp_regs (struct regs_dump *intr_regs,u64 *pos, +const struct intel_pt_blk_items *items, +u64 regs_mask) +{ +const u64 *gp_regs = items->val[INTEL_PT_GP_REGS_POS ]; +u32 mask = items->mask[INTEL_PT_GP_REGS_POS ]; +u32 bit; +int i; + +for (i =0 , bit =1 ; i <PERF_REG_X86_64_MAX ; i++, bit <<=1 ) { +/* Get the PEBS gp_regs array index */ +int n = pebs_gp_regs[i] -1 ; + +if (n <0 ) +continue ; +/* +* Add only registers that were requested (i.e. 'regs_mask') and +* that were provided (i.e. 'mask'), and update the resulting +* mask (i.e. 'intr_regs->mask') accordingly. +*/ +if (mask &1 << n && regs_mask & bit) { + intr_regs->mask |= bit; + *pos++ = gp_regs[n]; + } + } + +return pos; +} +static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq) {const struct intel_pt_blk_items *items = &ptq->state->items;
@@ -1597,6 +1653,19 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq) sample.time =tsc_to_perf_time (timestamp, &pt->tc); } +if (sample_type &PERF_SAMPLE_REGS_INTR && + items->mask[INTEL_PT_GP_REGS_POS ]) { +u64 regs[sizeof (sample.intr_regs.mask)]; +u64 regs_mask = evsel->attr.sample_regs_intr; + + sample.intr_regs.abi = items->is_32_bit ? +PERF_SAMPLE_REGS_ABI_32 : +PERF_SAMPLE_REGS_ABI_64 ; + sample.intr_regs.regs = regs; + +intel_pt_add_gp_regs (&sample.intr_regs, regs, items, regs_mask); + } +return intel_pt_deliver_synth_event (pt, ptq, event, &sample, sample_type); }
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 10/25 perf intel-pt: Add XMM registers to synthesized PEBS sample
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add XMM register information from PEBS data in the Intel PT trace to the synthesized PEBS sample.
--- tools/perf/util/intel-pt.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
tools/perf/util/intel-pt.c +29 -1
@@ -1603,6 +1603,31 @@ static u64 *intel_pt_add_gp_regs(struct regs_dump *intr_regs, u64 *pos,return pos; } +#ifndef PERF_REG_X86_XMM0 +#define PERF_REG_X86_XMM0 32 +#endif + +static void intel_pt_add_xmm (struct regs_dump *intr_regs,u64 *pos, +const struct intel_pt_blk_items *items, +u64 regs_mask) +{ +u32 mask = items->has_xmm & (regs_mask >>PERF_REG_X86_XMM0 ); +const u64 *xmm = items->xmm; + +/* +* If there are any XMM registers, then there should be all of them. +* Nevertheless, follow the logic to add only registers that were +* requested (i.e. 'regs_mask') and that were provided (i.e. 'mask'), +* and update the resulting mask (i.e. 'intr_regs->mask') accordingly. +*/ + intr_regs->mask |= (u64 )mask <<PERF_REG_X86_XMM0 ; + +for (; mask; mask >>=1 , xmm++) { +if (mask &1 ) + *pos++ = *xmm; + } +} +static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq) {const struct intel_pt_blk_items *items = &ptq->state->items;
@@ -1657,13 +1682,16 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq) items->mask[INTEL_PT_GP_REGS_POS]) {u64 regs[sizeof (sample.intr_regs.mask)];u64 regs_mask = evsel->attr.sample_regs_intr; +u64 *pos; sample.intr_regs.abi = items->is_32_bit ?PERF_SAMPLE_REGS_ABI_32 :PERF_SAMPLE_REGS_ABI_64 ; sample.intr_regs.regs = regs; -intel_pt_add_gp_regs (&sample.intr_regs, regs, items, regs_mask); + pos =intel_pt_add_gp_regs (&sample.intr_regs, regs, items, regs_mask); + +intel_pt_add_xmm (&sample.intr_regs, pos, items, regs_mask); }return intel_pt_deliver_synth_event (pt, ptq, event, &sample, sample_type);
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 11/25 perf intel-pt: Add LBR information to synthesized PEBS sample
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add LBR information from PEBS data in the Intel PT trace to the synthesized PEBS sample.
--- tools/perf/util/intel-pt.c | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+)
tools/perf/util/intel-pt.c +72 -0
@@ -1628,6 +1628,58 @@ static void intel_pt_add_xmm(struct regs_dump *intr_regs, u64 *pos, } } +#define LBR_INFO_MISPRED (1ULL << 63) +#define LBR_INFO_IN_TX (1ULL << 62) +#define LBR_INFO_ABORT (1ULL << 61) +#define LBR_INFO_CYCLES 0xffff + +/* Refer kernel's intel_pmu_store_pebs_lbrs() */ +static u64 intel_pt_lbr_flags (u64 info) +{ +union { +struct branch_flags flags; +u64 result; + } u = { + .flags = { + .mispred = !!(info &LBR_INFO_MISPRED ), + .predicted = !(info &LBR_INFO_MISPRED ), + .in_tx = !!(info &LBR_INFO_IN_TX ), + .abort = !!(info &LBR_INFO_ABORT ), + .cycles = info &LBR_INFO_CYCLES , + } + }; + +return u.result; +} + +static void intel_pt_add_lbrs (struct branch_stack *br_stack, +const struct intel_pt_blk_items *items) +{ +u64 *to; +int i; + + br_stack->nr =0 ; + + to = &br_stack->entries[0 ].from; + +for (i =INTEL_PT_LBR_0_POS ; i <=INTEL_PT_LBR_2_POS ; i++) { +u32 mask = items->mask[i]; +const u64 *from = items->val[i]; + +for (; mask; mask >>=3 , from +=3 ) { +if ((mask &7 ) ==7 ) { + *to++ = from[0 ]; + *to++ = from[1 ]; + *to++ =intel_pt_lbr_flags (from[2 ]); + br_stack->nr +=1 ; + } + } + } +} + +/* INTEL_PT_LBR_0, INTEL_PT_LBR_1 and INTEL_PT_LBR_2 */ +#define LBRS_MAX (INTEL_PT_BLK_ITEM_ID_CNT * 3) +static int intel_pt_synth_pebs_sample (struct intel_pt_queue *ptq) {const struct intel_pt_blk_items *items = &ptq->state->items;
@@ -1694,6 +1746,26 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq)intel_pt_add_xmm (&sample.intr_regs, pos, items, regs_mask); } +if (sample_type &PERF_SAMPLE_BRANCH_STACK ) { +struct { +struct branch_stack br_stack; +struct branch_entry entries[LBRS_MAX ]; + } br; + +if (items->mask[INTEL_PT_LBR_0_POS ] || + items->mask[INTEL_PT_LBR_1_POS ] || + items->mask[INTEL_PT_LBR_2_POS ]) { +intel_pt_add_lbrs (&br.br_stack, items); + sample.branch_stack = &br.br_stack; + }else if (pt->synth_opts.last_branch) { +intel_pt_copy_last_branch_rb (ptq); + sample.branch_stack = ptq->last_branch; + }else { + br.br_stack.nr =0 ; + sample.branch_stack = &br.br_stack; + } + } +return intel_pt_deliver_synth_event (pt, ptq, event, &sample, sample_type); }
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 12/25 perf intel-pt: Add memory information to synthesized PEBS sample
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add memory information from PEBS data in the Intel PT trace to the synthesized PEBS sample. This provides sample types PERF_SAMPLE_ADDR, PERF_SAMPLE_WEIGHT, and PERF_SAMPLE_TRANSACTION, but not PERF_SAMPLE_DATA_SRC.
--- tools/perf/util/intel-pt.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
tools/perf/util/intel-pt.c +27 -0
@@ -1766,6 +1766,33 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq) } } +if (sample_type &PERF_SAMPLE_ADDR && items->has_mem_access_address) + sample.addr = items->mem_access_address; + +if (sample_type &PERF_SAMPLE_WEIGHT ) { +/* +* Refer kernel's setup_pebs_adaptive_sample_data() and +* intel_hsw_weight(). +*/ +if (items->has_mem_access_latency) + sample.weight = items->mem_access_latency; +if (!sample.weight && items->has_tsx_aux_info) { +/* Cycles last block */ + sample.weight = (u32 )items->tsx_aux_info; + } + } + +if (sample_type &PERF_SAMPLE_TRANSACTION && items->has_tsx_aux_info) { +u64 ax = items->has_rax ? items->rax :0 ; +/* Refer kernel's intel_hsw_transaction() */ +u64 txn = (u8)(items->tsx_aux_info >>32 ); + +/* For RTM XABORTs also log the abort code from AX */ +if (txn &PERF_TXN_TRANSACTION && ax &1 ) + txn |= ((ax >>24 ) &0xff ) <<PERF_TXN_ABORT_SHIFT ; + sample.transaction = txn; + } +return intel_pt_deliver_synth_event (pt, ptq, event, &sample, sample_type); }
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 13/25 perf intel-pt: Add callchain to synthesized PEBS sample
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Like other synthesized events, if there is also an Intel PT branch trace, then a call stack can also be synthesized. Add that.
--- tools/perf/util/intel-pt.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/util/intel-pt.c +8 -0
@@ -1730,6 +1730,14 @@ static int intel_pt_synth_pebs_sample(struct intel_pt_queue *ptq) sample.time =tsc_to_perf_time (timestamp, &pt->tc); } +if (sample_type &PERF_SAMPLE_CALLCHAIN && + pt->synth_opts.callchain) { +thread_stack__sample (ptq->thread, ptq->cpu, ptq->chain, + pt->synth_opts.callchain_sz, sample.ip, + pt->kernel_start); + sample.callchain = ptq->chain; + } +if (sample_type &PERF_SAMPLE_REGS_INTR && items->mask[INTEL_PT_GP_REGS_POS ]) {u64 regs[sizeof (sample.intr_regs.mask)];
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 14/25 tools build: Check if gettid() is available before providing helper
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Laura reported that the perf build failed in fedora when we got a glibc that provides gettid(), which I reproduced using fedora rawhide with the glibc-devel-2.29.9000-26.fc31.x86_64 package.
Add a feature check to avoid providing a gettid() helper in such systems.
On a fedora rawhide system with this patch applied we now get:
[root@7a5f55352234 perf]# grep gettid /tmp/build/perf/FEATURE-DUMP feature-gettid=1
[root@7a5f55352234 perf]# cat /tmp/build/perf/feature/test-gettid.make.output [root@7a5f55352234 perf]# ldd /tmp/build/perf/feature/test-gettid.bin
linux-vdso.so.1 (0x00007ffc6b1f6000)
libc.so.6 => /lib64/libc.so.6 (0x00007f04e0a74000)
/lib64/ld-linux-x86-64.so.2 (0x00007f04e0c47000)
[root@7a5f55352234 perf]# nm /tmp/build/perf/feature/test-gettid.bin | grep -w gettid
U gettid@@GLIBC_2.30[root@7a5f55352234 perf]#
While on a fedora:29 system:
[acme@quaco perf]$ grep gettid /tmp/build/perf/FEATURE-DUMP
feature-gettid=0
[acme@quaco perf]$ cat /tmp/build/perf/feature/test-gettid.make.output
test-gettid.c: In function ‘main’:
test-gettid.c:8:9: error: implicit declaration of function ‘gettid’; did you mean ‘getgid’? [-Werror=implicit-function-declaration]
return gettid();
^~~~~~
getgid cc1: all warnings being treated as errors
[acme@quaco perf]$
--- tools/build/Makefile.feature | 1 + tools/build/feature/Makefile | 4 ++++ tools/build/feature/test-all.c | 5 +++++ tools/build/feature/test-gettid.c | 11 +++++++++++ tools/perf/Makefile.config | 4 ++++ tools/perf/jvmti/jvmti_agent.c | 2 ++ 6 files changed, 27 insertions(+) create mode 100644 tools/build/feature/test-gettid.c
tools/build/Makefile.feature +1 -0
@@ -36,6 +36,7 @@ FEATURE_TESTS_BASIC := \ fortify-source \ sync-compare-and-swap \ get_current_dir_name \ + gettid \ glibc \ gtk2 \ gtk2-infobar \
tools/build/feature/Makefile +4 -0
@@ -54,6 +54,7 @@ FILES= \ test-get_cpuid.bin \ test-sdt.bin \ test-cxx.bin \ + test-gettid.bin \ test-jvmti.bin \ test-jvmti-cmlr.bin \ test-sched_getcpu.bin \
@@ -267,6 +268,9 @@ $(OUTPUT)test-sdt.bin: $(OUTPUT)test-cxx.bin: $(BUILDXX) -std=gnu++11 +$(OUTPUT)test-gettid.bin: + $(BUILD) + $(OUTPUT)test-jvmti.bin: $(BUILD)
tools/build/feature/test-all.c +5 -0
@@ -38,6 +38,10 @@# include "test-get_current_dir_name.c" #undef main +#define main main_test_gettid +# include "test-gettid.c" +#undef main +#define main main_test_glibc# include "test-glibc.c" #undef main
@@ -195,6 +199,7 @@ int main(int argc, char *argv[])main_test_libelf ();main_test_libelf_mmap ();main_test_get_current_dir_name (); +main_test_gettid ();main_test_glibc ();main_test_dwarf ();main_test_dwarf_getlocations ();
tools/build/feature/test-gettid.c new file +11 -0
@@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019, Red Hat Inc, Arnaldo Carvalho de Melo <[email protected]> +#define _GNU_SOURCE +#include <unistd.h> + +int main (void ) +{ +return gettid (); +} + +#undef _GNU_SOURCE
tools/perf/Makefile.config +4 -0
@@ -332,6 +332,10 @@ ifeq ($(feature-get_current_dir_name), 1) CFLAGS += -DHAVE_GET_CURRENT_DIR_NAME endif +ifeq ($(feature-gettid), 1) + CFLAGS += -DHAVE_GETTID +endif + ifdef NO_LIBELF NO_DWARF := 1 NO_DEMANGLE := 1
tools/perf/jvmti/jvmti_agent.c +2 -0
@@ -45,10 +45,12 @@static char jit_path[PATH_MAX ];static void *marker_addr; +#ifndef HAVE_GETTID static inline pid_t gettid (void ) {return (pid_t )syscall (__NR_gettid); } +#endif static int get_e_machine (struct jitheader *hdr) {
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 15/25 perf trace: Fix exclusion of not available syscall names from selector list
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We were just skipping the syscalls not available in a particular architecture without reflecting this in the number of entries in the ev_qualifier_ids.nr variable, fix it.
This was done with the most minimalistic way, reusing the index variable 'i', a followup patch will further clean this by making 'i' renamed to 'nr_used' and using 'nr_allocated' in a few more places.
--- tools/perf/builtin-trace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/builtin-trace.c +4 -4
@@ -1527,9 +1527,9 @@ static int trace__read_syscall_info(struct trace *trace, int id)static int trace__validate_ev_qualifier (struct trace *trace) { -int err =0 , i; +int err =0 ;bool printed_invalid_prefix = false; -size_t nr_allocated; +size_t nr_allocated, i;struct str_node *pos; trace->ev_qualifier_ids.nr =strlist__nr_entries (trace->ev_qualifier);
@@ -1574,7 +1574,7 @@ static int trace__validate_ev_qualifier(struct trace *trace) id =syscalltbl__strglobmatch_next (trace->sctbl, sc, &match_next);if (id <0 )break ; -if (nr_allocated == trace->ev_qualifier_ids.nr) { +if (nr_allocated == i) {void *entries; nr_allocated +=8 ;
@@ -1587,11 +1587,11 @@ static int trace__validate_ev_qualifier(struct trace *trace) } trace->ev_qualifier_ids.entries = entries; } - trace->ev_qualifier_ids.nr++; trace->ev_qualifier_ids.entries[i++] = id; } } + trace->ev_qualifier_ids.nr = i; out:if (printed_invalid_prefix)pr_debug ("\n" );
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 16/25 perf trace: Streamline validation of select syscall names list
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Rename the 'i' variable to 'nr_used' and use set 'nr_allocated' since the start of this function, leaving the final assignment of the longer named trace->ev_qualifier_ids.nr state to 'nr_used' at the end of the function.
No change in behaviour intended.
--- tools/perf/builtin-trace.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
tools/perf/builtin-trace.c +6 -10
@@ -1529,11 +1529,10 @@ static int trace__validate_ev_qualifier(struct trace *trace) {int err =0 ;bool printed_invalid_prefix = false; -size_t nr_allocated, i;struct str_node *pos; +size_t nr_used =0 , nr_allocated =strlist__nr_entries (trace->ev_qualifier); - trace->ev_qualifier_ids.nr =strlist__nr_entries (trace->ev_qualifier); - trace->ev_qualifier_ids.entries =malloc (trace->ev_qualifier_ids.nr * + trace->ev_qualifier_ids.entries =malloc (nr_allocated *sizeof (trace->ev_qualifier_ids.entries[0 ]));if (trace->ev_qualifier_ids.entries ==NULL ) {
@@ -1543,9 +1542,6 @@ static int trace__validate_ev_qualifier(struct trace *trace) goto out; } - nr_allocated = trace->ev_qualifier_ids.nr; - i =0 ; -strlist__for_each_entry (pos, trace->ev_qualifier) {const char *sc = pos->s;int id =syscalltbl__id (trace->sctbl, sc), match_next =-1 ;
@@ -1566,7 +1562,7 @@ static int trace__validate_ev_qualifier(struct trace *trace)continue ; } matches: - trace->ev_qualifier_ids.entries[i++] = id; + trace->ev_qualifier_ids.entries[nr_used++] = id;if (match_next ==-1 )continue ;
@@ -1574,7 +1570,7 @@ static int trace__validate_ev_qualifier(struct trace *trace) id =syscalltbl__strglobmatch_next (trace->sctbl, sc, &match_next);if (id <0 )break ; -if (nr_allocated == i) { +if (nr_allocated == nr_used) {void *entries; nr_allocated +=8 ;
@@ -1587,11 +1583,11 @@ static int trace__validate_ev_qualifier(struct trace *trace) } trace->ev_qualifier_ids.entries = entries; } - trace->ev_qualifier_ids.entries[i++] = id; + trace->ev_qualifier_ids.entries[nr_used++] = id; } } - trace->ev_qualifier_ids.nr = i; + trace->ev_qualifier_ids.nr = nr_used; out:if (printed_invalid_prefix)pr_debug ("\n" );
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 17/25 tools build feature tests: Add missing SPDX headers
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
--- tools/build/feature/test-fortify-source.c | 1 + tools/build/feature/test-hello.c | 1 + tools/build/feature/test-setns.c | 1 + 3 files changed, 3 insertions(+)
tools/build/feature/test-fortify-source.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> int main (void )
tools/build/feature/test-hello.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <stdio.h> int main (void )
tools/build/feature/test-setns.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #define _GNU_SOURCE#include <sched.h>
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 18/25 perf tests: Add missing SPDX headers
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/tests/Build | 2 ++ tools/perf/tests/bp_account.c | 1 + tools/perf/tests/bpf-script-example.c | 1 + tools/perf/tests/bpf-script-test-kbuild.c | 1 + tools/perf/tests/bpf-script-test-prologue.c | 1 + tools/perf/tests/bpf-script-test-relocation.c | 1 + tools/perf/tests/bpf.c | 1 + tools/perf/tests/map_groups.c | 1 + tools/perf/tests/mem.c | 1 + tools/perf/tests/mem2node.c | 1 + tools/perf/tests/shell/lib/probe.sh | 1 + tools/perf/tests/shell/probe_vfs_getname.sh | 3 ++- tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 1 + tools/perf/tests/shell/record+script_probe_vfs_getname.sh | 1 + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 ++ tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 + 16 files changed, 19 insertions(+), 1 deletion(-)
tools/perf/tests/Build +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + perf-y += builtin-test.o perf-y += parse-events.o perf-y += dso-data.o
tools/perf/tests/bp_account.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Powerpc needs __SANE_USERSPACE_TYPES__ before <linux/types.h> to select * 'int-ll64.h' and avoid compile warnings when printing __u64 with %llu.
tools/perf/tests/bpf-script-example.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * bpf-script-example.c * Test basic LLVM building
tools/perf/tests/bpf-script-test-kbuild.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * bpf-script-test-kbuild.c * Test include from kernel header
tools/perf/tests/bpf-script-test-prologue.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * bpf-script-test-prologue.c * Test BPF prologue
tools/perf/tests/bpf-script-test-relocation.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * bpf-script-test-relocation.c * Test BPF loader checking relocation
tools/perf/tests/bpf.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <errno.h> #include <stdio.h> #include <sys/epoll.h>
tools/perf/tests/map_groups.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <linux/kernel.h> #include "tests.h"
tools/perf/tests/mem.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include "util/mem-events.h" #include "util/symbol.h" #include "linux/perf_event.h"
tools/perf/tests/mem2node.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <linux/bitmap.h> #include "cpumap.h"
tools/perf/tests/shell/lib/probe.sh +1 -0
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # Arnaldo Carvalho de Melo <[email protected]>, 2017 skip_if_no_perf_probe() {
tools/perf/tests/shell/probe_vfs_getname.sh +2 -1
@@ -1,6 +1,7 @@ #!/bin/sh # Add vfs_getname probe to get syscall args filenames -# + +# SPDX-License-Identifier: GPL-2.0 # Arnaldo Carvalho de Melo <[email protected]>, 2017 . $(dirname $0)/lib/probe.sh
tools/perf/tests/shell/record+probe_libc_inet_pton.sh +1 -0
@@ -7,6 +7,7 @@ # This needs no debuginfo package, all is done using the libc ELF symtab # and the CFI info in the binaries. +# SPDX-License-Identifier: GPL-2.0 # Arnaldo Carvalho de Melo <[email protected]>, 2017 . $(dirname $0)/lib/probe.sh
tools/perf/tests/shell/record+script_probe_vfs_getname.sh +1 -0
@@ -6,6 +6,7 @@ # checks that that was captured by the vfs_getname probe in the generated # perf.data file, with the temp file name as the pathname argument. +# SPDX-License-Identifier: GPL-2.0 # Arnaldo Carvalho de Melo <[email protected]>, 2017 . $(dirname $0)/lib/probe.sh
tools/perf/tests/shell/record+zstd_comp_decomp.sh +2 -0
@@ -1,6 +1,8 @@ #!/bin/sh # Zstd perf.data compression/decompression +# SPDX-License-Identifier: GPL-2.0 + trace_file=$(mktemp /tmp/perf.data.XXX) perf_tool=perf
tools/perf/tests/shell/trace+probe_vfs_getname.sh +1 -0
@@ -7,6 +7,7 @@ # that already handles "probe:vfs_getname" if present, and used in the # "open" syscall "filename" argument beautifier. +# SPDX-License-Identifier: GPL-2.0 # Arnaldo Carvalho de Melo <[email protected]>, 2017 . $(dirname $0)/lib/probe.sh
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 19/25 perf pmu: Fix uncore PMU alias list for ARM64
In reply to Arnaldo Carvalho de MeloFrom: John Garry <[email protected]>
In commit 292c34c10249 ("perf pmu: Fix core PMU alias list for X86 platform"), we fixed the issue of CPU events being aliased to uncore events.
Fix this same issue for ARM64, since the said commit left the (broken) behaviour untouched for ARM64.
--- tools/perf/util/pmu.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
tools/perf/util/pmu.c +12 -16
@@ -709,9 +709,7 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu) {int i;struct pmu_events_map *map; -struct pmu_event *pe;const char *name = pmu->name; -const char *pname; map =perf_pmu__find_map (pmu);if (!map)
@@ -722,28 +720,26 @@ static void pmu_add_cpu_aliases(struct list_head *head, struct perf_pmu *pmu)*/ i =0 ;while (1 ) { +const char *cpu_name =is_arm_pmu_core (name) ? name :"cpu" ; +struct pmu_event *pe = &map->table[i++]; +const char *pname = pe->pmu ? pe->pmu : cpu_name; - pe = &map->table[i++];if (!pe->name) {if (pe->metric_group || pe->metric_name)continue ;break ; } -if (!is_arm_pmu_core (name)) { - pname = pe->pmu ? pe->pmu :"cpu" ; - -/* -* uncore alias may be from different PMU -* with common prefix -*/ -if (pmu_is_uncore (name) && - !strncmp (pname, name,strlen (pname))) - goto new_alias; +/* +* uncore alias may be from different PMU +* with common prefix +*/ +if (pmu_is_uncore (name) && + !strncmp (pname, name,strlen (pname))) + goto new_alias; -if (strcmp (pname, name)) -continue ; - } +if (strcmp (pname, name)) +continue ; new_alias:/* need type casts to override 'const' */
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 20/25 perf trace: Fixup pointer arithmetic when consuming augmented syscall args
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We can't just add the consumed bytes to the arg->augmented.args member, as it is not void *, so it will access (consumed * sizeof(struct augmented_arg)) in the next augmented arg, totally wrong, cast the member to void pointe before adding the number of bytes consumed, duh.
With this and hardcoding handling the 'renameat' and 'renameat2' syscalls in the tools/perf/examples/bpf/augmented_raw_syscalls.c eBPF proggie, we get:
mv/24388 renameat2(AT_FDCWD, "/tmp/build/perf/util/.bpf-event.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.bpf-event.o.cmd", RENAME_NOREPLACE) = 0 mv/24394 renameat2(AT_FDCWD, "/tmp/build/perf/util/.perf-hooks.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.perf-hooks.o.cmd", RENAME_NOREPLACE) = 0 mv/24398 renameat2(AT_FDCWD, "/tmp/build/perf/util/.pmu-bison.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.pmu-bison.o.cmd", RENAME_NOREPLACE) = 0 mv/24401 renameat2(AT_FDCWD, "/tmp/build/perf/util/.expr-bison.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.expr-bison.o.cmd", RENAME_NOREPLACE) = 0 mv/24406 renameat2(AT_FDCWD, "/tmp/build/perf/util/.pmu.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.pmu.o.cmd", RENAME_NOREPLACE) = 0 mv/24407 renameat2(AT_FDCWD, "/tmp/build/perf/util/.pmu-flex.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.pmu-flex.o.cmd", RENAME_NOREPLACE) = 0 mv/24416 renameat2(AT_FDCWD, "/tmp/build/perf/util/.parse-events-flex.o.tmp", AT_FDCWD, "/tmp/build/perf/util/.parse-events-flex.o.cmd", RENAME_NOREPLACE) = 0
I.e. it works with two string args in the same syscall.
Now back to taming the verifier...
--- tools/perf/builtin-trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-trace.c +1 -1
@@ -1239,7 +1239,7 @@ static size_t syscall_arg__scnprintf_augmented_string(struct syscall_arg *arg, c*/ int consumed =sizeof (*augmented_arg) + augmented_arg->size; - arg->augmented.args += consumed; + arg->augmented.args = ((void *)arg->augmented.args) + consumed; arg->augmented.size -= consumed;return printed;
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 21/25 perf evsel: Make perf_evsel__name() accept a NULL argument
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
In which case it simply returns "unknown", like when it can't figure out the evsel->name value.
This makes this code more robust and fixes a problem in 'perf trace' where a NULL evsel was being passed to a routine that only used the evsel for printing its name when a invalid syscall id was passed.
--- tools/perf/util/evsel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/util/evsel.c +7 -1
@@ -589,6 +589,9 @@ const char *perf_evsel__name(struct perf_evsel *evsel) {char bf[128 ]; +if (!evsel) + goto out_unknown; +if (evsel->name)return evsel->name;
@@ -628,7 +631,10 @@ const char *perf_evsel__name(struct perf_evsel *evsel) evsel->name =strdup (bf); -return evsel->name ?:"unknown" ; +if (evsel->name) +return evsel->name; +out_unknown: +return "unknown" ; }const char *perf_evsel__group_name (struct perf_evsel *evsel)
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 22/25 perf tools: Don't hardcode host include path for libslang
In reply to Arnaldo Carvalho de MeloFrom: Florian Fainelli <[email protected]>
Hardcoding /usr/include/slang is fundamentally incompatible with cross compilation and will lead to the inability for a cross-compiled environment to properly detect whether slang is available or not.
If /usr/include/slang is necessary that is a distribution specific knowledge that could be solved with either a standard pkg-config .pc file (which slang has) or simply overriding CFLAGS accordingly, but the default perf Makefile should be clean of all of that.
--- tools/build/feature/Makefile | 2 +- tools/perf/Makefile.config | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
tools/build/feature/Makefile +1 -1
@@ -182,7 +182,7 @@ $(OUTPUT)test-libaudit.bin: $(BUILD) -laudit $(OUTPUT)test-libslang.bin: - $(BUILD) -I/usr/include/slang -lslang + $(BUILD) -lslang $(OUTPUT)test-libcrypto.bin: $(BUILD) -lcrypto
tools/perf/Makefile.config +0 -1
@@ -648,7 +648,6 @@ ifndef NO_SLANG NO_SLANG := 1 else # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h - CFLAGS += -I/usr/include/slang CFLAGS += -DHAVE_SLANG_SUPPORT EXTLIBS += -lslang $(call detected,CONFIG_SLANG)
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 23/25 tools build: Add test to check if slang.h is in /usr/include/slang/
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
A few odd old distros (rhel5, 6, yeah, lots of those out in use, in many cases we want to use upstream perf on it) have the slang header files in /usr/include/slang/, so add a test that will be performed only when test-all.c (the one with the most common sane settings) fails, either because we're in one of these odd distros with slang/slang.h or because something else failed (say libelf is not present).
So for the common case nothing changes, no additional test is performed.
Next step is to check in perf the result of these tests.
--- tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 4 ++++ tools/build/feature/test-libslang-include-subdir.c | 7 +++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 tools/build/feature/test-libslang-include-subdir.c
tools/build/Makefile.feature +1 -1
@@ -53,6 +53,7 @@ FEATURE_TESTS_BASIC := \ libpython \ libpython-version \ libslang \ + libslang-include-subdir \ libcrypto \ libunwind \ pthread-attr-setaffinity-np \
@@ -114,7 +115,6 @@ FEATURE_DISPLAY ?= \ numa_num_possible_cpus \ libperl \ libpython \ - libslang \ libcrypto \ libunwind \ libdw-dwarf-unwind \
tools/build/feature/Makefile +4 -0
@@ -31,6 +31,7 @@ FILES= \ test-libpython.bin \ test-libpython-version.bin \ test-libslang.bin \ + test-libslang-include-subdir.bin \ test-libcrypto.bin \ test-libunwind.bin \ test-libunwind-debug-frame.bin \
@@ -184,6 +185,9 @@ $(OUTPUT)test-libaudit.bin: $(OUTPUT)test-libslang.bin: $(BUILD) -lslang +$(OUTPUT)test-libslang-include-subdir.bin: + $(BUILD) -lslang + $(OUTPUT)test-libcrypto.bin: $(BUILD) -lcrypto
tools/build/feature/test-libslang-include-subdir.c new file +7 -0
@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <slang/slang.h> + +int main (void ) +{ +return SLsmg_init_smg (); +}
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 24/25 perf build: Handle slang being in /usr/include and in /usr/include/slang/
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
In some distros slang.h may be in a /usr/include 'slang' subdir, so use the if slang is not explicitely disabled (by using NO_SLANG=1) and its feature test for the common case (having /usr/include/slang.h) failed, use the results for the test that checks if it is in slang/slang.h.
Change the only file in perf that includes slang.h to use HAVE_SLANG_INCLUDE_SUBDIR and forget about this for good.
On a rhel6 system now we have:
$ /tmp/build/perf/perf -vv | grep slang
libslang: [ on ] # HAVE_SLANG_SUPPORT
$ ldd /tmp/build/perf/perf | grep libslang
libslang.so.2 => /usr/lib64/libslang.so.2 (0x00007fa2d5a8d000)
$ grep slang /tmp/build/perf/FEATURE-DUMP
feature-libslang=0
feature-libslang-include-subdir=1
$ cat /etc/redhat-release
CentOS release 6.10 (Final)
$While on fedora:29:
$ /tmp/build/perf/perf -vv | grep slang
libslang: [ on ] # HAVE_SLANG_SUPPORT
$ ldd /tmp/build/perf/perf | grep slang
libslang.so.2 => /lib64/libslang.so.2 (0x00007f8eb11a7000)
$ grep slang /tmp/build/perf/FEATURE-DUMP
feature-libslang=1
feature-libslang-include-subdir=1
$
$ cat /etc/fedora-release
Fedora release 29 (Twenty Nine)
$The feature-libslang-include-subdir=1 line is because the 'gettid()' test was added to test-all.c as the new glibc has an implementation for that, so we soon should have it not failing, i.e. should be the common case soon. Perhaps I should move it out till it becomes the norm...
--- tools/perf/Makefile.config | 11 ++++++++--- tools/perf/ui/libslang.h | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-)
tools/perf/Makefile.config +8 -3
@@ -644,9 +644,14 @@ endif ifndef NO_SLANG ifneq ($(feature-libslang), 1) - msg := $(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev); - NO_SLANG := 1 - else + ifneq ($(feature-libslang-include-subdir), 1) + msg := $(warning slang not found, disables TUI support. Please install slang-devel, libslang-dev or libslang2-dev); + NO_SLANG := 1 + else + CFLAGS += -DHAVE_SLANG_INCLUDE_SUBDIR + endif + endif + ifndef NO_SLANG # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h CFLAGS += -DHAVE_SLANG_SUPPORT EXTLIBS += -lslang
tools/perf/ui/libslang.h +5 -0
@@ -10,7 +10,12 @@#ifndef HAVE_LONG_LONG #define HAVE_LONG_LONG __GLIBC_HAVE_LONG_LONG#endif + +#ifdef HAVE_SLANG_INCLUDE_SUBDIR +#include <slang/slang.h> +#else #include <slang.h> +#endif #if SLANG_VERSION <20104 #define slsmg_printf(msg, args...) \
Signature · 1 line
2.20.1
Arnaldo Carvalho de Melo
maintainerPATCH 25/25 tools build: Fix the zstd test in the test-all.c common case feature test
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We were renanimg 'main' to 'main_zstd' but then using 'main_libzstd();' in the main() for test-all.c, causing this:
$ cat /tmp/build/perf/feature/test-all.make.output
test-all.c: In function ‘main’:
test-all.c:236:2: error: implicit declaration of function ‘main_test_libzstd’; did you mean ‘main_test_zstd’? [-Werror=implicit-function-declaration]
main_test_libzstd();
^~~~~~~~~~~~~~~~~
main_test_zstd
cc1: all warnings being treated as errors
$I.e. what was supposed to be the fast path feature test was _always_ failing, duh, fix it.
--- tools/build/feature/test-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/build/feature/test-all.c +1 -1
@@ -186,7 +186,7 @@# include "test-disassembler-four-args.c" #undef main -#define main main_test_zstd +#define main main_test_libzstd# include "test-libzstd.c" #undef main
Signature · 1 line
2.20.1
Quoted 155 lines · Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling,
Best regards,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit
3ce5aceb5dee298b082adfa2baa0df5a447c1b0b:Merge tag 'perf-core-for-mingo-5.3-20190611' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/core (2019-06-17 20:48:14 +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.3-20190621for you to fetch changes up to
3469fa84c1631face938efc42b3f488a2c2504e0:tools build: Fix the zstd test in the
test-all.ccommon case feature test (2019-06-18 18:44:24 -0300)----------------------------------------------------------------
perf/core improvements and fixes:perf trace:
Arnaldo Carvalho de Melo:
- Fix exclusion of not available syscall names from selector list.
- Fixup pointer arithmetic when consuming augmented syscall args.
Intel PT:
Adrian Hunter:
- Add support for decoding PEBS via PT packets. See:
https://software.intel.com/en-us/articles/intel-sdm
May 2019 version: Vol. 3B 18.5.5.2 PEBS output to Intel® Processor Tracefor more details about it.
ARM64:
John Garry:
- Fix uncore PMU alias list for ARM64
Raphael Gault:
- Compile tests unconditionally.
cs-etm:
Mathieu Poirier:
- Optimize option setup for CPU-wide sessions.
build:
Florian Fainelli:
- Don't hardcode host include path for libslang, fixing up building with it in cross build environments.
Arnaldo Carvalho de Melo:
- Check if
gettid()is available before providing helper, fixing the build when using the latest glibc version, where a helper forgettid()is finally present.- Fix building with libslang in systems where it is located in
slang/slang.h.- Fix fast path test for zstd library.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Adrian Hunter (11):
perf intel-pt: Add new packets for PEBS via PT
perf intel-pt: Add Intel PT packet decoder test
perf intel-pt: Add decoder support for PEBS via PT perf intel-pt: Prepare to synthesize PEBS samples perf intel-pt: Factor out common sample preparation for re-use perf intel-pt: Synthesize PEBS sample basic information perf intel-pt: Add gp registers to synthesized PEBS sample perf intel-pt: Add XMM registers to synthesized PEBS sample perf intel-pt: Add LBR information to synthesized PEBS sample perf intel-pt: Add memory information to synthesized PEBS sample perf intel-pt: Add callchain to synthesized PEBS sampleArnaldo Carvalho de Melo (10):
tools build: Check ifgettid()is available before providing helper perf trace: Fix exclusion of not available syscall names from selector list perf trace: Streamline validation of select syscall names list tools build feature tests: Add missing SPDX headers
perf tests: Add missing SPDX headers
perf trace: Fixup pointer arithmetic when consuming augmented syscall args perf evsel: Makeperf_evsel__name()accept a NULL argument tools build: Add test to check ifslang.his in/usr/include/slang/perf build: Handle slang being in/usr/includeand in/usr/include/slang/tools build: Fix the zstd test in thetest-all.ccommon case feature testFlorian Fainelli (1):
perf tools: Don't hardcode host include path for libslangJohn Garry (1):
perf pmu: Fix uncore PMU alias list for ARM64Mathieu Poirier (1):
perf: cs-etm: Optimize option setup for CPU-wide sessionsRaphael Gault (1):
perf tests arm64: Compile tests unconditionallytools/build/Makefile.feature | 3 +- tools/build/feature/Makefile | 10 +- tools/build/feature/test-all.c | 7 +- tools/build/feature/test-fortify-source.c | 1 + tools/build/feature/test-gettid.c | 11 + tools/build/feature/test-hello.c | 1 + tools/build/feature/test-libslang-include-subdir.c | 7 + tools/build/feature/test-setns.c | 1 + tools/perf/Makefile.config | 16 +- tools/perf/arch/arm/util/cs-etm.c | 20 +- tools/perf/arch/arm64/Build | 2 +- tools/perf/arch/arm64/tests/Build | 2 +- tools/perf/arch/x86/include/arch-tests.h | 1 + tools/perf/arch/x86/tests/Build | 2 +- tools/perf/arch/x86/tests/arch-tests.c | 4 + .../arch/x86/tests/intel-pt-pkt-decoder-test.c | 304 +++++++++++++++++++++ tools/perf/builtin-trace.c | 20 +- tools/perf/jvmti/jvmti_agent.c | 2 + tools/perf/tests/Build | 2 + tools/perf/tests/bp_account.c | 1 + tools/perf/tests/bpf-script-example.c | 1 + tools/perf/tests/bpf-script-test-kbuild.c | 1 + tools/perf/tests/bpf-script-test-prologue.c | 1 + tools/perf/tests/bpf-script-test-relocation.c | 1 + tools/perf/tests/bpf.c | 1 + tools/perf/tests/map_groups.c | 1 + tools/perf/tests/mem.c | 1 + tools/perf/tests/mem2node.c | 1 + tools/perf/tests/shell/lib/probe.sh | 1 + tools/perf/tests/shell/probe_vfs_getname.sh | 3 +- .../tests/shell/record+probe_libc_inet_pton.sh | 1 + .../tests/shell/record+script_probe_vfs_getname.sh | 1 + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 + tools/perf/ui/libslang.h | 5 + tools/perf/util/evsel.c | 8 +- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 114 +++++++- .../perf/util/intel-pt-decoder/intel-pt-decoder.h | 137 ++++++++++
Quoted 8 lines
.../util/intel-pt-decoder/intel-pt-pkt-decoder.c | 140 +++++++++- .../util/intel-pt-decoder/intel-pt-pkt-decoder.h | 21 +- tools/perf/util/intel-pt.c | 296 +++++++++++++++++++- tools/perf/util/pmu.c | 28 +- 42 files changed, 1115 insertions(+), 68 deletions(-) create mode 100644 tools/build/feature/test-gettid.c create mode 100644 tools/build/feature/test-libslang-include-subdir.c create mode 100644 tools/perf/arch/x86/tests/intel-pt-pkt-decoder-test.c
Pulled, thanks a lot Arnaldo!
Ingo