perf/core improvements and fixes
Subsystems (7)
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 d44f821b0e13275735e8f3fe4db8703b45f05d52:
perf/core: Optimize perf_init_event() for TYPE_SOFTWARE (2019-10-28 12:53:28 +0100)
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.5-20191107
for you to fetch changes up to 7fa46cbf20d327d78114b1c8c7e69fabe7c57794:
perf report: Sort by sampled cycles percent per block for tui (2019-11-07 10:14:48 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
perf report:
Jin Yao:
- Introduce --total-cycles, for basic block profiling, further using data
obtained from LBR, an example should suffice:
# perf record -b
^C[ perf record: Woken up 595 times to write data ]
[ perf record: Captured and wrote 156.672 MB perf.data (196873 samples) ]
# perf evlist -v
cycles: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|CPU|PERIOD|BRANCH_STACK, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, freq: 1, task: 1, precise_ip: 3, sample_id_all: 1, exclude_guest: 1, mmap2: 1, comm_exec: 1, ksymbol: 1, bpf_event: 1, branch_sample_type: ANY
# perf report --total-cycles --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 6M of event 'cycles'
# Event count (approx.): 6299936
#
# Sampled Sampled Avg Avg
# Cycles% Cycles Cycles% Cycles [Program Block Range] Shared Object
# ....... ...... ....... ..... .................................... ................
#
2.17% 1.7M 0.08% 607 [compiler.h:199 -> common.c:221] [kernel.vmlinux]
0.72% 544.5K 0.03% 230 [entry_64.S:657 -> entry_64.S:662] [kernel.vmlinux]
0.56% 541.8K 0.09% 672 [compiler.h:199 -> common.c:300] [kernel.vmlinux]
0.39% 293.2K 0.01% 104 [list_debug.c:43 -> list_debug.c:61] [kernel.vmlinux]
0.36% 278.6K 0.03% 272 [entry_64.S:1289 -> entry_64.S:1308] [kernel.vmlinux]perf record:
Adrian Hunter:
- Allow storing perf.data in a directory together with a copy of /proc/kcore.
Jiwei Sun:
- Add support for limit perf output file size, i.e.:
# perf record --all-cpus -F 10000 --max-size=4M sleep 10h
[ perf record: perf size limit reached (4097 KB), stopping session ]
[ perf record: Woken up 6 times to write data ]
[ perf record: Captured and wrote 4.048 MB perf.data (54094 samples) ]
Terminated
# ls -lah perf.data
-rw-------. 1 root root 4.1M Nov 7 15:27 perf.data
#perf stat:
Jiri Olsa:
- Add --per-node agregation support:
In live mode:
# perf stat -a -I 1000 -e cycles --per-node
# time node cpus counts unit events
1.000542550 N0 20 6,202,097 cycles
1.000542550 N1 20 639,559 cycles
2.002040063 N0 20 7,412,495 cycles
2.002040063 N1 20 2,185,577 cycles
3.003451699 N0 20 6,508,917 cycles
3.003451699 N1 20 765,607 cycles
...
Or in the record/report stat session:
# perf stat record -a -I 1000 -e cycles
# time counts unit events
1.000536937 10,008,468 cycles
2.002090152 9,578,539 cycles
3.003625233 7,647,869 cycles
4.005135036 7,032,086 cycles
^C 4.340902364 3,923,893 cycles
# perf stat report --per-node
# time node cpus counts unit events
1.000536937 N0 20 9,355,086 cycles
1.000536937 N1 20 653,382 cycles
2.002090152 N0 20 7,712,838 cycles
2.002090152 N1 20 1,865,701 cycles
...perf probe:
Masami Hiramatsu:
Various fixes related to recent additions to the DWARF format:
- Fix to find range-only function instance
- Walk function lines in lexical blocks
- Fix to show function entry line as probe-able
- Fix wrong address verification
- Fix to probe a function which has no entry pc
- Fix to probe an inline function which has no entry pc
- Fix to list probe event with correct line number
- Fix to show inlined function callsite without entry_pc
- Fix to show ranges of variables in functions without entry_pc
- Return a better scope DIE if there is no best scope
- Skip end-of-sequence and non statement lines
- Filter out instances except for inlined subroutine and subprogram
- Fix to show calling lines of inlined functions
- Skip overlapped location on searching variables
perf inject:
Adrian Hunter:
- Do not strip evsels with --strip, as they are needed for create_gcov (see the autofdo example in tools/perf/Documentation/intel-pt.txt).
Intel PT:
Adrian Hunter:
- Intel PT uses an auxtrace_cache to store the results of code-walking, to avoid repeated decoding. Add an auxtrace_cache__remove to handle text poke events.
core:
Andi Kleen:
- Always preserve errno while cleaning up perf_event_open failures.
llvm:
Arnaldo Carvalho de Melo:
- No need to tell that the request for saving a .o file for BPF events, as expressed in ~/.perfconfig was satisfied, make that a debug message.
perf vendor events:
Intel:
Haiyan Song:
- Update CascadelakeX events to v1.05.
- Update all the Intel JSON metrics from TMAM 3.6.
Treewide:
Ian Rogers:
- Improve error paths, plugging leaks found using LLVM tools such as libFuzzer.
jevents:
Yunfeng Ye:
- Fix resource leak in process_mapfile() and main()
perf kvm:
Igor Lubashev:
- Use evlist layer api when possible.
libsubcmd:
James Clark:
- Move EXTRA_FLAGS to the end to allow overriding existing flags.
- Use -O0 with DEBUG=1
perf diff:
Jin Yao:
- Don't use hack to skip column length calculation
CoreSight ETM:
Leo yan:
- Fix definition of macro TO_CS_QUEUE_NR
ARM64:
John Garry:
- Do not try to include libelf header files when its feature detection failed, fixing the cross build for ARM64.
perf tests:
Leo Yan:
- Fix out of bounds memory access in the backward ring buffer test.
----------------------------------------------------------------
Adrian Hunter (9):
perf data: Correctly identify directory data files perf data: Move perf_dir_version into data.h
perf data: Rename directory "header" file to "data" perf data: Support single perf.data file directory perf record: Put a copy of kcore into the perf.data directory perf auxtrace: Add auxtrace_cache__remove()
perf dso: Refactor dso_cache__read()
perf dso: Add dso__data_write_cache_addr()
perf inject: Make --strip keep evsels
Andi Kleen (2):
perf evsel: Always preserve errno while cleaning up perf_event_open failures perf evsel: Avoid close(-1)
Arnaldo Carvalho de Melo (7):
perf llvm: Make .o saving a debug message, not an info one
perf map: Check if the map still has some refcounts on exit
perf map: Allow map__next() to receive a NULL arg
perf maps: Add for_each_entry()/_safe() iterators
perf map_groups: Introduce for_each_entry() and for_each_entry_safe() iterators perf symbols: Remove needless checks for map->groups->machine perf machine: Add kernel_dso() method
Haiyan Song (2):
perf vendor events intel: Update CascadelakeX events to v1.05 perf vendor events intel: Update all the Intel JSON metrics from TMAM 3.6.
Ian Rogers (10):
perf tools: Move ALLOC_LIST into a function perf tools: Avoid a malloc() for array events perf tools: Splice events onto evlist even on error perf parse: Add parse events handle error perf parse: Ensure config and str in terms are unique perf parse: Add destructors for parse event terms perf parse: Before yyabort-ing free components perf parse: If pmu configuration fails free terms perf parse: Add a deep delete for parse event terms perf annotate: Fix heap overflow
Igor Lubashev (1):
perf kvm: Use evlist layer api when possible
James Clark (2):
libsubcmd: Move EXTRA_FLAGS to the end to allow overriding existing flags
libsubcmd: Use -O0 with DEBUG=1
Jin Yao (7):
perf diff: Don't use hack to skip column length calculation perf block: Cleanup and refactor block info functions perf hist: Count the total cycles of all samples perf hist: Support block formats with compare/sort/display perf report: Sort by sampled cycles percent per block for stdio perf report: Support --percent-limit for --total-cycles perf report: Sort by sampled cycles percent per block for tui
Jiri Olsa (3):
perf session: Fix indent in perf_session__new()" perf env: Add perf_env__numa_node() perf stat: Add --per-node agregation support
Jiwei Sun (1):
perf record: Add support for limit perf output file size
John Garry (1):
perf tools: Fix cross compile for ARM64
Leo Yan (3):
perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR perf tests: Fix a typo
perf tests: Fix out of bounds memory access
Masami Hiramatsu (14):
perf probe: Fix to find range-only function instance
perf probe: Walk function lines in lexical blocks
perf probe: Fix to show function entry line as probe-able
perf probe: Fix wrong address verification
perf probe: Fix to probe a function which has no entry pc
perf probe: Fix to probe an inline function which has no entry pc perf probe: Fix to list probe event with correct line number perf probe: Fix to show inlined function callsite without entry_pc perf probe: Fix to show ranges of variables in functions without entry_pc perf probe: Return a better scope DIE if there is no best scope perf probe: Skip end-of-sequence and non statement lines
perf probe: Filter out instances except for inlined subroutine and subprogram perf probe: Fix to show calling lines of inlined functions
perf probe: Skip overlapped location on searching variables
Yunfeng Ye (1):
perf jevents: Fix resource leak in process_mapfile() and main()
tools/lib/subcmd/Makefile | 9 +- tools/perf/Documentation/perf-record.txt | 7 + tools/perf/Documentation/perf-report.txt | 11 + tools/perf/Documentation/perf-stat.txt | 5 + .../Documentation/perf.data-directory-format.txt | 63 + tools/perf/arch/arm64/util/sym-handling.c | 3 +- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 121 +- tools/perf/builtin-inject.c | 54 - tools/perf/builtin-kvm.c | 2 +- tools/perf/builtin-record.c | 100 +- tools/perf/builtin-report.c | 67 +- tools/perf/builtin-stat.c | 52 + tools/perf/builtin-top.c | 3 +- tools/perf/lib/evsel.c | 3 +- .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 178 +- .../arch/x86/broadwellx/bdx-metrics.json | 184 +- .../pmu-events/arch/x86/cascadelakex/cache.json | 12068 +++++++++---------- .../arch/x86/cascadelakex/clx-metrics.json | 210 +- .../arch/x86/cascadelakex/floating-point.json | 92 +- .../pmu-events/arch/x86/cascadelakex/frontend.json | 656 +- .../pmu-events/arch/x86/cascadelakex/memory.json | 11408 +++++++++--------- .../pmu-events/arch/x86/cascadelakex/other.json | 9620 +++++++-------- .../pmu-events/arch/x86/cascadelakex/pipeline.json | 1234 +- .../arch/x86/cascadelakex/uncore-memory.json | 191 + .../arch/x86/cascadelakex/uncore-other.json | 1585 ++- .../arch/x86/cascadelakex/virtual-memory.json | 339 +- .../pmu-events/arch/x86/haswell/hsw-metrics.json | 164 +- .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 170 +- .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 170 +- .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 172 +- .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 114 +- .../arch/x86/sandybridge/snb-metrics.json | 112 +- .../pmu-events/arch/x86/skylake/skl-metrics.json | 188 +- .../pmu-events/arch/x86/skylakex/skx-metrics.json | 204 +- tools/perf/pmu-events/jevents.c | 13 +- tools/perf/tests/backward-ring-buffer.c | 9 + tools/perf/tests/bp_signal.c | 2 +- tools/perf/tests/map_groups.c | 9 +- tools/perf/tests/vmlinux-kallsyms.c | 6 +- tools/perf/ui/browsers/hists.c | 7 +- tools/perf/ui/browsers/hists.h | 2 + tools/perf/ui/stdio/hist.c | 29 +- tools/perf/util/Build | 1 + tools/perf/util/annotate.c | 2 +- tools/perf/util/auxtrace.c | 28 + tools/perf/util/auxtrace.h | 1 + tools/perf/util/block-info.c | 538 + tools/perf/util/block-info.h | 78 + tools/perf/util/cpumap.c | 18 + tools/perf/util/cpumap.h | 3 + tools/perf/util/cs-etm.c | 4 +- tools/perf/util/data.c | 46 +- tools/perf/util/data.h | 12 + tools/perf/util/dso.c | 135 +- tools/perf/util/dso.h | 7 + tools/perf/util/dwarf-aux.c | 80 +- tools/perf/util/dwarf-aux.h | 3 + tools/perf/util/env.c | 40 + tools/perf/util/env.h | 6 + tools/perf/util/evsel.c | 9 +- tools/perf/util/header.h | 4 - tools/perf/util/hist.c | 13 +- tools/perf/util/hist.h | 3 +- tools/perf/util/llvm-utils.c | 5 +- tools/perf/util/machine.c | 12 +- tools/perf/util/map.c | 65 +- tools/perf/util/map_groups.h | 24 +- tools/perf/util/parse-events.c | 175 +- tools/perf/util/parse-events.h | 3 + tools/perf/util/parse-events.y | 390 +- tools/perf/util/pmu.c | 32 +- tools/perf/util/probe-event.c | 2 +- tools/perf/util/probe-finder.c | 77 +- tools/perf/util/record.h | 1 + tools/perf/util/session.c | 8 +- tools/perf/util/stat-display.c | 15 + tools/perf/util/stat.c | 1 + tools/perf/util/stat.h | 1 + tools/perf/util/symbol.c | 64 +- tools/perf/util/symbol.h | 24 - tools/perf/util/symbol_conf.h | 1 + tools/perf/util/synthetic-events.c | 2 +- tools/perf/util/thread.c | 2 +- tools/perf/util/util.c | 19 +- tools/perf/util/vdso.c | 4 +- 87 files changed, 22145 insertions(+), 19453 deletions(-) create mode 100644 tools/perf/Documentation/perf.data-directory-format.txt create mode 100644 tools/perf/util/block-info.c create mode 100644 tools/perf/util/block-info.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.
Manjaro is failing due to some missing library related to bison, looks like a distro bug.
# export PERF_TARBALL=http://192.168.124.1/perf/perf-5.4.0-rc5.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 9.2.0) 9.2.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 20180712 (Red Hat 7.3.1-6), 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-39), clang version 3.4.2 (tags/RELEASE_34/dot2-final) 16 centos:8 : Ok gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3), clang version 7.0.1 (tags/RELEASE_701/final) 17 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 9.2.1 20191101 gcc-9-branch@277702, clang version 9.0.0 (tags/RELEASE_900/final) 18 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) 19 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, clang version 3.8.1-24 (tags/RELEASE_381/final) 20 debian:10 : Ok gcc (Debian 8.3.0-6) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final) 21 debian:experimental : Ok gcc (Debian 9.2.1-9) 9.2.1 20191008, clang version 8.0.1-3+b1 (tags/RELEASE_801/final) 22 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 23 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 24 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 8.3.0-19) 8.3.0 25 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0 26 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) 27 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.5.0 (tags/RELEASE_350/final) 28 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.7.0 (tags/RELEASE_370/final) 29 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1), clang version 3.8.1 (tags/RELEASE_381/final) 30 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 31 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1), clang version 3.9.1 (tags/RELEASE_391/final) 32 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2), clang version 4.0.1 (tags/RELEASE_401/final) 33 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 5.0.2 (tags/RELEASE_502/final) 34 fedora:28 : Ok gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 6.0.1 (tags/RELEASE_601/final) 35 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) 36 fedora:30 : Ok gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 8.0.0 (Fedora 8.0.0-3.fc30) 37 fedora:30-x-ARC-glibc : Ok arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225 38 fedora:30-x-ARC-uClibc : Ok arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225 39 fedora:31 : Ok gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc31) 40 fedora:32 : Ok gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc32) 41 fedora:rawhide : Ok gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc32) 42 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 8.3.0-r1 p1.1) 8.3.0 43 mageia:5 : Ok gcc (GCC) 4.9.2, clang version 3.5.2 (tags/RELEASE_352/final) 44 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0, clang version 3.9.1 (tags/RELEASE_391/final) 45 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) 46 manjaro:latest : FAIL gcc (GCC) 9.2.0, clang version 9.0.0 (tags/RELEASE_900/final) 47 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) 48 opensuse:15.1 : Ok gcc (SUSE Linux) 7.4.1 20190905 [gcc-7-branch revision 275407], clang version 7.0.1 (tags/RELEASE_701/final 349238) 49 opensuse:15.2 : Ok gcc (SUSE Linux) 7.4.1 20190424 [gcc-7-branch revision 270538], clang version 7.0.1 (tags/RELEASE_701/final 349238) 50 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5, clang version 3.8.0 (tags/RELEASE_380/final 262553) 51 opensuse:tumbleweed : Ok gcc (SUSE Linux) 9.2.1 20190903 [gcc-9-branch revision 275330], clang version 9.0.0 (tags/RELEASE_900/final 372316) 52 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1) 53 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) 54 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) 55 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) 56 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) 57 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) 58 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 59 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 60 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 61 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 62 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 63 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 64 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) 65 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 66 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0 67 ubuntu:18.04-x-m68k : Ok m68k-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 68 ubuntu:18.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 69 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 70 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 71 ubuntu:18.04-x-riscv64 : Ok riscv64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 72 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 73 ubuntu:18.04-x-sh4 : Ok sh4-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 74 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0 75 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) 76 ubuntu:19.04 : Ok gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0, clang version 8.0.0-3 (tags/RELEASE_800/final) 77 ubuntu:19.04-x-alpha : Ok alpha-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 78 ubuntu:19.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 8.3.0-6ubuntu1) 8.3.0 79 ubuntu:19.04-x-hppa : Ok hppa-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0 80 ubuntu:19.10 : Ok gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008, clang version 9.0.0-2 (tags/RELEASE_900/final) #
# uname -a
Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
7fa46cbf20d3 perf report: Sort by sampled cycles percent per block for tui
# perf version --build-options
perf version 5.4.rc5.g7fa46cbf20d3
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_util_pmu_bison_o_O: make util/pmu-bison.o
make_no_libbionic_O: make NO_LIBBIONIC=1
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_auxtrace_O: make NO_AUXTRACE=1
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_libpython_O: make NO_LIBPYTHON=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_help_O: make help
make_with_babeltrace_O: make LIBBABELTRACE=1
make_no_slang_O: make NO_SLANG=1
make_no_backtrace_O: make NO_BACKTRACE=1
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_no_gtk2_O: make NO_GTK2=1
make_no_libbpf_O: make NO_LIBBPF=1
make_doc_O: make doc
make_install_O: make install
make_install_prefix_O: make install prefix=/tmp/krava
make_debug_O: make DEBUG=1
make_no_libaudit_O: make NO_LIBAUDIT=1
make_util_map_o_O: make util/map.o
make_no_libnuma_O: make NO_LIBNUMA=1
make_tags_O: make tags
make_no_libperl_O: make NO_LIBPERL=1
make_install_bin_O: make install-bin
make_cscope_O: make cscope
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_no_libelf_O: make NO_LIBELF=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_static_O: make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
make_no_newt_O: make NO_NEWT=1
make_clean_all_O: make clean all
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_perf_o_O: make perf.o
make_pure_O: make
make_no_demangle_O: make NO_DEMANGLE=1
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/63 perf data: Correctly identify directory data files
From: Adrian Hunter <[email protected]>
In order to rename the "header" file to "data" without conflicting, correctly identify the non-header files as starting with "data."
--- tools/perf/util/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/data.c +1 -1
@@ -96,7 +96,7 @@ int perf_data__open_dir(struct perf_data *data)if (stat (path, &st))continue ; -if (!S_ISREG (st.st_mode) ||strncmp (dent->d_name,"data" ,4 )) +if (!S_ISREG (st.st_mode) ||strncmp (dent->d_name,"data." ,5 ))continue ; ret = -ENOMEM ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/63 perf data: Move perf_dir_version into data.h
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
perf_dir_version belongs to struct perf_data which is declared in data.h. To allow its use in inline perf_data functions, move perf_dir_version to data.h
--- tools/perf/util/data.h | 4 ++++ tools/perf/util/header.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
tools/perf/util/data.h +4 -0
@@ -9,6 +9,10 @@ enum perf_data_mode { PERF_DATA_MODE_READ, }; +enum perf_dir_version { +PERF_DIR_VERSION =1 , +}; +struct perf_data_file {char *path;int fd;
tools/perf/util/header.h +0 -4
@@ -52,10 +52,6 @@ enum perf_header_version { PERF_HEADER_VERSION_2, }; -enum perf_dir_version { -PERF_DIR_VERSION =1 , -}; -struct perf_file_section {u64 offset;u64 size;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 3/63 perf data: Rename directory "header" file to "data"
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
In preparation to support a single file directory format, rename "header" to "data" because "header" is a mis-leading name when there is only 1 file. Note, in the multi-file case, the "header" file also contains data.
--- tools/perf/util/data.c | 2 +- tools/perf/util/util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/data.c +1 -1
@@ -306,7 +306,7 @@ static int open_dir(struct perf_data *data)* So far we open only the header, so we can read the data version and * layout. */ -if (asprintf (&data->file.path,"%s/header" , data->path) <0 ) +if (asprintf (&data->file.path,"%s/data" , data->path) <0 )return -1 ; if (perf_data__is_write(data) &&
tools/perf/util/util.c +1 -1
@@ -185,7 +185,7 @@ static int rm_rf_depth_pat(const char *path, int depth, const char **pat)int rm_rf_perf_data (const char *path) {const char *pat[] = { -"header" , +"data" ,"data.*" ,NULL , };
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 4/63 perf session: Fix indent in perf_session__new()"
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Fix up indentation.
--- tools/perf/util/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/session.c +2 -2
@@ -227,8 +227,8 @@ struct perf_session *perf_session__new(struct perf_data *data,/* Open the directory data. */ if (data->is_dir) { ret =perf_data__open_dir (data); -if (ret) - goto out_delete; +if (ret) + goto out_delete; } } }else {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 5/63 perf data: Support single perf.data file directory
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Support directory output that contains a regular perf.data file, named "data". By default the directory is named perf.data i.e.
perf.data
└── data
Most of the infrastructure to support a directory is already there. This patch makes the changes needed to support the format above.
Presently there is no 'perf record' option to output a directory.
This is preparation for adding support for putting a copy of /proc/kcore in the directory.
--- .../perf.data-directory-format.txt | 28 +++++++++++++++++++ tools/perf/builtin-record.c | 2 +- tools/perf/util/data.c | 9 +++++- tools/perf/util/data.h | 6 ++++ 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 tools/perf/Documentation/perf.data-directory-format.txt
tools/perf/Documentation/perf.data-directory-format.txt new file +28 -0
@@ -0,0 +1,28 @@ +perf.data directory format + +DISCLAIMER This is not ABI yet and is subject to possible change + in following versions of perf. We will remove this + disclaimer once the directory format soaks in. + + +This document describes the on-disk perf.data directory format. + +The layout is described by HEADER_DIR_FORMAT feature. +Currently it holds only version number (0): + + HEADER_DIR_FORMAT = 24 + + struct { + uint64_t version; + } + +The current only version value 0 means that: + - there is a single perf.data file named 'data' within the directory. + e.g. + + $ tree -ps perf.data + perf.data + └── [-rw------- 25912] data + +Future versions are expected to describe different data files +layout according to special needs.
tools/perf/builtin-record.c +1 -1
@@ -537,7 +537,7 @@ static int record__process_auxtrace(struct perf_tool *tool,size_t padding;u8 pad[8 ] = {0 }; -if (!perf_data__is_pipe (data) && !perf_data__is_dir (data)) { +if (!perf_data__is_pipe (data) &&perf_data__is_single_file (data)) {off_t file_offset;int fd =perf_data__fd (data);int err;
tools/perf/util/data.c +8 -1
@@ -76,6 +76,13 @@ int perf_data__open_dir(struct perf_data *data)DIR *dir;int nr =0 ; +/* +* Directory containing a single regular perf data file which is already +* open, means there is nothing more to do here. +*/ +if (perf_data__is_single_file (data)) +return 0 ; +if (WARN_ON (!data->is_dir))return -EINVAL ;
@@ -406,7 +413,7 @@ unsigned long perf_data__size(struct perf_data *data)u64 size = data->file.size;int i; -if (!data->is_dir) +if (perf_data__is_single_file (data))return size;for (i =0 ; i < data->dir.nr; i++) {
tools/perf/util/data.h +6 -0
@@ -10,6 +10,7 @@ enum perf_data_mode { };enum perf_dir_version { +PERF_DIR_SINGLE_FILE =0 ,PERF_DIR_VERSION =1 , };
@@ -54,6 +55,11 @@ static inline bool perf_data__is_dir(struct perf_data *data)return data->is_dir; } +static inline bool perf_data__is_single_file (struct perf_data *data) +{ +return data->dir.version ==PERF_DIR_SINGLE_FILE ; +} +static inline int perf_data__fd (struct perf_data *data) {return data->file.fd;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 6/63 perf record: Put a copy of kcore into the perf.data directory
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add a new 'perf record' option '--kcore' which will put a copy of /proc/kcore, kallsyms and modules into a perf.data directory. Note, that without the --kcore option, output goes to a file as previously. The tools' -o and -i options work with either a file name or directory name.
Example:
$ sudo perf record --kcore uname
$ sudo tree perf.data perf.data ├── kcore_dir │ ├── kallsyms │ ├── kcore │ └── modules └── data
$ sudo perf script -v
build id event received for vmlinux: 1eaa285996affce2d74d8e66dcea09a80c9941de
build id event received for [vdso]: 8bbaf5dc62a9b644b4d4e4539737e104e4a84541
Samples for 'cycles' event do not have CPU attribute set. Skipping 'cpu' field.
Using CPUID GenuineIntel-6-8E-A
Using perf.data/kcore_dir/kcore for kernel data
Using perf.data/kcore_dir/kallsyms for symbols
perf 19058 506778.423729: 1 cycles: ffffffffa2caa548 native_write_msr+0x8 (vmlinux)
perf 19058 506778.423733: 1 cycles: ffffffffa2caa548 native_write_msr+0x8 (vmlinux)
perf 19058 506778.423734: 7 cycles: ffffffffa2caa548 native_write_msr+0x8 (vmlinux)
perf 19058 506778.423736: 117 cycles: ffffffffa2caa54a native_write_msr+0xa (vmlinux)
perf 19058 506778.423738: 2092 cycles: ffffffffa2c9b7b0 native_apic_msr_write+0x0 (vmlinux)
perf 19058 506778.423740: 37380 cycles: ffffffffa2f121d0 perf_event_addr_filters_exec+0x0 (vmlinux)
uname 19058 506778.423751: 582673 cycles: ffffffffa303a407 propagate_protected_usage+0x147 (vmlinux)
uname 19058 506778.423892: 2241841 cycles: ffffffffa2cae0c9 unwind_next_frame.part.5+0x79 (vmlinux)
uname 19058 506778.424430: 2457397 cycles: ffffffffa3019232 check_memory_region+0x52 (vmlinux)Committer testing:
# rm -rf perf.data*
# perf record sleep 1
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.024 MB perf.data (7 samples) ]
# ls -l perf.data
-rw-------. 1 root root 34772 Oct 21 11:08 perf.data
# perf record --kcore uname
Linux
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.024 MB perf.data (7 samples) ]
ls[root@quaco ~]# ls -lad perf.data*
drwx------. 3 root root 4096 Oct 21 11:08 perf.data
-rw-------. 1 root root 34772 Oct 21 11:08 perf.data.old
# perf evlist -v
cycles: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|PERIOD, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, freq: 1, enable_on_exec: 1, task: 1, precise_ip: 3, sample_id_all: 1, exclude_guest: 1, mmap2: 1, comm_exec: 1, ksymbol: 1, bpf_event: 1
# perf evlist -v -i perf.data/data
cycles: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|PERIOD, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, freq: 1, enable_on_exec: 1, task: 1, precise_ip: 3, sample_id_all: 1, exclude_guest: 1, mmap2: 1, comm_exec: 1, ksymbol: 1, bpf_event: 1
#--- tools/perf/Documentation/perf-record.txt | 3 ++ .../perf.data-directory-format.txt | 35 +++++++++++++ tools/perf/builtin-record.c | 52 +++++++++++++++++++ tools/perf/util/data.c | 33 ++++++++++++ tools/perf/util/data.h | 2 + tools/perf/util/record.h | 1 + tools/perf/util/session.c | 4 ++ tools/perf/util/util.c | 17 ++++++ 8 files changed, 147 insertions(+)
tools/perf/Documentation/perf-record.txt +3 -0
@@ -571,6 +571,9 @@ config terms. For example: 'cycles/overwrite/' and 'instructions/no-overwrite/'. Implies --tail-synthesize. +--kcore:: +Make a copy of /proc/kcore and place it into a directory with the perf data file. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/Documentation/perf.data-directory-format.txt +35 -0
@@ -26,3 +26,38 @@ The current only version value 0 means that: Future versions are expected to describe different data files layout according to special needs. + +Currently the only 'perf record' option to output to a directory is +the --kcore option which puts a copy of /proc/kcore into the directory. +e.g. + + $ sudo perf record --kcore uname + Linux + [ perf record: Woken up 1 times to write data ] + [ perf record: Captured and wrote 0.015 MB perf.data (9 samples) ] + $ sudo tree -ps perf.data + perf.data + ├── [-rw------- 23744] data + └── [drwx------ 4096] kcore_dir + ├── [-r-------- 6731125] kallsyms + ├── [-r-------- 40230912] kcore + └── [-r-------- 5419] modules + + 1 directory, 4 files + $ sudo perf script -v + build id event received for vmlinux: 1eaa285996affce2d74d8e66dcea09a80c9941de + build id event received for [vdso]: 8bbaf5dc62a9b644b4d4e4539737e104e4a84541 + build id event received for /lib/x86_64-linux-gnu/libc-2.28.so: 5b157f49586a3ca84d55837f97ff466767dd3445 + Samples for 'cycles' event do not have CPU attribute set. Skipping 'cpu' field. + Using CPUID GenuineIntel-6-8E-A + Using perf.data/kcore_dir/kcore for kernel data + Using perf.data/kcore_dir/kallsyms for symbols + perf 15316 2060795.480902: 1 cycles: ffffffffa2caa548 native_write_msr+0x8 (vmlinux) + perf 15316 2060795.480906: 1 cycles: ffffffffa2caa548 native_write_msr+0x8 (vmlinux) + perf 15316 2060795.480908: 7 cycles: ffffffffa2caa548 native_write_msr+0x8 (vmlinux) + perf 15316 2060795.480910: 119 cycles: ffffffffa2caa54a native_write_msr+0xa (vmlinux) + perf 15316 2060795.480912: 2109 cycles: ffffffffa2c9b7b0 native_apic_msr_write+0x0 (vmlinux) + perf 15316 2060795.480914: 37606 cycles: ffffffffa2f121fe perf_event_addr_filters_exec+0x2e (vmlinux) + uname 15316 2060795.480924: 588287 cycles: ffffffffa303a56d page_counter_try_charge+0x6d (vmlinux) + uname 15316 2060795.481067: 2261945 cycles: ffffffffa301438f kmem_cache_free+0x4f (vmlinux) + uname 15316 2060795.481643: 2172167 cycles: 7f1a48c393c0 _IO_un_link+0x0 (/lib/x86_64-linux-gnu/libc-2.28.so)
tools/perf/builtin-record.c +52 -0
88 lines not on this page · raw message
tools/perf/util/data.c +33 -0
@@ -424,3 +424,36 @@ unsigned long perf_data__size(struct perf_data *data)return size; } + +int perf_data__make_kcore_dir (struct perf_data *data,char *buf,size_t buf_sz) +{ +int ret; + +if (!data->is_dir) +return -1 ; + + ret =snprintf (buf, buf_sz,"%s/kcore_dir" , data->path); +if (ret <0 || (size_t )ret >= buf_sz) +return -1 ; + +return mkdir (buf,S_IRWXU ); +} + +char *perf_data__kallsyms_name (struct perf_data *data) +{ +char *kallsyms_name; +struct stat st; + +if (!data->is_dir) +return NULL ; + +if (asprintf (&kallsyms_name,"%s/kcore_dir/kallsyms" , data->path) <0 ) +return NULL ; + +if (stat (kallsyms_name, &st)) { +free (kallsyms_name); +return NULL ; + } + +return kallsyms_name; +}
tools/perf/util/data.h +2 -0
@@ -87,4 +87,6 @@ int perf_data__open_dir(struct perf_data *data);void perf_data__close_dir (struct perf_data *data);int perf_data__update_dir (struct perf_data *data);unsigned long perf_data__size (struct perf_data *data); +int perf_data__make_kcore_dir (struct perf_data *data,char *buf,size_t buf_sz); +char *perf_data__kallsyms_name (struct perf_data *data);#endif /* __PERF_DATA_H */
tools/perf/util/record.h +1 -0
@@ -44,6 +44,7 @@ struct record_opts {bool strict_freq;bool sample_id;bool no_bpf_event; +bool kcore;unsigned int freq;unsigned int mmap_pages;unsigned int auxtrace_mmap_pages;
tools/perf/util/session.c +4 -0
@@ -230,6 +230,10 @@ struct perf_session *perf_session__new(struct perf_data *data,if (ret) goto out_delete; } + +if (!symbol_conf.kallsyms_name && + !symbol_conf.vmlinux_name) + symbol_conf.kallsyms_name =perf_data__kallsyms_name (data); } }else { session->machines.host.env = &perf_env;
tools/perf/util/util.c +17 -0
@@ -182,6 +182,21 @@ static int rm_rf_depth_pat(const char *path, int depth, const char **pat)return rmdir (path); } +static int rm_rf_kcore_dir (const char *path) +{ +char kcore_dir_path[PATH_MAX ]; +const char *pat[] = { +"kcore" , +"kallsyms" , +"modules" , +NULL , + }; + +snprintf (kcore_dir_path,sizeof (kcore_dir_path),"%s/kcore_dir" , path); + +return rm_rf_depth_pat (kcore_dir_path,0 , pat); +} +int rm_rf_perf_data (const char *path) {const char *pat[] = {
@@ -190,6 +205,8 @@ int rm_rf_perf_data(const char *path) NULL, }; +rm_rf_kcore_dir (path); +return rm_rf_depth_pat (path,0 , pat); }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 7/63 perf llvm: Make .o saving a debug message, not an info one
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Its a bit annoying to have that message, better make it a debug one.
I.e. now this message will only appear when using '-v':
[root@quaco tracebuffer]# trace -e bristot.c
LLVM: dumping bristot.o
^C[root@quaco tracebuffer]#
--- tools/perf/util/llvm-utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
tools/perf/util/llvm-utils.c +2 -3
@@ -418,10 +418,9 @@ void llvm__dump_obj(const char *path, void *obj_buf, size_t size) goto out; } -pr_info ("LLVM: dumping %s\n" , obj_path); +pr_debug ("LLVM: dumping %s\n" , obj_path);if (fwrite (obj_buf, size,1 , fp) !=1 ) -pr_warning ("WARNING: failed to write to file '%s': %s, skip object dumping\n" , - obj_path,strerror (errno)); +pr_debug ("WARNING: failed to write to file '%s': %s, skip object dumping\n" , obj_path,strerror (errno));fclose (fp); out:free (obj_path);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 8/63 perf cs-etm: Fix definition of macro TO_CS_QUEUE_NR
In reply to Arnaldo Carvalho de MeloFrom: Leo Yan <[email protected]>
Macro TO_CS_QUEUE_NR definition has a typo, which uses 'trace_id_chan' as its parameter, this doesn't match with its definition body which uses 'trace_chan_id'. So renames the parameter to 'trace_chan_id'.
It's luck to have a local variable 'trace_chan_id' in the function cs_etm__setup_queue(), even we wrongly define the macro TO_CS_QUEUE_NR, the local variable 'trace_chan_id' is used rather than the macro's parameter 'trace_id_chan'; so the compiler doesn't complain for this before.
After renaming the parameter, it leads to a compiling error due cs_etm__setup_queue() has no variable 'trace_id_chan'. This patch uses the variable 'trace_chan_id' for the macro so that fixes the compiling error.
--- tools/perf/util/cs-etm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/cs-etm.c +2 -2
@@ -110,7 +110,7 @@ static int cs_etm__decode_data_block(struct cs_etm_queue *etmq);* encode the etm queue number as the upper 16 bit and the channel as * the lower 16 bit. */ -#define TO_CS_QUEUE_NR (queue_nr, trace_id_chan) \ +#define TO_CS_QUEUE_NR (queue_nr, trace_chan_id) \ (queue_nr << 16 | trace_chan_id)#define TO_QUEUE_NR (cs_queue_nr) (cs_queue_nr >> 16)#define TO_TRACE_CHAN_ID (cs_queue_nr) (cs_queue_nr & 0x0000ffff)
@@ -819,7 +819,7 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,* Note that packets decoded above are still in the traceID's packet * queue and will be processed in cs_etm__process_queues(). */ - cs_queue_nr =TO_CS_QUEUE_NR (queue_nr, trace_id_chan); + cs_queue_nr =TO_CS_QUEUE_NR (queue_nr, trace_chan_id); ret =auxtrace_heap__add (&etm->heap, cs_queue_nr, timestamp); out:return ret;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 9/63 perf evsel: Always preserve errno while cleaning up perf_event_open failures
In reply to Arnaldo Carvalho de MeloFrom: Andi Kleen <[email protected]>
In some cases when perf_event_open fails, it may do some closes to clean up. In special cases these closes can fail too, which overwrites the errno of the perf_event_open, which is then incorrectly reported.
Save/restore errno around closes.
--- tools/perf/util/evsel.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/evsel.c +4 -2
@@ -1574,7 +1574,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, {int cpu, thread, nthreads;unsigned long flags =PERF_FLAG_FD_CLOEXEC ; -int pid =-1 , err; +int pid =-1 , err, old_errno;enum {NO_CHANGE ,SET_TO_MAX ,INCREASED_MAX } set_rlimit =NO_CHANGE ; if ((perf_missing_features.write_backward && evsel->core.attr.write_backward) ||
@@ -1727,8 +1727,8 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,*/ if (err == -EMFILE && set_rlimit <INCREASED_MAX ) {struct rlimit l; -int old_errno = errno; + old_errno = errno;if (getrlimit (RLIMIT_NOFILE , &l) ==0 ) {if (set_rlimit ==NO_CHANGE ) l.rlim_cur = l.rlim_max;
@@ -1812,6 +1812,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,if (err) threads->err_thread = thread; + old_errno = errno; do { while (--thread >= 0) { close(FD(evsel, cpu, thread));
@@ -1819,6 +1820,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, } thread = nthreads; }while (--cpu >=0 ); + errno = old_errno;return err; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 10/63 perf evsel: Avoid close(-1)
In reply to Arnaldo Carvalho de MeloFrom: Andi Kleen <[email protected]>
In some weak fallback cases close can be called a lot with -1. Check for this case and avoid calling close then.
This is mainly to shut up valgrind which complains about this case.
--- tools/perf/lib/evsel.c | 3 ++- tools/perf/util/evsel.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/lib/evsel.c +2 -1
@@ -120,7 +120,8 @@ void perf_evsel__close_fd(struct perf_evsel *evsel)for (cpu =0 ; cpu <xyarray__max_x (evsel->fd); cpu++)for (thread =0 ; thread <xyarray__max_y (evsel->fd); ++thread) { -close (FD (evsel, cpu, thread)); +if (FD (evsel, cpu, thread) >=0 ) +close (FD (evsel, cpu, thread));FD (evsel, cpu, thread) =-1 ; } }
tools/perf/util/evsel.c +2 -1
@@ -1815,7 +1815,8 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, old_errno = errno; do { while (--thread >= 0) { - close(FD(evsel, cpu, thread)); + if (FD(evsel, cpu, thread) >= 0) + close(FD(evsel, cpu, thread)); FD(evsel, cpu, thread) = -1; } thread = nthreads;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 11/63 perf tools: Move ALLOC_LIST into a function
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Having a YYABORT in a macro makes it hard to free memory for components of a rule. Separate the logic out.
--- tools/perf/util/parse-events.y | 65 ++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 22 deletions(-)
tools/perf/util/parse-events.y +43 -22
@@ -25,12 +25,17 @@ do { \ YYABORT; \ } while (0) -#define ALLOC_LIST(list) \ -do { \ - list = malloc(sizeof(*list)); \ - ABORT_ON(!list); \ - INIT_LIST_HEAD(list); \ -} while (0) +static struct list_head* alloc_list() +{ + struct list_head *list; + + list = malloc(sizeof(*list)); + if (!list) + return NULL; + + INIT_LIST_HEAD(list); + return list; +} static void inc_group_count(struct list_head *list, struct parse_events_state *parse_state)
@@ -238,7 +243,8 @@ PE_NAME opt_pmu_config if (error) error->idx = @1.first_column; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { struct perf_pmu *pmu = NULL; int ok = 0;
@@ -306,7 +312,8 @@ value_sym '/' event_config '/' int type = $1 >> 16; int config = $1 & 255; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, $3)); parse_events_terms__delete($3); $$ = list;
@@ -318,7 +325,8 @@ value_sym sep_slash_slash_dc int type = $1 >> 16; int config = $1 & 255; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, NULL)); $$ = list; }
@@ -327,7 +335,8 @@ PE_VALUE_SYM_TOOL sep_slash_slash_dc { struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_tool(_parse_state, list, $1)); $$ = list; }
@@ -339,7 +348,8 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e struct parse_events_error *error = parse_state->error; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6)); parse_events_terms__delete($6); $$ = list;
@@ -351,7 +361,8 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config struct parse_events_error *error = parse_state->error; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4)); parse_events_terms__delete($4); $$ = list;
@@ -363,7 +374,8 @@ PE_NAME_CACHE_TYPE opt_event_config struct parse_events_error *error = parse_state->error; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2)); parse_events_terms__delete($2); $$ = list;
@@ -375,7 +387,8 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc struct parse_events_state *parse_state = _parse_state; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, (void *) $2, $6, $4)); $$ = list;
@@ -386,7 +399,8 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc struct parse_events_state *parse_state = _parse_state; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, (void *) $2, NULL, $4)); $$ = list;
@@ -397,7 +411,8 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc struct parse_events_state *parse_state = _parse_state; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, (void *) $2, $4, 0)); $$ = list;
@@ -408,7 +423,8 @@ PE_PREFIX_MEM PE_VALUE sep_dc struct parse_events_state *parse_state = _parse_state; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, (void *) $2, NULL, 0)); $$ = list;
@@ -421,7 +437,8 @@ tracepoint_name opt_event_config struct parse_events_error *error = parse_state->error; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); if (error) error->idx = @1.first_column;
@@ -457,7 +474,8 @@ PE_VALUE ':' PE_VALUE opt_event_config { struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4)); parse_events_terms__delete($4); $$ = list;
@@ -468,7 +486,8 @@ PE_RAW opt_event_config { struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2)); parse_events_terms__delete($2); $$ = list;
@@ -480,7 +499,8 @@ PE_BPF_OBJECT opt_event_config struct parse_events_state *parse_state = _parse_state; struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_load_bpf(parse_state, list, $1, false, $2)); parse_events_terms__delete($2); $$ = list;
@@ -490,7 +510,8 @@ PE_BPF_SOURCE opt_event_config { struct list_head *list; - ALLOC_LIST(list); + list = alloc_list(); + ABORT_ON(!list); ABORT_ON(parse_events_load_bpf(_parse_state, list, $1, true, $2)); parse_events_terms__delete($2); $$ = list;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 12/63 perf tools: Avoid a malloc() for array events
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Use realloc() rather than malloc()+memcpy() to possibly avoid a memory allocation when appending array elements.
--- tools/perf/util/parse-events.y | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
tools/perf/util/parse-events.y +3 -5
@@ -689,14 +689,12 @@ array_terms ',' array_term struct parse_events_array new_array; new_array.nr_ranges = $1.nr_ranges + $3.nr_ranges; - new_array.ranges = malloc(sizeof(new_array.ranges[0]) * - new_array.nr_ranges); + new_array.ranges = realloc($1.ranges, + sizeof(new_array.ranges[0]) * + new_array.nr_ranges); ABORT_ON(!new_array.ranges); - memcpy(&new_array.ranges[0], $1.ranges, - $1.nr_ranges * sizeof(new_array.ranges[0])); memcpy(&new_array.ranges[$1.nr_ranges], $3.ranges, $3.nr_ranges * sizeof(new_array.ranges[0])); - free($1.ranges); free($3.ranges); $$ = new_array; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 13/63 perf tests: Fix a typo
In reply to Arnaldo Carvalho de MeloFrom: Leo Yan <[email protected]>
Correct typo in comment: s/suck/stuck.
--- tools/perf/tests/bp_signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/bp_signal.c +1 -1
@@ -295,7 +295,7 @@ bool test__bp_signal_is_supported(void)* breakpointed instruction. * * Since arm64 has the same issue with arm for the single-step -* handling, this case also gets suck on the breakpointed +* handling, this case also gets stuck on the breakpointed * instruction. * * Just disable the test for these architectures until these
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 14/63 perf kvm: Use evlist layer api when possible
In reply to Arnaldo Carvalho de MeloFrom: Igor Lubashev <[email protected]>
No need for layer violations when a proper evlist api is available.
--- tools/perf/builtin-kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-kvm.c +1 -1
@@ -998,7 +998,7 @@ static int kvm_events_live_report(struct perf_kvm_stat *kvm) done =perf_kvm__handle_stdin ();if (!rc && !done) - err =fdarray__poll (fda,100 ); + err =evlist__poll (kvm->evlist,100 ); }evlist__disable (kvm->evlist);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 15/63 perf probe: Fix to find range-only function instance
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix die_is_func_instance() to find range-only function instance.
In some case, a function instance can be made without any low PC or entry PC, but only with address ranges by optimization. (e.g. cold text partially in "text.unlikely" section) To find such function instance, we have to check the range attribute too.
--- tools/perf/util/dwarf-aux.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +5 -1
@@ -318,10 +318,14 @@ bool die_is_func_def(Dwarf_Die *dw_die)bool die_is_func_instance (Dwarf_Die *dw_die) {Dwarf_Addr tmp; +Dwarf_Attribute attr_mem;/* Actually gcc optimizes non-inline as like as inlined */ -return !dwarf_func_inline (dw_die) &&dwarf_entrypc (dw_die, &tmp) ==0 ; +return !dwarf_func_inline (dw_die) && + (dwarf_entrypc (dw_die, &tmp) ==0 || +dwarf_attr (dw_die, DW_AT_ranges, &attr_mem) !=NULL ); } +/** * die_get_data_member_location - Get the data-member offset * @mb_die: a DIE of a member of a data structure
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 16/63 perf probe: Walk function lines in lexical blocks
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Since some inlined functions are in lexical blocks of given function, we have to recursively walk through the DIE tree. Without this fix, perf-probe -L can miss the inlined functions which is in a lexical block (like if (..) { func() } case.)
However, even though, to walk the lines in a given function, we don't need to follow the children DIE of inlined functions because those do not have any lines in the specified function.
We need to walk though whole trees only if we walk all lines in a given file, because an inlined function can include another inlined function in the same file.
--- tools/perf/util/dwarf-aux.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
tools/perf/util/dwarf-aux.c +9 -5
@@ -678,10 +678,9 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)if (lw->retval !=0 )return DIE_FIND_CB_END ; } +if (!lw->recursive) +return DIE_FIND_CB_SIBLING ; } -if (!lw->recursive) -/* Don't need to search recursively */ -return DIE_FIND_CB_SIBLING ;if (addr) { fname =dwarf_decl_file (in_die);
@@ -728,6 +727,10 @@ static int __die_walk_culines_cb(Dwarf_Die *sp_die, void *data) {struct __line_walk_param *lw = data; +/* +* Since inlined function can include another inlined function in +* the same file, we need to walk in it recursively. +*/ lw->retval =__die_walk_funclines (sp_die, true, lw->callback, lw->data);if (lw->retval !=0 )return DWARF_CB_ABORT ;
@@ -817,8 +820,9 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)*/ if (rt_die != cu_die)/* -* Don't need walk functions recursively, because nested -* inlined functions don't have lines of the specified DIE. +* Don't need walk inlined functions recursively, because +* inner inlined functions don't have the lines of the +* specified function. */ ret =__die_walk_funclines (rt_die, false, callback, data);else {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 17/63 perf probe: Fix to show function entry line as probe-able
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix die_walk_lines() to list the function entry line correctly. Since the dwarf_entrypc() does not return the entry pc if the DIE has only range attribute, __die_walk_funclines() fails to list the declaration line (entry line) in that case.
To solve this issue, this introduces die_entrypc() which correctly returns the entry PC (the first address range) even if the DIE has only range attribute. With this fix die_walk_lines() shows the function entry line is able to probe correctly.
--- tools/perf/util/dwarf-aux.c | 24 +++++++++++++++++++++++- tools/perf/util/dwarf-aux.h | 3 +++ 2 files changed, 26 insertions(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +23 -1
@@ -307,6 +307,28 @@ bool die_is_func_def(Dwarf_Die *dw_die) dwarf_attr(dw_die, DW_AT_declaration, &attr) == NULL); } +/** +* die_entrypc - Returns entry PC (the lowest address) of a DIE +* @dw_die: a DIE +* @addr: where to store entry PC +* +* Since dwarf_entrypc() does not return entry PC if the DIE has only address +* range, we have to use this to retrieve the lowest address from the address +* range attribute. +*/ +int die_entrypc (Dwarf_Die *dw_die,Dwarf_Addr *addr) +{ +Dwarf_Addr base, end; + +if (!addr) +return -EINVAL ; + +if (dwarf_entrypc (dw_die, addr) ==0 ) +return 0 ; + +return dwarf_ranges (dw_die,0 , &base, addr, &end) <0 ? -ENOENT :0 ; +} +/** * die_is_func_instance - Ensure that this DIE is an instance of a subprogram * @dw_die: a DIE
@@ -713,7 +735,7 @@ static int __die_walk_funclines(Dwarf_Die *sp_die, bool recursive,/* Handle function declaration line */ fname =dwarf_decl_file (sp_die);if (fname &&dwarf_decl_line (sp_die, &lineno) ==0 && -dwarf_entrypc (sp_die, &addr) ==0 ) { +die_entrypc (sp_die, &addr) ==0 ) { lw.retval =callback (fname, lineno, addr, data);if (lw.retval !=0 ) goto done;
tools/perf/util/dwarf-aux.h +3 -0
@@ -29,6 +29,9 @@ int cu_walk_functions_at(Dwarf_Die *cu_die, Dwarf_Addr addr,/* Get DW_AT_linkage_name (should be NULL for C binary) */ const char *die_get_linkage_name (Dwarf_Die *dw_die); +/* Get the lowest PC in DIE (including range list) */ +int die_entrypc (Dwarf_Die *dw_die,Dwarf_Addr *addr); +/* Ensure that this DIE is a subprogram and definition (not declaration) */ bool die_is_func_def (Dwarf_Die *dw_die);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 18/63 perf jevents: Fix resource leak in process_mapfile() and main()
In reply to Arnaldo Carvalho de MeloFrom: Yunfeng Ye <[email protected]>
There are memory leaks and file descriptor resource leaks in process_mapfile() and main().
Fix this by adding free(), fclose() and free_arch_std_events() on the error paths.
--- tools/perf/pmu-events/jevents.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
tools/perf/pmu-events/jevents.c +11 -2
@@ -772,6 +772,7 @@ static int process_mapfile(FILE *outfp, char *fpath)char *line, *p;int line_num;char *tblname; +int ret =0 ;pr_info ("%s: Processing mapfile %s\n" , prog, fpath);
@@ -783,6 +784,7 @@ static int process_mapfile(FILE *outfp, char *fpath)if (!mapfp) {pr_info ("%s: Error %s opening %s\n" , prog,strerror (errno), fpath); +free (line);return -1 ; }
@@ -809,7 +811,8 @@ static int process_mapfile(FILE *outfp, char *fpath)/* TODO Deal with lines longer than 16K */ pr_info ("%s: Mapfile %s: line %d too long, aborting\n" , prog, fpath, line_num); -return -1 ; + ret =-1 ; + goto out; } line[strlen (line)-1 ] ='\0' ;
@@ -839,7 +842,9 @@ static int process_mapfile(FILE *outfp, char *fpath) out:print_mapping_table_suffix (outfp); -return 0 ; +fclose (mapfp); +free (line); +return ret; }/*
@@ -1136,6 +1141,7 @@ int main(int argc, char *argv[]) goto empty_map; }else if (rc <0 ) {/* Make build fail */ +fclose (eventsfp);free_arch_std_events ();return 1 ; }else if (rc) {
@@ -1148,6 +1154,7 @@ int main(int argc, char *argv[]) goto empty_map; }else if (rc <0 ) {/* Make build fail */ +fclose (eventsfp);free_arch_std_events ();return 1 ; }else if (rc) {
@@ -1165,6 +1172,8 @@ int main(int argc, char *argv[])if (process_mapfile (eventsfp, mapfile)) {pr_info ("%s: Error processing mapfile %s\n" , prog, mapfile);/* Make build fail */ +fclose (eventsfp); +free_arch_std_events ();return 1 ; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 19/63 perf probe: Fix wrong address verification
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Since there are some DIE which has only ranges instead of the combination of entrypc/highpc, address verification must use dwarf_haspc() instead of dwarf_entrypc/dwarf_highpc.
Also, the ranges only DIE will have a partial code in different section (e.g. unlikely code will be in text.unlikely as "FUNC.cold" symbol). In that case, we can not use dwarf_entrypc() or die_entrypc(), because the offset from original DIE can be a minus value.
Instead, this simply gets the symbol and offset from symtab.
Without this patch;
# perf probe -D clear_tasks_mm_cpumask:1
Failed to get entry address of clear_tasks_mm_cpumask
Error: Failed to add events.And with this patch:
# perf probe -D clear_tasks_mm_cpumask:1 p:probe/clear_tasks_mm_cpumask clear_tasks_mm_cpumask+0 p:probe/clear_tasks_mm_cpumask_1 clear_tasks_mm_cpumask+5 p:probe/clear_tasks_mm_cpumask_2 clear_tasks_mm_cpumask+8 p:probe/clear_tasks_mm_cpumask_3 clear_tasks_mm_cpumask+16 p:probe/clear_tasks_mm_cpumask_4 clear_tasks_mm_cpumask+82
Committer testing:
I managed to reproduce the above:
[root@quaco ~]# perf probe -D clear_tasks_mm_cpumask:1 p:probe/clear_tasks_mm_cpumask _text+919968 p:probe/clear_tasks_mm_cpumask_1 _text+919973 p:probe/clear_tasks_mm_cpumask_2 _text+919976 [root@quaco ~]#
But then when trying to actually put the probe in place, it fails if I use :0 as the offset:
[root@quaco ~]# perf probe -L clear_tasks_mm_cpumask | head -5
<clear_tasks_mm_cpumask@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/kernel/cpu.c:0>
0 void clear_tasks_mm_cpumask(int cpu)
1 {
2 struct task_struct *p; [root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Probe point 'clear_tasks_mm_cpumask' not found.
Error: Failed to add events.
[root@quaco
The next patch is needed to fix this case.
--- tools/perf/util/probe-finder.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-)
tools/perf/util/probe-finder.c +10 -22
@@ -604,38 +604,26 @@ static int convert_to_trace_point(Dwarf_Die *sp_die, Dwfl_Module *mod,const char *function, struct probe_trace_point *tp) { - Dwarf_Addr eaddr, highaddr; + Dwarf_Addr eaddr;GElf_Sym sym;const char *symbol;/* Verify the address is correct */ -if (dwarf_entrypc (sp_die, &eaddr) !=0 ) { -pr_warning ("Failed to get entry address of %s\n" , -dwarf_diename (sp_die)); -return -ENOENT ; - } -if (dwarf_highpc (sp_die, &highaddr) !=0 ) { -pr_warning ("Failed to get end address of %s\n" , -dwarf_diename (sp_die)); -return -ENOENT ; - } -if (paddr > highaddr) { -pr_warning ("Offset specified is greater than size of %s\n" , +if (!dwarf_haspc (sp_die, paddr)) { +pr_warning ("Specified offset is out of %s\n" ,dwarf_diename (sp_die));return -EINVAL ; } - symbol =dwarf_diename (sp_die); +/* Try to get actual symbol name from symtab */ + symbol =dwfl_module_addrsym (mod, paddr, &sym,NULL );if (!symbol) { -/* Try to get the symbol name from symtab */ - symbol =dwfl_module_addrsym (mod, paddr, &sym,NULL ); -if (!symbol) { -pr_warning ("Failed to find symbol at 0x%lx\n" , - (unsigned long )paddr); -return -ENOENT ; - } - eaddr = sym.st_value; +pr_warning ("Failed to find symbol at 0x%lx\n" , + (unsigned long )paddr); +return -ENOENT ; } + eaddr = sym.st_value; + tp->offset = (unsigned long )(paddr - eaddr); tp->address = (unsigned long )paddr; tp->symbol =strdup (symbol);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 20/63 perf probe: Fix to probe a function which has no entry pc
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix 'perf probe' to probe a function which has no entry pc or low pc but only has ranges attribute.
probe_point_search_cb() uses dwarf_entrypc() to get the probe address, but that doesn't work for the function DIE which has only ranges attribute. Use die_entrypc() instead.
Without this fix:
# perf probe -k ../build-x86_64/vmlinux -D clear_tasks_mm_cpumask:0
Probe point 'clear_tasks_mm_cpumask' not found.
Error: Failed to add events.With this:
# perf probe -k ../build-x86_64/vmlinux -D clear_tasks_mm_cpumask:0 p:probe/clear_tasks_mm_cpumask clear_tasks_mm_cpumask+0
Committer testing:
Before:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Probe point 'clear_tasks_mm_cpumask' not found.
Error: Failed to add events.
[root@quaco ~]#
After:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask:0 Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask)
You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
[root@quaco ~]#
Using it with 'perf trace':
[root@quaco ~]# perf trace -e probe:clear_tasks_mm_cpumask
Doesn't seem to be used in x86_64:
$ find . -name "*.c" | xargs grep clear_tasks_mm_cpumask ./kernel/cpu.c: * clear_tasks_mm_cpumask - Safely clear tasks' mm_cpumask for a CPU ./kernel/cpu.c:void clear_tasks_mm_cpumask(int cpu) ./arch/xtensa/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/csky/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/sh/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/arm/kernel/smp.c: clear_tasks_mm_cpumask(cpu); ./arch/powerpc/mm/nohash/mmu_context.c: clear_tasks_mm_cpumask(cpu); $ find . -name "*.h" | xargs grep clear_tasks_mm_cpumask ./include/linux/cpu.h:void clear_tasks_mm_cpumask(int cpu); $ find . -name "*.S" | xargs grep clear_tasks_mm_cpumask $
--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-finder.c +1 -1
@@ -982,7 +982,7 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data) param->retval =find_probe_point_by_line (pf); }else if (die_is_func_instance (sp_die)) {/* Instances always have the entry address */ -dwarf_entrypc (sp_die, &pf->addr); +die_entrypc (sp_die, &pf->addr);/* But in some case the entry address is 0 */ if (pf->addr ==0 ) { pr_debug("%s has no entry PC. Skipped\n",
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 21/63 perf probe: Fix to probe an inline function which has no entry pc
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix perf probe to probe an inlne function which has no entry pc or low pc but only has ranges attribute.
This seems very rare case, but I could find a few examples, as same as probe_point_search_cb(), use die_entrypc() to get the entry address in probe_point_inline_cb() too.
Without this patch:
# perf probe -D __amd_put_nb_event_constraints
Failed to get entry address of __amd_put_nb_event_constraints.
Probe point '__amd_put_nb_event_constraints' not found.
Error: Failed to add events.With this patch:
# perf probe -D __amd_put_nb_event_constraints p:probe/__amd_put_nb_event_constraints amd_put_event_constraints+43
Committer testing:
Before:
[root@quaco ~]# perf probe -D __amd_put_nb_event_constraints Failed to get entry address of __amd_put_nb_event_constraints. Probe point '__amd_put_nb_event_constraints' not found.
Error: Failed to add events.
[root@quaco ~]#
After:
[root@quaco ~]# perf probe -D __amd_put_nb_event_constraints p:probe/__amd_put_nb_event_constraints _text+33789 [root@quaco ~]#
--- tools/perf/util/probe-finder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/probe-finder.c +1 -1
@@ -930,7 +930,7 @@ static int probe_point_inline_cb(Dwarf_Die *in_die, void *data) ret =find_probe_point_lazy (in_die, pf); else {/* Get probe address */ -if (dwarf_entrypc (in_die, &addr) !=0 ) { +if (die_entrypc (in_die, &addr) !=0 ) {pr_warning ("Failed to get entry address of %s.\n" ,dwarf_diename (in_die));return -ENOENT ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 22/63 perf probe: Fix to list probe event with correct line number
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Since debuginfo__find_probe_point() uses dwarf_entrypc() for finding the entry address of the function on which a probe is, it will fail when the function DIE has only ranges attribute.
To fix this issue, use die_entrypc() instead of dwarf_entrypc().
Without this fix, perf probe -l shows incorrect offset:
# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579263632@work/linux/linux/kernel/cpu.c)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask+18446744071579263752@work/linux/linux/kernel/cpu.c)With this:
# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@work/linux/linux/kernel/cpu.c)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:21@work/linux/linux/kernel/cpu.c)Committer testing:
Before:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask+18446744071579765152@kernel/cpu.c)
[root@quaco ~]#
After:
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#
--- tools/perf/util/probe-finder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/probe-finder.c +2 -2
@@ -1566,7 +1566,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,/* Get function entry information */ func = basefunc =dwarf_diename (&spdie);if (!func || -dwarf_entrypc (&spdie, &baseaddr) !=0 || +die_entrypc (&spdie, &baseaddr) !=0 ||dwarf_decl_line (&spdie, &baseline) !=0 ) { lineno =0 ; goto post;
@@ -1583,7 +1583,7 @@ int debuginfo__find_probe_point(struct debuginfo *dbg, unsigned long addr,while (die_find_top_inlinefunc (&spdie, (Dwarf_Addr )addr, &indie)) {/* There is an inline function */ -if (dwarf_entrypc (&indie, &_addr) ==0 && +if (die_entrypc (&indie, &_addr) ==0 && _addr == addr) {/* * addr is at an inline function entry.
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 23/63 perf probe: Fix to show inlined function callsite without entry_pc
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix 'perf probe --line' option to show inlined function callsite lines even if the function DIE has only ranges.
Without this:
# perf probe -L amd_put_event_constraints
...
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
__amd_put_nb_event_constraints(cpuc, event);
5 }With this patch:
# perf probe -L amd_put_event_constraints
...
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
4 __amd_put_nb_event_constraints(cpuc, event);
5 }Committer testing:
Before:
[root@quaco ~]# perf probe -L amd_put_event_constraints
<amd_put_event_constraints@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/arch/x86/events/amd/core.c:0>
0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
struct perf_event *event)
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
__amd_put_nb_event_constraints(cpuc, event);
5 } PMU_FORMAT_ATTR(event, "config:0-7,32-35");
PMU_FORMAT_ATTR(umask, "config:8-15" );[root@quaco ~]#
After:
[root@quaco ~]# perf probe -L amd_put_event_constraints
<amd_put_event_constraints@/usr/src/debug/kernel-5.2.fc30/linux-5.2.18-200.fc30.x86_64/arch/x86/events/amd/core.c:0>
0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
struct perf_event *event)
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
4 __amd_put_nb_event_constraints(cpuc, event);
5 } PMU_FORMAT_ATTR(event, "config:0-7,32-35");
PMU_FORMAT_ATTR(umask, "config:8-15" ); [root@quaco ~]# perf probe amd_put_event_constraints:4 Added new event:
probe:amd_put_event_constraints (on amd_put_event_constraints:4)
You can now use it in all perf tools, such as:
perf record -e probe:amd_put_event_constraints -aR sleep 1
[root@quaco ~]#
[root@quaco ~]# perf probe -l
probe:amd_put_event_constraints (on amd_put_event_constraints:4@arch/x86/events/amd/core.c) probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c)
[root@quaco ~]#
Using it:
[root@quaco ~]# perf trace -e probe:*
^C[root@quaco ~]#
Ok, Intel system here... :-)
--- tools/perf/util/dwarf-aux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +1 -1
@@ -695,7 +695,7 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)if (dwarf_tag (in_die) == DW_TAG_inlined_subroutine) { fname =die_get_call_file (in_die); lineno =die_get_call_lineno (in_die); -if (fname && lineno >0 &&dwarf_entrypc (in_die, &addr) ==0 ) { +if (fname && lineno >0 &&die_entrypc (in_die, &addr) ==0 ) { lw->retval = lw->callback (fname, lineno, addr, lw->data);if (lw->retval !=0 )return DIE_FIND_CB_END ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 24/63 perf probe: Fix to show ranges of variables in functions without entry_pc
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix to show ranges of variables (--range and --vars option) in functions which DIE has only ranges but no entry_pc attribute.
Without this fix:
# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> (No matched variables)
With this fix:
# perf probe --range -V clear_tasks_mm_cpumask Available variables at clear_tasks_mm_cpumask @<clear_tasks_mm_cpumask+0> [VAL] int cpu @<clear_tasks_mm_cpumask+[0-35,317-317,2052-2059]>
Committer testing:
Before:
[root@quaco ~]# perf probe --range -V clear_tasks_mm_cpumask
Available variables at clear_tasks_mm_cpumask
@<clear_tasks_mm_cpumask+0>
(No matched variables)
[root@quaco ~]#After:
[root@quaco ~]# perf probe --range -V clear_tasks_mm_cpumask
Available variables at clear_tasks_mm_cpumask
@<clear_tasks_mm_cpumask+0>
[VAL] int cpu @<clear_tasks_mm_cpumask+[0-23,23-105,105-106,106-106,1843-1850,1850-1862]>
[root@quaco ~]#Using it:
[root@quaco ~]# perf probe clear_tasks_mm_cpumask cpu Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask with cpu)
You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
[root@quaco ~]# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c with cpu)
[root@quaco ~]#
[root@quaco ~]# perf trace -e probe:*cpumask
^C[root@quaco ~]#
--- tools/perf/util/dwarf-aux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/dwarf-aux.c +2 -2
@@ -1019,7 +1019,7 @@ static int die_get_var_innermost_scope(Dwarf_Die *sp_die, Dwarf_Die *vr_die,bool first = true;const char *name; - ret =dwarf_entrypc (sp_die, &entry); + ret =die_entrypc (sp_die, &entry);if (ret)return ret;
@@ -1082,7 +1082,7 @@ int die_get_var_range(Dwarf_Die *sp_die, Dwarf_Die *vr_die, struct strbuf *buf)bool first = true;const char *name; - ret =dwarf_entrypc (sp_die, &entry); + ret =die_entrypc (sp_die, &entry);if (ret)return ret;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 25/63 perf auxtrace: Add auxtrace_cache__remove()
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add auxtrace_cache__remove(). Intel PT uses an auxtrace_cache to store the results of code-walking, so that the same block of instructions does not have to be decoded repeatedly. However, when there are text poke events, the associated cache entries need to be removed.
--- tools/perf/util/auxtrace.c | 28 ++++++++++++++++++++++++++++ tools/perf/util/auxtrace.h | 1 + 2 files changed, 29 insertions(+)
tools/perf/util/auxtrace.c +28 -0
@@ -1457,6 +1457,34 @@ int auxtrace_cache__add(struct auxtrace_cache *c, u32 key,return 0 ; } +static struct auxtrace_cache_entry *auxtrace_cache__rm (struct auxtrace_cache *c, +u32 key) +{ +struct auxtrace_cache_entry *entry; +struct hlist_head *hlist; +struct hlist_node *n; + +if (!c) +return NULL ; + + hlist = &c->hashtable[hash_32 (key, c->bits)]; +hlist_for_each_entry_safe (entry, n, hlist, hash) { +if (entry->key == key) { +hlist_del (&entry->hash); +return entry; + } + } + +return NULL ; +} + +void auxtrace_cache__remove (struct auxtrace_cache *c,u32 key) +{ +struct auxtrace_cache_entry *entry =auxtrace_cache__rm (c, key); + +auxtrace_cache__free_entry (c, entry); +} +void *auxtrace_cache__lookup (struct auxtrace_cache *c,u32 key) {struct auxtrace_cache_entry *entry;
tools/perf/util/auxtrace.h +1 -0
@@ -489,6 +489,7 @@ void *auxtrace_cache__alloc_entry(struct auxtrace_cache *c);void auxtrace_cache__free_entry (struct auxtrace_cache *c,void *entry);int auxtrace_cache__add (struct auxtrace_cache *c,u32 key,struct auxtrace_cache_entry *entry); +void auxtrace_cache__remove (struct auxtrace_cache *c,u32 key);void *auxtrace_cache__lookup (struct auxtrace_cache *c,u32 key); struct auxtrace_record *auxtrace_record__init(struct evlist *evlist,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 26/63 perf dso: Refactor dso_cache__read()
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Refactor dso_cache__read() to separate populating the cache from copying data from it. This is preparation for adding a cache "write" that will update the data in the cache.
--- tools/perf/util/dso.c | 64 +++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 27 deletions(-)
tools/perf/util/dso.c +37 -27
@@ -768,7 +768,7 @@ dso_cache__free(struct dso *dso)pthread_mutex_unlock (&dso->lock); } -static struct dso_cache *dso_cache__find (struct dso *dso,u64 offset) +static struct dso_cache *__dso_cache__find (struct dso *dso,u64 offset) {const struct rb_root *root = &dso->data.cache;struct rb_node *const *p = &root->rb_node;
@@ -863,54 +863,64 @@ static ssize_t file_read(struct dso *dso, struct machine *machine,return ret; } -static ssize_t -dso_cache__read (struct dso *dso,struct machine *machine, -u64 offset,u8 *data,ssize_t size) +static struct dso_cache *dso_cache__populate (struct dso *dso, +struct machine *machine, +u64 offset,ssize_t *ret) {u64 cache_offset = offset &DSO__DATA_CACHE_MASK ;struct dso_cache *cache;struct dso_cache *old; -ssize_t ret; cache =zalloc (sizeof (*cache) +DSO__DATA_CACHE_SIZE ); -if (!cache) -return -ENOMEM ; +if (!cache) { + *ret = -ENOMEM ; +return NULL ; + }if (dso->binary_type ==DSO_BINARY_TYPE__BPF_PROG_INFO ) - ret =bpf_read (dso, cache_offset, cache->data); + *ret =bpf_read (dso, cache_offset, cache->data);else - ret =file_read (dso, machine, cache_offset, cache->data); + *ret =file_read (dso, machine, cache_offset, cache->data); -if (ret >0 ) { - cache->offset = cache_offset; - cache->size = ret; +if (*ret <=0 ) { +free (cache); +return NULL ; + } - old =dso_cache__insert (dso, cache); -if (old) { -/* we lose the race */ -free (cache); - cache = old; - } + cache->offset = cache_offset; + cache->size = *ret; - ret =dso_cache__memcpy (cache, offset, data, size); + old =dso_cache__insert (dso, cache); +if (old) { +/* we lose the race */ +free (cache); + cache = old; } -if (ret <=0 ) -free (cache); +return cache; +} -return ret; +static struct dso_cache *dso_cache__find (struct dso *dso, +struct machine *machine, +u64 offset, +ssize_t *ret) +{ +struct dso_cache *cache =__dso_cache__find (dso, offset); + +return cache ? cache :dso_cache__populate (dso, machine, offset, ret); }static ssize_t dso_cache_read (struct dso *dso,struct machine *machine,u64 offset,u8 *data,ssize_t size) {struct dso_cache *cache; +ssize_t ret =0 ; - cache =dso_cache__find (dso, offset); -if (cache) -return dso_cache__memcpy (cache, offset, data, size); -else -return dso_cache__read (dso, machine, offset, data, size); + cache =dso_cache__find (dso, machine, offset, &ret); +if (!cache) +return ret; + +return dso_cache__memcpy (cache, offset, data, size); }/*
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 27/63 perf dso: Add dso__data_write_cache_addr()
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
Add functions to write into the dso file data cache, but not change the file itself.
--- tools/perf/util/dso.c | 73 ++++++++++++++++++++++++++++++++++--------- tools/perf/util/dso.h | 7 +++++ 2 files changed, 65 insertions(+), 15 deletions(-)
tools/perf/util/dso.c +58 -15
@@ -827,14 +827,16 @@ dso_cache__insert(struct dso *dso, struct dso_cache *new)return cache; } -static ssize_t -dso_cache__memcpy (struct dso_cache *cache,u64 offset, -u8 *data,u64 size) +static ssize_t dso_cache__memcpy (struct dso_cache *cache,u64 offset,u8 *data, +u64 size,bool out) {u64 cache_offset = offset - cache->offset;u64 cache_size =min (cache->size - cache_offset, size); -memcpy (data, cache->data + cache_offset, cache_size); +if (out) +memcpy (data, cache->data + cache_offset, cache_size); +else +memcpy (cache->data + cache_offset, data, cache_size);return cache_size; }
@@ -910,8 +912,8 @@ static struct dso_cache *dso_cache__find(struct dso *dso,return cache ? cache :dso_cache__populate (dso, machine, offset, ret); } -static ssize_t dso_cache_read (struct dso *dso,struct machine *machine, -u64 offset,u8 *data,ssize_t size) +static ssize_t dso_cache_io (struct dso *dso,struct machine *machine, +u64 offset,u8 *data,ssize_t size,bool out) {struct dso_cache *cache;ssize_t ret =0 ;
@@ -920,16 +922,16 @@ static ssize_t dso_cache_read(struct dso *dso, struct machine *machine,if (!cache)return ret; -return dso_cache__memcpy (cache, offset, data, size); +return dso_cache__memcpy (cache, offset, data, size, out); }/* * Reads and caches dso data DSO__DATA_CACHE_SIZE size chunks * in the rb_tree. Any read to already cached data is served -* by cached data. +* by cached data. Writes update the cache only, not the backing file. */ -static ssize_t cached_read (struct dso *dso,struct machine *machine, -u64 offset,u8 *data,ssize_t size) +static ssize_t cached_io (struct dso *dso,struct machine *machine, +u64 offset,u8 *data,ssize_t size,bool out) {ssize_t r =0 ;u8 *p = data;
@@ -937,7 +939,7 @@ static ssize_t cached_read(struct dso *dso, struct machine *machine, do { ssize_t ret; - ret = dso_cache_read(dso, machine, offset, p, size); + ret = dso_cache_io(dso, machine, offset, p, size, out); if (ret < 0) return ret;
@@ -1021,8 +1023,9 @@ off_t dso__data_size(struct dso *dso, struct machine *machine)return dso->data.file_size; } -static ssize_t data_read_offset (struct dso *dso,struct machine *machine, -u64 offset,u8 *data,ssize_t size) +static ssize_t data_read_write_offset (struct dso *dso,struct machine *machine, +u64 offset,u8 *data,ssize_t size, +bool out) {if (dso__data_file_size (dso, machine))return -1 ;
@@ -1034,7 +1037,7 @@ static ssize_t data_read_offset(struct dso *dso, struct machine *machine,if (offset + size < offset)return -1 ; -return cached_read (dso, machine, offset, data, size); +return cached_io (dso, machine, offset, data, size, out); }/**
@@ -1054,7 +1057,7 @@ ssize_t dso__data_read_offset(struct dso *dso, struct machine *machine,if (dso->data.status ==DSO_DATA_STATUS_ERROR )return -1 ; -return data_read_offset (dso, machine, offset, data, size); +return data_read_write_offset (dso, machine, offset, data, size, true); }/**
@@ -1075,6 +1078,46 @@ ssize_t dso__data_read_addr(struct dso *dso, struct map *map,return dso__data_read_offset (dso, machine, offset, data, size); } +/** +* dso__data_write_cache_offs - Write data to dso data cache at file offset +* @dso: dso object +* @machine: machine object +* @offset: file offset +* @data: buffer to write +* @size: size of the @data buffer +* +* Write into the dso file data cache, but do not change the file itself. +*/ +ssize_t dso__data_write_cache_offs (struct dso *dso,struct machine *machine, +u64 offset,const u8 *data_in,ssize_t size) +{ +u8 *data = (u8 *)data_in;/* cast away const to use same fns for r/w */ + +if (dso->data.status ==DSO_DATA_STATUS_ERROR ) +return -1 ; + +return data_read_write_offset (dso, machine, offset, data, size, false); +} + +/** +* dso__data_write_cache_addr - Write data to dso data cache at dso address +* @dso: dso object +* @machine: machine object +* @add: virtual memory address +* @data: buffer to write +* @size: size of the @data buffer +* +* External interface to write into the dso file data cache, but do not change +* the file itself. +*/ +ssize_t dso__data_write_cache_addr (struct dso *dso,struct map *map, +struct machine *machine,u64 addr, +const u8 *data,ssize_t size) +{ +u64 offset = map->map_ip (map, addr); +return dso__data_write_cache_offs (dso, machine, offset, data, size); +} +struct map *dso__new_map (const char *name) {struct map *map =NULL ;
tools/perf/util/dso.h +7 -0
@@ -285,6 +285,8 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* dso__data_size * dso__data_read_offset * dso__data_read_addr +* dso__data_write_cache_offs +* dso__data_write_cache_addr * * Please refer to the dso.c object code for each function and * arguments documentation. Following text tries to explain the
@@ -332,6 +334,11 @@ ssize_t dso__data_read_addr(struct dso *dso, struct map *map, struct machine *machine, u64 addr, u8 *data, ssize_t size);bool dso__data_status_seen (struct dso *dso,enum dso_data_status_seen by); +ssize_t dso__data_write_cache_offs (struct dso *dso,struct machine *machine, +u64 offset,const u8 *data,ssize_t size); +ssize_t dso__data_write_cache_addr (struct dso *dso,struct map *map, +struct machine *machine,u64 addr, +const u8 *data,ssize_t size);struct map *dso__new_map (const char *name); struct dso *machine__findnew_kernel(struct machine *machine, const char *name,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 28/63 perf map: Check if the map still has some refcounts on exit
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
We were checking just if it was still on some rb tree, but that is not the only way that this map can still have references, map->refcnt is there exactly for this, use it.
--- tools/perf/util/map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/map.c +1 -1
@@ -288,7 +288,7 @@ bool map__has_symbols(const struct map *map)static void map__exit (struct map *map) { -BUG_ON (!RB_EMPTY_NODE (&map->rb_node)); +BUG_ON (refcount_read (&map->refcnt) !=0 );dso__zput (map->dso); }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 29/63 perf map: Allow map__next() to receive a NULL arg
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Just like free(), return NULL in that case, will simplify the for_each_entry_safe() iterators.
--- tools/perf/util/map.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
tools/perf/util/map.c +6 -1
@@ -1007,7 +1007,7 @@ struct map *maps__first(struct maps *maps)return NULL ; } -struct map *map__next (struct map *map) +static struct map *__map__next (struct map *map) {struct rb_node *next =rb_next (&map->rb_node);
@@ -1016,6 +1016,11 @@ struct map *map__next(struct map *map)return NULL ; } +struct map *map__next (struct map *map) +{ +return map ?__map__next (map) :NULL ; +} +struct kmap *__map__kmap (struct map *map) {if (!map->dso || !map->dso->kernel)
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 30/63 perf maps: Add for_each_entry()/_safe() iterators
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
To reduce boilerplate, provide a more compact form using an idiom present in other trees of data structures.
--- tools/perf/arch/x86/util/event.c | 2 +- tools/perf/builtin-report.c | 6 ++-- tools/perf/tests/vmlinux-kallsyms.c | 6 ++-- tools/perf/util/machine.c | 2 +- tools/perf/util/map.c | 56 +++++++++++++++++------------ tools/perf/util/map_groups.h | 15 ++++++++ tools/perf/util/probe-event.c | 2 +- tools/perf/util/symbol.c | 16 ++++----- tools/perf/util/synthetic-events.c | 2 +- tools/perf/util/thread.c | 2 +- 10 files changed, 65 insertions(+), 44 deletions(-)
tools/perf/arch/x86/util/event.c +1 -1
@@ -29,7 +29,7 @@ int perf_event__synthesize_extra_kmaps(struct perf_tool *tool,return -1 ; } -for (pos =maps__first (maps); pos; pos =map__next (pos)) { +maps__for_each_entry (maps, pos) {struct kmap *kmap;size_t size;
tools/perf/builtin-report.c +2 -4
@@ -727,11 +727,9 @@ static struct task *tasks_list(struct task *task, struct machine *machine)static size_t maps__fprintf_task (struct maps *maps,int indent,FILE *fp) {size_t printed =0 ; -struct rb_node *nd; - -for (nd =rb_first (&maps->entries); nd; nd =rb_next (nd)) { - struct map *map = rb_entry(nd, struct map, rb_node); +struct map *map; +maps__for_each_entry (maps, map) { printed += fprintf(fp, "%*s %" PRIx64 "-%" PRIx64 " %c%c%c%c %08" PRIx64 " %" PRIu64 " %s\n", indent, "", map->start, map->end, map->prot & PROT_READ ? 'r' : '-',
tools/perf/tests/vmlinux-kallsyms.c +3 -3
@@ -182,7 +182,7 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest header_printed = false; -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {struct map */* * If it is the kernel, kallsyms is always "[kernel.kallsyms]", while
@@ -207,7 +207,7 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest header_printed = false; -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {struct map *pair; mem_start = vmlinux_map->unmap_ip (vmlinux_map, map->start);
@@ -237,7 +237,7 @@ int test__vmlinux_matches_kallsyms(struct test *test __maybe_unused, int subtest maps =machine__kernel_maps (&kallsyms); -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {if (!map->priv) {if (!header_printed) {pr_info ("WARN: Maps only in kallsyms:\n" );
tools/perf/util/machine.c +1 -1
@@ -1057,7 +1057,7 @@ int machine__map_x86_64_entry_trampolines(struct machine *machine,* In the vmlinux case, pgoff is a virtual address which must now be * mapped to a vmlinux offset. */ -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) {struct kmap *kmap =__map__kmap (map);struct map *dest_map;
tools/perf/util/map.c +34 -22
100 lines not on this page · raw message
tools/perf/util/map_groups.h +15 -0
@@ -25,7 +25,22 @@ void maps__remove(struct maps *maps, struct map *map);struct map *maps__find (struct maps *maps,u64 addr);struct map *maps__first (struct maps *maps);struct map *map__next (struct map *map); + +#define maps__for_each_entry (maps, map) \ + for (map = maps__first(maps); map; map = map__next(map)) + +#define maps__for_each_entry_safe (maps, map, next) \ + for (map = maps__first(maps), next = map__next(map); map; map = next, next = map__next(map)) +struct symbol *maps__find_symbol_by_name (struct maps *maps,const char *name,struct map **mapp); +struct map *maps__first_by_name (struct maps *maps); +struct map *map__next_by_name (struct map *map); + +#define maps__for_each_entry_by_name (maps, map) \ + for (map = maps__first_by_name(maps); map; map = map__next_by_name(map)) + +#define maps__for_each_entry_by_name_safe (maps, map, next) \ + for (map = maps__first_by_name(maps), next = map__next_by_name(map); map; map = next, next = map__next_by_name(map))struct map_groups {struct maps maps;
tools/perf/util/probe-event.c +1 -1
@@ -153,7 +153,7 @@ static struct map *kernel_get_module_map(const char *module)return map__get (pos); } -for (pos =maps__first (maps); pos; pos =map__next (pos)) { +maps__for_each_entry (maps, pos) {/* short_name is "[module]" */ if (strncmp(pos->dso->short_name + 1, module, pos->dso->short_name_len - 2) == 0 &&
tools/perf/util/symbol.c +6 -10
@@ -242,28 +242,24 @@ void symbols__fixup_end(struct rb_root_cached *symbols)void map_groups__fixup_end (struct map_groups *mg) {struct maps *maps = &mg->maps; -struct map *next, *curr; +struct map *prev =NULL , *curr;down_write (&maps->lock); - curr =maps__first (maps); -if (curr ==NULL ) - goto out_unlock; +maps__for_each_entry (maps, curr) { +if (prev !=NULL && !prev->end) + prev->end = curr->start; -for (next =map__next (curr); next; next =map__next (curr)) { -if (!curr->end) - curr->end = next->start; - curr = next; + prev = curr; }/* * We still haven't the actual symbols, so guess the * last map final address. */ -if (!curr->end) +if (curr && !curr->end) curr->end = ~0ULL ; -out_unlock:up_write (&maps->lock); }
tools/perf/util/synthetic-events.c +1 -1
@@ -438,7 +438,7 @@ int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_telse event->header.misc =PERF_RECORD_MISC_GUEST_KERNEL ; -for (pos =maps__first (maps); pos; pos =map__next (pos)) { +maps__for_each_entry (maps, pos) {size_t size;if (!__map__is_kmodule (pos))
tools/perf/util/thread.c +1 -1
@@ -350,7 +350,7 @@ static int __thread__prepare_access(struct thread *thread)down_read (&maps->lock); -for (map =maps__first (maps); map; map =map__next (map)) { +maps__for_each_entry (maps, map) { err =unwind__prepare_access (thread->mg, map, &initialized);if (err || initialized)break ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 31/63 perf map_groups: Introduce for_each_entry() and for_each_entry_safe() iterators
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
To reduce boilerplate, providing a more compact form to iterate over the maps in a map_group.
--- tools/perf/tests/map_groups.c | 9 ++++----- tools/perf/util/map_groups.h | 9 ++++----- tools/perf/util/symbol.c | 24 ++++-------------------- tools/perf/util/vdso.c | 4 ++-- 4 files changed, 14 insertions(+), 32 deletions(-)
tools/perf/tests/map_groups.c +4 -5
@@ -18,17 +18,16 @@ static int check_maps(struct map_def *merged, unsigned int size, struct map_groustruct map *map;unsigned int i =0 ; - map =map_groups__first (mg); -while (map) { +map_groups__for_each_entry (mg, map) { +if (i >0 ) +TEST_ASSERT_VAL ("less maps expected" , (map && i < size) || (!map && i == size)); +TEST_ASSERT_VAL ("wrong map start" , map->start == merged[i].start);TEST_ASSERT_VAL ("wrong map end" , map->end == merged[i].end);TEST_ASSERT_VAL ("wrong map name" , !strcmp (map->dso->name, merged[i].name));TEST_ASSERT_VAL ("wrong map refcnt" ,refcount_read (&map->refcnt) ==2 ); i++; - map =map_groups__next (map); - -TEST_ASSERT_VAL ("less maps expected" , (map && i < size) || (!map && i == size)); }return TEST_OK ;
tools/perf/util/map_groups.h +4 -5
@@ -89,12 +89,11 @@ static inline struct map *map_groups__find(struct map_groups *mg, u64 addr)return maps__find (&mg->maps, addr); } -struct map *map_groups__first (struct map_groups *mg); +#define map_groups__for_each_entry (mg, map) \ + for (map = maps__first(&mg->maps); map; map = map__next(map)) -static inline struct map *map_groups__next (struct map *map) -{ -return map__next (map); -} +#define map_groups__for_each_entry_safe (mg, map, next) \ + for (map = maps__first(&mg->maps), next = map__next(map); map; map = next, next = map__next(map))struct symbol *map_groups__find_symbol (struct map_groups *mg,u64 addr,struct map **mapp);struct symbol *map_groups__find_symbol_by_name (struct map_groups *mg,const char *name,struct map **mapp);
tools/perf/util/symbol.c +4 -20
@@ -1049,11 +1049,6 @@ int compare_proc_modules(const char *from, const char *to)return ret; } -struct map *map_groups__first (struct map_groups *mg) -{ -return maps__first (&mg->maps); -} -static int do_validate_kcore_modules (const char *filename,struct map_groups *kmaps) {
@@ -1065,13 +1060,10 @@ static int do_validate_kcore_modules(const char *filename,if (err)return err; - old_map =map_groups__first (kmaps); -while (old_map) { -struct map *next =map_groups__next (old_map); +map_groups__for_each_entry (kmaps, old_map) {struct module_info *mi;if (!__map__is_kmodule (old_map)) { - old_map = next;continue ; }
@@ -1081,8 +1073,6 @@ static int do_validate_kcore_modules(const char *filename, err = -EINVAL ; goto out; } - - old_map = next; } out:delete_modules (&modules);
@@ -1185,9 +1175,7 @@ int map_groups__merge_in(struct map_groups *kmaps, struct map *new_map)struct map *old_map;LIST_HEAD (merged); -for (old_map =map_groups__first (kmaps); old_map; - old_map =map_groups__next (old_map)) { - +map_groups__for_each_entry (kmaps, old_map) {/* no overload with this one */ if (new_map->end < old_map->start || new_map->start >= old_map->end)
@@ -1260,7 +1248,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map, {struct map_groups *kmaps =map__kmaps (map);struct kcore_mapfn_data md; -struct map *old_map, *new_map, *replacement_map =NULL ; +struct map *old_map, *new_map, *replacement_map =NULL , *next;struct machine *machine;bool is_64_bit;int err, fd;
@@ -1307,10 +1295,7 @@ static int dso__load_kcore(struct dso *dso, struct map *map, }/* Remove old maps */ - old_map =map_groups__first (kmaps); -while (old_map) { -struct map *next =map_groups__next (old_map); - +map_groups__for_each_entry_safe (kmaps, old_map, next) {/* * We need to preserve eBPF maps even if they are * covered by kcore, because we need to access
@@ -1318,7 +1303,6 @@ static int dso__load_kcore(struct dso *dso, struct map *map,*/ if (old_map != map && !__map__is_bpf_prog (old_map))map_groups__remove (kmaps, old_map); - old_map = next; } machine->trampolines_mapped = false;
tools/perf/util/vdso.c +2 -2
@@ -142,9 +142,9 @@ static enum dso_type machine__thread_dso_type(struct machine *machine, struct thread *thread) {enum dso_type dso_type =DSO__TYPE_UNKNOWN ; -struct map *map =map_groups__first (thread->mg); +struct map *map; -for (; map ; map =map_groups__next (map)) { +map_groups__for_each_entry (thread->mg, map) {struct dso *dso = map->dso;if (!dso || dso->long_name[0 ] !='/' )continue ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 32/63 libsubcmd: Move EXTRA_FLAGS to the end to allow overriding existing flags
In reply to Arnaldo Carvalho de MeloFrom: James Clark <[email protected]>
Move EXTRA_WARNINGS and EXTRA_FLAGS to the end of the compilation line, otherwise they cannot be used to override the default values.
--- tools/lib/subcmd/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/lib/subcmd/Makefile +3 -2
@@ -19,8 +19,7 @@ MAKEFLAGS += --no-print-directory LIBFILE = $(OUTPUT)libsubcmd.a -CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -fPIC +CFLAGS := -ggdb3 -Wall -Wextra -std=gnu99 -fPIC ifeq ($(DEBUG),0) ifeq ($(feature-fortify-source), 1)
@@ -43,6 +42,8 @@ CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -I$(srctree)/tools/include/ +CFLAGS += $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) + SUBCMD_IN := $(OUTPUT)libsubcmd-in.o all:
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 33/63 libsubcmd: Use -O0 with DEBUG=1
In reply to Arnaldo Carvalho de MeloFrom: James Clark <[email protected]>
When a 'make DEBUG=1' build is done, the command parser is still built with -O6 and is hard to step through, fix it making it use -O0 in that case.
--- tools/lib/subcmd/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/lib/subcmd/Makefile +3 -1
@@ -27,7 +27,9 @@ ifeq ($(DEBUG),0) endif endif -ifeq ($(CC_NO_CLANG), 0) +ifeq ($(DEBUG),1) + CFLAGS += -O0 +else ifeq ($(CC_NO_CLANG), 0) CFLAGS += -O3 else CFLAGS += -O6
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 34/63 perf tools: Splice events onto evlist even on error
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
If event parsing fails the event list is leaked, instead splice the list onto the out result and let the caller cleanup.
An example input for parse_events found by libFuzzer that reproduces this memory leak is 'm{'.
--- tools/perf/util/parse-events.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
tools/perf/util/parse-events.c +11 -6
@@ -1927,15 +1927,20 @@ int parse_events(struct evlist *evlist, const char *str, ret =parse_events__scanner (str, &parse_state,PE_START_EVENTS );perf_pmu__parse_cleanup (); + +if (!ret &&list_empty (&parse_state.list)) { +WARN_ONCE (true,"WARNING: event parser found nothing\n" ); +return -1 ; + } + +/* +* Add list to the evlist even with errors to allow callers to clean up. +*/ +perf_evlist__splice_list_tail (evlist, &parse_state.list); +if (!ret) {struct evsel *last; -if (list_empty (&parse_state.list)) { -WARN_ONCE (true,"WARNING: event parser found nothing\n" ); -return -1 ; - } - -perf_evlist__splice_list_tail (evlist, &parse_state.list); evlist->nr_groups += parse_state.nr_groups; last =evlist__last (evlist); last->cmdline_group_boundary = true;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 36/63 perf vendor events intel: Update all the Intel JSON metrics from TMAM 3.6.
In reply to Arnaldo Carvalho de MeloFrom: Haiyan Song <[email protected]>
New Metrics:
- DSB_Switches: fraction of cycles CPU was stalled due to switches from DSB to MITE pipeline [all]
- L2_Evictions_{Silent|NonSilent}_PKI: L2 {silent|non silent} ecivtions rate per Kilo instruction [SKX+]
- IpFarBranch - Instructions per Far Branch
Other Enhancements & fixes:
- KBLR/CFL & CLX move to separate columns (no column sharing via if #model)
- Re-organized/renamed Metric Group
--- .../arch/x86/broadwell/bdw-metrics.json | 178 +++++++-------- .../arch/x86/broadwellx/bdx-metrics.json | 184 +++++++-------- .../arch/x86/cascadelakex/clx-metrics.json | 210 ++++++++++-------- .../arch/x86/haswell/hsw-metrics.json | 164 +++++++------- .../arch/x86/haswellx/hsx-metrics.json | 170 +++++++------- .../arch/x86/ivybridge/ivb-metrics.json | 170 +++++++------- .../arch/x86/ivytown/ivt-metrics.json | 172 +++++++------- .../arch/x86/jaketown/jkt-metrics.json | 114 +++++----- .../arch/x86/sandybridge/snb-metrics.json | 112 +++++----- .../arch/x86/skylake/skl-metrics.json | 188 ++++++++-------- .../arch/x86/skylakex/skx-metrics.json | 204 +++++++++-------- 11 files changed, 954 insertions(+), 912 deletions(-)
tools/perf/pmu-events/arch/x86/broadwell/bdw-metrics.json +89 -89
@@ -1,352 +1,352 @@ [ { - "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * cycles)", - "PublicDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend. Frontend denotes the first part of the processor core responsible to fetch operations that are executed later on by the Backend part. Within the Frontend; a branch predictor predicts the next address to fetch; cache-lines are fetched from the memory subsystem; parsed into instructions; and lastly decoded into micro-ops (uops). Ideally the Frontend can issue 4 uops every cycle to the Backend. Frontend Bound denotes unutilized issue-slots when there is no Backend stall; i.e. bubbles where Frontend delivered no uops while Backend could have accepted them. For example; stalls due to instruction-cache misses would be categorized under Frontend Bound.", "BriefDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend", + "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * cycles)", "MetricGroup": "TopdownL1", - "MetricName": "Frontend_Bound" + "MetricName": "Frontend_Bound", + "PublicDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend. Frontend denotes the first part of the processor core responsible to fetch operations that are executed later on by the Backend part. Within the Frontend; a branch predictor predicts the next address to fetch; cache-lines are fetched from the memory subsystem; parsed into instructions; and lastly decoded into micro-ops (uops). Ideally the Frontend can issue 4 uops every cycle to the Backend. Frontend Bound denotes unutilized issue-slots when there is no Backend stall; i.e. bubbles where Frontend delivered no uops while Backend could have accepted them. For example; stalls due to instruction-cache misses would be categorized under Frontend Bound." }, { - "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", - "PublicDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend. Frontend denotes the first part of the processor core responsible to fetch operations that are executed later on by the Backend part. Within the Frontend; a branch predictor predicts the next address to fetch; cache-lines are fetched from the memory subsystem; parsed into instructions; and lastly decoded into micro-ops (uops). Ideally the Frontend can issue 4 uops every cycle to the Backend. Frontend Bound denotes unutilized issue-slots when there is no Backend stall; i.e. bubbles where Frontend delivered no uops while Backend could have accepted them. For example; stalls due to instruction-cache misses would be categorized under Frontend Bound. SMT version; u se when SMT is enabled and measuring per logical CPU.", "BriefDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend. SMT version; use when SMT is enabled and measuring per logical CPU.", + "MetricExpr": "IDQ_UOPS_NOT_DELIVERED.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", "MetricGroup": "TopdownL1_SMT", - "MetricName": "Frontend_Bound_SMT" + "MetricName": "Frontend_Bound_SMT", + "PublicDescription": "This category represents fraction of slots where the processor's Frontend undersupplies its Backend. Frontend denotes the first part of the processor core responsible to fetch operations that are executed later on by the Backend part. Within the Frontend; a branch predictor predicts the next address to fetch; cache-lines are fetched from the memory subsystem; parsed into instructions; and lastly decoded into micro-ops (uops). Ideally the Frontend can issue 4 uops every cycle to the Backend. Frontend Bound denotes unutilized issue-slots when there is no Backend stall; i.e. bubbles where Frontend delivered no uops while Backend could have accepted them. For example; stalls due to instruction-cache misses would be categorized under Frontend Bound. SMT version; u se when SMT is enabled and measuring per logical CPU." }, { - "MetricExpr": "( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES ) / (4 * cycles)", - "PublicDescription": "This category represents fraction of slots wasted due to incorrect speculations. This include slots used to issue uops that do not eventually get retired and slots for which the issue-pipeline was blocked due to recovery from earlier incorrect speculation. For example; wasted work due to miss-predicted branches are categorized under Bad Speculation category. Incorrect data speculation followed by Memory Ordering Nukes is another example.", "BriefDescription": "This category represents fraction of slots wasted due to incorrect speculations", + "MetricExpr": "( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES ) / (4 * cycles)", "MetricGroup": "TopdownL1", - "MetricName": "Bad_Speculation" + "MetricName": "Bad_Speculation", + "PublicDescription": "This category represents fraction of slots wasted due to incorrect speculations. This include slots used to issue uops that do not eventually get retired and slots for which the issue-pipeline was blocked due to recovery from earlier incorrect speculation. For example; wasted work due to miss-predicted branches are categorized under Bad Speculation category. Incorrect data speculation followed by Memory Ordering Nukes is another example." }, { - "MetricExpr": "( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * (( INT_MISC.RECOVERY_CYCLES_ANY / 2 )) ) / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", - "PublicDescription": "This category represents fraction of slots wasted due to incorrect speculations. This include slots used to issue uops that do not eventually get retired and slots for which the issue-pipeline was blocked due to recovery from earlier incorrect speculation. For example; wasted work due to miss-predicted branches are categorized under Bad Speculation category. Incorrect data speculation followed by Memory Ordering Nukes is another example. SMT version; use when SMT is enabled and measuring per logical CPU.", "BriefDescription": "This category represents fraction of slots wasted due to incorrect speculations. SMT version; use when SMT is enabled and measuring per logical CPU.", + "MetricExpr": "( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * (( INT_MISC.RECOVERY_CYCLES_ANY / 2 )) ) / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", "MetricGroup": "TopdownL1_SMT", - "MetricName": "Bad_Speculation_SMT" + "MetricName": "Bad_Speculation_SMT", + "PublicDescription": "This category represents fraction of slots wasted due to incorrect speculations. This include slots used to issue uops that do not eventually get retired and slots for which the issue-pipeline was blocked due to recovery from earlier incorrect speculation. For example; wasted work due to miss-predicted branches are categorized under Bad Speculation category. Incorrect data speculation followed by Memory Ordering Nukes is another example. SMT version; use when SMT is enabled and measuring per logical CPU." }, { - "MetricExpr": "1 - ( (IDQ_UOPS_NOT_DELIVERED.CORE / (4 * cycles)) + (( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES ) / (4 * cycles)) + (UOPS_RETIRED.RETIRE_SLOTS / (4 * cycles)) )", - "PublicDescription": "This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend. Backend is the portion of the processor core where the out-of-order scheduler dispatches ready uops into their respective execution units; and once completed these uops get retired according to program order. For example; stalls due to data-cache misses or stalls due to the divider unit being overloaded are both categorized under Backend Bound. Backend Bound is further divided into two main categories: Memory Bound and Core Bound.", "BriefDescription": "This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend", + "MetricExpr": "1 - ( (IDQ_UOPS_NOT_DELIVERED.CORE / (4 * cycles)) + (( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES ) / (4 * cycles)) + (UOPS_RETIRED.RETIRE_SLOTS / (4 * cycles)) )", "MetricGroup": "TopdownL1", - "MetricName": "Backend_Bound" + "MetricName": "Backend_Bound", + "PublicDescription": "This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend. Backend is the portion of the processor core where the out-of-order scheduler dispatches ready uops into their respective execution units; and once completed these uops get retired according to program order. For example; stalls due to data-cache misses or stalls due to the divider unit being overloaded are both categorized under Backend Bound. Backend Bound is further divided into two main categories: Memory Bound and Core Bound." }, { - "MetricExpr": "1 - ( (IDQ_UOPS_NOT_DELIVERED.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) + (( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * (( INT_MISC.RECOVERY_CYCLES_ANY / 2 )) ) / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) + (UOPS_RETIRED.RETIRE_SLOTS / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) )", - "PublicDescription": "This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend. Backend is the portion of the processor core where the out-of-order scheduler dispatches ready uops into their respective execution units; and once completed these uops get retired according to program order. For example; stalls due to data-cache misses or stalls due to the divider unit being overloaded are both categorized under Backend Bound. Backend Bound is further divided into two main categories: Memory Bound and Core Bound. SMT version; use when SMT is enabled and measuring per logical CPU.", "BriefDescription": "This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend. SMT version; use when SMT is enabled and measuring per logical CPU.", + "MetricExpr": "1 - ( (IDQ_UOPS_NOT_DELIVERED.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) + (( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * (( INT_MISC.RECOVERY_CYCLES_ANY / 2 )) ) / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) + (UOPS_RETIRED.RETIRE_SLOTS / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) )", "MetricGroup": "TopdownL1_SMT", - "MetricName": "Backend_Bound_SMT" + "MetricName": "Backend_Bound_SMT", + "PublicDescription": "This category represents fraction of slots where no uops are being delivered due to a lack of required resources for accepting new uops in the Backend. Backend is the portion of the processor core where the out-of-order scheduler dispatches ready uops into their respective execution units; and once completed these uops get retired according to program order. For example; stalls due to data-cache misses or stalls due to the divider unit being overloaded are both categorized under Backend Bound. Backend Bound is further divided into two main categories: Memory Bound and Core Bound. SMT version; use when SMT is enabled and measuring per logical CPU." }, { - "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / (4 * cycles)", - "PublicDescription": "This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired. Ideally; all pipeline slots would be attributed to the Retiring category. Retiring of 100% would indicate the maximum 4 uops retired per cycle has been achieved. Maximizing Retiring typically increases the Instruction-Per-Cycle metric. Note that a high Retiring value does not necessary mean there is no room for more performance. For example; Microcode assists are categorized under Retiring. They hurt performance and can often be avoided. ", "BriefDescription": "This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired", + "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / (4 * cycles)", "MetricGroup": "TopdownL1", - "MetricName": "Retiring" + "MetricName": "Retiring", + "PublicDescription": "This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired. Ideally; all pipeline slots would be attributed to the Retiring category. Retiring of 100% would indicate the maximum 4 uops retired per cycle has been achieved. Maximizing Retiring typically increases the Instruction-Per-Cycle metric. Note that a high Retiring value does not necessary mean there is no room for more performance. For example; Microcode assists are categorized under Retiring. They hurt performance and can often be avoided. " }, { - "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", - "PublicDescription": "This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired. Ideally; all pipeline slots would be attributed to the Retiring category. Retiring of 100% would indicate the maximum 4 uops retired per cycle has been achieved. Maximizing Retiring typically increases the Instruction-Per-Cycle metric. Note that a high Retiring value does not necessary mean there is no room for more performance. For example; Microcode assists are categorized under Retiring. They hurt performance and can often be avoided. SMT version; use when SMT is enabled and measuring per logical CPU.", "BriefDescription": "This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired. SMT version; use when SMT is enabled and measuring per logical CPU.", + "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))", "MetricGroup": "TopdownL1_SMT", - "MetricName": "Retiring_SMT" + "MetricName": "Retiring_SMT", + "PublicDescription": "This category represents fraction of slots utilized by useful work i.e. issued uops that eventually get retired. Ideally; all pipeline slots would be attributed to the Retiring category. Retiring of 100% would indicate the maximum 4 uops retired per cycle has been achieved. Maximizing Retiring typically increases the Instruction-Per-Cycle metric. Note that a high Retiring value does not necessary mean there is no room for more performance. For example; Microcode assists are categorized under Retiring. They hurt performance and can often be avoided. SMT version; use when SMT is enabled and measuring per logical CPU." }, { + "BriefDescription": "Instructions Per Cycle (per Logical Processor)", "MetricExpr": "INST_RETIRED.ANY / CPU_CLK_UNHALTED.THREAD", - "BriefDescription": "Instructions Per Cycle (per logical thread)", "MetricGroup": "TopDownL1", "MetricName": "IPC" }, { - "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / INST_RETIRED.ANY", "BriefDescription": "Uops Per Instruction", - "MetricGroup": "Pipeline;Retiring", + "MetricExpr": "UOPS_RETIRED.RETIRE_SLOTS / INST_RETIRED.ANY", + "MetricGroup": "Pipeline;Retire", "MetricName": "UPI" }, { - "MetricExpr": "INST_RETIRED.ANY / BR_INST_RETIRED.NEAR_TAKEN", "BriefDescription": "Instruction per taken branch", - "MetricGroup": "Branches;PGO", + "MetricExpr": "INST_RETIRED.ANY / BR_INST_RETIRED.NEAR_TAKEN", + "MetricGroup": "Branches;Fetch_BW;PGO", "MetricName": "IpTB" }, { - "MetricExpr": "BR_INST_RETIRED.ALL_BRANCHES / BR_INST_RETIRED.NEAR_TAKEN", "BriefDescription": "Branch instructions per taken branch. ", + "MetricExpr": "BR_INST_RETIRED.ALL_BRANCHES / BR_INST_RETIRED.NEAR_TAKEN", "MetricGroup": "Branches;PGO", "MetricName": "BpTB" }, { - "MetricExpr": "min( 1 , IDQ.MITE_UOPS / ( (UOPS_RETIRED.RETIRE_SLOTS / INST_RETIRED.ANY) * 16 * ( ICACHE.HIT + ICACHE.MISSES ) / 4.0 ) )", "BriefDescription": "Rough Estimation of fraction of fetched lines bytes that were likely (includes speculatively fetches) consumed by program instructions", - "MetricGroup": "PGO", + "MetricExpr": "min( 1 , IDQ.MITE_UOPS / ( (UOPS_RETIRED.RETIRE_SLOTS / INST_RETIRED.ANY) * 16 * ( ICACHE.HIT + ICACHE.MISSES ) / 4.0 ) )", + "MetricGroup": "PGO;IcMiss", "MetricName": "IFetch_Line_Utilization" }, { - "MetricExpr": "IDQ.DSB_UOPS / (( IDQ.DSB_UOPS + LSD.UOPS + IDQ.MITE_UOPS + IDQ.MS_UOPS ) )", "BriefDescription": "Fraction of Uops delivered by the DSB (aka Decoded ICache; or Uop Cache)", - "MetricGroup": "DSB;Frontend_Bandwidth", + "MetricExpr": "IDQ.DSB_UOPS / (( IDQ.DSB_UOPS + LSD.UOPS + IDQ.MITE_UOPS + IDQ.MS_UOPS ) )", + "MetricGroup": "DSB;Fetch_BW", "MetricName": "DSB_Coverage" }, { + "BriefDescription": "Cycles Per Instruction (per Logical Processor)", "MetricExpr": "1 / (INST_RETIRED.ANY / cycles)", - "BriefDescription": "Cycles Per Instruction (threaded)", "MetricGroup": "Pipeline;Summary", "MetricName": "CPI" }, { + "BriefDescription": "Per-Logical Processor actual clocks when the Logical Processor is active.", "MetricExpr": "CPU_CLK_UNHALTED.THREAD", - "BriefDescription": "Per-thread actual clocks when the logical processor is active.", "MetricGroup": "Summary", "MetricName": "CLKS" }, { + "BriefDescription": "Total issue-pipeline slots (per-Physical Core)", "MetricExpr": "4 * cycles", - "BriefDescription": "Total issue-pipeline slots (per core)", "MetricGroup": "TopDownL1", "MetricName": "SLOTS" }, { + "BriefDescription": "Total issue-pipeline slots (per-Physical Core)", "MetricExpr": "4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", - "BriefDescription": "Total issue-pipeline slots (per core)", "MetricGroup": "TopDownL1_SMT", "MetricName": "SLOTS_SMT" }, { + "BriefDescription": "Instructions per Load (lower number means higher occurance rate)", "MetricExpr": "INST_RETIRED.ANY / MEM_UOPS_RETIRED.ALL_LOADS", - "BriefDescription": "Instructions per Load (lower number means loads are more frequent)", - "MetricGroup": "Instruction_Type;L1_Bound", + "MetricGroup": "Instruction_Type", "MetricName": "IpL" }, { + "BriefDescription": "Instructions per Store (lower number means higher occurance rate)", "MetricExpr": "INST_RETIRED.ANY / MEM_UOPS_RETIRED.ALL_STORES", - "BriefDescription": "Instructions per Store", - "MetricGroup": "Instruction_Type;Store_Bound", + "MetricGroup": "Instruction_Type", "MetricName": "IpS" }, { + "BriefDescription": "Instructions per Branch (lower number means higher occurance rate)", "MetricExpr": "INST_RETIRED.ANY / BR_INST_RETIRED.ALL_BRANCHES", - "BriefDescription": "Instructions per Branch", - "MetricGroup": "Branches;Instruction_Type;Port_5;Port_6", + "MetricGroup": "Branches;Instruction_Type", "MetricName": "IpB" }, { + "BriefDescription": "Instruction per (near) call (lower number means higher occurance rate)", "MetricExpr": "INST_RETIRED.ANY / BR_INST_RETIRED.NEAR_CALL", - "BriefDescription": "Instruction per (near) call", "MetricGroup": "Branches", "MetricName": "IpCall" }, { - "MetricExpr": "INST_RETIRED.ANY", "BriefDescription": "Total number of retired Instructions", + "MetricExpr": "INST_RETIRED.ANY", "MetricGroup": "Summary", "MetricName": "Instructions" }, { - "MetricExpr": "INST_RETIRED.ANY / cycles", "BriefDescription": "Instructions Per Cycle (per physical core)", + "MetricExpr": "INST_RETIRED.ANY / cycles", "MetricGroup": "SMT", "MetricName": "CoreIPC" }, { - "MetricExpr": "INST_RETIRED.ANY / (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", "BriefDescription": "Instructions Per Cycle (per physical core)", + "MetricExpr": "INST_RETIRED.ANY / (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", "MetricGroup": "SMT", "MetricName": "CoreIPC_SMT" }, { - "MetricExpr": "(( 1 * ( FP_ARITH_INST_RETIRED.SCALAR_SINGLE + FP_ARITH_INST_RETIRED.SCALAR_DOUBLE ) + 2 * FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE + 4 * ( FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE + FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE ) + 8 * FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE )) / cycles", "BriefDescription": "Floating Point Operations Per Cycle", + "MetricExpr": "(( 1 * ( FP_ARITH_INST_RETIRED.SCALAR_SINGLE + FP_ARITH_INST_RETIRED.SCALAR_DOUBLE ) + 2 * FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE + 4 * ( FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE + FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE ) + 8 * FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE )) / cycles", "MetricGroup": "FLOPS", "MetricName": "FLOPc" }, { - "MetricExpr": "(( 1 * ( FP_ARITH_INST_RETIRED.SCALAR_SINGLE + FP_ARITH_INST_RETIRED.SCALAR_DOUBLE ) + 2 * FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE + 4 * ( FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE + FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE ) + 8 * FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE )) / (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", "BriefDescription": "Floating Point Operations Per Cycle", + "MetricExpr": "(( 1 * ( FP_ARITH_INST_RETIRED.SCALAR_SINGLE + FP_ARITH_INST_RETIRED.SCALAR_DOUBLE ) + 2 * FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE + 4 * ( FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE + FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE ) + 8 * FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE )) / (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", "MetricGroup": "FLOPS_SMT", "MetricName": "FLOPc_SMT" }, { - "MetricExpr": "UOPS_EXECUTED.THREAD / (( cpu@UOPS_EXECUTED.CORE\\,cmask\\=1@ / 2 ) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC)", "BriefDescription": "Instruction-Level-Parallelism (average number of uops executed when there is at least 1 uop executed)", - "MetricGroup": "Pipeline;Ports_Utilization", + "MetricExpr": "UOPS_EXECUTED.THREAD / (( cpu@UOPS_EXECUTED.CORE\\,cmask\\=1@ / 2 ) if #SMT_on else UOPS_EXECUTED.CYCLES_GE_1_UOP_EXEC)", + "MetricGroup": "Pipeline", "MetricName": "ILP" }, { + "BriefDescription": "Branch Misprediction Cost: Fraction of TopDown slots wasted per non-speculative branch misprediction (jeclear)", "MetricExpr": "( ((BR_MISP_RETIRED.ALL_BRANCHES / ( BR_MISP_RETIRED.ALL_BRANCHES + MACHINE_CLEARS.COUNT )) * (( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * INT_MISC.RECOVERY_CYCLES ) / (4 * cycles))) + (4 * IDQ_UOPS_NOT_DELIVERED.CYCLES_0_UOPS_DELIV.CORE / (4 * cycles)) * (12 * ( BR_MISP_RETIRED.ALL_BRANCHES + MACHINE_CLEARS.COUNT + BACLEARS.ANY ) / cycles) / (4 * IDQ_UOPS_NOT_DELIVERED.CYCLES_0_UOPS_DELIV.CORE / (4 * cycles)) ) * (4 * cycles) / BR_MISP_RETIRED.ALL_BRANCHES", - "BriefDescription": "Branch Misprediction Cost: Fraction of TopDown slots wasted per branch misprediction (jeclear and baclear)", - "MetricGroup": "Branch_Mispredicts", + "MetricGroup": "BrMispredicts", "MetricName": "Branch_Misprediction_Cost" }, { + "BriefDescription": "Branch Misprediction Cost: Fraction of TopDown slots wasted per non-speculative branch misprediction (jeclear)", "MetricExpr": "( ((BR_MISP_RETIRED.ALL_BRANCHES / ( BR_MISP_RETIRED.ALL_BRANCHES + MACHINE_CLEARS.COUNT )) * (( UOPS_ISSUED.ANY - UOPS_RETIRED.RETIRE_SLOTS + 4 * (( INT_MISC.RECOVERY_CYCLES_ANY / 2 )) ) / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))))) + (4 * IDQ_UOPS_NOT_DELIVERED.CYCLES_0_UOPS_DELIV.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) * (12 * ( BR_MISP_RETIRED.ALL_BRANCHES + MACHINE_CLEARS.COUNT + BACLEARS.ANY ) / cycles) / (4 * IDQ_UOPS_NOT_DELIVERED.CYCLES_0_UOPS_DELIV.CORE / (4 * (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )))) ) * (4 * (( ( CPU_CLK_UNHALT ED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))) / BR_MISP_RETIRED.ALL_BRANCHES", - "BriefDescription": "Branch Misprediction Cost: Fraction of TopDown slots wasted per branch misprediction (jeclear and baclear)", - "MetricGroup": "Branch_Mispredicts_SMT", + "MetricGroup": "BrMispredicts_SMT", "MetricName": "Branch_Misprediction_Cost_SMT" }, { - "MetricExpr": "INST_RETIRED.ANY / BR_MISP_RETIRED.ALL_BRANCHES", "BriefDescription": "Number of Instructions per non-speculative Branch Misprediction (JEClear)", - "MetricGroup": "Branch_Mispredicts", + "MetricExpr": "INST_RETIRED.ANY / BR_MISP_RETIRED.ALL_BRANCHES", + "MetricGroup": "BrMispredicts", "MetricName": "IpMispredict" }, { + "BriefDescription": "Core actual clocks when any Logical Processor is active on the Physical Core", "MetricExpr": "( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) )", - "BriefDescription": "Core actual clocks when any thread is active on the physical core", "MetricGroup": "SMT", "MetricName": "CORE_CLKS" }, { - "MetricExpr": "L1D_PEND_MISS.PENDING / ( MEM_LOAD_UOPS_RETIRED.L1_MISS + mem_load_uops_retired.hit_lfb )", "BriefDescription": "Actual Average Latency for L1 data-cache miss demand loads (in core cycles)", + "MetricExpr": "L1D_PEND_MISS.PENDING / ( MEM_LOAD_UOPS_RETIRED.L1_MISS + mem_load_uops_retired.hit_lfb )", "MetricGroup": "Memory_Bound;Memory_Lat", "MetricName": "Load_Miss_Real_Latency" }, { + "BriefDescription": "Memory-Level-Parallelism (average number of L1 miss demand load when there is at least one such miss. Per-Logical Processor)", "MetricExpr": "L1D_PEND_MISS.PENDING / L1D_PEND_MISS.PENDING_CYCLES", - "BriefDescription": "Memory-Level-Parallelism (average number of L1 miss demand load when there is at least one such miss. Per-thread)", "MetricGroup": "Memory_Bound;Memory_BW", "MetricName": "MLP" }, { - "MetricExpr": "( cpu@ITLB_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_LOAD_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_STORE_MISSES.WALK_DURATION\\,cmask\\=1@ + 7 * ( DTLB_STORE_MISSES.WALK_COMPLETED + DTLB_LOAD_MISSES.WALK_COMPLETED + ITLB_MISSES.WALK_COMPLETED ) ) / cycles", "BriefDescription": "Utilization of the core's Page Walker(s) serving STLB misses triggered by instruction/Load/Store accesses", + "MetricExpr": "( cpu@ITLB_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_LOAD_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_STORE_MISSES.WALK_DURATION\\,cmask\\=1@ + 7 * ( DTLB_STORE_MISSES.WALK_COMPLETED + DTLB_LOAD_MISSES.WALK_COMPLETED + ITLB_MISSES.WALK_COMPLETED ) ) / cycles", "MetricGroup": "TLB", "MetricName": "Page_Walks_Utilization" }, { - "MetricExpr": "( cpu@ITLB_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_LOAD_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_STORE_MISSES.WALK_DURATION\\,cmask\\=1@ + 7 * ( DTLB_STORE_MISSES.WALK_COMPLETED + DTLB_LOAD_MISSES.WALK_COMPLETED + ITLB_MISSES.WALK_COMPLETED ) ) / (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", "BriefDescription": "Utilization of the core's Page Walker(s) serving STLB misses triggered by instruction/Load/Store accesses", + "MetricExpr": "( cpu@ITLB_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_LOAD_MISSES.WALK_DURATION\\,cmask\\=1@ + cpu@DTLB_STORE_MISSES.WALK_DURATION\\,cmask\\=1@ + 7 * ( DTLB_STORE_MISSES.WALK_COMPLETED + DTLB_LOAD_MISSES.WALK_COMPLETED + ITLB_MISSES.WALK_COMPLETED ) ) / (( ( CPU_CLK_UNHALTED.THREAD / 2 ) * ( 1 + CPU_CLK_UNHALTED.ONE_THREAD_ACTIVE / CPU_CLK_UNHALTED.REF_XCLK ) ))", "MetricGroup": "TLB_SMT", "MetricName": "Page_Walks_Utilization_SMT" }, { - "MetricExpr": "64 * L1D.REPLACEMENT / 1000000000 / duration_time", "BriefDescription": "Average data fill bandwidth to the L1 data cache [GB / sec]", + "MetricExpr": "64 * L1D.REPLACEMENT / 1000000000 / duration_time", "MetricGroup": "Memory_BW", "MetricName": "L1D_Cache_Fill_BW" }, { - "MetricExpr": "64 * L2_LINES_IN.ALL / 1000000000 / duration_time", "BriefDescription": "Average data fill bandwidth to the L2 cache [GB / sec]", + "MetricExpr": "64 * L2_LINES_IN.ALL / 1000000000 / duration_time", "MetricGroup": "Memory_BW", "MetricName": "L2_Cache_Fill_BW" }, { - "MetricExpr": "64 * LONGEST_LAT_CACHE.MISS / 1000000000 / duration_time", "BriefDescription": "Average per-core data fill bandwidth to the L3 cache [GB / sec]", + "MetricExpr": "64 * LONGEST_LAT_CACHE.MISS / 1000000000 / duration_time", "MetricGroup": "Memory_BW", "MetricName": "L3_Cache_Fill_BW" }, { - "MetricExpr": "1000 * MEM_LOAD_UOPS_RETIRED.L1_MISS / INST_RETIRED.ANY", "BriefDescription": "L1 cache true misses per kilo instruction for retired demand loads", - "MetricGroup": "Cache_Misses;", + "MetricExpr": "1000 * MEM_LOAD_UOPS_RETIRED.L1_MISS / INST_RETIRED.ANY", + "MetricGroup": "Cache_Misses", "MetricName": "L1MPKI" }, { - "MetricExpr": "1000 * MEM_LOAD_UOPS_RETIRED.L2_MISS / INST_RETIRED.ANY", "BriefDescription": "L2 cache true misses per kilo instruction for retired demand loads", - "MetricGroup": "Cache_Misses;", + "MetricExpr": "1000 * MEM_LOAD_UOPS_RETIRED.L2_MISS / INST_RETIRED.ANY", + "MetricGroup": "Cache_Misses", "MetricName": "L2MPKI" }, { - "MetricExpr": "1000 * L2_RQSTS.MISS / INST_RETIRED.ANY", "BriefDescription": "L2 cache misses per kilo instruction for all request types (including speculative)", - "MetricGroup": "Cache_Misses;", + "MetricExpr": "1000 * L2_RQSTS.MISS / INST_RETIRED.ANY", + "MetricGroup": "Cache_Misses", "MetricName": "L2MPKI_All" }, { - "MetricExpr": "1000 * ( L2_RQSTS.REFERENCES - L2_RQSTS.MISS ) / INST_RETIRED.ANY", "BriefDescription": "L2 cache hits per kilo instruction for all request types (including speculative)", - "MetricGroup": "Cache_Misses;", + "MetricExpr": "1000 * ( L2_RQSTS.REFERENCES - L2_RQSTS.MISS ) / INST_RETIRED.ANY", + "MetricGroup": "Cache_Misses", "MetricName": "L2HPKI_All" }, { - "MetricExpr": "1000 * MEM_LOAD_UOPS_RETIRED.L3_MISS / INST_RETIRED.ANY", "BriefDescription": "L3 cache true misses per kilo instruction for retired demand loads", - "MetricGroup": "Cache_Misses;", + "MetricExpr": "1000 * MEM_LOAD_UOPS_RETIRED.L3_MISS / INST_RETIRED.ANY", + "MetricGroup": "Cache_Misses", "MetricName": "L3MPKI" }, { - "MetricExpr": "CPU_CLK_UNHALTED.REF_TSC / msr@tsc@", "BriefDescription": "Average CPU Utilization", + "MetricExpr": "CPU_CLK_UNHALTED.REF_TSC / msr@tsc@", "MetricGroup": "Summary", "MetricName": "CPU_Utilization" }, { - "MetricExpr": "( (( 1 * ( FP_ARITH_INST_RETIRED.SCALAR_SINGLE + FP_ARITH_INST_RETIRED.SCALAR_DOUBLE ) + 2 * FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE + 4 * ( FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE + FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE ) + 8 * FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE )) / 1000000000 ) / duration_time", "BriefDescription": "Giga Floating Point Operations Per Second", + "MetricExpr": "( (( 1 * ( FP_ARITH_INST_RETIRED.SCALAR_SINGLE + FP_ARITH_INST_RETIRED.SCALAR_DOUBLE ) + 2 * FP_ARITH_INST_RETIRED.128B_PACKED_DOUBLE + 4 * ( FP_ARITH_INST_RETIRED.128B_PACKED_SINGLE + FP_ARITH_INST_RETIRED.256B_PACKED_DOUBLE ) + 8 * FP_ARITH_INST_RETIRED.256B_PACKED_SINGLE )) / 1000000000 ) / duration_time", "MetricGroup": "FLOPS;Summary", "MetricName": "GFLOPs" }, { - "MetricExpr": "CPU_CLK_UNHALTED.THREAD / CPU_CLK_UNHALTED.REF_TSC", "BriefDescription": "Average Frequency Utilization relative nominal frequency", + "MetricExpr": "CPU_CLK_UNHALTED.THREAD / CPU_CLK_UNHALTED.REF_TSC", "MetricGroup": "Power", "MetricName": "Turbo_Utilization" }, { + "BriefDescription": "Fraction of cycles where both hardware Logical Processors were active", "MetricExpr": "1 - CPU_CLK_THREAD_UNHALTED.ONE_THREAD_ACTIVE / ( CPU_CLK_THREAD_UNHALTED.REF_XCLK_ANY / 2 ) if #SMT_on else 0", - "BriefDescription": "Fraction of cycles where both hardware threads were active", "MetricGroup": "SMT;Summary", "MetricName": "SMT_2T_Utilization" }, { - "MetricExpr": "CPU_CLK_UNHALTED.REF_TSC:u / CPU_CLK_UNHALTED.REF_TSC", "BriefDescription": "Fraction of cycles spent in Kernel mode", + "MetricExpr": "CPU_CLK_UNHALTED.REF_TSC:u / CPU_CLK_UNHALTED.REF_TSC", "MetricGroup": "Summary", "MetricName": "Kernel_Utilization" }, { - "MetricExpr": "64 * ( arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@ ) / 1000000 / duration_time / 1000", "BriefDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]", + "MetricExpr": "64 * ( arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@ ) / 1000000 / duration_time / 1000", "MetricGroup": "Memory_BW", "MetricName": "DRAM_BW_Use" }, { + "BriefDescription": "C3 residency percent per core", "MetricExpr": "(cstate_core@c3\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C3 residency percent per core", "MetricName": "C3_Core_Residency" }, { + "BriefDescription": "C6 residency percent per core", "MetricExpr": "(cstate_core@c6\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C6 residency percent per core", "MetricName": "C6_Core_Residency" }, { + "BriefDescription": "C7 residency percent per core", "MetricExpr": "(cstate_core@c7\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C7 residency percent per core", "MetricName": "C7_Core_Residency" }, { + "BriefDescription": "C2 residency percent per package", "MetricExpr": "(cstate_pkg@c2\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C2 residency percent per package", "MetricName": "C2_Pkg_Residency" }, { + "BriefDescription": "C3 residency percent per package", "MetricExpr": "(cstate_pkg@c3\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C3 residency percent per package", "MetricName": "C3_Pkg_Residency" }, { + "BriefDescription": "C6 residency percent per package", "MetricExpr": "(cstate_pkg@c6\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C6 residency percent per package", "MetricName": "C6_Pkg_Residency" }, { + "BriefDescription": "C7 residency percent per package", "MetricExpr": "(cstate_pkg@c7\\-residency@ / msr@tsc@) * 100", "MetricGroup": "Power", - "BriefDescription": "C7 residency percent per package",
"MetricName": "C7_Pkg_Residency"
}]
tools/perf/pmu-events/arch/x86/broadwellx/bdx-metrics.json +92 -92
462 lines not on this page · raw message
"MetricName": "C7_Pkg_Residency"
}]
tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json +114 -96
508 lines not on this page · raw message
"MetricName": "C7_Pkg_Residency"
}]
tools/perf/pmu-events/arch/x86/haswell/hsw-metrics.json +82 -82
404 lines not on this page · raw message
}
]
tools/perf/pmu-events/arch/x86/haswellx/hsx-metrics.json +85 -85
425 lines not on this page · raw message
}
]
tools/perf/pmu-events/arch/x86/ivybridge/ivb-metrics.json +85 -85
425 lines not on this page · raw message
}
]
tools/perf/pmu-events/arch/x86/ivytown/ivt-metrics.json +86 -86
335 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
}
]
tools/perf/pmu-events/arch/x86/jaketown/jkt-metrics.json +57 -57
114 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
}
]
tools/perf/pmu-events/arch/x86/sandybridge/snb-metrics.json +56 -56
112 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
}
]
tools/perf/pmu-events/arch/x86/skylake/skl-metrics.json +97 -91
188 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
"MetricName": "C7_Pkg_Residency"
}]
tools/perf/pmu-events/arch/x86/skylakex/skx-metrics.json +111 -93
204 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
"MetricName": "C7_Pkg_Residency"
}]
Signature · 1 line
2.21.0
Part of the diff is not shown here. View the raw message.
Arnaldo Carvalho de Melo
maintainerPATCH 37/63 perf env: Add perf_env__numa_node()
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
To speed up cpu to node lookup, add perf_env__numa_node(), that creates cpu array on the first lookup, that holds numa nodes for each stored cpu.
--- tools/perf/util/env.c | 40 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/env.h | 6 ++++++ 2 files changed, 46 insertions(+)
tools/perf/util/env.c +40 -0
@@ -180,6 +180,7 @@ void perf_env__exit(struct perf_env *env)zfree (&env->sibling_threads);zfree (&env->pmu_mappings);zfree (&env->cpu); +zfree (&env->numa_map);for (i =0 ; i < env->nr_numa_nodes; i++)perf_cpu_map__put (env->numa_nodes[i].map);
@@ -354,3 +355,42 @@ const char *perf_env__arch(struct perf_env *env)return normalize_arch (arch_name); } + + +int perf_env__numa_node (struct perf_env *env,int cpu) +{ +if (!env->nr_numa_map) { +struct numa_node *nn; +int i, nr =0 ; + +for (i =0 ; i < env->nr_numa_nodes; i++) { + nn = &env->numa_nodes[i]; + nr =max (nr,perf_cpu_map__max (nn->map)); + } + + nr++; + +/* +* We initialize the numa_map array to prepare +* it for missing cpus, which return node -1 +*/ + env->numa_map =malloc (nr *sizeof (int )); +if (!env->numa_map) +return -1 ; + +for (i =0 ; i < nr; i++) + env->numa_map[i] =-1 ; + + env->nr_numa_map = nr; + +for (i =0 ; i < env->nr_numa_nodes; i++) { +int tmp, j; + + nn = &env->numa_nodes[i]; +perf_cpu_map__for_each_cpu (j, tmp, nn->map) + env->numa_map[j] = i; + } + } + +return cpu >=0 && cpu < env->nr_numa_map ? env->numa_map[cpu] :-1 ; +}
tools/perf/util/env.h +6 -0
@@ -87,6 +87,10 @@ struct perf_env {struct rb_root btfs;u32 btfs_cnt; } bpf_progs; + +/* For fast cpu to numa node lookup via perf_env__numa_node */ +int *numa_map; +int nr_numa_map; };enum perf_compress_type {
@@ -120,4 +124,6 @@ struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env, __u32 prog_id);void perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node);struct btf_node *perf_env__find_btf (struct perf_env *env,__u32 btf_id); + +int perf_env__numa_node (struct perf_env *env,int cpu);#endif /* __PERF_ENV_H */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 38/63 perf stat: Add --per-node agregation support
In reply to Arnaldo Carvalho de MeloFrom: Jiri Olsa <[email protected]>
Adding new --per-node option to aggregate counts per NUMA nodes for system-wide mode measurements.
You can specify --per-node in live mode:
# perf stat -a -I 1000 -e cycles --per-node
# time node cpus counts unit events
1.000542550 N0 20 6,202,097 cycles
1.000542550 N1 20 639,559 cycles
2.002040063 N0 20 7,412,495 cycles
2.002040063 N1 20 2,185,577 cycles
3.003451699 N0 20 6,508,917 cycles
3.003451699 N1 20 765,607 cycles
...Or in the record/report stat session:
# perf stat record -a -I 1000 -e cycles
# time counts unit events
1.000536937 10,008,468 cycles
2.002090152 9,578,539 cycles
3.003625233 7,647,869 cycles
4.005135036 7,032,086 cycles
^C 4.340902364 3,923,893 cycles # perf stat report --per-node
# time node cpus counts unit events
1.000536937 N0 20 9,355,086 cycles
1.000536937 N1 20 653,382 cycles
2.002090152 N0 20 7,712,838 cycles
2.002090152 N1 20 1,865,701 cycles
3.003625233 N0 20 6,604,441 cycles
3.003625233 N1 20 1,043,428 cycles
4.005135036 N0 20 6,350,522 cycles
4.005135036 N1 20 681,564 cycles
4.340902364 N0 20 3,403,188 cycles
4.340902364 N1 20 520,705 cycles--- tools/perf/Documentation/perf-stat.txt | 5 +++ tools/perf/builtin-stat.c | 52 ++++++++++++++++++++++++++ tools/perf/util/cpumap.c | 18 +++++++++ tools/perf/util/cpumap.h | 3 ++ tools/perf/util/stat-display.c | 15 ++++++++ tools/perf/util/stat.c | 1 + tools/perf/util/stat.h | 1 + 7 files changed, 95 insertions(+)
tools/perf/Documentation/perf-stat.txt +5 -0
@@ -217,6 +217,11 @@ core number and the number of online logical processors on that physical process Aggregate counts per monitored threads, when monitoring threads (-t option) or processes (-p option). +--per-node:: +Aggregate counts per NUMA nodes for system-wide mode measurements. This +is a useful mode to detect imbalance between NUMA nodes. To enable this +mode, use --per-node in addition to -a. (system-wide). + -D msecs:: --delay msecs:: After starting the program, wait msecs before measuring. This is useful to
tools/perf/builtin-stat.c +52 -0
112 lines not on this page · raw message
tools/perf/util/cpumap.c +18 -0
@@ -206,6 +206,11 @@ int cpu_map__get_core_id(int cpu)return ret ?: value; } +int cpu_map__get_node_id (int cpu) +{ +return cpu__get_node (cpu); +} +int cpu_map__get_core (struct perf_cpu_map *map,int idx,void *data) {int cpu, s_die;
@@ -235,6 +240,14 @@ int cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data)return (s_die <<16 ) | (cpu &0xffff ); } +int cpu_map__get_node (struct perf_cpu_map *map,int idx,void *data__maybe_unused ) +{ +if (idx <0 || idx >= map->nr) +return -1 ; + +return cpu_map__get_node_id (map->map[idx]); +} +int cpu_map__build_socket_map (struct perf_cpu_map *cpus,struct perf_cpu_map **sockp) {return cpu_map__build_map (cpus, sockp, cpu_map__get_socket,NULL );
@@ -250,6 +263,11 @@ int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct perf_cpu_map **correturn cpu_map__build_map (cpus, corep, cpu_map__get_core,NULL ); } +int cpu_map__build_node_map (struct perf_cpu_map *cpus,struct perf_cpu_map **numap) +{ +return cpu_map__build_map (cpus, numap, cpu_map__get_node,NULL ); +} +/* setup simple routines to easily access node numbers given a cpu number */ static int get_max_num (char *path,int *max) {
tools/perf/util/cpumap.h +3 -0
@@ -20,9 +20,12 @@ int cpu_map__get_die_id(int cpu);int cpu_map__get_die (struct perf_cpu_map *map,int idx,void *data);int cpu_map__get_core_id (int cpu);int cpu_map__get_core (struct perf_cpu_map *map,int idx,void *data); +int cpu_map__get_node_id (int cpu); +int cpu_map__get_node (struct perf_cpu_map *map,int idx,void *data);int cpu_map__build_socket_map (struct perf_cpu_map *cpus,struct perf_cpu_map **sockp);int cpu_map__build_die_map (struct perf_cpu_map *cpus,struct perf_cpu_map **diep);int cpu_map__build_core_map (struct perf_cpu_map *cpus,struct perf_cpu_map **corep); +int cpu_map__build_node_map (struct perf_cpu_map *cpus,struct perf_cpu_map **nodep);const struct perf_cpu_map *cpu_map__online (void );/* thread unsafe */ static inline int cpu_map__socket (struct perf_cpu_map *sock,int s)
tools/perf/util/stat-display.c +15 -0
@@ -100,6 +100,15 @@ static void aggr_printout(struct perf_stat_config *config, nr, config->csv_sep);break ; +case AGGR_NODE : +fprintf (config->output,"N%*d%s%*d%s" , + config->csv_output ?0 :-5 , + id, + config->csv_sep, + config->csv_output ?0 :4 , + nr, + config->csv_sep); +break ;case AGGR_NONE :if (evsel->percore) { fprintf(config->output, "S%d-D%d-C%*d%s",
@@ -965,6 +974,11 @@ static void print_interval(struct perf_stat_config *config,if ((num_print_interval ==0 && !config->csv_output) || config->interval_clear) {switch (config->aggr_mode) { +case AGGR_NODE : +fprintf (output,"# time node cpus" ); +if (!metric_only) +fprintf (output," counts %*s events\n" , unit_width,"unit" ); +break ;case AGGR_SOCKET :fprintf (output,"# time socket cpus" );if (!metric_only)
@@ -1188,6 +1202,7 @@ perf_evlist__print_counters(struct evlist *evlist,case AGGR_CORE :case AGGR_DIE :case AGGR_SOCKET : +case AGGR_NODE :print_aggr (config, evlist, prefix);break ;case AGGR_THREAD :
tools/perf/util/stat.c +1 -0
@@ -299,6 +299,7 @@ process_counter_values(struct perf_stat_config *config, struct evsel *evsel,case AGGR_CORE :case AGGR_DIE :case AGGR_SOCKET : +case AGGR_NODE :case AGGR_NONE :if (!evsel->snapshot)perf_evsel__compute_deltas (evsel, cpu, thread, count);
tools/perf/util/stat.h +1 -0
@@ -47,6 +47,7 @@ enum aggr_mode {AGGR_CORE ,AGGR_THREAD ,AGGR_UNSET , + AGGR_NODE, }; enum {
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 39/63 perf tools: Fix cross compile for ARM64
In reply to Arnaldo Carvalho de MeloFrom: John Garry <[email protected]>
Currently when cross compiling perf tool for ARM64 on my x86 machine I get this error:
arch/arm64/util/sym-handling.c:9:10: fatal error: gelf.h: No such file or directory
#include <gelf.h>
For the build, libelf is reported off:
Auto-detecting system features:
...
... libelf: [ OFF ]
Indeed, test-libelf is not built successfully:
more ./build/feature/test-libelf.make.output test-libelf.c:2:10: fatal error: libelf.h: No such file or directory
#include <libelf.h>
^~~~~~~~~~compilation terminated.
I have no such problems natively compiling on ARM64, and I did not previously have this issue for cross compiling. Fix by relocating the gelf.h include.
--- tools/perf/arch/arm64/util/sym-handling.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/arch/arm64/util/sym-handling.c +2 -1
@@ -6,9 +6,10 @@#include "symbol.h" // for the elf__needs_adjust_symbols() prototype #include <stdbool.h> -#include <gelf.h> #ifdef HAVE_LIBELF_SUPPORT +#include <gelf.h> +bool elf__needs_adjust_symbols (GElf_Ehdr ehdr) { return ehdr.e_type == ET_EXEC ||
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 40/63 perf inject: Make --strip keep evsels
In reply to Arnaldo Carvalho de MeloFrom: Adrian Hunter <[email protected]>
create_gcov (refer to the autofdo example in tools/perf/Documentation/intel-pt.txt) now needs the evsels to read the perf.data file. So don't strip them.
--- tools/perf/builtin-inject.c | 54 ------------------------------------- 1 file changed, 54 deletions(-)
tools/perf/builtin-inject.c +0 -54
@@ -578,58 +578,6 @@ static void strip_init(struct perf_inject *inject) evsel->handler = drop_sample; } -static bool has_tracking (struct evsel *evsel) -{ -return evsel->core.attr.mmap || evsel->core.attr.mmap2 || evsel->core.attr.comm || - evsel->core.attr.task; -} - -#define COMPAT_MASK (PERF_SAMPLE_ID | PERF_SAMPLE_TID | PERF_SAMPLE_TIME | \ - PERF_SAMPLE_ID | PERF_SAMPLE_CPU | PERF_SAMPLE_IDENTIFIER) - -/* -* In order that the perf.data file is parsable, tracking events like MMAP need -* their selected event to exist, except if there is only 1 selected event left -* and it has a compatible sample type. -*/ -static bool ok_to_remove (struct evlist *evlist, -struct evsel *evsel_to_remove) -{ -struct evsel *evsel; -int cnt =0 ; -bool ok = false; - -if (!has_tracking (evsel_to_remove)) -return true; - -evlist__for_each_entry (evlist, evsel) { -if (evsel->handler != drop_sample) { - cnt +=1 ; -if ((evsel->core.attr.sample_type &COMPAT_MASK ) == - (evsel_to_remove->core.attr.sample_type &COMPAT_MASK )) - ok = true; - } - } - -return ok && cnt ==1 ; -} - -static void strip_fini (struct perf_inject *inject) -{ -struct evlist *evlist = inject->session->evlist; -struct evsel *evsel, *tmp; - -/* Remove non-synthesized evsels if possible */ -evlist__for_each_entry_safe (evlist, tmp, evsel) { -if (evsel->handler == drop_sample && -ok_to_remove (evlist, evsel)) { -pr_debug ("Deleting %s\n" ,perf_evsel__name (evsel)); -evlist__remove (evlist, evsel); -evsel__delete (evsel); - } - } -} -static int __cmd_inject (struct perf_inject *inject) {int ret = -EINVAL ;
@@ -729,8 +677,6 @@ static int __cmd_inject(struct perf_inject *inject)evlist__remove (session->evlist, evsel);evsel__delete (evsel); } -if (inject->strip) -strip_fini (inject); } session->header.data_offset = output_data_offset; session->header.data_size = inject->bytes_written;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 41/63 perf parse: Add parse events handle error
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Parse event error handling may overwrite one error string with another creating memory leaks. Introduce a helper routine that warns about multiple error messages as well as avoiding the memory leak.
A reproduction of this problem can be seen with:
perf stat -e c/c/
After this change this produces:
WARNING: multiple event parsing errors
event syntax error: 'c/c/'
\___ unknown term
valid terms: event,filter_rem,filter_opc0,edge,filter_isoc,filter_tid,filter_loc,filter_nc,inv,umask,filter_opc1,tid_en,thresh,filter_all_op,filter_not_nm,filter_state,filter_nm,config,config1,config2,name,period,percore Run 'perf list' for a list of valid events
Usage: perf stat [<options>] [<command>]
-e, --event <event> event selector. use 'perf list' to list available events
--- tools/perf/util/parse-events.c | 82 +++++++++++++++++++++------------- tools/perf/util/parse-events.h | 2 + tools/perf/util/pmu.c | 30 ++++++++----- 3 files changed, 71 insertions(+), 43 deletions(-)
tools/perf/util/parse-events.c +51 -31
@@ -182,6 +182,20 @@ static int tp_event_has_id(const char *dir_path, struct dirent *evt_dir)#define MAX_EVENT_LENGTH 512 +void parse_events__handle_error (struct parse_events_error *err,int idx, +char *str,char *help) +{ +if (WARN (!str,"WARNING: failed to provide error string\n" )) { +free (help); +return ; + } +WARN_ONCE (err->str,"WARNING: multiple event parsing errors\n" ); + err->idx = idx; +free (err->str); + err->str = str; +free (err->help); + err->help = help; +}struct tracepoint_path *tracepoint_id_to_path (u64 config) {
@@ -932,11 +946,11 @@ static int check_type_val(struct parse_events_term *term,return 0 ;if (err) { - err->idx = term->err_val; -if (type ==PARSE_EVENTS__TERM_TYPE_NUM ) - err->str =strdup ("expected numeric value" ); -else - err->str =strdup ("expected string value" ); +parse_events__handle_error (err, term->err_val, + type ==PARSE_EVENTS__TERM_TYPE_NUM + ?strdup ("expected numeric value" ) + :strdup ("expected string value" ), +NULL ); }return -EINVAL ; }
@@ -972,8 +986,11 @@ static bool config_term_shrinked;static bool config_term_avail (int term_type,struct parse_events_error *err) { +char *err_str; +if (term_type <0 || term_type >= __PARSE_EVENTS__TERM_TYPE_NR) { - err->str =strdup ("Invalid term_type" ); +parse_events__handle_error (err,-1 , +strdup ("Invalid term_type" ),NULL );return false; }if (!config_term_shrinked)
@@ -992,9 +1009,9 @@ config_term_avail(int term_type, struct parse_events_error *err)return false;/* term_type is validated so indexing is safe */ -if (asprintf (&err->str,"'%s' is not usable in 'perf stat'" , - config_term_names[term_type]) <0 ) - err->str =NULL ; +if (asprintf (&err_str,"'%s' is not usable in 'perf stat'" , + config_term_names[term_type]) >=0 ) +parse_events__handle_error (err,-1 , err_str,NULL );return false; } }
@@ -1036,17 +1053,20 @@ do { \case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE :CHECK_TYPE_VAL (STR );if (strcmp (term->val.str,"no" ) && -parse_branch_str (term->val.str, &attr->branch_sample_type)) { - err->str =strdup ("invalid branch sample type" ); - err->idx = term->err_val; +parse_branch_str (term->val.str, + &attr->branch_sample_type)) { +parse_events__handle_error (err, term->err_val, +strdup ("invalid branch sample type" ), +NULL );return -EINVAL ; }break ;case PARSE_EVENTS__TERM_TYPE_TIME :CHECK_TYPE_VAL (NUM );if (term->val.num >1 ) { - err->str =strdup ("expected 0 or 1" ); - err->idx = term->err_val; +parse_events__handle_error (err, term->err_val, +strdup ("expected 0 or 1" ), +NULL );return -EINVAL ; }break ;
@@ -1080,8 +1100,9 @@ do { \case PARSE_EVENTS__TERM_TYPE_PERCORE :CHECK_TYPE_VAL (NUM );if ((unsigned int )term->val.num >1 ) { - err->str =strdup ("expected 0 or 1" ); - err->idx = term->err_val; +parse_events__handle_error (err, term->err_val, +strdup ("expected 0 or 1" ), +NULL );return -EINVAL ; }break ;
@@ -1089,9 +1110,9 @@ do { \CHECK_TYPE_VAL (NUM );break ;default : - err->str =strdup ("unknown term" ); - err->idx = term->err_term; - err->help =parse_events_formats_error_string (NULL ); +parse_events__handle_error (err, term->err_term, +strdup ("unknown term" ), +parse_events_formats_error_string (NULL ));return -EINVAL ; }
@@ -1142,9 +1163,9 @@ static int config_term_tracepoint(struct perf_event_attr *attr,return config_term_common (attr, term, err);default :if (err) { - err->idx = term->err_term; - err->str =strdup ("unknown term" ); - err->help =strdup ("valid terms: call-graph,stack-size\n" ); +parse_events__handle_error (err, term->err_term, +strdup ("unknown term" ), +strdup ("valid terms: call-graph,stack-size\n" )); }return -EINVAL ; }
@@ -1323,10 +1344,12 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, pmu =perf_pmu__find (name);if (!pmu) { -if (asprintf (&err->str, +char *err_str; + +if (asprintf (&err_str,"Cannot find PMU `%s'. Missing kernel support?" , - name) <0 ) - err->str =NULL ; + name) >=0 ) +parse_events__handle_error (err,-1 , err_str,NULL );return -EINVAL ; }
@@ -2802,13 +2825,10 @@ void parse_events__clear_array(struct parse_events_array *a)void parse_events_evlist_error (struct parse_events_state *parse_state,int idx,const char *str) { -struct parse_events_error *err = parse_state->error; - -if (!err) +if (!parse_state->error)return ; - err->idx = idx; - err->str =strdup (str); -WARN_ONCE (!err->str,"WARNING: failed to allocate error string" ); + +parse_events__handle_error (parse_state->error, idx,strdup (str),NULL ); }static void config_terms_list (char *buf,size_t buf_sz)
tools/perf/util/parse-events.h +2 -0
@@ -124,6 +124,8 @@ struct parse_events_state {struct list_head *terms; }; +void parse_events__handle_error (struct parse_events_error *err,int idx, +char *str,char *help);void parse_events__shrink_config_terms (void );int parse_events__is_hardcoded_term (struct parse_events_term *term); int parse_events_term__num(struct parse_events_term **term,
tools/perf/util/pmu.c +18 -12
@@ -1050,9 +1050,9 @@ static int pmu_config_term(struct list_head *formats,if (err) {char *pmu_term =pmu_formats_string (formats); - err->idx = term->err_term; - err->str =strdup ("unknown term" ); - err->help =parse_events_formats_error_string (pmu_term); +parse_events__handle_error (err, term->err_term, +strdup ("unknown term" ), +parse_events_formats_error_string (pmu_term));free (pmu_term); }return -EINVAL ;
@@ -1080,8 +1080,9 @@ static int pmu_config_term(struct list_head *formats,if (term->no_value &&bitmap_weight (format->bits,PERF_PMU_FORMAT_BITS ) >1 ) {if (err) { - err->idx = term->err_val; - err->str =strdup ("no value assigned for term" ); +parse_events__handle_error (err, term->err_val, +strdup ("no value assigned for term" ), +NULL ); }return -EINVAL ; }
@@ -1094,8 +1095,9 @@ static int pmu_config_term(struct list_head *formats, term->config, term->val.str); }if (err) { - err->idx = term->err_val; - err->str =strdup ("expected numeric value" ); +parse_events__handle_error (err, term->err_val, +strdup ("expected numeric value" ), +NULL ); }return -EINVAL ; }
@@ -1108,11 +1110,15 @@ static int pmu_config_term(struct list_head *formats, max_val =pmu_format_max_value (format->bits);if (val > max_val) {if (err) { - err->idx = term->err_val; -if (asprintf (&err->str, -"value too big for format, maximum is %llu" , - (unsigned long long )max_val) <0 ) - err->str =strdup ("value too big for format" ); +char *err_str; + +parse_events__handle_error (err, term->err_val, +asprintf (&err_str, +"value too big for format, maximum is %llu" , + (unsigned long long )max_val) <0 + ?strdup ("value too big for format" ) + : err_str, +NULL );return -EINVAL ; }/*
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 42/63 perf parse: Ensure config and str in terms are unique
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Make it easier to release memory associated with parse event terms by duplicating the string for the config name and ensuring the val string is a duplicate.
Currently the parser may memory leak terms and this is addressed in a later patch.
--- tools/perf/util/parse-events.c | 51 ++++++++++++++++++++++++++++------ tools/perf/util/parse-events.y | 4 ++- 2 files changed, 45 insertions(+), 10 deletions(-)
tools/perf/util/parse-events.c +42 -9
@@ -1412,7 +1412,6 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,int parse_events_multi_pmu_add (struct parse_events_state *parse_state,char *str,struct list_head **listp) { -struct list_head *head;struct parse_events_term *term;struct list_head *list;struct perf_pmu *pmu =NULL ;
@@ -1429,19 +1428,30 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,list_for_each_entry (alias, &pmu->aliases, list) {if (!strcasecmp (alias->name, str)) { +struct list_head *head; +char *config; + head =malloc (sizeof (struct list_head ));if (!head)return -1 ;INIT_LIST_HEAD (head); -if (parse_events_term__num (&term,PARSE_EVENTS__TERM_TYPE_USER , - str,1 , false, &str,NULL ) <0 ) + config =strdup (str); +if (!config) +return -1 ; +if (parse_events_term__num (&term, +PARSE_EVENTS__TERM_TYPE_USER , + config,1 , false, &config, +NULL ) <0 ) { +free (list); +free (config);return -1 ; + }list_add_tail (&term->list, head);if (!parse_events_add_pmu (parse_state, list, pmu->name, head, true, true)) { -pr_debug ("%s -> %s/%s/\n" , str, +pr_debug ("%s -> %s/%s/\n" , config, pmu->name, alias->str); ok++; }
@@ -1450,8 +1460,10 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, } } } -if (!ok) +if (!ok) { +free (list);return -1 ; + } *listp = list;return 0 ; }
@@ -2746,30 +2758,51 @@ int parse_events_term__sym_hw(struct parse_events_term **term, char *config, unsigned idx) {struct event_symbol *sym; +char *str;struct parse_events_term temp = { .type_val =PARSE_EVENTS__TERM_TYPE_STR , .type_term =PARSE_EVENTS__TERM_TYPE_USER , - .config = config ?: (char *)"event" , + .config = config, }; +if (!temp.config) { + temp.config =strdup ("event" ); +if (!temp.config) +return -ENOMEM ; + }BUG_ON (idx >=PERF_COUNT_HW_MAX ); sym = &event_symbols_hw[idx]; -return new_term (term, &temp, (char *) sym->symbol,0 ); + str =strdup (sym->symbol); +if (!str) +return -ENOMEM ; +return new_term (term, &temp, str,0 ); }int parse_events_term__clone (struct parse_events_term **new,struct parse_events_term *term) { +char *str;struct parse_events_term temp = { .type_val = term->type_val, .type_term = term->type_term, - .config = term->config, + .config =NULL , .err_term = term->err_term, .err_val = term->err_val, }; -return new_term (new, &temp, term->val.str, term->val.num); +if (term->config) { + temp.config =strdup (term->config); +if (!temp.config) +return -ENOMEM ; + } +if (term->type_val ==PARSE_EVENTS__TERM_TYPE_NUM ) +return new_term (new, &temp,NULL , term->val.num); + + str =strdup (term->val.str); +if (!str) +return -ENOMEM ; +return new_term (new, &temp, str,0 ); } int parse_events_copy_term_list(struct list_head *old,
tools/perf/util/parse-events.y +3 -1
@@ -665,9 +665,11 @@ PE_NAME array '=' PE_VALUE PE_DRV_CFG_TERM { struct parse_events_term *term; + char *config = strdup($1); + ABORT_ON(!config); ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, - $1, $1, &@1, NULL)); + config, $1, &@1, NULL)); $$ = term; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 43/63 perf parse: Add destructors for parse event terms
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
If parsing fails then destructors are ran to clean the up the stack. Rename the head union member to make the term and evlist use cases more distinct, this simplifies matching the correct destructor.
Committer notes:
Jiri: "Nice did not know about this.. looks like it's been in bison for some time, right?"
Ian: "Looks like it wasn't in Bison 1 but in Bison 2, we're at Bison 3 and
Bison 2 is > 14 years old:
https://web.archive.org/web/20050924004158/http://www.gnu.org/software/bison/manual/html_mono/bison.html#Destructor-Decl"
--- tools/perf/util/parse-events.y | 69 +++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 21 deletions(-)
tools/perf/util/parse-events.y +48 -21
@@ -12,6 +12,7 @@ #include <stdio.h> #include <linux/compiler.h> #include <linux/types.h> +#include <linux/zalloc.h> #include "pmu.h" #include "evsel.h" #include "parse-events.h"
@@ -37,6 +38,25 @@ static struct list_head* alloc_list() return list; } +static void free_list_evsel(struct list_head* list_evsel) +{ + struct evsel *evsel, *tmp; + + list_for_each_entry_safe(evsel, tmp, list_evsel, core.node) { + list_del_init(&evsel->core.node); + perf_evsel__delete(evsel); + } + free(list_evsel); +} + +static void free_term(struct parse_events_term *term) +{ + if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR) + free(term->val.str); + zfree(&term->array.ranges); + free(term); +} + static void inc_group_count(struct list_head *list, struct parse_events_state *parse_state) {
@@ -66,6 +86,7 @@ static void inc_group_count(struct list_head *list, %type <num> PE_VALUE_SYM_TOOL %type <num> PE_RAW %type <num> PE_TERM +%type <num> value_sym %type <str> PE_NAME %type <str> PE_BPF_OBJECT %type <str> PE_BPF_SOURCE
@@ -76,37 +97,43 @@ static void inc_group_count(struct list_head *list, %type <str> PE_EVENT_NAME %type <str> PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT %type <str> PE_DRV_CFG_TERM -%type <num> value_sym -%type <head> event_config -%type <head> opt_event_config -%type <head> opt_pmu_config +%destructor { free ($$); } <str> %type <term> event_term -%type <head> event_pmu -%type <head> event_legacy_symbol -%type <head> event_legacy_cache -%type <head> event_legacy_mem -%type <head> event_legacy_tracepoint +%destructor { free_term ($$); } <term> +%type <list_terms> event_config +%type <list_terms> opt_event_config +%type <list_terms> opt_pmu_config +%destructor { parse_events_terms__delete ($$); } <list_terms> +%type <list_evsel> event_pmu +%type <list_evsel> event_legacy_symbol +%type <list_evsel> event_legacy_cache +%type <list_evsel> event_legacy_mem +%type <list_evsel> event_legacy_tracepoint +%type <list_evsel> event_legacy_numeric +%type <list_evsel> event_legacy_raw +%type <list_evsel> event_bpf_file +%type <list_evsel> event_def +%type <list_evsel> event_mod +%type <list_evsel> event_name +%type <list_evsel> event +%type <list_evsel> events +%type <list_evsel> group_def +%type <list_evsel> group +%type <list_evsel> groups +%destructor { free_list_evsel ($$); } <list_evsel> %type <tracepoint_name> tracepoint_name -%type <head> event_legacy_numeric -%type <head> event_legacy_raw -%type <head> event_bpf_file -%type <head> event_def -%type <head> event_mod -%type <head> event_name -%type <head> event -%type <head> events -%type <head> group_def -%type <head> group -%type <head> groups +%destructor { free ($$.sys); free ($$.event); } <tracepoint_name> %type <array> array %type <array> array_term %type <array> array_terms +%destructor { free ($$.ranges); } <array> %union { char *str; u64 num; - struct list_head *head; + struct list_head *list_evsel; + struct list_head *list_terms; struct parse_events_term *term; struct tracepoint_name { char *sys;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 44/63 perf parse: Before yyabort-ing free components
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Yyabort doesn't destruct inputs and so this must be done manually before using yyabort.
--- tools/perf/util/parse-events.y | 252 ++++++++++++++++++++++++++------- 1 file changed, 197 insertions(+), 55 deletions(-)
tools/perf/util/parse-events.y +197 -55
@@ -152,6 +152,7 @@ start_events: groups { struct parse_events_state *parse_state = _parse_state; + /* frees $1 */ parse_events_update_lists($1, &parse_state->list); }
@@ -161,6 +162,7 @@ groups ',' group struct list_head *list = $1; struct list_head *group = $3; + /* frees $3 */ parse_events_update_lists(group, list); $$ = list; }
@@ -170,6 +172,7 @@ groups ',' event struct list_head *list = $1; struct list_head *event = $3; + /* frees $3 */ parse_events_update_lists(event, list); $$ = list; }
@@ -182,8 +185,14 @@ group: group_def ':' PE_MODIFIER_EVENT { struct list_head *list = $1; + int err; - ABORT_ON(parse_events__modifier_group(list, $3)); + err = parse_events__modifier_group(list, $3); + free($3); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; } |
@@ -196,6 +205,7 @@ PE_NAME '{' events '}' inc_group_count(list, _parse_state); parse_events__set_leader($1, list, _parse_state); + free($1); $$ = list; } |
@@ -214,6 +224,7 @@ events ',' event struct list_head *event = $3; struct list_head *list = $1; + /* frees $3 */ parse_events_update_lists(event, list); $$ = list; }
@@ -226,13 +237,19 @@ event_mod: event_name PE_MODIFIER_EVENT { struct list_head *list = $1; + int err; /* * Apply modifier on all events added by single event definition * (there could be more events added for multiple tracepoint * definitions via '*?'. */ - ABORT_ON(parse_events__modifier_event(list, $2, false)); + err = parse_events__modifier_event(list, $2, false); + free($2); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; } |
@@ -241,8 +258,14 @@ event_name event_name: PE_EVENT_NAME event_def { - ABORT_ON(parse_events_name($2, $1)); + int err; + + err = parse_events_name($2, $1); free($1); + if (err) { + free_list_evsel($2); + YYABORT; + } $$ = $2; } |
@@ -262,23 +285,33 @@ PE_NAME opt_pmu_config { struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; - struct list_head *list, *orig_terms, *terms; + struct list_head *list = NULL, *orig_terms = NULL, *terms= NULL; + char *pattern = NULL; + +#define CLEANUP_YYABORT \ + do { \ + parse_events_terms__delete($2); \ + parse_events_terms__delete(orig_terms); \ + free($1); \ + free(pattern); \ + YYABORT; \ + } while(0) if (parse_events_copy_term_list($2, &orig_terms)) - YYABORT; + CLEANUP_YYABORT; if (error) error->idx = @1.first_column; list = alloc_list(); - ABORT_ON(!list); + if (!list) + CLEANUP_YYABORT; if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { struct perf_pmu *pmu = NULL; int ok = 0; - char *pattern; if (asprintf(&pattern, "%s*", $1) < 0) - YYABORT; + CLEANUP_YYABORT; while ((pmu = perf_pmu__scan(pmu)) != NULL) { char *name = pmu->name;
@@ -287,31 +320,32 @@ PE_NAME opt_pmu_config strncmp($1, "uncore_", 7)) name += 7; if (!fnmatch(pattern, name, 0)) { - if (parse_events_copy_term_list(orig_terms, &terms)) { - free(pattern); - YYABORT; - } + if (parse_events_copy_term_list(orig_terms, &terms)) + CLEANUP_YYABORT; if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false)) ok++; parse_events_terms__delete(terms); } } - free(pattern); - if (!ok) - YYABORT; + CLEANUP_YYABORT; } parse_events_terms__delete($2); parse_events_terms__delete(orig_terms); + free($1); $$ = list; +#undef CLEANUP_YYABORT } | PE_KERNEL_PMU_EVENT sep_dc { struct list_head *list; + int err; - if (parse_events_multi_pmu_add(_parse_state, $1, &list) < 0) + err = parse_events_multi_pmu_add(_parse_state, $1, &list); + free($1); + if (err < 0) YYABORT; $$ = list; }
@@ -322,6 +356,8 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc char pmu_name[128]; snprintf(&pmu_name, 128, "%s-%s", $1, $3); + free($1); + free($3); if (parse_events_multi_pmu_add(_parse_state, pmu_name, &list) < 0) YYABORT; $$ = list;
@@ -338,11 +374,16 @@ value_sym '/' event_config '/' struct list_head *list; int type = $1 >> 16; int config = $1 & 255; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, type, config, $3)); + err = parse_events_add_numeric(_parse_state, list, type, config, $3); parse_events_terms__delete($3); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; } |
@@ -374,11 +415,19 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT opt_e struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6)); + err = parse_events_add_cache(list, &parse_state->idx, $1, $3, $5, error, $6); parse_events_terms__delete($6); + free($1); + free($3); + free($5); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; } |
@@ -387,11 +436,18 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT opt_event_config struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4)); + err = parse_events_add_cache(list, &parse_state->idx, $1, $3, NULL, error, $4); parse_events_terms__delete($4); + free($1); + free($3); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; } |
@@ -400,11 +456,17 @@ PE_NAME_CACHE_TYPE opt_event_config struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2)); + err = parse_events_add_cache(list, &parse_state->idx, $1, NULL, NULL, error, $2); parse_events_terms__delete($2); + free($1); + if (err) { + free_list_evsel(list); + YYABORT; + } $$ = list; }
@@ -413,11 +475,17 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE ':' PE_MODIFIER_BP sep_dc { struct parse_events_state *parse_state = _parse_state; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $6, $4)); + err = parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, $6, $4); + free($6); + if (err) { + free(list); + YYABORT; + } $$ = list; } |
@@ -428,8 +496,11 @@ PE_PREFIX_MEM PE_VALUE '/' PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, $4)); + if (parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, NULL, $4)) { + free(list); + YYABORT; + } $$ = list; } |
@@ -437,11 +508,17 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc { struct parse_events_state *parse_state = _parse_state; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, $4, 0)); + err = parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, $4, 0); + free($4); + if (err) { + free(list); + YYABORT; + } $$ = list; } |
@@ -452,8 +529,11 @@ PE_PREFIX_MEM PE_VALUE sep_dc list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_breakpoint(list, &parse_state->idx, - (void *) $2, NULL, 0)); + if (parse_events_add_breakpoint(list, &parse_state->idx, + (void *) $2, NULL, 0)) { + free(list); + YYABORT; + } $$ = list; }
@@ -463,29 +543,35 @@ tracepoint_name opt_event_config struct parse_events_state *parse_state = _parse_state; struct parse_events_error *error = parse_state->error; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); if (error) error->idx = @1.first_column; - if (parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, - error, $2)) - return -1; + err = parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, + error, $2); + parse_events_terms__delete($2); + free($1.sys); + free($1.event); + if (err) { + free(list); + return -1; + } $$ = list; } tracepoint_name: PE_NAME '-' PE_NAME ':' PE_NAME { - char sys_name[128]; struct tracepoint_name tracepoint; - snprintf(&sys_name, 128, "%s-%s", $1, $3); - tracepoint.sys = &sys_name; + ABORT_ON(asprintf(&tracepoint.sys, "%s-%s", $1, $3) < 0); tracepoint.event = $5; - + free($1); + free($3); $$ = tracepoint; } |
@@ -500,11 +586,16 @@ event_legacy_numeric: PE_VALUE ':' PE_VALUE opt_event_config { struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4)); + err = parse_events_add_numeric(_parse_state, list, (u32)$1, $3, $4); parse_events_terms__delete($4); + if (err) { + free(list); + YYABORT; + } $$ = list; }
@@ -512,11 +603,16 @@ event_legacy_raw: PE_RAW opt_event_config { struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2)); + err = parse_events_add_numeric(_parse_state, list, PERF_TYPE_RAW, $1, $2); parse_events_terms__delete($2); + if (err) { + free(list); + YYABORT; + } $$ = list; }
@@ -525,22 +621,33 @@ PE_BPF_OBJECT opt_event_config { struct parse_events_state *parse_state = _parse_state; struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_load_bpf(parse_state, list, $1, false, $2)); + err = parse_events_load_bpf(parse_state, list, $1, false, $2); parse_events_terms__delete($2); + free($1); + if (err) { + free(list); + YYABORT; + } $$ = list; } | PE_BPF_SOURCE opt_event_config { struct list_head *list; + int err; list = alloc_list(); ABORT_ON(!list); - ABORT_ON(parse_events_load_bpf(_parse_state, list, $1, true, $2)); + err = parse_events_load_bpf(_parse_state, list, $1, true, $2); parse_events_terms__delete($2); + if (err) { + free(list); + YYABORT; + } $$ = list; }
@@ -573,6 +680,10 @@ opt_pmu_config: start_terms: event_config { struct parse_events_state *parse_state = _parse_state; + if (parse_state->terms) { + parse_events_terms__delete ($1); + YYABORT; + } parse_state->terms = $1; }
@@ -582,7 +693,10 @@ event_config ',' event_term struct list_head *head = $1; struct parse_events_term *term = $3; - ABORT_ON(!head); + if (!head) { + free_term(term); + YYABORT; + } list_add_tail(&term->list, head); $$ = $1; }
@@ -603,8 +717,12 @@ PE_NAME '=' PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3, &@1, &@3)); + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $3, &@1, &@3)) { + free($1); + free($3); + YYABORT; + } $$ = term; } |
@@ -612,8 +730,11 @@ PE_NAME '=' PE_VALUE { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $3, false, &@1, &@3)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $3, false, &@1, &@3)) { + free($1); + YYABORT; + } $$ = term; } |
@@ -622,7 +743,10 @@ PE_NAME '=' PE_VALUE_SYM_HW struct parse_events_term *term; int config = $3 & 255; - ABORT_ON(parse_events_term__sym_hw(&term, $1, config)); + if (parse_events_term__sym_hw(&term, $1, config)) { + free($1); + YYABORT; + } $$ = term; } |
@@ -630,8 +754,11 @@ PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, 1, true, &@1, NULL)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, 1, true, &@1, NULL)) { + free($1); + YYABORT; + } $$ = term; } |
@@ -648,7 +775,10 @@ PE_TERM '=' PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3)); + if (parse_events_term__str(&term, (int)$1, NULL, $3, &@1, &@3)) { + free($3); + YYABORT; + } $$ = term; } |
@@ -672,9 +802,13 @@ PE_NAME array '=' PE_NAME { struct parse_events_term *term; - ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $4, &@1, &@4)); - + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $4, &@1, &@4)) { + free($1); + free($4); + free($2.ranges); + YYABORT; + } term->array = $2; $$ = term; }
@@ -683,8 +817,12 @@ PE_NAME array '=' PE_VALUE { struct parse_events_term *term; - ABORT_ON(parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, - $1, $4, false, &@1, &@4)); + if (parse_events_term__num(&term, PARSE_EVENTS__TERM_TYPE_USER, + $1, $4, false, &@1, &@4)) { + free($1); + free($2.ranges); + YYABORT; + } term->array = $2; $$ = term; }
@@ -695,8 +833,12 @@ PE_DRV_CFG_TERM char *config = strdup($1); ABORT_ON(!config); - ABORT_ON(parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, - config, $1, &@1, NULL)); + if (parse_events_term__str(&term, PARSE_EVENTS__TERM_TYPE_DRV_CFG, + config, $1, &@1, NULL)) { + free($1); + free(config); + YYABORT; + } $$ = term; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 45/63 perf parse: If pmu configuration fails free terms
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Avoid a memory leak when the configuration fails.
--- tools/perf/util/parse-events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
tools/perf/util/parse-events.c +8 -1
@@ -1388,8 +1388,15 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,if (get_config_terms (head_config, &config_terms))return -ENOMEM ; -if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) +if (perf_pmu__config (pmu, &attr, head_config, parse_state->error)) { +struct perf_evsel_config_term *pos, *tmp; + +list_for_each_entry_safe (pos, tmp, &config_terms, list) { +list_del_init (&pos->list); +free (pos); + }return -EINVAL ; + } evsel = __add_event(list, &parse_state->idx, &attr, get_config_name(head_config), pmu,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 46/63 perf parse: Add a deep delete for parse event terms
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Add a parse_events_term deep delete function so that owned strings and arrays are freed.
--- tools/perf/util/parse-events.c | 16 +++++++++++++--- tools/perf/util/parse-events.h | 1 + tools/perf/util/parse-events.y | 12 ++---------- tools/perf/util/pmu.c | 2 +- 4 files changed, 17 insertions(+), 14 deletions(-)
tools/perf/util/parse-events.c +13 -3
@@ -2812,6 +2812,18 @@ int parse_events_term__clone(struct parse_events_term **new,return new_term (new, &temp, str,0 ); } +void parse_events_term__delete (struct parse_events_term *term) +{ +if (term->array.nr_ranges) +zfree (&term->array.ranges); + +if (term->type_val !=PARSE_EVENTS__TERM_TYPE_NUM ) +zfree (&term->val.str); + +zfree (&term->config); +free (term); +} +int parse_events_copy_term_list (struct list_head *old,struct list_head **new) {
@@ -2842,10 +2854,8 @@ void parse_events_terms__purge(struct list_head *terms)struct parse_events_term *term, *h;list_for_each_entry_safe (term, h, terms, list) { -if (term->array.nr_ranges) -zfree (&term->array.ranges);list_del_init (&term->list); -free (term); +parse_events_term__delete (term); } }
tools/perf/util/parse-events.h +1 -0
@@ -139,6 +139,7 @@ int parse_events_term__sym_hw(struct parse_events_term **term, char *config, unsigned idx);int parse_events_term__clone (struct parse_events_term **new,struct parse_events_term *term); +void parse_events_term__delete (struct parse_events_term *term);void parse_events_terms__delete (struct list_head *terms);void parse_events_terms__purge (struct list_head *terms);void parse_events__clear_array (struct parse_events_array *a);
tools/perf/util/parse-events.y +2 -10
@@ -49,14 +49,6 @@ static void free_list_evsel(struct list_head* list_evsel) free(list_evsel); } -static void free_term(struct parse_events_term *term) -{ - if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR) - free(term->val.str); - zfree(&term->array.ranges); - free(term); -} - static void inc_group_count(struct list_head *list, struct parse_events_state *parse_state) {
@@ -99,7 +91,7 @@ static void inc_group_count(struct list_head *list, %type <str> PE_DRV_CFG_TERM %destructor { free ($$); } <str> %type <term> event_term -%destructor { free_term ($$); } <term> +%destructor { parse_events_term__delete ($$); } <term> %type <list_terms> event_config %type <list_terms> opt_event_config %type <list_terms> opt_pmu_config
@@ -694,7 +686,7 @@ event_config ',' event_term struct parse_events_term *term = $3; if (!head) { - free_term(term); + parse_events_term__delete(term); YYABORT; } list_add_tail(&term->list, head);
tools/perf/util/pmu.c +1 -1
@@ -1260,7 +1260,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, info->metric_name = alias->metric_name;list_del_init (&term->list); -free (term); +parse_events_term__delete (term); }/*
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 47/63 perf symbols: Remove needless checks for map->groups->machine
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Its sufficient to check if map->groups is NULL before using it to get ->machine value.
--- tools/perf/util/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/symbol.c +1 -1
@@ -1617,7 +1617,7 @@ int dso__load(struct dso *dso, struct map *map) goto out; } -if (map->groups && map->groups->machine) +if (map->groups) machine = map->groups->machine;else machine =NULL ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 48/63 perf machine: Add kernel_dso() method
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
To reduce boilerplate in some places.
--- tools/perf/util/machine.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
tools/perf/util/machine.c +7 -3
@@ -42,6 +42,11 @@static void __machine__remove_thread (struct machine *machine,struct thread *th,bool lock); +static struct dso *machine__kernel_dso (struct machine *machine) +{ +return machine->vmlinux_map->dso; +} +static void dsos__init (struct dsos *dsos) {INIT_LIST_HEAD (&dsos->head);
@@ -861,7 +866,7 @@ size_t machine__fprintf_vmlinux_path(struct machine *machine, FILE *fp) {int i;size_t printed =0 ; -struct dso *kdso =machine__kernel_map (machine)->dso; +struct dso *kdso =machine__kernel_dso (machine);if (kdso->has_build_id) {char filename[PATH_MAX ];
@@ -1543,8 +1548,7 @@ static bool perf_event__is_extra_kernel_mmap(struct machine *machine,static int machine__process_extra_kernel_map (struct machine *machine,union perf_event *event) { -struct map *kernel_map =machine__kernel_map (machine); -struct dso *kernel = kernel_map ? kernel_map->dso :NULL ; +struct dso *kernel =machine__kernel_dso (machine);struct extra_kernel_map xm = { .start = event->mmap.start, .end = event->mmap.start + event->mmap.len,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 49/63 perf annotate: Fix heap overflow
In reply to Arnaldo Carvalho de MeloFrom: Ian Rogers <[email protected]>
Fix expand_tabs that copies the source lines '\0' and then appends another '\0' at a potentially out of bounds address.
--- tools/perf/util/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/annotate.c +1 -1
@@ -1892,7 +1892,7 @@ static char *expand_tabs(char *line, char **storage, size_t *storage_len) }/* Expand the last region. */ - len = line_len +1 - src; + len = line_len - src;memcpy (&new_line[dst], &line[src], len); dst += len; new_line[dst] ='\0' ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 50/63 perf probe: Return a better scope DIE if there is no best scope
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Make find_best_scope() returns innermost DIE at given address if there is no best matched scope DIE. Since Gcc sometimes generates intuitively strange line info which is out of inlined function address range, we need this fixup.
Without this, sometimes perf probe failed to probe on a line inside an inlined function:
# perf probe -D ksys_open:3
Failed to find scope of probe point.
Error: Failed to add events.With this fix, 'perf probe' can probe it:
# perf probe -D ksys_open:3 p:probe/ksys_open _text+25707308 p:probe/ksys_open_1 _text+25710596 p:probe/ksys_open_2 _text+25711114 p:probe/ksys_open_3 _text+25711343 p:probe/ksys_open_4 _text+25714058 p:probe/ksys_open_5 _text+2819653 p:probe/ksys_open_6 _text+2819701
--- tools/perf/util/probe-finder.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
tools/perf/util/probe-finder.c +16 -1
@@ -744,6 +744,16 @@ static int find_best_scope_cb(Dwarf_Die *fn_die, void *data)return 0 ; } +/* Return innermost DIE */ +static int find_inner_scope_cb (Dwarf_Die *fn_die,void *data) +{ +struct find_scope_param *fsp = data; + +memcpy (fsp->die_mem, fn_die,sizeof (Dwarf_Die)); + fsp->found = true; +return 1 ; +} +/* Find an appropriate scope fits to given conditions */ static Dwarf_Die *find_best_scope (struct probe_finder *pf,Dwarf_Die *die_mem) {
@@ -755,8 +765,13 @@ static Dwarf_Die *find_best_scope(struct probe_finder *pf, Dwarf_Die *die_mem) .die_mem = die_mem, .found = false, }; +int ret; -cu_walk_functions_at (&pf->cu_die, pf->addr, find_best_scope_cb, &fsp); + ret =cu_walk_functions_at (&pf->cu_die, pf->addr, find_best_scope_cb, + &fsp); +if (!ret && !fsp.found) +cu_walk_functions_at (&pf->cu_die, pf->addr, + find_inner_scope_cb, &fsp);return fsp.found ? die_mem :NULL ; }
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 51/63 perf probe: Skip end-of-sequence and non statement lines
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Skip end-of-sequence and non-statement lines while walking through lines list.
The "end-of-sequence" line information means:
"the current address is that of the first byte after the
end of a sequence of target machine instructions."
(DWARF version 4 spec 6.2.2)
This actually means out of scope and we can not probe on it.
On the other hand, the statement lines (is_stmt) means:
"the current instruction is a recommended breakpoint location.
A recommended breakpoint location is intended to “represent” a line, a statement and/or a semantically distinct subpart of a statement."
(DWARF version 4 spec 6.2.2)
So, non-statement line info also should be skipped.
These can reduce unneeded probe points and also avoid an error.
E.g. without this patch:
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new events:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_2 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_3 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_4 (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask_4 -aR sleep 1
#
This puts 5 probes on one line, but acutally it's not inlined function. This is because there are many non statement instructions at the function prologue.
With this patch:
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
#
Now perf-probe skips unneeded addresses.
Committer testing:
Slightly different results, but similar:
Before:
# uname -a
Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
#
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new events:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_1 (on clear_tasks_mm_cpumask:1)
probe:clear_tasks_mm_cpumask_2 (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask_2 -aR sleep 1
#
After:
# perf probe -a "clear_tasks_mm_cpumask:1"
Added new event:
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask:1)You can now use it in all perf tools, such as:
perf record -e probe:clear_tasks_mm_cpumask -aR sleep 1
# perf probe -l
probe:clear_tasks_mm_cpumask (on clear_tasks_mm_cpumask@kernel/cpu.c)
#--- tools/perf/util/dwarf-aux.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/util/dwarf-aux.c +7 -0
@@ -782,6 +782,7 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)int decl =0 , inl;Dwarf_Die die_mem, *cu_die;size_t nlines, i; +bool flag;/* Get the CU die */ if (dwarf_tag (rt_die) != DW_TAG_compile_unit) {
@@ -812,6 +813,12 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data) "Possible error in debuginfo.\n");continue ; } +/* Skip end-of-sequence */ +if (dwarf_lineendsequence (line, &flag) !=0 || flag) +continue ; +/* Skip Non statement line-info */ +if (dwarf_linebeginstatement (line, &flag) !=0 || !flag) +continue ;/* Filter lines based on address */ if (rt_die != cu_die) {/*
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 52/63 perf probe: Filter out instances except for inlined subroutine and subprogram
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Filter out instances except for inlined_subroutine and subprogram DIE in die_walk_instances() and die_is_func_instance().
This fixes an issue that perf probe sets some probes on calling address instead of a target function itself.
When perf probe walks on instances of an abstruct origin (a kind of function prototype of inlined function), die_walk_instances() can also pass a GNU_call_site (a GNU extension for call site) to callback. Since it is not an inlined instance of target function, we have to filter out when searching a probe point.
Without this patch, perf probe sets probes on call site address too.This can happen on some function which is marked "inlined", but has actual symbol. (I'm not sure why GCC mark it "inlined"):
# perf probe -D vfs_read p:probe/vfs_read _text+2500017 p:probe/vfs_read_1 _text+2499468 p:probe/vfs_read_2 _text+2499563 p:probe/vfs_read_3 _text+2498876 p:probe/vfs_read_4 _text+2498512 p:probe/vfs_read_5 _text+2498627
With this patch:
Slightly different results, similar tho:
# perf probe -D vfs_read p:probe/vfs_read _text+2498512
Committer testing:
# uname -a Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
Before:
# perf probe -D vfs_read p:probe/vfs_read _text+3131557 p:probe/vfs_read_1 _text+3130975 p:probe/vfs_read_2 _text+3131047 p:probe/vfs_read_3 _text+3130380 p:probe/vfs_read_4 _text+3130000 # uname -a Linux quaco 5.3.8-200.fc30.x86_64 #1 SMP Tue Oct 29 14:46:22 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux #
After:
# perf probe -D vfs_read p:probe/vfs_read _text+3130000 #
--- tools/perf/util/dwarf-aux.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
tools/perf/util/dwarf-aux.c +13 -6
@@ -334,18 +334,22 @@ int die_entrypc(Dwarf_Die *dw_die, Dwarf_Addr *addr)* @dw_die: a DIE * * Ensure that this DIE is an instance (which has an entry address). -* This returns true if @dw_die is a function instance. If not, you need to -* call die_walk_instances() to find actual instances. +* This returns true if @dw_die is a function instance. If not, the @dw_die +* must be a prototype. You can use die_walk_instances() to find actual +* instances. **/ bool die_is_func_instance (Dwarf_Die *dw_die) {Dwarf_Addr tmp;Dwarf_Attribute attr_mem; +int tag =dwarf_tag (dw_die); -/* Actually gcc optimizes non-inline as like as inlined */ -return !dwarf_func_inline (dw_die) && - (dwarf_entrypc (dw_die, &tmp) ==0 || -dwarf_attr (dw_die, DW_AT_ranges, &attr_mem) !=NULL ); +if (tag != DW_TAG_subprogram && + tag != DW_TAG_inlined_subroutine) +return false; + +return dwarf_entrypc (dw_die, &tmp) ==0 || +dwarf_attr (dw_die, DW_AT_ranges, &attr_mem) !=NULL ; }/**
@@ -624,6 +628,9 @@ static int __die_walk_instances_cb(Dwarf_Die *inst, void *data)Dwarf_Die *origin;int tmp; +if (!die_is_func_instance (inst)) +return DIE_FIND_CB_CONTINUE ; + attr =dwarf_attr (inst, DW_AT_abstract_origin, &attr_mem);if (attr ==NULL )return DIE_FIND_CB_CONTINUE ;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 53/63 perf probe: Fix to show calling lines of inlined functions
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Fix to show calling lines of inlined functions (where an inline function is called).
die_walk_lines() filtered out the lines inside inlined functions based on the address. However this also filtered out the lines which call those inlined functions from the target function.
To solve this issue, check the call_file and call_line attributes and do not filter out if it matches to the line information.
Without this fix, perf probe -L doesn't show some lines correctly. (don't see the lines after 17)
# perf probe -L vfs_read
<vfs_read@/home/mhiramat/ksrc/linux/fs/read_write.c:0>
0 ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
1 {
2 ssize_t ret; 4 if (!(file->f_mode & FMODE_READ))
return -EBADF;
6 if (!(file->f_mode & FMODE_CAN_READ))
return -EINVAL;
8 if (unlikely(!access_ok(buf, count)))
return -EFAULT;
11 ret = rw_verify_area(READ, file, pos, count);
12 if (!ret) {
13 if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
15 ret = __vfs_read(file, buf, count, pos);
16 if (ret > 0) {
fsnotify_access(file);
add_rchar(current, ret);
}With this fix:
# perf probe -L vfs_read
<vfs_read@/home/mhiramat/ksrc/linux/fs/read_write.c:0>
0 ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
1 {
2 ssize_t ret; 4 if (!(file->f_mode & FMODE_READ))
return -EBADF;
6 if (!(file->f_mode & FMODE_CAN_READ))
return -EINVAL;
8 if (unlikely(!access_ok(buf, count)))
return -EFAULT;
11 ret = rw_verify_area(READ, file, pos, count);
12 if (!ret) {
13 if (count > MAX_RW_COUNT)
count = MAX_RW_COUNT;
15 ret = __vfs_read(file, buf, count, pos);
16 if (ret > 0) {
17 fsnotify_access(file);
18 add_rchar(current, ret);
}
20 inc_syscr(current);
}--- tools/perf/util/dwarf-aux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tools/perf/util/dwarf-aux.c +9 -1
@@ -784,7 +784,7 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)Dwarf_Lines *lines;Dwarf_Line *line;Dwarf_Addr addr; -const char *fname, *decf =NULL ; +const char *fname, *decf =NULL , *inf =NULL ;int lineno, ret =0 ;int decl =0 , inl;Dwarf_Die die_mem, *cu_die;
@@ -835,13 +835,21 @@ int die_walk_lines(Dwarf_Die *rt_die, line_walk_callback_t callback, void *data)*/ if (!dwarf_haspc (rt_die, addr))continue ; +if (die_find_inlinefunc (rt_die, addr, &die_mem)) { +/* Call-site check */ + inf =die_get_call_file (&die_mem); +if ((inf && !strcmp (inf, decf)) && +die_get_call_lineno (&die_mem) == lineno) + goto found; +dwarf_decl_line (&die_mem, &inl);if (inl != decl || decf !=dwarf_decl_file (&die_mem))continue ; } } +found:/* Get source line */ fname =dwarf_linesrc (line,NULL ,NULL );
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 54/63 perf probe: Skip overlapped location on searching variables
In reply to Arnaldo Carvalho de MeloFrom: Masami Hiramatsu <[email protected]>
Since debuginfo__find_probes() callback function can be called with the location which already passed, the callback function must filter out such overlapped locations.
add_probe_trace_event() has already done it by commit 1a375ae7659a ("perf probe: Skip same probe address for a given line"), but add_available_vars() doesn't. Thus perf probe -v shows same address repeatedly as below:
# perf probe -V vfs_read:18
Available variables at vfs_read:18
@<vfs_read+217>
char* buf
loff_t* pos
ssize_t ret
struct file* file
@<vfs_read+217>
char* buf
loff_t* pos
ssize_t ret
struct file* file
@<vfs_read+226>
char* buf
loff_t* pos
ssize_t ret
struct file* fileWith this fix, perf probe -V shows it correctly:
# perf probe -V vfs_read:18
Available variables at vfs_read:18
@<vfs_read+217>
char* buf
loff_t* pos
ssize_t ret
struct file* file
@<vfs_read+226>
char* buf
loff_t* pos
ssize_t ret
struct file* file--- tools/perf/util/probe-finder.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
tools/perf/util/probe-finder.c +20 -0
@@ -1428,6 +1428,18 @@ static int collect_variables_cb(Dwarf_Die *die_mem, void *data)return DIE_FIND_CB_END ; } +static bool available_var_finder_overlap (struct available_var_finder *af) +{ +int i; + +for (i =0 ; i < af->nvls; i++) { +if (af->pf.addr == af->vls[i].point.address) +return true; + } +return false; + +} +/* Add a found vars into available variables list */ static int add_available_vars (Dwarf_Die *sc_die,struct probe_finder *pf) {
@@ -1438,6 +1450,14 @@ static int add_available_vars(Dwarf_Die *sc_die, struct probe_finder *pf)Dwarf_Die die_mem;int ret; +/* +* For some reason (e.g. different column assigned to same address), +* this callback can be called with the address which already passed. +* Ignore it first. +*/ +if (available_var_finder_overlap (af)) +return 0 ; +/* Check number of tevs */ if (af->nvls == af->max_vls) {pr_warning ("Too many( > %d) probe point found.\n" , af->max_vls);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 55/63 perf record: Add support for limit perf output file size
In reply to Arnaldo Carvalho de MeloFrom: Jiwei Sun <[email protected]>
The patch adds a new option to limit the output file size, then based on it, we can create a wrapper of the perf command that uses the option to avoid exhausting the disk space by the unconscious user.
In order to make the perf.data parsable, we just limit the sample data size, since the perf.data consists of many headers and sample data and other data, the actual size of the recorded file will bigger than the setting value.
Testing it:
# ./perf record -a -g --max-size=10M Couldn't synthesize bpf events. [ perf record: perf size limit reached (10249 KB), stopping session ] [ perf record: Woken up 32 times to write data ] [ perf record: Captured and wrote 10.133 MB perf.data (71964 samples) ]
# ls -lh perf.data -rw------- 1 root root 11M Oct 22 14:32 perf.data
# ./perf record -a -g --max-size=10K [ perf record: perf size limit reached (10 KB), stopping session ] Couldn't synthesize bpf events. [ perf record: Woken up 0 times to write data ] [ perf record: Captured and wrote 1.546 MB perf.data (69 samples) ]
# ls -l perf.data -rw------- 1 root root 1626952 Oct 22 14:36 perf.data
Committer notes:
Fixed the build in multiple distros by using PRIu64 to print u64 struct members, fixing this:
builtin-record.c: In function 'record__write':
builtin-record.c:150:5: error: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'u64' [-Werror=format=]
rec->bytes_written >> 10);
^
CC /tmp/build/pe--- tools/perf/Documentation/perf-record.txt | 4 +++ tools/perf/builtin-record.c | 46 +++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-record.txt +4 -0
@@ -574,6 +574,10 @@ Implies --tail-synthesize. --kcore:: Make a copy of /proc/kcore and place it into a directory with the perf data file. +--max-size=<size>:: +Limit the sample data max size, <size> is expected to be a number with +appended unit character - B/K/M/G + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/builtin-record.c +45 -1
84 lines not on this page · raw message
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 56/63 perf tests: Fix out of bounds memory access
In reply to Arnaldo Carvalho de MeloFrom: Leo Yan <[email protected]>
The test case 'Read backward ring buffer' failed on 32-bit architectures which were found by LKFT perf testing. The test failed on arm32 x15 device, qemu_arm32, qemu_i386, and found intermittent failure on i386; the failure log is as below:
50: Read backward ring buffer :
--- start ---
test child forked, pid 510
Using CPUID GenuineIntel-6-9E-9
mmap size 1052672B
mmap size 8192B
Finished reading overwrite ring buffer: rewind
free(): invalid next size (fast)
test child interrupted
---- end ----
Read backward ring buffer: FAILED!
The log hints there have issue for memory usage, thus free() reports error 'invalid next size' and directly exit for the case. Finally, this issue is root caused as out of bounds memory access for the data array 'evsel->id'.
The backward ring buffer test invokes do_test() twice. 'evsel->id' is allocated at the first call with the flow:
test__backward_ring_buffer()
`-> do_test() `-> evlist__mmap() `-> evlist__mmap_ex() `-> perf_evsel__alloc_id()
So 'evsel->id' is allocated with one item, and it will be used in function perf_evlist__id_add():
evsel->id[0] = id
evsel->ids = 1
At the second call for do_test(), it skips to initialize 'evsel->id' and reuses the array which is allocated in the first call. But 'evsel->ids' contains the stale value. Thus:
evsel->id[1] = id -> out of bound access
evsel->ids = 2
To fix this issue, we will use evlist__open() and evlist__close() pair functions to prepare and cleanup context for evlist; so 'evsel->id' and 'evsel->ids' can be initialized properly when invoke do_test() and avoid the out of bounds memory access.
--- tools/perf/tests/backward-ring-buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/perf/tests/backward-ring-buffer.c +9 -0
@@ -148,6 +148,15 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m goto out_delete_evlist; } +evlist__close (evlist); + + err =evlist__open (evlist); +if (err <0 ) { +pr_debug ("perf_evlist__open: %s\n" , +str_error_r (errno, sbuf,sizeof (sbuf))); + goto out_delete_evlist; + } + err =do_test (evlist,1 , &sample_count, &comm_count);if (err !=TEST_OK ) goto out_delete_evlist;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 57/63 perf diff: Don't use hack to skip column length calculation
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
Previously we use a nasty hack to skip the hists__calc_col_len for block since this function is not very suitable for block column length calculation.
This patch removes the hack code and add a check at the entry of hists__calc_col_len to skip for block case.
--- tools/perf/builtin-diff.c | 11 ++--------- tools/perf/util/hist.c | 2 ++ 2 files changed, 4 insertions(+), 9 deletions(-)
tools/perf/builtin-diff.c +2 -9
@@ -765,13 +765,6 @@ static void block_hists_match(struct hists *hists_base, } } -static int filter_cb (struct hist_entry *he,void *arg__maybe_unused ) -{ -/* Skip the calculation of column length in output_resort */ - he->filtered = true; -return 0 ; -} -static void hists__precompute (struct hists *hists) {struct rb_root_cached *root;
@@ -820,8 +813,8 @@ static void hists__precompute(struct hists *hists)if (bh->valid && pair_bh->valid) {block_hists_match (&bh->block_hists, &pair_bh->block_hists); -hists__output_resort_cb (&pair_bh->block_hists, -NULL , filter_cb); +hists__output_resort (&pair_bh->block_hists, +NULL ); }break ;default :
tools/perf/util/hist.c +2 -0
@@ -80,6 +80,8 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)int symlen;u16 len; +if (h->block_info) +return ;/* * +4 accounts for '[x] ' priv level info * +2 accounts for 0x prefix on raw addresses
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 58/63 perf block: Cleanup and refactor block info functions
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
We have already implemented some block-info related functions. Now it's time to do some cleanup, refactoring and move the functions and structures to new block-info.h/block-info.c.
v4:
---
Move code for skipping column length calculation to patch:
'perf diff: Don't use hack to skip column length calculation'
v3:
---
1. Rename the patch title
2. Rename from block.h/block.c to block-info.h/block-info.c
3. Move more common part to block-info, such as block_info__process_sym.
4. Remove the nasty hack for skipping calculation of column length
--- tools/perf/builtin-diff.c | 107 +++-------------------------- tools/perf/util/Build | 1 + tools/perf/util/block-info.c | 129 +++++++++++++++++++++++++++++++++++ tools/perf/util/block-info.h | 43 ++++++++++++ tools/perf/util/hist.c | 1 + tools/perf/util/symbol.c | 22 ------ tools/perf/util/symbol.h | 24 ------- 7 files changed, 185 insertions(+), 142 deletions(-) create mode 100644 tools/perf/util/block-info.c create mode 100644 tools/perf/util/block-info.h
tools/perf/builtin-diff.c +11 -96
@@ -24,6 +24,7 @@#include "util/annotate.h" #include "util/map.h" #include "util/spark.h" +#include "util/block-info.h" #include <linux/err.h> #include <linux/zalloc.h> #include <subcmd/pager.h>
@@ -98,8 +99,6 @@ static s64 compute_wdiff_w2;static const char *cpu_list; static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS); -static struct addr_location dummy_al; -enum {COMPUTE_DELTA ,COMPUTE_RATIO ,
@@ -537,41 +536,6 @@ static void hists__baseline_only(struct hists *hists) } } -static int64_t block_cmp (struct perf_hpp_fmt *fmt__maybe_unused , -struct hist_entry *left,struct hist_entry *right) -{ -struct block_info *bi_l = left->block_info; -struct block_info *bi_r = right->block_info; -int cmp; - -if (!bi_l->sym || !bi_r->sym) { -if (!bi_l->sym && !bi_r->sym) -return 0 ; -else if (!bi_l->sym) -return -1 ; -else -return 1 ; - } - -if (bi_l->sym == bi_r->sym) { -if (bi_l->start == bi_r->start) { -if (bi_l->end == bi_r->end) -return 0 ; -else -return (int64_t )(bi_r->end - bi_l->end); - }else -return (int64_t )(bi_r->start - bi_l->start); - }else { - cmp =strcmp (bi_l->sym->name, bi_r->sym->name); -return cmp; - } - -if (bi_l->sym->start != bi_r->sym->start) -return (int64_t )(bi_r->sym->start - bi_l->sym->start); - -return (int64_t )(bi_r->sym->end - bi_l->sym->end); -} -static int64_t block_cycles_diff_cmp (struct hist_entry *left,struct hist_entry *right) {
@@ -600,67 +564,13 @@ static void init_block_hist(struct block_hist *bh)INIT_LIST_HEAD (&bh->block_fmt.list);INIT_LIST_HEAD (&bh->block_fmt.sort_list); - bh->block_fmt.cmp = block_cmp; + bh->block_fmt.cmp = block_info__cmp; bh->block_fmt.sort = block_sort;perf_hpp_list__register_sort_field (&bh->block_list, &bh->block_fmt); bh->valid = true; } -static void init_block_info (struct block_info *bi,struct symbol *sym, -struct cyc_hist *ch,int offset) -{ - bi->sym = sym; - bi->start = ch->start; - bi->end = offset; - bi->cycles = ch->cycles; - bi->cycles_aggr = ch->cycles_aggr; - bi->num = ch->num; - bi->num_aggr = ch->num_aggr; - -memcpy (bi->cycles_spark, ch->cycles_spark, -NUM_SPARKS *sizeof (u64)); -} - -static int process_block_per_sym (struct hist_entry *he) -{ -struct annotation *notes; -struct cyc_hist *ch; -struct block_hist *bh; - -if (!he->ms.map || !he->ms.sym) -return 0 ; - - notes =symbol__annotation (he->ms.sym); -if (!notes || !notes->src || !notes->src->cycles_hist) -return 0 ; - - bh = container_of(he, struct block_hist, he); -init_block_hist (bh); - - ch = notes->src->cycles_hist; -for (unsigned int i =0 ; i <symbol__size (he->ms.sym); i++) { -if (ch[i].num_aggr) { -struct block_info *bi; -struct hist_entry *he_block; - - bi =block_info__new (); -if (!bi) -return -1 ; - -init_block_info (bi, he->ms.sym, &ch[i], i); - he_block =hists__add_entry_block (&bh->block_hists, - &dummy_al, bi); -if (!he_block) { -block_info__put (bi); -return -1 ; - } - } - } - -return 0 ; -} -static int block_pair_cmp (struct hist_entry *a,struct hist_entry *b) {struct block_info *bi_a = a->block_info;
@@ -785,8 +695,11 @@ static void hists__precompute(struct hists *hists) he = rb_entry(next, struct hist_entry, rb_node_in); next =rb_next (&he->rb_node_in); -if (compute ==COMPUTE_CYCLES ) -process_block_per_sym (he); +if (compute ==COMPUTE_CYCLES ) { + bh = container_of(he, struct block_hist, he); +init_block_hist (bh); +block_info__process_sym (he, bh,NULL ,0 ); + }data__for_each_file_new (i, d) { pair =get_pair_data (he, d);
@@ -805,10 +718,12 @@ static void hists__precompute(struct hists *hists)compute_wdiff (he, pair);break ;case COMPUTE_CYCLES : -process_block_per_sym (pair); - bh = container_of(he, struct block_hist, he); pair_bh = container_of(pair, struct block_hist, he); +init_block_hist (pair_bh); +block_info__process_sym (pair, pair_bh,NULL ,0 ); + + bh = container_of(he, struct block_hist, he);if (bh->valid && pair_bh->valid) { block_hists_match(&bh->block_hists,
tools/perf/util/Build +1 -0
@@ -1,4 +1,5 @@ perf-y += annotate.o +perf-y += block-info.o perf-y += block-range.o perf-y += build-id.o perf-y += cacheline.o
tools/perf/util/block-info.c new file +129 -0
129 lines not on this page · raw message
tools/perf/util/block-info.h new file +43 -0
43 lines not on this page · raw message
tools/perf/util/hist.c +1 -0
@@ -18,6 +18,7 @@#include "srcline.h" #include "symbol.h" #include "thread.h" +#include "block-info.h" #include "ui/progress.h" #include <errno.h> #include <math.h>
tools/perf/util/symbol.c +0 -22
@@ -2351,25 +2351,3 @@ struct mem_info *mem_info__new(void)refcount_set (&mi->refcnt,1 );return mi; } - -struct block_info *block_info__get (struct block_info *bi) -{ -if (bi) -refcount_inc (&bi->refcnt); -return bi; -} - -void block_info__put (struct block_info *bi) -{ -if (bi &&refcount_dec_and_test (&bi->refcnt)) -free (bi); -} - -struct block_info *block_info__new (void ) -{ -struct block_info *bi =zalloc (sizeof (*bi)); - -if (bi) -refcount_set (&bi->refcnt,1 ); -return bi; -}
tools/perf/util/symbol.h +0 -24
@@ -106,18 +106,6 @@ struct ref_reloc_sym {u64 unrelocated_addr; }; -struct block_info { -struct symbol *sym; -u64 start; -u64 end; -u64 cycles; -u64 cycles_aggr; -s64 cycles_spark[NUM_SPARKS ]; -int num; -int num_aggr; -refcount_t refcnt; -}; -struct addr_location {struct machine *machine;struct thread *thread;
@@ -291,16 +279,4 @@ static inline void __mem_info__zput(struct mem_info **mi)#define mem_info__zput (mi) __mem_info__zput(&mi) -struct block_info *block_info__new (void ); -struct block_info *block_info__get (struct block_info *bi); -void block_info__put (struct block_info *bi); - -static inline void __block_info__zput (struct block_info **bi) -{ -block_info__put (*bi); - *bi =NULL ; -} - -#define block_info__zput (bi) __block_info__zput(&bi) -#endif /* __PERF_SYMBOL */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 59/63 perf hist: Count the total cycles of all samples
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
We can get the per sample cycles by hist__account_cycles(). It's also useful to know the total cycles of all samples in order to get the cycles coverage for a single program block in further. For example:
coverage = per block sampled cycles / total sampled cycles
This patch creates a new argument 'total_cycles' in hist__account_cycles(), which will be added with the cycles of each sample.
--- tools/perf/builtin-annotate.c | 2 +- tools/perf/builtin-diff.c | 3 ++- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-top.c | 3 ++- tools/perf/util/hist.c | 6 +++++- tools/perf/util/hist.h | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-)
tools/perf/builtin-annotate.c +1 -1
@@ -201,7 +201,7 @@ static int process_branch_callback(struct evsel *evsel,if (a.map !=NULL ) a.map->dso->hit =1 ; -hist__account_cycles (sample->branch_stack, al, sample, false); +hist__account_cycles (sample->branch_stack, al, sample, false,NULL ); ret =hist_entry_iter__add (&iter, &a,PERF_MAX_STACK_DEPTH , ann);return ret;
tools/perf/builtin-diff.c +2 -1
@@ -426,7 +426,8 @@ static int diff__process_sample_event(struct perf_tool *tool, goto out_put; } -hist__account_cycles (sample->branch_stack, &al, sample, false); +hist__account_cycles (sample->branch_stack, &al, sample, false, +NULL ); }/*
tools/perf/builtin-report.c +1 -1
@@ -292,7 +292,7 @@ static int process_sample_event(struct perf_tool *tool,if (ui__has_annotation () || rep->symbol_ipc) {hist__account_cycles (sample->branch_stack, &al, sample, - rep->nonany_branch_mode); + rep->nonany_branch_mode,NULL ); } ret =hist_entry_iter__add (&iter, &al, rep->max_stack, rep);
tools/perf/builtin-top.c +2 -1
@@ -725,7 +725,8 @@ static int hist_iter__top_callback(struct hist_entry_iter *iter,perf_top__record_precise_ip (top, he, iter->sample, evsel, al->addr);hist__account_cycles (iter->sample->branch_stack, al, iter->sample, - !(top->record_opts.branch_stack &PERF_SAMPLE_BRANCH_ANY )); + !(top->record_opts.branch_stack &PERF_SAMPLE_BRANCH_ANY ), +NULL );return 0 ; }
tools/perf/util/hist.c +5 -1
@@ -2572,7 +2572,8 @@ int hists__unlink(struct hists *hists) }void hist__account_cycles (struct branch_stack *bs,struct addr_location *al, -struct perf_sample *sample,bool nonany_branch_mode) +struct perf_sample *sample,bool nonany_branch_mode, +u64 *total_cycles) {struct branch_info *bi;
@@ -2599,6 +2600,9 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al, nonany_branch_mode ?NULL : prev, bi[i].flags.cycles); prev = &bi[i].to; + +if (total_cycles) + *total_cycles += bi[i].flags.cycles; }free (bi); }
tools/perf/util/hist.h +2 -1
@@ -527,7 +527,8 @@ unsigned int hists__sort_list_width(struct hists *hists);unsigned int hists__overhead_width (struct hists *hists);void hist__account_cycles (struct branch_stack *bs,struct addr_location *al, -struct perf_sample *sample,bool nonany_branch_mode); +struct perf_sample *sample,bool nonany_branch_mode, +u64 *total_cycles);struct option ;int parse_filter_percentage (const struct option *opt,const char *arg,int unset);
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 60/63 perf hist: Support block formats with compare/sort/display
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
This patch provides helper routines to support new columns for block info output.
The new columns are:
Sampled Cycles%
Sampled Cycles
Avg Cycles%
Avg Cycles
[Program Block Range]
Shared Object
v5:
---
1. Move more block related functions from builtin-report.c to block-info.c
2. Set ms (map+sym) in block hist_entry. Because this info is needed for reporting the block range (i.e. source line)
Committer notes:
Remove unused set_fmt() function, some build were not completing with:
util/block-info.c:396:20: error: unused function 'set_fmt' [-Werror,-Wunused-function] static inline void set_fmt(struct block_fmt *block_fmt,
^
1 error generated.
--- tools/perf/util/block-info.c | 310 +++++++++++++++++++++++++++++++++++ tools/perf/util/block-info.h | 33 +++- tools/perf/util/hist.c | 4 + 3 files changed, 345 insertions(+), 2 deletions(-)
tools/perf/util/block-info.c +310 -0
@@ -6,6 +6,40 @@#include "sort.h" #include "annotate.h" #include "symbol.h" +#include "dso.h" +#include "map.h" +#include "srcline.h" +#include "evlist.h" + +static struct block_header_column { +const char *name; +int width; +} block_columns[PERF_HPP_REPORT__BLOCK_MAX_INDEX ] = { + [PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT ] = { + .name ="Sampled Cycles%" , + .width =15 , + }, + [PERF_HPP_REPORT__BLOCK_LBR_CYCLES ] = { + .name ="Sampled Cycles" , + .width =14 , + }, + [PERF_HPP_REPORT__BLOCK_CYCLES_PCT ] = { + .name ="Avg Cycles%" , + .width =11 , + }, + [PERF_HPP_REPORT__BLOCK_AVG_CYCLES ] = { + .name ="Avg Cycles" , + .width =10 , + }, + [PERF_HPP_REPORT__BLOCK_RANGE ] = { + .name ="[Program Block Range]" , + .width =70 , + }, + [PERF_HPP_REPORT__BLOCK_DSO ] = { + .name ="Shared Object" , + .width =20 , + } +};struct block_info *block_info__get (struct block_info *bi) {
@@ -127,3 +161,279 @@ int block_info__process_sym(struct hist_entry *he, struct block_hist *bh,return 0 ; } + +static int block_column_header (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp, +struct hists *hists__maybe_unused , +int line__maybe_unused , +int *span__maybe_unused ) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + block_fmt->header); +} + +static int block_column_width (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp__maybe_unused , +struct hists *hists__maybe_unused ) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); + +return block_fmt->width; +} + +static int block_total_cycles_pct_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +double ratio =0.0 ; +char buf[16 ]; + +if (block_fmt->total_cycles) + ratio = (double )bi->cycles / (double )block_fmt->total_cycles; + +sprintf (buf,"%.2f%%" ,100.0 * ratio); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +} + +static int64_t block_total_cycles_pct_sort (struct perf_hpp_fmt *fmt, +struct hist_entry *left, +struct hist_entry *right) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi_l = left->block_info; +struct block_info *bi_r = right->block_info; +double l, r; + +if (block_fmt->total_cycles) { + l = ((double )bi_l->cycles / + (double )block_fmt->total_cycles) *100000.0 ; + r = ((double )bi_r->cycles / + (double )block_fmt->total_cycles) *100000.0 ; +return (int64_t )l - (int64_t )r; + } + +return 0 ; +} + +static void cycles_string (u64 cycles,char *buf,int size) +{ +if (cycles >=1000000 ) +scnprintf (buf, size,"%.1fM" , (double )cycles /1000000.0 ); +else if (cycles >=1000 ) +scnprintf (buf, size,"%.1fK" , (double )cycles /1000.0 ); +else +scnprintf (buf, size,"%1d" , cycles); +} + +static int block_cycles_lbr_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +char cycles_buf[16 ]; + +cycles_string (bi->cycles_aggr, cycles_buf,sizeof (cycles_buf)); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + cycles_buf); +} + +static int block_cycles_pct_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp,struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +double ratio =0.0 ; +u64 avg; +char buf[16 ]; + +if (block_fmt->block_cycles && bi->num_aggr) { + avg = bi->cycles_aggr / bi->num_aggr; + ratio = (double )avg / (double )block_fmt->block_cycles; + } + +sprintf (buf,"%.2f%%" ,100.0 * ratio); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +} + +static int block_avg_cycles_entry (struct perf_hpp_fmt *fmt, +struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +char cycles_buf[16 ]; + +cycles_string (bi->cycles_aggr / bi->num_aggr, cycles_buf, +sizeof (cycles_buf)); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + cycles_buf); +} + +static int block_range_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct block_info *bi = he->block_info; +char buf[128 ]; +char *start_line, *end_line; + + symbol_conf.disable_add2line_warn = true; + + start_line =map__srcline (he->ms.map, bi->sym->start + bi->start, + he->ms.sym); + + end_line =map__srcline (he->ms.map, bi->sym->start + bi->end, + he->ms.sym); + +if ((start_line !=SRCLINE_UNKNOWN ) && (end_line !=SRCLINE_UNKNOWN )) { +scnprintf (buf,sizeof (buf),"[%s -> %s]" , + start_line, end_line); + }else { +scnprintf (buf,sizeof (buf),"[%7lx -> %7lx]" , + bi->start, bi->end); + } + +free_srcline (start_line); +free_srcline (end_line); + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, buf); +} + +static int block_dso_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he) +{ + struct block_fmt *block_fmt = container_of(fmt, struct block_fmt, fmt); +struct map *map = he->ms.map; + +if (map && map->dso) { +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, + map->dso->short_name); + } + +return scnprintf (hpp->buf, hpp->size,"%*s" , block_fmt->width, +"[unknown]" ); +} + +static void init_block_header (struct block_fmt *block_fmt) +{ +struct perf_hpp_fmt *fmt = &block_fmt->fmt; + +BUG_ON (block_fmt->idx >=PERF_HPP_REPORT__BLOCK_MAX_INDEX ); + + block_fmt->header = block_columns[block_fmt->idx].name; + block_fmt->width = block_columns[block_fmt->idx].width; + + fmt->header = block_column_header; + fmt->width = block_column_width; +} + +static void hpp_register (struct block_fmt *block_fmt,int idx, +struct perf_hpp_list *hpp_list) +{ +struct perf_hpp_fmt *fmt = &block_fmt->fmt; + + block_fmt->idx = idx; +INIT_LIST_HEAD (&fmt->list); +INIT_LIST_HEAD (&fmt->sort_list); + +switch (idx) { +case PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT : + fmt->entry = block_total_cycles_pct_entry; + fmt->cmp = block_info__cmp; + fmt->sort = block_total_cycles_pct_sort; +break ; +case PERF_HPP_REPORT__BLOCK_LBR_CYCLES : + fmt->entry = block_cycles_lbr_entry; +break ; +case PERF_HPP_REPORT__BLOCK_CYCLES_PCT : + fmt->entry = block_cycles_pct_entry; +break ; +case PERF_HPP_REPORT__BLOCK_AVG_CYCLES : + fmt->entry = block_avg_cycles_entry; +break ; +case PERF_HPP_REPORT__BLOCK_RANGE : + fmt->entry = block_range_entry; +break ; +case PERF_HPP_REPORT__BLOCK_DSO : + fmt->entry = block_dso_entry; +break ; +default : +return ; + } + +init_block_header (block_fmt); +perf_hpp_list__column_register (hpp_list, fmt); +} + +static void register_block_columns (struct perf_hpp_list *hpp_list, +struct block_fmt *block_fmts) +{ +for (int i =0 ; i <PERF_HPP_REPORT__BLOCK_MAX_INDEX ; i++) +hpp_register (&block_fmts[i], i, hpp_list); +} + +static void init_block_hist (struct block_hist *bh,struct block_fmt *block_fmts) +{ +__hists__init (&bh->block_hists, &bh->block_list); +perf_hpp_list__init (&bh->block_list); + bh->block_list.nr_header_lines =1 ; + +register_block_columns (&bh->block_list, block_fmts); + +perf_hpp_list__register_sort_field (&bh->block_list, + &block_fmts[PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT ].fmt); +} + +static void process_block_report (struct hists *hists, +struct block_report *block_report, +u64 total_cycles) +{ +struct rb_node *next =rb_first_cached (&hists->entries); +struct block_hist *bh = &block_report->hist; +struct hist_entry *he; + +init_block_hist (bh, block_report->fmts); + +while (next) { + he = rb_entry(next, struct hist_entry, rb_node); +block_info__process_sym (he, bh, &block_report->cycles, + total_cycles); + next =rb_next (&he->rb_node); + } + +for (int i =0 ; i <PERF_HPP_REPORT__BLOCK_MAX_INDEX ; i++) { + block_report->fmts[i].total_cycles = total_cycles; + block_report->fmts[i].block_cycles = block_report->cycles; + } + +hists__output_resort (&bh->block_hists,NULL ); +} + +struct block_report *block_info__create_report (struct evlist *evlist, +u64 total_cycles) +{ +struct block_report *block_reports; +int nr_hists = evlist->core.nr_entries, i =0 ; +struct evsel *pos; + + block_reports =calloc (nr_hists,sizeof (struct block_report )); +if (!block_reports) +return NULL ; + +evlist__for_each_entry (evlist, pos) { +struct hists *hists =evsel__hists (pos); + +process_block_report (hists, &block_reports[i], total_cycles); + i++; + } + +return block_reports; +}
tools/perf/util/block-info.h +31 -2
@@ -4,8 +4,9 @@#include <linux/types.h> #include <linux/refcount.h> -#include "util/hist.h" -#include "util/symbol.h" +#include "hist.h" +#include "symbol.h" +#include "sort.h" struct block_info {struct symbol *sym;
@@ -20,6 +21,31 @@ struct block_info {refcount_t refcnt; }; +struct block_fmt { +struct perf_hpp_fmt fmt; +int idx; +int width; +const char *header; +u64 total_cycles; +u64 block_cycles; +}; + +enum { +PERF_HPP_REPORT__BLOCK_TOTAL_CYCLES_PCT , +PERF_HPP_REPORT__BLOCK_LBR_CYCLES , +PERF_HPP_REPORT__BLOCK_CYCLES_PCT , +PERF_HPP_REPORT__BLOCK_AVG_CYCLES , +PERF_HPP_REPORT__BLOCK_RANGE , +PERF_HPP_REPORT__BLOCK_DSO , +PERF_HPP_REPORT__BLOCK_MAX_INDEX +}; + +struct block_report { +struct block_hist hist; +u64 cycles; +struct block_fmt fmts[PERF_HPP_REPORT__BLOCK_MAX_INDEX ]; +}; +struct block_hist ;struct block_info *block_info__new (void );
@@ -40,4 +66,7 @@ int64_t block_info__cmp(struct perf_hpp_fmt *fmt __maybe_unused,int block_info__process_sym (struct hist_entry *he,struct block_hist *bh,u64 *block_cycles_aggr,u64 total_cycles); +struct block_report *block_info__create_report (struct evlist *evlist, +u64 total_cycles); +#endif /* __PERF_BLOCK_H */
tools/perf/util/hist.c +4 -0
@@ -758,6 +758,10 @@ struct hist_entry *hists__add_entry_block(struct hists *hists,struct hist_entry entry = { .block_info = block_info, .hists = hists, + .ms = { + .map = al->map, + .sym = al->sym, + }, }, *he =hists__findnew_entry (hists, &entry, al, false);return he;
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 61/63 perf report: Sort by sampled cycles percent per block for stdio
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
It would be useful to support sorting for all blocks by the sampled cycles percent per block. This is useful to concentrate on the globally hottest blocks.
This patch implements a new option "--total-cycles" which sorts all blocks by 'Sampled Cycles%'. The 'Sampled Cycles%' is the percent:
percent = block sampled cycles aggregation / total sampled cycles
Note that, this patch only supports "--stdio" mode.
For example,
# perf record -b ./div
# perf report --total-cycles --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 2M of event 'cycles'
# Event count (approx.): 2753248
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ................................................ .................
#
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.so
0.25% 182.5K 0.02% 1 [random_r.c:388 -> random_r.c:391] libc-2.27.so
0.00% 48 1.07% 48 [x86_pmu_enable+284 -> x86_pmu_enable+298] [kernel.kallsyms]
0.00% 74 1.64% 74 [vm_mmap_pgoff+0 -> vm_mmap_pgoff+92] [kernel.kallsyms]
0.00% 73 1.62% 73 [vm_mmap+0 -> vm_mmap+48] [kernel.kallsyms]
0.00% 63 0.69% 31 [up_write+0 -> up_write+34] [kernel.kallsyms]
0.00% 13 0.29% 13 [setup_arg_pages+396 -> setup_arg_pages+413] [kernel.kallsyms]
0.00% 3 0.07% 3 [setup_arg_pages+418 -> setup_arg_pages+450] [kernel.kallsyms]
0.00% 616 6.84% 308 [security_mmap_file+0 -> security_mmap_file+72] [kernel.kallsyms]
0.00% 23 0.51% 23 [security_mmap_file+77 -> security_mmap_file+87] [kernel.kallsyms]
0.00% 4 0.02% 1 [sched_clock+0 -> sched_clock+4] [kernel.kallsyms]
0.00% 4 0.02% 1 [sched_clock+9 -> sched_clock+12] [kernel.kallsyms]
0.00% 1 0.02% 1 [rcu_nmi_exit+0 -> rcu_nmi_exit+9] [kernel.kallsyms]Committer testing:
This should provide material for hours of endless joy, both from looking for suspicious things in the implementation of this patch, such as the top one:
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
2.17% 1.7M 0.08% 607 [compiler.h:199 -> common.c:221] [kernel.vmlinux]
As well from things that look legit:
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
0.16% 123.0K 0.60% 4.7K [nospec-branch.h:265 -> nospec-branch.h:278] [kernel.vmlinux]
:-)
Very short system wide taken branches session:
# perf record -h -b
Usage: perf record [<options>] [<command>]
or: perf record [<options>] -- <command> [<options>]
-b, --branch-any sample any taken branches
#
# perf record -b ^C[ perf record: Woken up 595 times to write data ] [ perf record: Captured and wrote 156.672 MB perf.data (196873 samples) ]
#
# perf evlist -v
cycles: size: 112, { sample_period, sample_freq }: 4000, sample_type: IP|TID|TIME|CPU|PERIOD|BRANCH_STACK, read_format: ID, disabled: 1, inherit: 1, mmap: 1, comm: 1, freq: 1, task: 1, precise_ip: 3, sample_id_all: 1, exclude_guest: 1, mmap2: 1, comm_exec: 1, ksymbol: 1, bpf_event: 1, branch_sample_type: ANY
#
# perf report --total-cycles --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
# Total Lost Samples: 0
#
# Samples: 6M of event 'cycles'
# Event count (approx.): 6299936
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ...................................................................... ....................
#
2.17% 1.7M 0.08% 607 [compiler.h:199 -> common.c:221] [kernel.vmlinux]
1.75% 1.3M 8.34% 65.5K [memset-vec-unaligned-erms.S:147 -> memset-vec-unaligned-erms.S:151] libc-2.29.so
0.72% 544.5K 0.03% 230 [entry_64.S:657 -> entry_64.S:662] [kernel.vmlinux]
0.56% 541.8K 0.09% 672 [compiler.h:199 -> common.c:300] [kernel.vmlinux]
0.39% 293.2K 0.01% 104 [list_debug.c:43 -> list_debug.c:61] [kernel.vmlinux]
0.36% 278.6K 0.03% 272 [entry_64.S:1289 -> entry_64.S:1308] [kernel.vmlinux]
0.30% 260.8K 0.07% 564 [clear_page_64.S:47 -> clear_page_64.S:50] [kernel.vmlinux]
0.28% 215.3K 0.05% 369 [traps.c:623 -> traps.c:628] [kernel.vmlinux]
0.23% 178.1K 0.04% 278 [entry_64.S:271 -> entry_64.S:275] [kernel.vmlinux]
0.20% 152.6K 0.09% 706 [paravirt.c:177 -> paravirt.c:179] [kernel.vmlinux]
0.20% 155.8K 0.05% 373 [entry_64.S:153 -> entry_64.S:175] [kernel.vmlinux]
0.18% 136.6K 0.03% 222 [msr.h:105 -> msr.h:166] [kernel.vmlinux]
0.16% 123.0K 0.60% 4.7K [nospec-branch.h:265 -> nospec-branch.h:278] [kernel.vmlinux]
0.16% 118.3K 0.01% 44 [entry_64.S:632 -> entry_64.S:657] [kernel.vmlinux]
0.14% 104.5K 0.00% 28 [rwsem.c:1541 -> rwsem.c:1544] [kernel.vmlinux]
0.13% 99.2K 0.01% 53 [spinlock.c:150 -> spinlock.c:152] [kernel.vmlinux]
0.13% 95.5K 0.00% 35 [swap.c:456 -> swap.c:471] [kernel.vmlinux]
0.12% 96.2K 0.05% 407 [copy_user_64.S:175 -> copy_user_64.S:209] [kernel.vmlinux]
0.11% 85.9K 0.00% 31 [swap.c:400 -> page-flags.h:188] [kernel.vmlinux]
0.10% 73.0K 0.01% 52 [paravirt.h:763 -> list.h:131] [kernel.vmlinux]
0.07% 56.2K 0.03% 214 [filemap.c:1524 -> filemap.c:1557] [kernel.vmlinux]
0.07% 54.2K 0.02% 145 [memory.c:1032 -> memory.c:1049] [kernel.vmlinux]
0.07% 50.3K 0.00% 39 [mmzone.c:49 -> mmzone.c:69] [kernel.vmlinux]
0.06% 48.3K 0.01% 40 [paravirt.h:768 -> page_alloc.c:3304] [kernel.vmlinux]
0.06% 46.7K 0.02% 155 [memory.c:1032 -> memory.c:1056] [kernel.vmlinux]
0.06% 46.9K 0.01% 103 [swap.c:867 -> swap.c:902] [kernel.vmlinux]
0.06% 47.8K 0.00% 34 [entry_64.S:1201 -> entry_64.S:1202] [kernel.vmlinux]-----------------------------------------------------------
v7:
---
Use use_browser in report__browse_block_hists for supporting stdio and potential tui mode.
v6:
---
Create report__browse_block_hists in block-info.c (codes are moved from builtin-report.c). It's called from perf_evlist__tty_browse_hists.
v5:
---
1. Move all block functions to block-info.c
2. Move the code of setting ms in block hist_entry to other patch.
v4:
---
1. Use new option '--total-cycles' to replace
'-s total_cycles' in v3.
2. Move block info collection out of block info
printing.
v3:
---
1. Use common function block_info__process_sym to process the blocks per symbol.
2. Remove the nasty hack for skipping calculation of column length
3. Some minor cleanup
--- tools/perf/Documentation/perf-report.txt | 11 ++++++ tools/perf/builtin-report.c | 44 ++++++++++++++++++++++-- tools/perf/ui/stdio/hist.c | 22 ++++++++++++ tools/perf/util/block-info.c | 17 +++++++++ tools/perf/util/block-info.h | 4 +++ tools/perf/util/symbol_conf.h | 1 + 6 files changed, 96 insertions(+), 3 deletions(-)
tools/perf/Documentation/perf-report.txt +11 -0
@@ -525,6 +525,17 @@ include::itrace.txt[] Configure time quantum for time sort key. Default 100ms. Accepts s, us, ms, ns units. +--total-cycles:: + When --total-cycles is specified, it supports sorting for all blocks by + 'Sampled Cycles%'. This is useful to concentrate on the globally hottest + blocks. In output, there are some new columns: + + 'Sampled Cycles%' - block sampled cycles aggregation / total sampled cycles + 'Sampled Cycles' - block sampled cycles aggregation + 'Avg Cycles%' - block average sampled cycles / sum of total block average + sampled cycles + 'Avg Cycles' - block average sampled cycles + include::callchain-overhead-calculation.txt[] SEE ALSO
tools/perf/builtin-report.c +41 -3
109 lines not on this page · raw message
tools/perf/ui/stdio/hist.c +22 -0
@@ -558,6 +558,25 @@ static int hist_entry__block_fprintf(struct hist_entry *he,return ret; } +static int hist_entry__individual_block_fprintf (struct hist_entry *he, +char *bf,size_t size, +FILE *fp) +{ +int ret =0 ; + +struct perf_hpp hpp = { + .buf = bf, + .size = size, + .skip = false, + }; + +hist_entry__snprintf (he, &hpp); +if (!hpp.skip) + ret +=fprintf (fp,"%s\n" , bf); + +return ret; +} +static int hist_entry__fprintf (struct hist_entry *he,size_t size,char *bf,size_t bfsz,FILE *fp,bool ignore_callchains)
@@ -580,6 +599,9 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,if (symbol_conf.report_block)return hist_entry__block_fprintf (he, bf, size, fp); +if (symbol_conf.report_individual_block) +return hist_entry__individual_block_fprintf (he, bf, size, fp); +hist_entry__snprintf (he, &hpp); ret =fprintf (fp,"%s\n" , bf);
tools/perf/util/block-info.c +17 -0
@@ -437,3 +437,20 @@ struct block_report *block_info__create_report(struct evlist *evlist,return block_reports; } + +int report__browse_block_hists (struct block_hist *bh,float min_percent, +struct evsel *evsel__maybe_unused ) +{ +switch (use_browser) { +case 0 : + symbol_conf.report_individual_block = true; +hists__fprintf (&bh->block_hists, true,0 ,0 , min_percent, + stdout, true); +hists__delete_entries (&bh->block_hists); +return 0 ; +default : +return -1 ; + } + +return 0 ; +}
tools/perf/util/block-info.h +4 -0
@@ -7,6 +7,7 @@#include "hist.h" #include "symbol.h" #include "sort.h" +#include "ui/ui.h" struct block_info {struct symbol *sym;
@@ -69,4 +70,7 @@ int block_info__process_sym(struct hist_entry *he, struct block_hist *bh,struct block_report *block_info__create_report (struct evlist *evlist,u64 total_cycles); +int report__browse_block_hists (struct block_hist *bh,float min_percent, +struct evsel *evsel); +#endif /* __PERF_BLOCK_H */
tools/perf/util/symbol_conf.h +1 -0
@@ -40,6 +40,7 @@ struct symbol_conf { raw_trace, report_hierarchy, report_block, + report_individual_block, inline_name, disable_add2line_warn; const char *vmlinux_name,
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 62/63 perf report: Support --percent-limit for --total-cycles
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
We have already supported the '--total-cycles' option in previous patch. It's also useful to show entries only above a threshold percent.
This patch enables '--percent-limit' for not showing entries under that percent.
For example:
perf report --total-cycles --stdio --percent-limit 1
# To display the perf.data header info, please use --header/--header-only options. #
#
# Total Lost Samples: 0
#
# Samples: 2M of event 'cycles'
# Event count (approx.): 2753248
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ................................................................. ....................
#
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.soCommitter testing:
From second exapmple onwards slightly edited for brevity:
# perf report --total-cycles --percent-limit 2 --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 6M of event 'cycles'
# Event count (approx.): 6299936
#
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
# ............... .............. ........... .......... ...................................................................... ....................
#
2.17% 1.7M 0.08% 607 [compiler.h:199 -> common.c:221] [kernel.vmlinux]
#
# (Tip: Create an archive with symtabs to analyse on other machine: perf archive)
#
# perf report --total-cycles --percent-limit 1 --stdio
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
2.17% 1.7M 0.08% 607 [compiler.h:199 -> common.c:221] [kernel.vmlinux]
1.75% 1.3M 8.34% 65.5K [memset-vec-unaligned-erms.S:147 -> memset-vec-unaligned-erms.S:151] libc-2.29.so
#
# perf report --total-cycles --percent-limit 0.7 --stdio
# Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
2.17% 1.7M 0.08% 607 [compiler.h:199 -> common.c:221] [kernel.vmlinux]
1.75% 1.3M 8.34% 65.5K [memset-vec-unaligned-erms.S:147 -> memset-vec-unaligned-erms.S:151] libc-2.29.so
0.72% 544.5K 0.03% 230 [entry_64.S:657 -> entry_64.S:662] [kernel.vmlinux]
#-------------------------------------------
It only shows the entries which 'Sampled Cycles%' > 1%.
v7:
---
No functional change. Only fix the conflict issue because previous patches are changed.
v6:
---
No functional change. Only fix the conflict issue because previous patches are changed.
v5:
---
No functional change. Only fix the conflict issue because previous patches are changed.
v4:
---
No functional change. Only fix the build issue because previous patches are changed.
--- tools/perf/builtin-report.c | 2 +- tools/perf/ui/stdio/hist.c | 7 ++++++- tools/perf/util/block-info.c | 10 ++++++++++ tools/perf/util/block-info.h | 2 ++ 4 files changed, 19 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +1 -1
@@ -509,7 +509,7 @@ static int perf_evlist__tty_browse_hists(struct evlist *evlist,if (rep->total_cycles_mode) {report__browse_block_hists (&rep->block_reports[i++].hist, -0 , pos); + rep->min_percent, pos);continue ; }
tools/perf/ui/stdio/hist.c +6 -1
@@ -15,6 +15,7 @@#include "../../util/srcline.h" #include "../../util/string2.h" #include "../../util/thread.h" +#include "../../util/block-info.h" #include <linux/ctype.h> #include <linux/zalloc.h>
@@ -856,7 +857,11 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,if (h->filtered)continue ; - percent =hist_entry__get_percent_limit (h); +if (symbol_conf.report_individual_block) + percent =block_info__total_cycles_percent (h); +else + percent =hist_entry__get_percent_limit (h); +if (percent < min_pcnt)continue ;
tools/perf/util/block-info.c +10 -0
@@ -454,3 +454,13 @@ int report__browse_block_hists(struct block_hist *bh, float min_percent,return 0 ; } + +float block_info__total_cycles_percent (struct hist_entry *he) +{ +struct block_info *bi = he->block_info; + +if (bi->total_cycles) +return bi->cycles *100.0 / bi->total_cycles; + +return 0.0 ; +}
tools/perf/util/block-info.h +2 -0
@@ -73,4 +73,6 @@ struct block_report *block_info__create_report(struct evlist *evlist,int report__browse_block_hists (struct block_hist *bh,float min_percent,struct evsel *evsel); +float block_info__total_cycles_percent (struct hist_entry *he); +#endif /* __PERF_BLOCK_H */
Signature · 1 line
2.21.0
Arnaldo Carvalho de Melo
maintainerPATCH 63/63 perf report: Sort by sampled cycles percent per block for tui
In reply to Arnaldo Carvalho de MeloFrom: Jin Yao <[email protected]>
Previous patch has implemented a new option "--total-cycles". But only stdio mode is supported.
This patch supports the tui mode and support '--percent-limit'.
For example,
perf record -b ./div
perf report --total-cycles --percent-limit 1
# Samples: 2753248 of event 'cycles'
Sampled Cycles% Sampled Cycles Avg Cycles% Avg Cycles [Program Block Range] Shared Object
26.04% 2.8M 0.40% 18 [div.c:42 -> div.c:39] div
15.17% 1.2M 0.16% 7 [random_r.c:357 -> random_r.c:380] libc-2.27.so
5.11% 402.0K 0.04% 2 [div.c:27 -> div.c:28] div
4.87% 381.6K 0.04% 2 [random.c:288 -> random.c:291] libc-2.27.so
4.53% 381.0K 0.04% 2 [div.c:40 -> div.c:40] div
3.85% 300.9K 0.02% 1 [div.c:22 -> div.c:25] div
3.08% 241.1K 0.02% 1 [rand.c:26 -> rand.c:27] libc-2.27.so
3.06% 240.0K 0.02% 1 [random.c:291 -> random.c:291] libc-2.27.so
2.78% 215.7K 0.02% 1 [random.c:298 -> random.c:298] libc-2.27.so
2.52% 198.3K 0.02% 1 [random.c:293 -> random.c:293] libc-2.27.so
2.36% 184.8K 0.02% 1 [rand.c:28 -> rand.c:28] libc-2.27.so
2.33% 180.5K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.28% 176.7K 0.02% 1 [random.c:295 -> random.c:295] libc-2.27.so
2.20% 168.8K 0.02% 1 [rand@plt+0 -> rand@plt+0] div
1.98% 158.2K 0.02% 1 [random_r.c:388 -> random_r.c:388] libc-2.27.so
1.57% 123.3K 0.02% 1 [div.c:42 -> div.c:44] div
1.44% 116.0K 0.42% 19 [random_r.c:357 -> random_r.c:394] libc-2.27.so--------------------------------------------------
v7:
---
1. Since we have used use_browser in report__browse_block_hists to support stdio mode, now we also add supporting for tui.
2. Move block tui browser code from ui/browsers/hists.c to block-info.c.
v6:
---
Create report__tui_browse_block_hists in block-info.c (codes are moved from builtin-report.c).
v5:
---
Fix a crash issue when running perf report without '--total-cycles'. The issue is because the internal flag is renamed from 'total_cycles' to 'total_cycles_mode' in previous patch but this patch still uses 'total_cycles' to check if the '--total-cycles' option is enabled, which causes the code to be inconsistent.
v4:
---
Since the block collection is moved out of printing in previous patch, this patch is updated accordingly for tui supporting.
v3:
---
Minor change since the function name is changed:
block_total_cycles_percent -> block_info__total_cycles_percent
--- tools/perf/builtin-report.c | 27 ++++++++++--- tools/perf/ui/browsers/hists.c | 7 +++- tools/perf/ui/browsers/hists.h | 2 + tools/perf/util/block-info.c | 74 +++++++++++++++++++++++++++++++++- 4 files changed, 103 insertions(+), 7 deletions(-)
tools/perf/builtin-report.c +22 -5
@@ -485,6 +485,22 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct reportreturn ret +fprintf (fp,"\n#\n" ); } +static int perf_evlist__tui_block_hists_browse (struct evlist *evlist, +struct report *rep) +{ +struct evsel *pos; +int i =0 , ret; + +evlist__for_each_entry (evlist, pos) { + ret =report__browse_block_hists (&rep->block_reports[i++].hist, + rep->min_percent, pos); +if (ret !=0 ) +return ret; + } + +return 0 ; +} +static int perf_evlist__tty_browse_hists (struct evlist *evlist,struct report *rep,const char *help)
@@ -595,6 +611,11 @@ static int report__browse_hists(struct report *rep)switch (use_browser) {case 1 : +if (rep->total_cycles_mode) { + ret =perf_evlist__tui_block_hists_browse (evlist, rep); +break ; + } + ret = perf_evlist__tui_browse_hists(evlist, help, NULL, rep->min_percent, &session->header.env,
@@ -1396,12 +1417,8 @@ int cmd_report(int argc, const char **argv)if (report.total_cycles_mode) {if (sort__mode !=SORT_MODE__BRANCH ) report.total_cycles_mode = false; -else if (!report.use_stdio) { -pr_err ("Error: --total-cycles can be only used together with --stdio\n" ); - goto error; - }else { +else sort_order ="sym" ; - } }if (strcmp (input_name,"-" ) !=0 )
tools/perf/ui/browsers/hists.c +6 -1
@@ -26,6 +26,7 @@#include "../../util/sort.h" #include "../../util/top.h" #include "../../util/thread.h" +#include "../../util/block-info.h" #include "../../arch/common.h" #include "../../perf.h"
@@ -1783,7 +1784,11 @@ static unsigned int hist_browser__refresh(struct ui_browser *browser)continue ; } - percent =hist_entry__get_percent_limit (h); +if (symbol_conf.report_individual_block) + percent =block_info__total_cycles_percent (h); +else + percent =hist_entry__get_percent_limit (h); +if (percent < hb->min_pcnt)continue ;
tools/perf/ui/browsers/hists.h +2 -0
@@ -5,6 +5,7 @@#include "ui/browser.h" struct annotation_options ; +struct evsel ;struct hist_browser {struct ui_browser b;
@@ -15,6 +16,7 @@ struct hist_browser {struct pstack *pstack;struct perf_env *env;struct annotation_options *annotation_opts; +struct evsel *block_evsel;int print_seq;bool show_dso;bool show_headers;
tools/perf/util/block-info.c +73 -1
94 lines not on this page · raw message
Signature · 1 line
2.21.0
Quoted 18 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
d44f821b0e13275735e8f3fe4db8703b45f05d52:perf/core: Optimize
perf_init_event()forTYPE_SOFTWARE(2019-10-28 12:53:28 +0100)are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-core-for-mingo-5.5-20191107
Quoted 8 lines
for you to fetch changes up to
7fa46cbf20d327d78114b1c8c7e69fabe7c57794:perf report: Sort by sampled cycles percent per block for tui (2019-11-07 10:14:48 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:87 files changed, 22145 insertions(+), 19453 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo
Re: [PATCH 56/63] perf tests: Fix out of bounds memory access
In reply to Arnaldo Carvalho de MeloThis patch merged into stable-rc tree and perf build failed on OE for Linaro builds for 5.3, 4.19, 4.14 and 4.9.
Please find build error logs here,
tests/backward-ring-buffer.c: In function 'test__backward_ring_buffer':tests/backward-ring-buffer.c:147:2: warning: implicit declaration of function 'evlist__close'; did you mean 'perf_evlist__close'? [-Wimplicit-function-declaration]
evlist__close(evlist);
^~~~~~~~~~~~~
perf_evlist__closetests/backward-ring-buffer.c:147:2: warning: nested extern declaration of 'evlist__close' [-Wnested-externs] tests/backward-ring-buffer.c:149:8: warning: implicit declaration of function 'evlist__open'; did you mean 'perf_evlist__open'? [-Wimplicit-function-declaration]
err = evlist__open(evlist);
^~~~~~~~~~~~
perf_evlist__opentests/backward-ring-buffer.c:149:8: warning: nested extern declaration of 'evlist__open' [-Wnested-externs] perf/1.0-r9/recipe-sysroot/usr/lib/python2.7/config/libpython2.7.a(posixmodule.o):
In function `posix_tmpnam':/usr/src/debug/python/2.7.15-r1/Python-2.7.15/Modules/posixmodule.c:7648:
warning: the use of tmpnam_r' is dangerous, better use mkstemp' perf/1.0-r9/recipe-sysroot/usr/lib/python2.7/config/libpython2.7.a(posixmodule.o):
In function `posix_tempnam':/usr/src/debug/python/2.7.15-r1/Python-2.7.15/Modules/posixmodule.c:7595:
warning: the use of tempnam' is dangerous, better use mkstemp' perf/1.0-r9/perf-1.0/perf-in.o: In function `test__backward_ring_buffer':perf/1.0-r9/perf-1.0/tools/perf/tests/backward-ring-buffer.c:147:
undefined reference to `evlist__close' perf/1.0-r9/perf-1.0/tools/perf/tests/backward-ring-buffer.c:149:
undefined reference to `evlist__open'
Full log can be found at,
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-5.3/DISTRO=lkft,MACHINE=hikey,label=docker-lkft/72/consoleText
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.19/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-lkft/378/consoleText
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.14/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-lkft/675/consoleText
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.9/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-lkft/753/consoleText
Quoted 91 lines · Arnaldo Carvalho de Melo
From: Leo Yan <[email protected]>
The test case 'Read backward ring buffer' failed on 32-bit architectures which were found by LKFT perf testing. The test failed on arm32 x15 device,
qemu_arm32,qemu_i386, and found intermittent failure on i386; the failure log is as below:50: Read backward ring buffer :
--- start ---
test child forked, pid 510
Using CPUID GenuineIntel-6-9E-9
mmap size 1052672B
mmap size 8192B
Finished reading overwrite ring buffer: rewind
free(): invalid next size (fast)
test child interrupted
---- end ----
Read backward ring buffer: FAILED!The log hints there have issue for memory usage, thus
free()reports error 'invalid next size' and directly exit for the case. Finally, this issue is root caused as out of bounds memory access for the data array 'evsel->id'.The backward ring buffer test invokes
do_test()twice. 'evsel->id' is allocated at the first call with the flow:
test__backward_ring_buffer()`-> do_test() `-> evlist__mmap() `-> evlist__mmap_ex() `-> perf_evsel__alloc_id()So '
evsel->id' is allocated with one item, and it will be used in functionperf_evlist__id_add():evsel->id[0] = id evsel->ids = 1At the second call for
do_test(), it skips to initialize 'evsel->id' and reuses the array which is allocated in the first call. But 'evsel->ids' contains the stale value. Thus:evsel->id[1] = id -> out of bound access
evsel->ids= 2To fix this issue, we will use
evlist__open()andevlist__close()pair functions to prepare and cleanup context for evlist; so 'evsel->id' and 'evsel->ids' can be initialized properly when invokedo_test()and avoid the out of bounds memory access.Fixes ee74701ed8ad ("perf tests: Add test to check backward ring buffer")Signed-off-by Leo Yan <[email protected]>Reviewed-by Jiri Olsa <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Mark Rutland <[email protected]>Cc Namhyung Kim <[email protected]>Cc Naresh Kamboju <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Wang Nan <[email protected]>Cc [email protected] # v4.10+Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/tests/backward-ring-buffer.c | 9 +++++++++ 1 file changed, 9 insertions(+)tools/perf/tests/backward-ring-buffer.c +9
-1@@ -148,6 +148,15 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m goto out_delete_evlist; } +evlist__close (evlist); + + err =evlist__open (evlist); +if (err <0 ) { +pr_debug ("perf_evlist__open: %s\n" , +str_error_r (errno, sbuf,sizeof (sbuf))); + goto out_delete_evlist; + } + err =do_test (evlist,1 , &sample_count, &comm_count);if (err !=TEST_OK ) goto out_delete_evlist; --2.21.0
Greg Kroah-Hartman
maintainerRe: [PATCH 56/63] perf tests: Fix out of bounds memory access
Quoted 35 lines · Naresh Kamboju
This patch merged into stable-rc tree and perf build failed on OE for Linaro builds for 5.3, 4.19, 4.14 and 4.9.
Please find build error logs here,
tests/backward-ring-buffer.c: In function 'test__backward_ring_buffer':tests/backward-ring-buffer.c:147:2: warning: implicit declaration of function 'evlist__close'; did you mean 'perf_evlist__close'? [-Wimplicit-function-declaration]
evlist__close(evlist);
^~~~~~~~~~~~~
perf_evlist__closetests/backward-ring-buffer.c:147:2: warning: nested extern declaration of 'evlist__close' [-Wnested-externs]tests/backward-ring-buffer.c:149:8: warning: implicit declaration of function 'evlist__open'; did you mean 'perf_evlist__open'? [-Wimplicit-function-declaration]err = evlist__open(evlist); ^~~~~~~~~~~~ perf_evlist__open
tests/backward-ring-buffer.c:149:8: warning: nested extern declaration of 'evlist__open' [-Wnested-externs] perf/1.0-r9/recipe-sysroot/usr/lib/python2.7/config/libpython2.7.a(posixmodule.o):
In function `posix_tmpnam':/usr/src/debug/python/2.7.15-r1/Python-2.7.15/Modules/posixmodule.c:7648:
warning: the use oftmpnam_r' is dangerous, better usemkstemp' perf/1.0-r9/recipe-sysroot/usr/lib/python2.7/config/libpython2.7.a(posixmodule.o):
In function `posix_tempnam':/usr/src/debug/python/2.7.15-r1/Python-2.7.15/Modules/posixmodule.c:7595:
warning: the use oftempnam' is dangerous, better usemkstemp'perf/1.0-r9/perf-1.0/perf-in.o: In function `test__backward_ring_buffer':perf/1.0-r9/perf-1.0/tools/perf/tests/backward-ring-buffer.c:147:
undefined reference to `evlist__close'perf/1.0-r9/perf-1.0/tools/perf/tests/backward-ring-buffer.c:149:
undefined reference to `evlist__open'
Quoted 6 lines
Full log can be found at,
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-5.3/DISTRO=lkft,MACHINE=hikey,label=docker-lkft/72/consoleText
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.19/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-lkft/378/consoleText
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.14/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-lkft/675/consoleText
https://ci.linaro.org/view/lkft/job/openembedded-lkft-linux-stable-rc-4.9/DISTRO=lkft,MACHINE=intel-corei7-64,label=docker-lkft/753/consoleText
Good catch, thanks, I'll go drop it from all of these queues.
greg k-h