perf/core improvements and fixes
Arnaldo Carvalho de Melo
maintainerHi Ingo,
Please consider pulling,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit 11737ca9e3b9d84448fa405a80980aa9957bcee8:
Merge tag 'perf-core-for-mingo-4.17-20180216' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2018-02-17 11:39:47 +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-4.17-20180220
for you to fetch changes up to 66dfdff03d196e51322c6a85c0d8db8bb2bdd655:
perf tools: Add Python 3 support (2018-02-19 12:28:23 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
- Initial support for linking with python3, by explicitely setting the PYTHON Makefile variable, python2 remains supported, more work needed to test the shipped python scripts used with 'perf script' (Jaroslav Škarvada)
- Make twatch.py, an example python script that sets up evlists and evsels to then parse events from mmap, to work with both python2 and python3 (Arnaldo Carvalho de Melo)
- Fix setting 'perf ftrace' function filter when using a non-existent function, which should result in an error instead of simply not setting the filter and showing all functions (Changbin Du)
- Fix paranoid check in machine__set_kernel_mmap(), problem introduced in previous perf/core batch (Namhyung Kim)
- Fix reading cpuid model information in s/390, ditto, also introduced in the previous perf/core batch (Thomas Richter)
----------------------------------------------------------------
Arnaldo Carvalho de Melo (1):
perf python: Make twatch.py work with both python2 and python3
Changbin Du (1):
perf ftrace: Append an EOL when write tracing files
Jaroslav Škarvada (1):
perf tools: Add Python 3 support
Namhyung Kim (1):
perf machine: Fix paranoid check in machine__set_kernel_mmap()
Thomas Richter (1):
perf s390: Fix reading cpuid model information
tools/perf/Makefile.config | 23 +--- tools/perf/Makefile.perf | 4 +- tools/perf/arch/s390/util/header.c | 2 +- tools/perf/builtin-ftrace.c | 18 ++- tools/perf/python/twatch.py | 8 +- .../perf/scripts/python/Perf-Trace-Util/Context.c | 34 ++++- tools/perf/util/machine.c | 2 +- tools/perf/util/python.c | 95 ++++++++++--- .../util/scripting-engines/trace-event-python.c | 147 +++++++++++++++------ tools/perf/util/setup.py | 6 +- 10 files changed, 243 insertions(+), 96 deletions(-)
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.
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.
Intel(R) Core(TM) i5-7500 CPU @ 3.40GHz
# dm 1 49.10 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 2 51.30 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 3 53.53 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 4 54.74 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 5 41.38 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-11) 6 58.50 amazonlinux:2 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) 7 35.52 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 8 34.34 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) 9 31.16 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) 10 40.51 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18) 11 50.00 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16) 12 40.12 debian:7 : Ok gcc (Debian 4.7.2-5) 4.7.2 13 41.64 debian:8 : Ok gcc (Debian 4.9.2-10+deb8u1) 4.9.2 14 69.65 debian:9 : Ok gcc (Debian 6.3.0-18) 6.3.0 20170516 15 91.07 debian:experimental : Ok gcc (Debian 7.2.0-18) 7.2.0 16 48.13 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0 17 41.69 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0 18 36.72 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 7.2.0-11) 7.2.0 19 52.76 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0 20 49.01 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7) 21 54.99 fedora:21 : Ok gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6) 22 39.61 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) 23 42.29 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) 24 41.84 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) 25 36.88 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 26 78.12 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1) 27 80.48 fedora:26 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) 28 81.00 fedora:27 : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2) 29 115.57 fedora:rawhide : Ok gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-4) 30 42.70 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 6.4.0-r1 p1.3) 6.4.0 31 45.48 mageia:5 : Ok gcc (GCC) 4.9.2 32 42.61 mageia:6 : Ok gcc (Mageia 5.4.0-5.mga6) 5.4.0 33 42.05 opensuse:42.1 : Ok gcc (SUSE Linux) 4.8.5 34 43.63 opensuse:42.2 : Ok gcc (SUSE Linux) 4.8.5 35 47.48 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5 36 90.12 opensuse:tumbleweed : Ok gcc (SUSE Linux) 7.3.0 37 35.32 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18) 38 41.55 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16) 39 33.95 ubuntu:12.04.5 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 40 39.13 ubuntu:14.04.4 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4 41 33.62 ubuntu:14.04.4-x-linaro-arm64 : Ok aarch64-linux-gnu-gcc (Linaro GCC 5.5-2017.10) 5.5.0 42 62.84 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.6) 5.4.0 20160609 43 38.41 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609 44 41.31 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609 45 40.18 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609 46 35.83 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.1) 5.4.0 20160609 47 35.91 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609 48 32.80 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.4) 5.4.0 20160609 49 65.42 ubuntu:16.10 : Ok gcc (Ubuntu 6.2.0-5ubuntu12) 6.2.0 20161005 50 67.55 ubuntu:17.04 : Ok gcc (Ubuntu 6.3.0-12ubuntu2) 6.3.0 20170406 51 68.25 ubuntu:17.10 : Ok gcc (Ubuntu 7.2.0-8ubuntu3) 7.2.0 52 72.18 ubuntu:18.04 : Ok gcc (Ubuntu 7.3.0-3ubuntu1) 7.3.0 #
# uname -a Linux jouet 4.16.0-rc2 #2 SMP Mon Feb 19 14:41:03 -03 2018 x86_64 x86_64 x86_64 GNU/Linux # 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: Number of exit events of a simple workload : Ok 22: Software clock events period values : Ok 23: Object code reading : Ok 24: Sample parsing : Ok 25: Use a dummy software event to keep tracking : Ok 26: Parse with no sample_id_all bit set : Ok 27: Filter hist entries : Ok 28: Lookup mmap thread : Ok 29: Share thread mg : Ok 30: Sort output of hist entries : Ok 31: Cumulate child hist entries : Ok 32: Track with sched_switch : Ok 33: Filter fds with revents mask in a fdarray : Ok 34: Add fd to a fdarray, making it autogrow : Ok 35: kmod_path__parse : Ok 36: Thread map : Ok 37: LLVM search and compile : 37.1: Basic BPF llvm compile : Ok 37.2: kbuild searching : Ok 37.3: Compile source for BPF prologue generation : Ok 37.4: Compile source for BPF relocation : Ok 38: Session topology : Ok 39: BPF filter : 39.1: Basic BPF filtering : Ok 39.2: BPF pinning : Ok 39.3: BPF prologue generation : Ok 39.4: BPF relocation checker : Ok 40: Synthesize thread map : Ok 41: Remove thread map : Ok 42: Synthesize cpu map : Ok 43: Synthesize stat config : Ok 44: Synthesize stat : Ok 45: Synthesize stat round : Ok 46: Synthesize attr update : Ok 47: Event times : Ok 48: Read backward ring buffer : Ok 49: Print cpu map : Ok 50: Probe SDT events : Ok 51: is_printable_array : Ok 52: Print bitmap : Ok 53: perf hooks : Ok 54: builtin clang support : Skip (not compiled in) 55: unit_number__scnprintf : Ok 56: x86 rdpmc : Ok 57: Convert perf time to TSC : Ok 58: DWARF unwind : Ok 59: x86 instruction decoder - new instructions : Ok 60: Use vfs_getname probe to get syscall args filenames : Ok 61: probe libc's inet_pton & backtrace it with ping : Ok 62: Check open filename arg using perf trace + vfs_getname: Ok 63: 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_install_prefix_slash_O: make install prefix=/tmp/krava/
make_no_libelf_O: make NO_LIBELF=1
make_no_slang_O: make NO_SLANG=1
make_with_babeltrace_O: make LIBBABELTRACE=1
make_install_O: make install
make_no_libbpf_O: make NO_LIBBPF=1
make_pure_O: make
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_no_backtrace_O: make NO_BACKTRACE=1
make_no_demangle_O: make NO_DEMANGLE=1
make_tags_O: make tags
make_no_libperl_O: make NO_LIBPERL=1
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_no_newt_O: make NO_NEWT=1
make_no_libpython_O: make NO_LIBPYTHON=1
make_clean_all_O: make clean all
make_no_libaudit_O: make NO_LIBAUDIT=1
make_static_O: make LDFLAGS=-static
make_doc_O: make doc
make_no_gtk2_O: make NO_GTK2=1
make_install_prefix_O: make install prefix=/tmp/krava
make_no_auxtrace_O: make NO_AUXTRACE=1
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_help_O: make help
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_install_bin_O: make install-bin
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_util_map_o_O: make util/map.o
make_debug_O: make DEBUG=1
make_no_libnuma_O: make NO_LIBNUMA=1
make_perf_o_O: make perf.o
OK
make: Leaving directory '/home/acme/git/perf/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/5 perf s390: Fix reading cpuid model information
From: Thomas Richter <[email protected]>
Commit eca0fa28cd0d (perf record: Provide detailed information on s390 CPU") fixed a build error on Ubuntu. However the fix uses the wrong size to print the model information.
--- tools/perf/arch/s390/util/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/arch/s390/util/header.c +1 -1
@@ -81,7 +81,7 @@ int get_cpuid(char *buffer, size_t sz) line2 = line +strlen (SYSINFO_MODEL );while ((cp =strtok_r (line2,"\n " , &line2))) { - mdsize +=scnprintf (model + mdsize,sizeof (type) - mdsize, + mdsize +=scnprintf (model + mdsize,sizeof (model) - mdsize,"%s%s" , model[0 ] ?"," :"" , cp); }break ;
Signature · 1 line
2.14.3
Arnaldo Carvalho de Melo
maintainerPATCH 2/5 perf machine: Fix paranoid check in machine__set_kernel_mmap()
In reply to Arnaldo Carvalho de MeloFrom: Namhyung Kim <[email protected]>
The machine__set_kernel_mmap() is to setup addresses of the kernel map using external info. But it has a check when the address is given from an incorrect input which should have the start and end address of 0 (i.e. machine__process_kernel_mmap_event).
But we also use the end address of 0 for a valid input so change it to check both start and end addresses.
--- tools/perf/util/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/machine.c +1 -1
@@ -1226,7 +1226,7 @@ static void machine__set_kernel_mmap(struct machine *machine,* Be a bit paranoid here, some perf.data file came with * a zero sized synthesized MMAP event for the kernel. */ -if (machine->vmlinux_maps[i]->end ==0 ) +if (start ==0 && end ==0 ) machine->vmlinux_maps[i]->end = ~0ULL ; } }
Signature · 1 line
2.14.3
Arnaldo Carvalho de Melo
maintainerPATCH 3/5 perf ftrace: Append an EOL when write tracing files
In reply to Arnaldo Carvalho de MeloFrom: Changbin Du <[email protected]>
Before this change, the '--graph-funcs', '--nograph-funcs' and '--trace-funcs' options didn't work as expected when the <func> doesn't exist. Because the kernel side hid possible errors.
$ sudo ./perf ftrace -a --graph-depth 1 --graph-funcs abcdefg 0) 0.140 us | rcu_all_qs(); 3) 0.304 us | mutex_unlock(); 0) 0.153 us | find_vma(); 3) 0.088 us | __fsnotify_parent(); 0) 6.145 us | handle_mm_fault(); 3) 0.089 us | fsnotify(); 3) 0.161 us | __sb_end_write(); 3) 0.710 us | SyS_close(); 3) 7.848 us | exit_to_usermode_loop();
On the example above, I specified the function filter 'abcdefg' but all functions are enabled. The expected result is for all functions to be filtered, since there is no such function ('abcdefg')
The original fix is to make the kernel support '\0' as end of string:
https://lkml.org/lkml/2018/1/16/116
But above fix cannot be compatible with old kernels. Then Namhyung Kim suggest adding a space after function name.
This patch will append an '\n' when write tracing file. After this fix, the perf will report correct error state. Also let it print an error if reset_tracing_files() fails.
Committer testing:
Now it prints:
# perf ftrace -a --graph-depth 1 --graph-funcs abcdefg failed to set tracing filters #
And for an existing function:
# perf ftrace -a --graph-depth 1 --graph-funcs SyS_open
3) | SyS_open() {
3) ! 494.899 us | }
0) + 23.910 us | SyS_open();
1) + 17.115 us | SyS_open();
1) + 13.900 us | SyS_open();
------------------------------------------
3) qemu-sy-2817 => pickup-1290
------------------------------------------ 3) + 20.021 us | SyS_open();
#
--- tools/perf/builtin-ftrace.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
tools/perf/builtin-ftrace.c +16 -2
@@ -72,6 +72,7 @@ static int __write_tracing_file(const char *name, const char *val, bool append)ssize_t size =strlen (val);int flags =O_WRONLY ;char errbuf[512 ]; +char *val_copy; file =get_tracing_file (name);if (!file) {
@@ -91,12 +92,23 @@ static int __write_tracing_file(const char *name, const char *val, bool append) goto out; } -if (write (fd, val, size) == size) +/* +* Copy the original value and append a '\n'. Without this, +* the kernel can hide possible errors. +*/ + val_copy =strdup (val); +if (!val_copy) + goto out_close; + val_copy[size] ='\n' ; + +if (write (fd, val_copy, size +1 ) == size +1 ) ret =0 ;else pr_debug ("write '%s' to tracing/%s failed: %s\n" , val, name,str_error_r (errno, errbuf,sizeof (errbuf))); +free (val_copy); +out_close:close (fd); out:put_tracing_file (file);
@@ -280,8 +292,10 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)signal (SIGCHLD , sig_handler);signal (SIGPIPE , sig_handler); -if (reset_tracing_files (ftrace) <0 ) +if (reset_tracing_files (ftrace) <0 ) { +pr_err ("failed to reset ftrace\n" ); goto out; + }/* reset ftrace buffer */ if (write_tracing_file ("trace" ,"0" ) <0 )
Signature · 1 line
2.14.3
Arnaldo Carvalho de Melo
maintainerPATCH 5/5 perf tools: Add Python 3 support
In reply to Arnaldo Carvalho de MeloFrom: Jaroslav Škarvada <[email protected]>
Added Python 3 support while keeping Python 2.7 compatibility.
Committer notes:
This doesn't make it to auto detect python 3, one has to explicitely ask it to build with python 3 devel files, here are the instructions provided by Jaroslav:
---
$ cp -a tools/perf tools/python3-perf
$ make V=1 prefix=/usr -C tools/perf PYTHON=/usr/bin/python2 all
$ make V=1 prefix=/usr -C tools/python3-perf PYTHON=/usr/bin/python3 all
$ make V=1 prefix=/usr -C tools/python3-perf PYTHON=/usr/bin/python3 DESTDIR=%{buildroot} install-python_ext
$ make V=1 prefix=/usr -C tools/perf PYTHON=/usr/bin/python2 DESTDIR=%{buildroot} install-python_ext
---We need to make this automatic, just like the existing tests for checking if the python2 devel files are in place, allowing the build with python3 if available, fallbacking to python2 and then just disabling it if none are available.
So, using the PYTHON variable to build it using O= we get:
Before this patch:
$ rpm -q python3 python3-devel python3-3.6.4-7.fc27.x86_64 python3-devel-3.6.4-7.fc27.x86_64 $ rm -rf /tmp/build/perf/ ; mkdir -p /tmp/build/perf ; make O=/tmp/build/perf PYTHON=/usr/bin/python3 -C tools/perf install-bin make: Entering directory '/home/acme/git/linux/tools/perf' <SNIP> Makefile.config:670: Python 3 is not yet supported; please set Makefile.config:671: PYTHON and/or PYTHON_CONFIG appropriately. Makefile.config:672: If you also have Python 2 installed, then Makefile.config:673: try something like: Makefile.config:674: Makefile.config:675: make PYTHON=python2 Makefile.config:676: Makefile.config:677: Otherwise, disable Python support entirely: Makefile.config:678: Makefile.config:679: make NO_LIBPYTHON=1 Makefile.config:680: Makefile.config:681: *** . Stop. make[1]: *** [Makefile.perf:212: sub-make] Error 2 make: *** [Makefile:110: install-bin] Error 2 make: Leaving directory '/home/acme/git/linux/tools/perf' $
After:
$ make O=/tmp/build/perf PYTHON=python3 -C tools/perf install-bin $ ldd ~/bin/perf | grep python libpython3.6m.so.1.0 => /lib64/libpython3.6m.so.1.0 (0x00007f58a31e8000) $ rpm -qf /lib64/libpython3.6m.so.1.0 python3-libs-3.6.4-7.fc27.x86_64 $
Now verify that when using the binding the right ELF file is loaded, using perf trace:
$ perf trace -e open* perf test python
0.051 ( 0.016 ms): perf/3927 openat(dfd: CWD, filename: /etc/ld.so.cache, flags: CLOEXEC ) = 3
<SNIP>
18: 'import perf' in python :
8.849 ( 0.013 ms): sh/3929 openat(dfd: CWD, filename: /etc/ld.so.cache, flags: CLOEXEC ) = 3
<SNIP>
25.572 ( 0.008 ms): python3/3931 openat(dfd: CWD, filename: /tmp/build/perf/python/perf.cpython-36m-x86_64-linux-gnu.so, flags: CLOEXEC) = 3
<SNIP>
Ok
<SNIP>
$And using tools/perf/python/twatch.py, to show PERF_RECORD_ metaevents:
$ python3 tools/perf/python/twatch.py
cpu: 3, pid: 16060, tid: 16060 { type: fork, pid: 5207, ppid: 16060, tid: 5207, ptid: 16060, time: 10798513015459}
cpu: 3, pid: 16060, tid: 16060 { type: fork, pid: 5208, ppid: 16060, tid: 5208, ptid: 16060, time: 10798513562503}
cpu: 0, pid: 5208, tid: 5208 { type: comm, pid: 5208, tid: 5208, comm: grep }
cpu: 2, pid: 5207, tid: 5207 { type: comm, pid: 5207, tid: 5207, comm: ps }
cpu: 2, pid: 5207, tid: 5207 { type: exit, pid: 5207, ppid: 5207, tid: 5207, ptid: 5207, time: 10798551337484}
cpu: 3, pid: 5208, tid: 5208 { type: exit, pid: 5208, ppid: 5208, tid: 5208, ptid: 5208, time: 10798551292153}
cpu: 3, pid: 601, tid: 601 { type: fork, pid: 5209, ppid: 601, tid: 5209, ptid: 601, time: 10801779977324}
^CTraceback (most recent call last):
File "tools/perf/python/twatch.py", line 68, in <module>
main()
File "tools/perf/python/twatch.py", line 40, in main
evlist.poll(timeout = -1)
KeyboardInterrupt
$# ps ax|grep twatch 5197 pts/8 S+ 0:00 python3 tools/perf/python/twatch.py # ls -la /proc/5197/smaps -r--r--r--. 1 acme acme 0 Feb 19 13:14 /proc/5197/smaps # grep python /proc/5197/smaps 558111307000-558111309000 r-xp 00000000 fd:00 3151710 /usr/bin/python3.6 558111508000-558111509000 r--p 00001000 fd:00 3151710 /usr/bin/python3.6 558111509000-55811150a000 rw-p 00002000 fd:00 3151710 /usr/bin/python3.6 7ffad6fc1000-7ffad7008000 r-xp 00000000 00:2d 220196 /tmp/build/perf/python/perf.cpython-36m-x86_64-linux-gnu.so 7ffad7008000-7ffad7207000 ---p 00047000 00:2d 220196 /tmp/build/perf/python/perf.cpython-36m-x86_64-linux-gnu.so 7ffad7207000-7ffad7208000 r--p 00046000 00:2d 220196 /tmp/build/perf/python/perf.cpython-36m-x86_64-linux-gnu.so 7ffad7208000-7ffad7215000 rw-p 00047000 00:2d 220196 /tmp/build/perf/python/perf.cpython-36m-x86_64-linux-gnu.so 7ffadea77000-7ffaded3d000 r-xp 00000000 fd:00 3151795 /usr/lib64/libpython3.6m.so.1.0 7ffaded3d000-7ffadef3c000 ---p 002c6000 fd:00 3151795 /usr/lib64/libpython3.6m.so.1.0 7ffadef3c000-7ffadef42000 r--p 002c5000 fd:00 3151795 /usr/lib64/libpython3.6m.so.1.0 7ffadef42000-7ffadefa5000 rw-p 002cb000 fd:00 3151795 /usr/lib64/libpython3.6m.so.1.0 #
And with this patch, but building normally, without specifying the PYTHON=python3 part, which will make it use python2 if its devel files are available, like in this test:
$ make O=/tmp/build/perf -C tools/perf install-bin $ ldd ~/bin/perf | grep python libpython2.7.so.1.0 => /lib64/libpython2.7.so.1.0 (0x00007f6a44410000) $ ldd /tmp/build/perf/python_ext_build/lib/perf.so | grep python libpython2.7.so.1.0 => /lib64/libpython2.7.so.1.0 (0x00007fed28a2c000) $
[acme@jouet perf]$ tools/perf/python/twatch.py
cpu: 0, pid: 2817, tid: 2817 { type: fork, pid: 2817, ppid: 2817, tid: 8910, ptid: 2817, time: 11126454335306}
cpu: 0, pid: 2817, tid: 2817 { type: comm, pid: 2817, tid: 8910, comm: worker }
$ ps ax | grep twatch.py 8909 pts/8 S+ 0:00 /usr/bin/python tools/perf/python/twatch.py $ grep python /proc/8909/smaps 5579de658000-5579de659000 r-xp 00000000 fd:00 3156044 /usr/bin/python2.7 5579de858000-5579de859000 r--p 00000000 fd:00 3156044 /usr/bin/python2.7 5579de859000-5579de85a000 rw-p 00001000 fd:00 3156044 /usr/bin/python2.7 7f0de01f7000-7f0de023e000 r-xp 00000000 00:2d 230695 /tmp/build/perf/python/perf.so 7f0de023e000-7f0de043d000 ---p 00047000 00:2d 230695 /tmp/build/perf/python/perf.so 7f0de043d000-7f0de043e000 r--p 00046000 00:2d 230695 /tmp/build/perf/python/perf.so 7f0de043e000-7f0de044b000 rw-p 00047000 00:2d 230695 /tmp/build/perf/python/perf.so 7f0de6f0f000-7f0de6f13000 r-xp 00000000 fd:00 134975 /usr/lib64/python2.7/lib-dynload/_localemodule.so 7f0de6f13000-7f0de7113000 ---p 00004000 fd:00 134975 /usr/lib64/python2.7/lib-dynload/_localemodule.so 7f0de7113000-7f0de7114000 r--p 00004000 fd:00 134975 /usr/lib64/python2.7/lib-dynload/_localemodule.so 7f0de7114000-7f0de7115000 rw-p 00005000 fd:00 134975 /usr/lib64/python2.7/lib-dynload/_localemodule.so 7f0de7e73000-7f0de8052000 r-xp 00000000 fd:00 3173292 /usr/lib64/libpython2.7.so.1.0 7f0de8052000-7f0de8251000 ---p 001df000 fd:00 3173292 /usr/lib64/libpython2.7.so.1.0 7f0de8251000-7f0de8255000 r--p 001de000 fd:00 3173292 /usr/lib64/libpython2.7.so.1.0 7f0de8255000-7f0de8291000 rw-p 001e2000 fd:00 3173292 /usr/lib64/libpython2.7.so.1.0 $
LPU-Reference: [email protected]
--- tools/perf/Makefile.config | 23 +--- tools/perf/Makefile.perf | 4 +- .../perf/scripts/python/Perf-Trace-Util/Context.c | 34 ++++- tools/perf/util/python.c | 95 ++++++++++--- .../util/scripting-engines/trace-event-python.c | 147 +++++++++++++++------ tools/perf/util/setup.py | 6 +- 6 files changed, 221 insertions(+), 88 deletions(-)
tools/perf/Makefile.config +4 -19
@@ -668,25 +668,10 @@ else ifneq ($(feature-libpython), 1) $(call disable-python,No 'Python.h' (for Python 2.x support) was found: disables Python support - please install python-devel/python-dev) else - ifneq ($(feature-libpython-version), 1) - $(warning Python 3 is not yet supported; please set) - $(warning PYTHON and/or PYTHON_CONFIG appropriately.) - $(warning If you also have Python 2 installed, then) - $(warning try something like:) - $(warning $(and ,)) - $(warning $(and ,) make PYTHON=python2) - $(warning $(and ,)) - $(warning Otherwise, disable Python support entirely:) - $(warning $(and ,)) - $(warning $(and ,) make NO_LIBPYTHON=1) - $(warning $(and ,)) - $(error $(and ,)) - else - LDFLAGS += $(PYTHON_EMBED_LDFLAGS) - EXTLIBS += $(PYTHON_EMBED_LIBADD) - LANG_BINDINGS += $(obj-perf)python/perf.so - $(call detected,CONFIG_LIBPYTHON) - endif + LDFLAGS += $(PYTHON_EMBED_LDFLAGS) + EXTLIBS += $(PYTHON_EMBED_LIBADD) + LANG_BINDINGS += $(obj-perf)python/perf.so + $(call detected,CONFIG_LIBPYTHON) endif endif endif
tools/perf/Makefile.perf +2 -2
@@ -302,7 +302,7 @@ PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/ PYTHON_EXTBUILD_TMP := $(PYTHON_EXTBUILD)tmp/ export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP -python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf.so +python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf*.so PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBTRACEEVENT) $(LIBAPI)
@@ -479,7 +479,7 @@ $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(LIBTRACEEVENT_D $(PYTHON_WORD) util/setup.py \ --quiet build_ext; \ mkdir -p $(OUTPUT)python && \ - cp $(PYTHON_EXTBUILD_LIB)perf.so $(OUTPUT)python/ + cp $(PYTHON_EXTBUILD_LIB)perf*.so $(OUTPUT)python/ please_set_SHELL_PATH_to_a_more_modern_shell: $(Q)$$(:)
tools/perf/scripts/python/Perf-Trace-Util/Context.c +31 -3
@@ -23,7 +23,17 @@#include "../../../perf.h" #include "../../../util/trace-event.h" +#if PY_MAJOR_VERSION <3 +#define _PyCapsule_GetPointer (arg1, arg2) \ + PyCObject_AsVoidPtr(arg1) +PyMODINIT_FUNC initperf_trace_context (void ); +#else +#define _PyCapsule_GetPointer (arg1, arg2) \ + PyCapsule_GetPointer((arg1), (arg2)) + +PyMODINIT_FUNC PyInit_perf_trace_context (void ); +#endif static PyObject *perf_trace_context_common_pc (PyObject *obj,PyObject *args) {
@@ -34,7 +44,7 @@ static PyObject *perf_trace_context_common_pc(PyObject *obj, PyObject *args)if (!PyArg_ParseTuple (args,"O" , &context))return NULL ; - scripting_context =PyCObject_AsVoidPtr (context); + scripting_context =_PyCapsule_GetPointer (context,NULL ); retval =common_pc (scripting_context);return Py_BuildValue ("i" , retval);
@@ -50,7 +60,7 @@ static PyObject *perf_trace_context_common_flags(PyObject *obj,if (!PyArg_ParseTuple (args,"O" , &context))return NULL ; - scripting_context =PyCObject_AsVoidPtr (context); + scripting_context =_PyCapsule_GetPointer (context,NULL ); retval =common_flags (scripting_context);return Py_BuildValue ("i" , retval);
@@ -66,7 +76,7 @@ static PyObject *perf_trace_context_common_lock_depth(PyObject *obj,if (!PyArg_ParseTuple (args,"O" , &context))return NULL ; - scripting_context =PyCObject_AsVoidPtr (context); + scripting_context =_PyCapsule_GetPointer (context,NULL ); retval =common_lock_depth (scripting_context);return Py_BuildValue ("i" , retval);
@@ -82,7 +92,25 @@ static PyMethodDef ContextMethods[] = { { NULL, NULL, 0, NULL} }; +#if PY_MAJOR_VERSION <3 PyMODINIT_FUNC initperf_trace_context (void ) { (void )Py_InitModule ("perf_trace_context" , ContextMethods); } +#else +PyMODINIT_FUNC PyInit_perf_trace_context (void ) +{ +static struct PyModuleDef moduledef = { + PyModuleDef_HEAD_INIT, +"perf_trace_context" ,/* m_name */ +"" ,/* m_doc */ +-1 ,/* m_size */ + ContextMethods,/* m_methods */ +NULL ,/* m_reload */ +NULL ,/* m_traverse */ +NULL ,/* m_clear */ +NULL ,/* m_free */ + }; +return PyModule_Create (&moduledef); +} +#endif
tools/perf/util/python.c +77 -18
240 lines not on this page · raw message
tools/perf/util/scripting-engines/trace-event-python.c +104 -43
299 lines not on this page · raw message
tools/perf/util/setup.py +3 -3
@@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python from os import getenv
@@ -35,11 +35,11 @@ build_tmp = getenv('PYTHON_EXTBUILD_TMP') libtraceevent = getenv('LIBTRACEEVENT') libapikfs = getenv('LIBAPI') -ext_sources = [f.strip() for f in file('util/python-ext-sources') +ext_sources = [f.strip() for f in open('util/python-ext-sources') if len(f.strip()) > 0 and f[0] != '#'] # use full paths with source files -ext_sources = map(lambda x: '%s/%s' % (src_perf, x) , ext_sources) +ext_sources = list(map(lambda x: '%s/%s' % (src_perf, x) , ext_sources)) perf = Extension('perf', sources = ext_sources,
Signature · 1 line
2.14.3
Arnaldo Carvalho de Melo
maintainerPATCH 4/5 perf python: Make twatch.py work with both python2 and python3
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Will be used to test patches allowing to build perf with python3, so that we make sure that we can build with both versions.
--- tools/perf/python/twatch.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/python/twatch.py +4 -4
@@ -42,10 +42,10 @@ def main(context_switch = 0, thread = -1): event = evlist.read_on_cpu(cpu) if not event: continue - print "cpu: %2d, pid: %4d, tid: %4d" % (event.sample_cpu, - event.sample_pid, - event.sample_tid), - print event + print("cpu: {0}, pid: {1}, tid: {2} {3}".format(event.sample_cpu, + event.sample_pid, + event.sample_tid, + event)) if __name__ == '__main__': """
Signature · 1 line
2.14.3
Quoted 60 lines · Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling,
- Arnaldo
Test results at the end of this message, as usual.
The following changes since commit
11737ca9e3b9d84448fa405a80980aa9957bcee8:Merge tag 'perf-core-for-mingo-4.17-20180216' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/core (2018-02-17 11:39:47 +0100)are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.gittags/perf-core-for-mingo-4.17-20180220for you to fetch changes up to
66dfdff03d196e51322c6a85c0d8db8bb2bdd655:perf tools: Add Python 3 support (2018-02-19 12:28:23 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:- Initial support for linking with python3, by explicitely setting the PYTHON
Makefilevariable, python2 remains supported, more work needed to test the shipped python scripts used with 'perf script' (Jaroslav Škarvada)- Make
twatch.py, an example python script that sets up evlists and evsels to then parse events from mmap, to work with both python2 and python3 (Arnaldo Carvalho de Melo)- Fix setting 'perf ftrace' function filter when using a non-existent function, which should result in an error instead of simply not setting the filter and showing all functions (Changbin Du)
- Fix paranoid check in
machine__set_kernel_mmap(), problem introduced in previous perf/core batch (Namhyung Kim)- Fix reading cpuid model information in s/390, ditto, also introduced in the previous perf/core batch (Thomas Richter)
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Arnaldo Carvalho de Melo (1):
perf python: Maketwatch.pywork with both python2 and python3Changbin Du (1):
perf ftrace: Append an EOL when write tracing filesJaroslav Škarvada (1):
perf tools: Add Python 3 supportNamhyung Kim (1):
perf machine: Fix paranoid check inmachine__set_kernel_mmap()Thomas Richter (1):
perf s390: Fix reading cpuid model information
Quoted 11 lines
tools/perf/Makefile.config | 23 +--- tools/perf/Makefile.perf | 4 +- tools/perf/arch/s390/util/header.c | 2 +- tools/perf/builtin-ftrace.c | 18 ++- tools/perf/python/twatch.py | 8 +- .../perf/scripts/python/Perf-Trace-Util/Context.c | 34 ++++- tools/perf/util/machine.c | 2 +- tools/perf/util/python.c | 95 ++++++++++--- .../util/scripting-engines/trace-event-python.c | 147 +++++++++++++++------ tools/perf/util/setup.py | 6 +- 10 files changed, 243 insertions(+), 96 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo