Changes this release.
Functional update: Add additional information about the last
instruction to the generic output packet & update docs for updated
output packet.
Bugfix: typecast removed from OCSD_VER_NUM in ocsd_if_version.h to
allow use in C pre-processor.
Bugfix: ETMV4: Interworking ISA change between A32-T32 occasionally
missed during instruction decode.
--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK
Hi Ingo,
Please consider pulling, next ones should be concentrating just
on bug fixes, been busy with some, so some were left in the queue,
flushing them now.
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit 28fa741c27e6d57f6bf594ba3c444ce79e671e09:
perf/core: Clean up inconsisent indentation (2018-10-30 09:51:58 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-4.20-20181031
for you to fetch changes up to 5d4f0edaa3ac4f1844ed7c64cd2bae6f1912bac5:
perf intel-pt/bts: Calculate cpumode for synthesized samples (2018-10-31 12:56:26 -0300)
----------------------------------------------------------------
perf/urgent improvements and fixes:
- Fixes dealing with the removal of the fallback to looking up samples
marked as userspace in the kernel maps, done recently:
- For intel-pt, that was setting the synthesized header misc field
as PERF_RECORD_MISC_USER, depending thus on the fallback to take
place, now it sets as USER or KERNEL according to x86 specific
knowledge. Also now it inserts the PERF_CONTEXT_{USER,KERNEL} into
the PERF_SAMPLE_CALLCHAINs it synthesizes from hw traces (Adrian Hunter)
- Similar fixes for the cs-etm ARM HW trace code, that used the Intel PT
model as a starting point (Leo Yan)
- For the "caller" callchain order, where the callchain returned by the
kernel was simply reversed without taking into account the
PERF_CONTEXT_{USER,KERNEL,etc} markers from where to define if an entry
was for kernel or userspace, working just because the map lookup fallback
was in place (David S. Miller)
- Allow for selecting if 'overwrite' mode should be used in 'perf top' and
make the default for it not to be used. This is due to problems with the
current implementation where the pausing used ends up making 'perf top'
miss PERF_RECORD_{MMAP,FORK,EXEC,etc} events, which with short lifetime
threads workloads leads quickly to many "unknown" maps (and thus symbols)
to appear in the UI. Workloads with long thread lifetimes and with few
metadata events can still use --overwrite to take advantage of the
overwrite mode (Arnaldo Carvalho de Melo)
- Start 'perf top''s display thread earlier, so that the screen doesn't
remain blank for too long at tool start (David S. Miller)
- Don't clone maps from parent when synthesizing forks, to avoid the inevitable
flurry of overlapping maps as we process the synthesized MMAP2 events that get
delivered shortly thereafter. (David S. Miller)
- Take pgoff into account when reporting elf to libdwfl, now the unwinding
results are the same with elfutils's libdwfl and libunwind (Milian Wolff)
- Update lotsa kernel ABI headers (Arnaldo Carvalho de Melo)
- 'perf trace' syscall arg beautification improvements to allow for
handling args such as mount's 'flags', where maks have to be ignored
before considering what is left, that, if only zeroes, is suppressed
like other args without such masks (Arnaldo Carvalho de Melo)
- Beautify mount's 'source' and 'flags' args (Arnaldo Carvalho de Melo)
- Generate mmap's flags bit constants from linux/mman.h and all the
arch specific mman.h files, so that no changes in the main 'perf trace'
source files is required when new flags get added (Arnaldo Carvalho de Melo)
- Consider syscall aliases, so that 'perf trace -e umount' works and we don't
have to use 'umount2' (that works as well, just not required) (Arnaldo Carvalho de Melo)
Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
----------------------------------------------------------------
Adrian Hunter (2):
perf intel-pt: Insert callchain context into synthesized callchains
perf intel-pt/bts: Calculate cpumode for synthesized samples
Arnaldo Carvalho de Melo (21):
tools include uapi: Grab a copy of linux/fs.h
perf beauty: Add a generator for MS_ mount/umount's flag constants
perf beauty: Switch from GPL v2.0 to LGPL v2.1
perf beauty: Introduce strarray__scnprintf_flags()
perf trace beauty: Allow syscalls to mask an argument before considering it
perf trace beauty: Beautify mount/umount's 'flags' argument
perf trace: Consider syscall aliases too
perf trace: Beautify the umount's 'name' argument
perf trace: Beautify mount's first pathname arg
perf top: Allow disabling the overwrite mode
perf top: Do not use overwrite mode by default
tools include uapi: Update linux/fs.h copy
tools arch uapi: Update asm-generic/unistd.h and arm64 unistd.h copies
tools include uapi: Update asound.h copy
perf beauty: Add a generator for MAP_ mmap's flag constants
perf beauty: Wire up the mmap flags table generator to the Makefile
perf trace beauty: Use the mmap flags table generated from headers
tools include uapi: Update linux/mmap.h copy
tools headers: Sync the various kvm.h header copies
tools headers uapi: Update linux/netlink.h header copy
tools headers uapi: Update linux/if_link.h header copy
David Miller (2):
perf top: Start display thread earlier
perf tools: Don't clone maps from parent when synthesizing forks
David S. Miller (1):
perf callchain: Honour the ordering of PERF_CONTEXT_{USER,KERNEL,etc}
Leo Yan (1):
perf cs-etm: Correct CPU mode for samples
Milian Wolff (1):
perf unwind: Take pgoff into account when reporting elf to libdwfl
include/uapi/linux/perf_event.h | 2 +
tools/arch/arm64/include/uapi/asm/unistd.h | 1 +
tools/arch/powerpc/include/uapi/asm/kvm.h | 1 +
tools/arch/s390/include/uapi/asm/kvm.h | 2 +
tools/arch/x86/include/uapi/asm/kvm.h | 6 +-
tools/include/uapi/asm-generic/unistd.h | 2 +
tools/include/uapi/linux/fs.h | 393 +++++++++++++++++++++
tools/include/uapi/linux/if_link.h | 1 +
tools/include/uapi/linux/kvm.h | 21 +-
tools/include/uapi/linux/mman.h | 2 +
tools/include/uapi/linux/netlink.h | 1 +
tools/include/uapi/linux/perf_event.h | 2 +
tools/include/uapi/sound/asound.h | 2 +-
tools/perf/Documentation/perf-top.txt | 10 +
tools/perf/Makefile.perf | 19 +
tools/perf/builtin-top.c | 21 +-
tools/perf/builtin-trace.c | 48 ++-
tools/perf/check-headers.sh | 1 +
tools/perf/trace/beauty/Build | 1 +
tools/perf/trace/beauty/beauty.h | 7 +
tools/perf/trace/beauty/clone.c | 3 +-
tools/perf/trace/beauty/drm_ioctl.sh | 1 +
tools/perf/trace/beauty/eventfd.c | 2 +-
tools/perf/trace/beauty/fcntl.c | 3 +-
tools/perf/trace/beauty/flock.c | 2 +-
tools/perf/trace/beauty/futex_op.c | 2 +-
tools/perf/trace/beauty/futex_val3.c | 2 +-
tools/perf/trace/beauty/ioctl.c | 3 +-
tools/perf/trace/beauty/kcmp.c | 3 +-
tools/perf/trace/beauty/kcmp_type.sh | 1 +
tools/perf/trace/beauty/kvm_ioctl.sh | 1 +
tools/perf/trace/beauty/madvise_behavior.sh | 1 +
tools/perf/trace/beauty/mmap.c | 50 +--
tools/perf/trace/beauty/mmap_flags.sh | 32 ++
tools/perf/trace/beauty/mode_t.c | 2 +-
tools/perf/trace/beauty/mount_flags.c | 43 +++
tools/perf/trace/beauty/mount_flags.sh | 15 +
tools/perf/trace/beauty/msg_flags.c | 2 +-
tools/perf/trace/beauty/open_flags.c | 2 +-
tools/perf/trace/beauty/perf_event_open.c | 2 +-
tools/perf/trace/beauty/perf_ioctl.sh | 1 +
tools/perf/trace/beauty/pid.c | 3 +-
tools/perf/trace/beauty/pkey_alloc.c | 30 +-
.../perf/trace/beauty/pkey_alloc_access_rights.sh | 1 +
tools/perf/trace/beauty/prctl.c | 3 +-
tools/perf/trace/beauty/prctl_option.sh | 1 +
tools/perf/trace/beauty/sched_policy.c | 2 +-
tools/perf/trace/beauty/seccomp.c | 2 +-
tools/perf/trace/beauty/signum.c | 2 +-
tools/perf/trace/beauty/sndrv_ctl_ioctl.sh | 1 +
tools/perf/trace/beauty/sndrv_pcm_ioctl.sh | 1 +
tools/perf/trace/beauty/sockaddr.c | 2 +-
tools/perf/trace/beauty/socket.c | 2 +-
tools/perf/trace/beauty/socket_ipproto.sh | 1 +
tools/perf/trace/beauty/socket_type.c | 2 +-
tools/perf/trace/beauty/statx.c | 3 +-
tools/perf/trace/beauty/vhost_virtio_ioctl.sh | 1 +
tools/perf/trace/beauty/waitid_options.c | 2 +-
tools/perf/util/cs-etm.c | 39 +-
tools/perf/util/event.c | 1 +
tools/perf/util/intel-bts.c | 17 +-
tools/perf/util/intel-pt.c | 28 +-
tools/perf/util/machine.c | 54 ++-
tools/perf/util/thread-stack.c | 44 ++-
tools/perf/util/thread-stack.h | 2 +-
tools/perf/util/thread.c | 13 +-
tools/perf/util/thread.h | 2 +-
tools/perf/util/unwind-libdw.c | 4 +-
68 files changed, 837 insertions(+), 142 deletions(-)
create mode 100644 tools/include/uapi/linux/fs.h
create mode 100755 tools/perf/trace/beauty/mmap_flags.sh
create mode 100644 tools/perf/trace/beauty/mount_flags.c
create mode 100755 tools/perf/trace/beauty/mount_flags.sh
Test results:
The first ones are container (docker) 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.
The failures are minor and will be fixed soon.
50 6.21 ubuntu:16.04-x-arm64 : FAIL aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
This one is related to smp_load_{acquire,release} expansions in this specific
gcc version, reported to Daniel Borkmann
60 3.70 ubuntu:18.04-x-m68k : FAIL m68k-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
64 3.48 ubuntu:18.04-x-riscv64 : FAIL riscv64-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
These two need mman.h files added to its directories in tools/arch/, will fix later.
66 3.84 ubuntu:18.04-x-sh4 : FAIL sh4-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
Needs to normalize sh4 -> sh so that it finds
tools/arch/sh/include/uapi/asm/mman.h.
# dm
1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0
2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822
3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0
4 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0
5 alpine:3.8 : Ok gcc (Alpine 6.4.0) 6.4.0
6 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0
7 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28)
8 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
9 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease)
10 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease)
11 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55)
12 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23)
13 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28)
14 clearlinux:latest : Ok gcc (Clear Linux OS for Intel Architecture) 8.2.1 20180502
15 debian:7 : Ok gcc (Debian 4.7.2-5) 4.7.2
16 debian:8 : Ok gcc (Debian 4.9.2-10+deb8u1) 4.9.2
17 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516
18 debian:experimental : Ok gcc (Debian 8.2.0-8) 8.2.0
19 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 8.2.0-7) 8.2.0
20 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 8.2.0-7) 8.2.0
21 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 8.1.0-12) 8.1.0
22 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 8.2.0-7) 8.2.0
23 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7)
24 fedora:21 : Ok gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
25 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6)
26 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6)
27 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1)
28 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710
29 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1)
30 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2)
31 fedora:27 : Ok gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6)
32 fedora:28 : Ok gcc (GCC) 8.1.1 20180712 (Red Hat 8.1.1-5)
33 fedora:29 : Ok gcc (GCC) 8.2.1 20181011 (Red Hat 8.2.1-4)
34 fedora:rawhide : Ok gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3)
35 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 7.3.0-r3 p1.4) 7.3.0
36 mageia:5 : Ok gcc (GCC) 4.9.2
37 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0
38 opensuse:13.2 : Ok gcc (SUSE Linux) 4.8.3 20140627 [gcc-4_8-branch revision 212064]
39 opensuse:42.1 : Ok gcc (SUSE Linux) 4.8.5
40 opensuse:42.2 : Ok gcc (SUSE Linux) 4.8.5
41 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5
42 opensuse:tumbleweed : Ok gcc (SUSE Linux) 7.3.1 20180323 [gcc-7-branch revision 258812]
43 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1)
44 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28.0.1)
45 ubuntu:12.04.5 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3
46 ubuntu:14.04.4 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4
47 ubuntu:14.04.4-x-linaro-arm64 : Ok aarch64-linux-gnu-gcc (Linaro GCC 5.5-2017.10) 5.5.0
48 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.10) 5.4.0 20160609
49 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
50 ubuntu:16.04-x-arm64 : FAIL aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
51 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
52 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
53 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
54 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
55 ubuntu:16.10 : Ok gcc (Ubuntu 6.2.0-5ubuntu12) 6.2.0 20161005
56 ubuntu:17.10 : Ok gcc (Ubuntu 7.2.0-8ubuntu3.2) 7.2.0
57 ubuntu:18.04 : Ok gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
58 ubuntu:18.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.3.0-27ubuntu1~18.04) 7.3.0
59 ubuntu:18.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.3.0-27ubuntu1~18.04) 7.3.0
60 ubuntu:18.04-x-m68k : FAIL m68k-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
61 ubuntu:17.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
62 ubuntu:18.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
63 ubuntu:18.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
64 ubuntu:18.04-x-riscv64 : FAIL riscv64-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
65 ubuntu:18.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
66 ubuntu:18.04-x-sh4 : FAIL sh4-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
67 ubuntu:18.04-x-sparc64 : Ok sparc64-linux-gnu-gcc (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
68 ubuntu:18.10 : Ok gcc (Ubuntu 8.2.0-7ubuntu1) 8.2.0
# uname -a
Linux seventh 4.19.0-rc8-00014-gc0cff31be705 #1 SMP Wed Oct 17 09:00:22 -03 2018 x86_64 x86_64 x86_64 GNU/Linux
# git log --oneline -1
5d4f0edaa3ac perf intel-pt/bts: Calculate cpumode for synthesized samples
# perf version --build-options
perf version 4.19.g5d4f0e
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
# 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: x86 rdpmc : Ok
60: Convert perf time to TSC : Ok
61: DWARF unwind : Ok
62: x86 instruction decoder - new instructions : Ok
63: x86 bp modify : Ok
64: probe libc's inet_pton & backtrace it with ping : Ok
65: Check open filename arg using perf trace + vfs_getname: Ok
66: Use vfs_getname probe to get syscall args filenames : Ok
67: Add vfs_getname probe to get syscall args filenames : Ok
$ make -C tools/perf build-test
make: Entering directory '/home/acme/git/perf/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_no_libperl_O: make NO_LIBPERL=1
make_install_prefix_O: make install prefix=/tmp/krava
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_no_libpython_O: make NO_LIBPYTHON=1
make_perf_o_O: make perf.o
make_static_O: make LDFLAGS=-static
make_no_newt_O: make NO_NEWT=1
make_no_auxtrace_O: make NO_AUXTRACE=1
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_util_map_o_O: make util/map.o
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
make_no_libelf_O: make NO_LIBELF=1
make_no_backtrace_O: make NO_BACKTRACE=1
make_no_libbpf_O: make NO_LIBBPF=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_no_gtk2_O: make NO_GTK2=1
make_install_bin_O: make install-bin
make_no_demangle_O: make NO_DEMANGLE=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_no_libnuma_O: make NO_LIBNUMA=1
make_with_babeltrace_O: make LIBBABELTRACE=1
make_pure_O: make
make_tags_O: make tags
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_install_O: make install
make_clean_all_O: make clean all
make_no_slang_O: make NO_SLANG=1
make_doc_O: make doc
make_debug_O: make DEBUG=1
make_no_libaudit_O: make NO_LIBAUDIT=1
make_help_O: make help
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$
Since commit 9042f5e3539e ("perf tools: Stop fallbacking to kallsyms
for vdso symbols lookup"), the kernel address cannot be properly parsed
to kernel symbol with command 'perf script -k vmlinux'. The reason is
CoreSight samples is always to set CPU mode as PERF_RECORD_MISC_USER,
thus it fails to find corresponding map/dso in below flows:
process_sample_event()
`-> machine__resolve()
`-> thread__find_map(thread, sample->cpumode, sample->ip, al);
In this flow it needs to pass argument 'sample->cpumode' to tell what's
the CPU mode, before it always passed PERF_RECORD_MISC_USER but without
any failure until the commit 9042f5e3539e ("perf tools: Stop fallbacking
to kallsyms for vdso symbols lookup") has been merged. The reason is
even with the wrong CPU mode the function thread__find_map() firstly
fails to find map but it will rollback to find kernel map for vdso
symbols lookup. In the latest code it has removed the fallback code,
thus if CPU mode is PERF_RECORD_MISC_USER then it cannot find map
anymore with kernel address.
This patch is to correct samples CPU mode setting, it creates a new
helper function cs_etm__cpu_mode() to tell what's the CPU mode based on
the address with the info from machine structure; this patch has a bit
extension to check not only kernel and user mode, but also check for
host/guest and hypervisor mode. Finally this patch uses the function
in instruction and branch samples and also apply in cs_etm__mem_access()
for a minor polishing.
Signed-off-by: Leo Yan <leo.yan(a)linaro.org>
---
tools/perf/util/cs-etm.c | 39 ++++++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 3b37d66..73430b7 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -244,6 +244,27 @@ static void cs_etm__free(struct perf_session *session)
zfree(&aux);
}
+static u8 cs_etm__cpu_mode(struct cs_etm_queue *etmq, u64 address)
+{
+ struct machine *machine;
+
+ machine = etmq->etm->machine;
+
+ if (address >= etmq->etm->kernel_start) {
+ if (machine__is_host(machine))
+ return PERF_RECORD_MISC_KERNEL;
+ else
+ return PERF_RECORD_MISC_GUEST_KERNEL;
+ } else {
+ if (machine__is_host(machine))
+ return PERF_RECORD_MISC_USER;
+ else if (perf_guest)
+ return PERF_RECORD_MISC_GUEST_USER;
+ else
+ return PERF_RECORD_MISC_HYPERVISOR;
+ }
+}
+
static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address,
size_t size, u8 *buffer)
{
@@ -258,10 +279,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address,
return -1;
machine = etmq->etm->machine;
- if (address >= etmq->etm->kernel_start)
- cpumode = PERF_RECORD_MISC_KERNEL;
- else
- cpumode = PERF_RECORD_MISC_USER;
+ cpumode = cs_etm__cpu_mode(etmq, address);
thread = etmq->thread;
if (!thread) {
@@ -653,7 +671,7 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,
struct perf_sample sample = {.ip = 0,};
event->sample.header.type = PERF_RECORD_SAMPLE;
- event->sample.header.misc = PERF_RECORD_MISC_USER;
+ event->sample.header.misc = cs_etm__cpu_mode(etmq, addr);
event->sample.header.size = sizeof(struct perf_event_header);
sample.ip = addr;
@@ -665,7 +683,7 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,
sample.cpu = etmq->packet->cpu;
sample.flags = 0;
sample.insn_len = 1;
- sample.cpumode = event->header.misc;
+ sample.cpumode = event->sample.header.misc;
if (etm->synth_opts.last_branch) {
cs_etm__copy_last_branch_rb(etmq);
@@ -706,12 +724,15 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq)
u64 nr;
struct branch_entry entries;
} dummy_bs;
+ u64 ip;
+
+ ip = cs_etm__last_executed_instr(etmq->prev_packet);
event->sample.header.type = PERF_RECORD_SAMPLE;
- event->sample.header.misc = PERF_RECORD_MISC_USER;
+ event->sample.header.misc = cs_etm__cpu_mode(etmq, ip);
event->sample.header.size = sizeof(struct perf_event_header);
- sample.ip = cs_etm__last_executed_instr(etmq->prev_packet);
+ sample.ip = ip;
sample.pid = etmq->pid;
sample.tid = etmq->tid;
sample.addr = cs_etm__first_executed_instr(etmq->packet);
@@ -720,7 +741,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq)
sample.period = 1;
sample.cpu = etmq->packet->cpu;
sample.flags = 0;
- sample.cpumode = PERF_RECORD_MISC_USER;
+ sample.cpumode = event->sample.header.misc;
/*
* perf report cannot handle events without a branch stack
--
2.7.4
This patch seris adds support for sample flags so can facilitate perf
to print sample flags for branch instruction.
The branch instructions also include exception taken and return
related instructions, so the first patch is used to generate branch
sample for exception packets; and the second patch is to track the
exception number.
The patch 0003 is to set branch instruction flags in packet, this
patch has the core code in this series to set flags according to the
decoding element type, and also based on the elements including
instruction type, subtype and condition flag to help making decision
to set flags value.
The patch 0004 is to support sample flags by copying the flags value
from packet structure to sample structure, and it includes two fixing
up for TRACE_ON and exception packets.
The patch series is based on OpenCSD v0.10.0 and Rob's patch 'perf:
Support for Arm A32/T32 instruction sets in CoreSight trace' also is
prerequisite to support A32/T32 ISAs.
The patches can be applied on the acme core branch [1] and tested on
Juno board with below commands for A64 and A32/T32 building:
# perf script -F,-time,+flags,+ip,+sym,+addr -k vmlinux
Leo Yan (4):
perf cs-etm: Generate branch sample for exception packet
perf cs-etm: Track exception number
perf cs-etm: Set branch instruction flags in packet
perf cs-etm: Add support sample flags
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 237 +++++++++++++++++++++++-
tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 11 +-
tools/perf/util/cs-etm.c | 44 ++++-
3 files changed, 277 insertions(+), 15 deletions(-)
--
2.7.4
Hi,
We are trying to us the Open CSD for decoding a onchip trace in our ETB.
The trace was enabled and is captured in the ETB.
We read the trace back and dumped it into a text file.
I am attaching it.
How can I use the CSD tool to decode it?
Thanks
Ajith
Hi,
I'm taking this back to the linaro coresight list so we can get the OpenCSD
library versioning sorted out.
The first patch splits the OpenCSD feature check into two parts. The
original check is left as is - this just checks for the presence of an
OpenCSD library. A new check (libopencsd-numinstr) is added that checks
for the new OpenCSD (>0.9.0) that has the num_instr_range member in the
ocsd_generic_trace_elem struct. This feature is then used to set a flag
used in cs-etm-decoder.c to select which versions of 2 functions are used
to get the instruction count / last instruction size of each instruction
block - if the flag is not set, then the previous assumptions of a 4 byte
instruction size are used. It was suggested that OpenCSD should export a
version header - I agree this is a good idea, but this will require a new
release of the library, so we would miss support for the instruction sizes
when OpenCSD 0.9.{0,1,2} is installed - hence why I've kept the version
check using the presence of num_instr_range.
The second patch adds support for finding the T32 instruction counts when
the OpenCSD library doesn't report the instruction counts. As this
involves iterating through the block of instructions and examining each
instruction, there is a significant peformance hit (about 5x slower than
using the OpenCSD library to report the instruction counts), so I'm not
sure this patch should go into upstream.
Regards
Rob
Robert Walker (2):
perf: Support for Arm A32/T32 instruction sets in CoreSight trace
perf: Full support for Arm T32 instructions with older version of
OpenCSD
tools/build/Makefile.feature | 3 +-
tools/build/feature/Makefile | 4 +
tools/build/feature/test-libopencsd-numinstr.c | 15 ++++
tools/perf/Makefile.config | 3 +
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 106 ++++++++++++++++++++++++
tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 10 +++
tools/perf/util/cs-etm.c | 71 +++++++---------
7 files changed, 171 insertions(+), 41 deletions(-)
create mode 100644 tools/build/feature/test-libopencsd-numinstr.c
--
2.7.4
This patchset adds more information about the final instuction in the
Instruction Range generic packet.
i) A flag is set if the last instruction is conditional [last_instr_cond].
ii) for A32/T32 ISA, the instruction subtype will be set to 'Implied Return'
[OCSD_S_INSTR_V7_IMPLIED_RET] if it is one of the instructions:
mov pc,lr
bx r14
pop {...,pc}
ldr pc,[sp], #offset
These are used by the CPU return predictor and in general by compilers
when a return is required.
The patchset also removes the uint32_t casts in the version #define
OCSD_VER_NUM to enable correct use with pre-processor.
updates for v2:
i) Instruction matching for implied return tightened to focus correctly on
specific instructions
ii) Typos in help / printed text corrected.
Mike Leach (4):
opencsd: Generic output packet - add additional instruction info
opencsd: Typo Fixes.
opencsd: docs: Update documents for new generic packet field
opencsd: Update README etc for version 0.10.0
README.md | 6 ++-
decoder/docs/doxygen_config.dox | 2 +-
decoder/docs/prog_guide/prog_guide_generic_pkts.md | 3 +-
decoder/include/common/trc_gen_elem.h | 1 +
.../include/opencsd/etmv4/trc_pkt_decode_etmv4i.h | 2 +
decoder/include/opencsd/ocsd_if_types.h | 1 +
decoder/include/opencsd/ocsd_if_version.h | 8 ++--
decoder/include/opencsd/trc_gen_elem_types.h | 1 +
decoder/source/etmv3/trc_pkt_decode_etmv3.cpp | 1 +
decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp | 29 ++++++--------
decoder/source/i_dec/trc_i_decode.cpp | 1 +
decoder/source/i_dec/trc_idec_arminst.cpp | 46 +++++++++++-----------
decoder/source/ocsd_dcd_tree.cpp | 1 -
decoder/source/ptm/trc_pkt_decode_ptm.cpp | 2 +
decoder/source/trc_gen_elem.cpp | 7 +++-
decoder/tests/source/trc_pkt_lister.cpp | 2 +-
16 files changed, 61 insertions(+), 52 deletions(-)
--
2.14.2
Greetings,
I'm trying to find an ARM server dedicated for high-computing and
parallelism,
that also supports Coresight.
The Cavium ThunderX2 fits perfectly for the performance requirements, but
i'm not quite sure Coresight is supported. This isn't documented anywhere,
so i thought it's best to ask this here.
Is Coresight supported on ThunderX2?
Thank you,
Mike.
The perf sample data contains flags to indicate the hardware trace data
is belonging to which type branch instruction, thus this can be used to
print out the human readable string. Arm CoreSight ETM sample data is
missed to set flags and it is always set to zeros, this results in perf
tool skips to print string for instruction types.
Arm CoreSight ETM supports different kind instruction of A64, A32 and
T32; as the first step, this patch is to set sample flags for A64
instructions.
The brief idea for implementation is describe as below:
- For element with OCSD_GEN_TRC_ELEM_TRACE_ON type, it is taken as trace
beginning packet; for element with OCSD_GEN_TRC_ELEM_NO_SYNC or
OCSD_GEN_TRC_ELEM_EO_TRACE, these two kinds elements are used to set
for trace end;
- For instruction range packet, mainly base on three factors to decide
the branch instruction types:
elem->last_i_type
elem->last_i_subtype
elem->last_instr_cond
If the instruction is immediate branch but without link and return
flag, we consider it as function internal branch; in fact the
immediate branch also can be used to invoke the function entry,
usually this is only used in assembly code to directly call a symbol
and don't expect to return back; after reviewing kernel normal
functions and user space programs, both of them are very seldom to use
immediate branch for function call. On the other hand, if we want to
decide the immediate branch is for function branch jumping or for
function calling, we need to rely on the start address of next packet
and check the symbol offset for the start address, this will
introduce much complexity in the implementation. So for this version
we simply consider immediate branch as function internal branch.
If the instruction is immediate branch with link, it's instruction
'BL' and which is used for function call.
If the instruction is indirect branch without link, this is
corresponding to instruction 'BR', this instruction usually is used
for dynamic link lib with below usage; so we think it's a return
instruction.
0000000000000680 <.plt>:
680: a9bf7bf0 stp x16, x30, [sp, #-16]!
684: 90000090 adrp x16, 10000 <__FRAME_END__+0xf630>
688: f947fe11 ldr x17, [x16, #4088]
68c: 913fe210 add x16, x16, #0xff8
690: d61f0220 br x17
If the instruction is indirect branch with link, e.g BLR, we think
it's a function call.
For function return, ARMv8 introduces a dedicated instruction 'ret',
which has flag of OCSD_S_INSTR_V8_RET.
- For exception packets, this patch divides into three types:
The first type of exception is caused by external logics like bus,
interrupt controller, debug module or PE reset or halt; this is
corresponding to flags "bcyi" which defined in doc perf-script.txt;
The second type is for system call, this is set as "bcs" by following
definition in the doc;
The third type is for CPU trap, data and instruction prefetch abort,
alignment abort; usually these exceptions are synchronous for CPU, so
set them as "bci" type.
This part is not very certain that this patch has set right flags for
them, the reason is the instruction trace decoding flags is original
from Intel PT and it's briefly defined in the document:
tools/perf/Documentation/perf-script.txt. But there have no more
detailed information to explain these flags and their corresponding
instructions.
This patch set exception related flags based on the literal meaning
which described in the doc, and should refine according to reviewing.
Cc: Mathieu Poirier <mathieu.poirier(a)linaro.org>
Cc: Mike Leach <mike.leach(a)linaro.org>
Cc: Robert Walker <robert.walker(a)arm.com>
Cc: Al Grant <Al.Grant(a)arm.com>
Cc: Andi Kleen <andi(a)firstfloor.org>
Cc: Adrian Hunter <adrian.hunter(a)intel.com>
Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com>
Signed-off-by: Leo Yan <leo.yan(a)linaro.org>
---
tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 158 ++++++++++++++++++++++++
tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 1 +
tools/perf/util/cs-etm.c | 4 +-
3 files changed, 161 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
index 938def6..b7cb962 100644
--- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
+++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
@@ -347,6 +347,162 @@ cs_etm_decoder__buffer_trace_on(struct cs_etm_decoder *decoder,
CS_ETM_TRACE_ON);
}
+static void cs_etm_decoder__set_sample_flags(
+ const void *context,
+ const ocsd_generic_trace_elem *elem)
+{
+ struct cs_etm_decoder *decoder = (struct cs_etm_decoder *) context;
+ struct cs_etm_packet *packet;
+ static u32 exc_num;
+
+ packet = &decoder->packet_buffer[decoder->tail];
+
+ switch (elem->elem_type) {
+ case OCSD_GEN_TRC_ELEM_TRACE_ON:
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_TRACE_BEGIN;
+ break;
+
+ case OCSD_GEN_TRC_ELEM_NO_SYNC:
+ case OCSD_GEN_TRC_ELEM_EO_TRACE:
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_TRACE_END;
+ break;
+
+ case OCSD_GEN_TRC_ELEM_INSTR_RANGE:
+ /*
+ * Immediate branch instruction without neither link nor
+ * return flag, it's normal branch instruction within
+ * the function.
+ */
+ if (elem->last_i_type == OCSD_INSTR_BR &&
+ elem->last_i_subtype == OCSD_S_INSTR_NONE) {
+ packet->flags = PERF_IP_FLAG_BRANCH;
+
+ if (elem->last_instr_cond)
+ packet->flags |= PERF_IP_FLAG_CONDITIONAL;
+ }
+
+ /*
+ * Immediate branch instruction with link (e.g. BL), this is
+ * branch instruction for function call.
+ */
+ if (elem->last_i_type == OCSD_INSTR_BR &&
+ elem->last_i_subtype == OCSD_S_INSTR_BR_LINK)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_CALL;
+
+ /*
+ * Indirect branch instruction without link (e.g. BR), usually
+ * this is used for function return, especially for functions
+ * within dynamic link lib.
+ */
+ if (elem->last_i_type == OCSD_INSTR_BR_INDIRECT &&
+ elem->last_i_subtype == OCSD_S_INSTR_NONE)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_RETURN;
+
+ /*
+ * Indirect branch instruction with link (e.g. BLR), this is
+ * branch instruction for function call.
+ */
+ if (elem->last_i_type == OCSD_INSTR_BR_INDIRECT &&
+ elem->last_i_subtype == OCSD_S_INSTR_BR_LINK)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_CALL;
+
+ /* Return instruction for function return. */
+ if (elem->last_i_type == OCSD_INSTR_BR_INDIRECT &&
+ elem->last_i_subtype == OCSD_S_INSTR_V8_RET)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_RETURN;
+
+ break;
+
+ case OCSD_GEN_TRC_ELEM_EXCEPTION:
+
+#define OCSD_EXC_RESET 0
+#define OCSD_EXC_DEBUG_HALT 1
+#define OCSD_EXC_CALL 2
+#define OCSD_EXC_TRAP 3
+#define OCSD_EXC_SYSTEM_ERROR 4
+#define OCSD_EXC_INST_DEBUG 6
+#define OCSD_EXC_DATA_DEBUG 7
+#define OCSD_EXC_ALIGNMENT 10
+#define OCSD_EXC_INST_FAULT 11
+#define OCSD_EXC_DATA_FAULT 12
+#define OCSD_EXC_IRQ 14
+#define OCSD_EXC_FIQ 15
+
+ /*
+ * Exception number is saved and can be used for return
+ * instruction analysis.
+ */
+ exc_num = elem->exception_number;
+
+ /*
+ * The exceptions are triggered by external signals
+ * from bus, interrupt controller, debug module,
+ * PE reset or halt.
+ */
+ if (exc_num == OCSD_EXC_RESET ||
+ exc_num == OCSD_EXC_DEBUG_HALT ||
+ exc_num == OCSD_EXC_SYSTEM_ERROR ||
+ exc_num == OCSD_EXC_INST_DEBUG ||
+ exc_num == OCSD_EXC_DATA_DEBUG ||
+ exc_num == OCSD_EXC_IRQ ||
+ exc_num == OCSD_EXC_FIQ)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_CALL |
+ PERF_IP_FLAG_ASYNC |
+ PERF_IP_FLAG_INTERRUPT;
+
+ /* The exception is for system call. */
+ if (exc_num == OCSD_EXC_CALL)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_CALL |
+ PERF_IP_FLAG_SYSCALLRET;
+
+ /*
+ * The exception is introduced by trap, instruction &
+ * data fault or alignment errors.
+ */
+ if (exc_num == OCSD_EXC_TRAP ||
+ exc_num == OCSD_EXC_ALIGNMENT ||
+ exc_num == OCSD_EXC_INST_FAULT ||
+ exc_num == OCSD_EXC_DATA_FAULT)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_CALL |
+ PERF_IP_FLAG_INTERRUPT;
+
+ break;
+
+ case OCSD_GEN_TRC_ELEM_EXCEPTION_RET:
+ if (exc_num == OCSD_EXC_CALL)
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_RETURN |
+ PERF_IP_FLAG_SYSCALLRET;
+ else
+ packet->flags = PERF_IP_FLAG_BRANCH |
+ PERF_IP_FLAG_RETURN |
+ PERF_IP_FLAG_INTERRUPT;
+ exc_num = -1;
+ break;
+
+ case OCSD_GEN_TRC_ELEM_UNKNOWN:
+ case OCSD_GEN_TRC_ELEM_PE_CONTEXT:
+ case OCSD_GEN_TRC_ELEM_ADDR_NACC:
+ case OCSD_GEN_TRC_ELEM_TIMESTAMP:
+ case OCSD_GEN_TRC_ELEM_CYCLE_COUNT:
+ case OCSD_GEN_TRC_ELEM_ADDR_UNKNOWN:
+ case OCSD_GEN_TRC_ELEM_EVENT:
+ case OCSD_GEN_TRC_ELEM_SWTRACE:
+ case OCSD_GEN_TRC_ELEM_CUSTOM:
+ default:
+ break;
+ }
+}
+
static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
const void *context,
const ocsd_trc_index_t indx __maybe_unused,
@@ -390,6 +546,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
break;
}
+ cs_etm_decoder__set_sample_flags(context, elem);
+
return resp;
}
diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h
index 612b575..9d5f65a 100644
--- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h
+++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h
@@ -36,6 +36,7 @@ struct cs_etm_packet {
u8 exc;
u8 exc_ret;
int cpu;
+ u32 flags;
};
struct cs_etm_queue;
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 3b37d66..bf66eb6 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -663,7 +663,7 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,
sample.stream_id = etmq->etm->instructions_id;
sample.period = period;
sample.cpu = etmq->packet->cpu;
- sample.flags = 0;
+ sample.flags = etmq->prev_packet->flags;
sample.insn_len = 1;
sample.cpumode = event->header.misc;
@@ -719,7 +719,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq)
sample.stream_id = etmq->etm->branches_id;
sample.period = 1;
sample.cpu = etmq->packet->cpu;
- sample.flags = 0;
+ sample.flags = etmq->prev_packet->flags;
sample.cpumode = PERF_RECORD_MISC_USER;
/*
--
2.7.4
