perf/core improvements and fixes
Subsystems (6)
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 e2cf00c257f5bbc071b489b1dfbeaa30b6f12da6:
Merge tag 'perf-core-for-mingo-4.11-20170126' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2017-01-26 16:20:59 +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.11-20170201
for you to fetch changes up to b05d1093987a78695766b71a2d723aa65b5c25c5:
perf ftrace: Add ftrace.tracer config option (2017-01-31 16:20:09 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:
New features:
. Allow configuring a 'perf ftrace' default --tracer (Taeung Song)
Infrastructure:
. Sync tools/arch/{powerpc,arm}/include/uapi/asm/kvm.h and
tools/arch/x86/include/asm/cpufeatures.h (Ingo Molnar)
. Add BPF program file system pinning APIs and respective
'perf test' entry (Joe Stringer)
. Make tools tree support 'make -s' (Josh Poimboeuf)
. Reference count maps in callchains, fixing SEGFAULT when
referencing maps after it is freed (Krister Johansen)
. Create for_each_event trace points iterator (Taeung Song)
. Do not consider an error not to have any perfconfig file
(Arnaldo Carvalho de Melo
. Propagate perf_config() errors (Arnaldo Carvalho de Melo)
----------------------------------------------------------------
Arnaldo Carvalho de Melo (2):
perf config: Do not consider an error not to have any perfconfig file perf tools: Propagate perf_config() errors
Ingo Molnar (1):
tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h, {tools/,}arch/x86/include/asm/cpufeatures.h and {tools/,}arch/arm/include/uapi/asm/kvm.h
Joe Stringer (6):
tools lib bpf: Add BPF program pinning APIs tools lib bpf: Add bpf_map__pin()
tools lib bpf: Add bpf_object__pin() tools perf util: Make rm_rf(path) argument const tools lib api fs: Add bpf_fs filesystem detector perf test: Add libbpf pinning test
Josh Poimboeuf (1):
tools build: Add tools tree support for 'make -s'
Krister Johansen (1):
perf callchain: Reference count maps
Taeung Song (3):
perf ftrace: Remove needless code setting default tracer perf tools: Create for_each_event macro for tracepoints iteration perf ftrace: Add ftrace.tracer config option
Makefile | 6 +- tools/arch/arm/include/uapi/asm/kvm.h | 9 ++ tools/arch/powerpc/include/uapi/asm/kvm.h | 5 + tools/arch/x86/include/asm/cpufeatures.h | 11 ++ tools/build/Makefile.build | 10 ++ tools/lib/api/fs/fs.c | 16 +++ tools/lib/api/fs/fs.h | 1 + tools/lib/bpf/libbpf.c | 195 ++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 5 + tools/perf/builtin-ftrace.c | 30 ++++- tools/perf/builtin-help.c | 6 +- tools/perf/builtin-kmem.c | 8 +- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-report.c | 4 +- tools/perf/builtin-top.c | 4 +- tools/perf/perf.c | 15 ++- tools/perf/tests/bpf.c | 42 ++++++- tools/perf/util/callchain.c | 27 ++++- tools/perf/util/callchain.h | 6 + tools/perf/util/config.c | 23 ++-- tools/perf/util/data-convert-bt.c | 7 +- tools/perf/util/hist.c | 11 +- tools/perf/util/intel-pt.c | 4 +- tools/perf/util/llvm-utils.c | 4 +- tools/perf/util/trace-event-info.c | 38 +++--- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- tools/scripts/Makefile.include | 12 +- 28 files changed, 446 insertions(+), 61 deletions(-)
Test results:
The first ones are container (docker) based builds of tools/perf with and without libelf support, objtool where it is supported and samples/bpf/, ditto.
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.
# dm 1 alpine:3.4: Ok 2 android-ndk:r12b-arm: Ok 3 archlinux:latest: Ok 4 centos:5: Ok 5 centos:6: Ok 6 centos:7: Ok 7 debian:7: Ok 8 debian:8: Ok 9 debian:experimental: Ok 10 debian:experimental-x-arm64: Ok 11 debian:experimental-x-mips: Ok 12 debian:experimental-x-mips64: Ok 13 debian:experimental-x-mipsel: Ok 14 fedora:20: Ok 15 fedora:21: Ok 16 fedora:22: Ok 17 fedora:23: Ok 18 fedora:24: Ok 19 fedora:24-x-ARC-uClibc: Ok 20 fedora:25: Ok 21 fedora:rawhide: Ok 22 mageia:5: Ok 23 opensuse:13.2: Ok 24 opensuse:42.1: Ok 25 opensuse:tumbleweed: Ok 26 ubuntu:12.04.5: Ok 27 ubuntu:14.04.4-x-linaro-arm64: Ok 28 ubuntu:15.10: Ok 29 ubuntu:16.04: Ok 30 ubuntu:16.04-x-arm: Ok 31 ubuntu:16.04-x-arm64: Ok 32 ubuntu:16.04-x-powerpc: Ok 33 ubuntu:16.04-x-powerpc64: Ok 34 ubuntu:16.04-x-powerpc64el: Ok 35 ubuntu:16.04-x-s390: Ok 36 ubuntu:16.10: Ok #
# uname -a Linux jouet 4.9.6-200.fc25.x86_64 #1 SMP Thu Jan 26 10:17:45 UTC 2017 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: Parse event definition strings : Ok 6: PERF_RECORD_* events & perf_sample fields : Ok 7: Parse perf pmu format : Ok 8: DSO data read : Ok 9: DSO data cache : Ok 10: DSO data reopen : Ok 11: Roundtrip evsel->name : Ok 12: Parse sched tracepoints fields : Ok 13: syscalls:sys_enter_openat event fields : Ok 14: Setup struct perf_event_attr : Ok 15: Match and link multiple hists : Ok 16: 'import perf' in python : Ok 17: Breakpoint overflow signal handler : Ok 18: Breakpoint overflow sampling : Ok 19: Number of exit events of a simple workload : Ok 20: Software clock events period values : Ok 21: Object code reading : Ok 22: Sample parsing : Ok 23: Use a dummy software event to keep tracking: Ok 24: Parse with no sample_id_all bit set : Ok 25: Filter hist entries : Ok 26: Lookup mmap thread : Ok 27: Share thread mg : Ok 28: Sort output of hist entries : Ok 29: Cumulate child hist entries : Ok 30: Track with sched_switch : Ok 31: Filter fds with revents mask in a fdarray : Ok 32: Add fd to a fdarray, making it autogrow : Ok 33: kmod_path__parse : Ok 34: Thread map : Ok 35: LLVM search and compile : 35.1: Basic BPF llvm compile : Ok 35.2: kbuild searching : Ok 35.3: Compile source for BPF prologue generation: Ok 35.4: Compile source for BPF relocation : Ok 36: Session topology : Ok 37: BPF filter : 37.1: Basic BPF filtering : Ok 37.2: BPF pinning : Ok 37.3: BPF prologue generation : Ok 37.4: BPF relocation checker : Ok 38: Synthesize thread map : Ok 39: Remove thread map : Ok 40: Synthesize cpu map : Ok 41: Synthesize stat config : Ok 42: Synthesize stat : Ok 43: Synthesize stat round : Ok 44: Synthesize attr update : Ok 45: Event times : Ok 46: Read backward ring buffer : Ok 47: Print cpu map : Ok 48: Probe SDT events : Ok 49: is_printable_array : Ok 50: Print bitmap : Ok 51: perf hooks : Ok 52: builtin clang support : Skip (not compiled in) 53: unit_number__scnprintf : Ok 54: x86 rdpmc : Ok 55: Convert perf time to TSC : Ok 56: DWARF unwind : Ok 57: x86 instruction decoder - new instructions : Ok 58: Intel cqm nmi context read : Skip
$ perf stat make -C tools/perf build-test
make: Entering directory '/home/acme/git/linux/tools/perf'
- tarpkg: ./tests/perf-targz-src-pkg .
make_with_clangllvm_O: make LIBCLANGLLVM=1
make_debug_O: make DEBUG=1
make_install_prefix_slash_O: make install prefix=/tmp/krava/
make_doc_O: make doc
make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
make_no_libpython_O: make NO_LIBPYTHON=1
make_no_slang_O: make NO_SLANG=1
make_clean_all_O: make clean all
make_no_libperl_O: make NO_LIBPERL=1
make_install_prefix_O: make install prefix=/tmp/krava
make_help_O: make help
make_no_auxtrace_O: make NO_AUXTRACE=1
make_tags_O: make tags
make_perf_o_O: make perf.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_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
make_no_libelf_O: make NO_LIBELF=1
make_no_libunwind_O: make NO_LIBUNWIND=1
make_static_O: make LDFLAGS=-static
make_no_libnuma_O: make NO_LIBNUMA=1
make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
make_no_demangle_O: make NO_DEMANGLE=1
make_no_newt_O: make NO_NEWT=1
make_no_libbionic_O: make NO_LIBBIONIC=1
make_pure_O: make
make_util_pmu_bison_o_O: make util/pmu-bison.o
make_no_gtk2_O: make NO_GTK2=1
make_util_map_o_O: make util/map.o
make_no_libaudit_O: make NO_LIBAUDIT=1
make_with_babeltrace_O: make LIBBABELTRACE=1
make_install_bin_O: make install-bin
make_no_backtrace_O: make NO_BACKTRACE=1
make_no_libbpf_O: make NO_LIBBPF=1
make_install_O: make install
OK
make: Leaving directory '/home/acme/git/linux/tools/perf'
$Arnaldo Carvalho de Melo
maintainerPATCH 1/14 perf ftrace: Remove needless code setting default tracer
From: Taeung Song <[email protected]>
As a result of commit a3497642c261 ("perf ftrace: Make 'function_graph' be the default tracer") the ftrace.tracer variable can't be NULL but the other code setting default tracer remained.
--- tools/perf/builtin-ftrace.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
tools/perf/builtin-ftrace.c +1 -4
@@ -202,7 +202,7 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) {int ret;struct perf_ftrace ftrace = { - .tracer ="function_graph" , + .tracer =DEFAULT_TRACER , .target = { .uid =UINT_MAX , }, };const char *const ftrace_usage[] = {
@@ -231,9 +231,6 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)if (ret <0 ) goto out_delete_evlist; -if (ftrace.tracer ==NULL ) - ftrace.tracer =DEFAULT_TRACER ; - ret =__cmd_ftrace (&ftrace, argc, argv); out_delete_evlist:
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 2/14 tools build: Add tools tree support for 'make -s'
In reply to Arnaldo Carvalho de MeloFrom: Josh Poimboeuf <[email protected]>
When doing a kernel build with 'make -s', everything is silenced except the objtool build. That's because the tools tree support for silent builds is some combination of missing and broken.
Three changes are needed to fix it:
- Makefile: propagate '-s' to the sub-make's MAKEFLAGS variable so the tools Makefiles can see it.
- tools/scripts/Makefile.include: fix the tools Makefiles' ability to recognize '-s'. The MAKE_VERSION and MAKEFLAGS checks are copied from the top-level Makefile. This silences the "DESCEND objtool" message.
- tools/build/Makefile.build: add support to the tools Build files for recognizing '-s'. Again the MAKE_VERSION and MAKEFLAGS checks are copied from the top-level Makefile. This silences all the object compile/link messages.
--- Makefile | 6 ++++-- tools/build/Makefile.build | 10 ++++++++++ tools/scripts/Makefile.include | 12 +++++++++++- 3 files changed, 25 insertions(+), 3 deletions(-)
Makefile +4 -2
@@ -87,10 +87,12 @@ endif ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) quiet=silent_ + tools_silent=s endif else # make-3.8x ifneq ($(filter s% -s%,$(MAKEFLAGS)),) quiet=silent_ + tools_silent=-s endif endif
@@ -1607,11 +1609,11 @@ image_name: # Clear a bunch of variables before executing the submake tools/: FORCE $(Q)mkdir -p $(objtree)/tools - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ tools/%: FORCE $(Q)mkdir -p $(objtree)/tools - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $* + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $* # Single targets # ---------------------------------------------------------------------------
tools/build/Makefile.build +10 -0
@@ -19,6 +19,16 @@ else Q=@ endif +ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 +ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) + quiet=silent_ +endif +else # make-3.8x +ifneq ($(filter s% -s%,$(MAKEFLAGS)),) + quiet=silent_ +endif +endif + build-dir := $(srctree)/tools/build # Define $(fixdep) for dep-cmd function
tools/scripts/Makefile.include +11 -1
@@ -46,6 +46,16 @@ else NO_SUBDIR = : endif +ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 +ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) + silent=1 +endif +else # make-3.8x +ifneq ($(filter s% -s%,$(MAKEFLAGS)),) + silent=1 +endif +endif + # # Define a callable command for descending to a new directory #
@@ -58,7 +68,7 @@ descend = \ QUIET_SUBDIR0 = +$(MAKE) $(COMMAND_O) -C # space to separate -C and subdir QUIET_SUBDIR1 = -ifneq ($(findstring $(MAKEFLAGS),s),s) +ifneq ($(silent),1) ifneq ($(V),1) QUIET_CC = @echo ' CC '$@; QUIET_CC_FPIC = @echo ' CC FPIC '$@;
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 3/14 perf config: Do not consider an error not to have any perfconfig file
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
While propagating the errors from perf_config(), which were being completely ignored, everything stopped working for people without a ~/.perfconfig file, because the perf_config_set__init() was considering an error not to have a .perfconfig file, duh, fix it by checking the errno after the failed stat() call.
It should also not return an error when it says it is ignoring the file, and also a empty file should not return an error either.
--- tools/perf/util/config.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
tools/perf/util/config.c +8 -6
@@ -646,8 +646,13 @@ static int perf_config_set__init(struct perf_config_set *set) goto out; } -if (stat (user_config, &st) <0 ) +if (stat (user_config, &st) <0 ) { +if (errno ==ENOENT ) + ret =0 ; goto out_free; + } + + ret =0 ;if (st.st_uid && (st.st_uid !=geteuid ())) { warning("File %s not owned by current user or root, "
@@ -655,11 +660,8 @@ static int perf_config_set__init(struct perf_config_set *set) goto out_free; } -if (!st.st_size) - goto out_free; - - ret =perf_config_from_file (collect_config, user_config, set); - +if (st.st_size) + ret =perf_config_from_file (collect_config, user_config, set); out_free:free (user_config); }
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 4/14 perf tools: Propagate perf_config() errors
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Previously these were being ignored, sometimes silently.
Stop doing that, emitting debug messages and handling the errors.
Testing it:
$ cat ~/.perfconfig cat: /home/acme/.perfconfig: No such file or directory $ perf stat -e cycles usleep 1
Performance counter stats for 'usleep 1':
938,996 cycles:u
0.003813731 seconds time elapsed$ perf top --stdio Error: You may not have permission to collect system-wide stats.
Consider tweaking /proc/sys/kernel/perf_event_paranoid,
<SNIP>
[ perf record: Captured and wrote 0.019 MB perf.data (7 samples) ]
[acme@jouet linux]$ perf report --stdio
# To display the perf.data header info, please use --header/--header-only options.
# Overhead Command Shared Object Symbol
# ........ ....... ................. .........................
71.77% usleep libc-2.24.so [.] _dl_addr
27.07% usleep ld-2.24.so [.] _dl_next_ld_env_entry
1.13% usleep [kernel.kallsyms] [k] page_fault
$
$ touch ~/.perfconfig
$ ls -la ~/.perfconfig
-rw-rw-r--. 1 acme acme 0 Jan 27 12:14 /home/acme/.perfconfig
$
$ perf stat -e instructions usleep 1Performance counter stats for 'usleep 1':
244,610 instructions:u
0.000805383 seconds time elapsed $
[root@jouet ~]# chown acme.acme ~/.perfconfig
[root@jouet ~]# perf stat -e cycles usleep 1
Warning: File /root/.perfconfig not owned by current user or root, ignoring it.
Performance counter stats for 'usleep 1':
937,615 cycles
0.000836931 seconds time elapsed#
--- tools/perf/builtin-help.c | 6 ++++-- tools/perf/builtin-kmem.c | 8 ++++++-- tools/perf/builtin-record.c | 4 +++- tools/perf/builtin-report.c | 4 +++- tools/perf/builtin-top.c | 4 +++- tools/perf/perf.c | 15 ++++++++++----- tools/perf/util/callchain.c | 16 ++++++++++++++-- tools/perf/util/config.c | 9 +++++---- tools/perf/util/data-convert-bt.c | 7 +++++-- tools/perf/util/hist.c | 4 +++- tools/perf/util/intel-pt.c | 4 +++- tools/perf/util/llvm-utils.c | 4 +++- 12 files changed, 62 insertions(+), 23 deletions(-)
tools/perf/builtin-help.c +4 -2
@@ -447,11 +447,13 @@ int cmd_help(int argc, const char **argv, const char *prefix __maybe_unused) NULL };const char *alias; -int rc =0 ; +int rc;load_command_list ("perf-" , &main_cmds, &other_cmds); -perf_config (perf_help_config, &help_format); + rc =perf_config (perf_help_config, &help_format); +if (rc) +return rc; argc =parse_options_subcommand (argc, argv, builtin_help_options, builtin_help_subcommands, builtin_help_usage,0 );
tools/perf/builtin-kmem.c +6 -2
@@ -1920,10 +1920,12 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) NULL };struct perf_session *session; -int ret =-1 ;const char errmsg[] ="No %s allocation events found. Have you run 'perf kmem record --%s'?\n" ; +int ret =perf_config (kmem_config,NULL ); + +if (ret) +return ret; -perf_config (kmem_config,NULL ); argc =parse_options_subcommand (argc, argv, kmem_options, kmem_subcommands, kmem_usage,0 );
@@ -1948,6 +1950,8 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)if (session ==NULL )return -1 ; + ret =-1 ; +if (kmem_slab) {if (!perf_evlist__find_tracepoint_by_name (session->evlist,"kmem:kmalloc" )) {
tools/perf/builtin-record.c +3 -1
@@ -1670,7 +1670,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)if (rec->evlist ==NULL )return -ENOMEM ; -perf_config (perf_record_config, rec); + err =perf_config (perf_record_config, rec); +if (err) +return err; argc =parse_options (argc, argv, record_options, record_usage,PARSE_OPT_STOP_AT_NON_OPTION );
tools/perf/builtin-report.c +3 -1
@@ -847,7 +847,9 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)if (ret <0 )return ret; -perf_config (report__config, &report); + ret =perf_config (report__config, &report); +if (ret) +return ret; argc =parse_options (argc, argv, options, report_usage,0 );if (argc) {
tools/perf/builtin-top.c +3 -1
@@ -1216,7 +1216,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)if (top.evlist ==NULL )return -ENOMEM ; -perf_config (perf_top_config, &top); + status =perf_config (perf_top_config, &top); +if (status) +return status; argc =parse_options (argc, argv, options, top_usage,0 );if (argc)
tools/perf/perf.c +10 -5
@@ -90,11 +90,12 @@ static int pager_command_config(const char *var, const char *value, void *data)/* returns 0 for "no pager", 1 for "use pager", and -1 for "not specified" */ int check_pager_config (const char *cmd) { +int err;struct pager_config c; c.cmd = cmd; c.val =-1 ; -perf_config (pager_command_config, &c); -return c.val; + err =perf_config (pager_command_config, &c); +return err ?: c.val; }static int browser_command_config (const char *var,const char *value,void *data)
@@ -113,11 +114,12 @@ static int browser_command_config(const char *var, const char *value, void *data*/ static int check_browser_config (const char *cmd) { +int err;struct pager_config c; c.cmd = cmd; c.val =-1 ; -perf_config (browser_command_config, &c); -return c.val; + err =perf_config (browser_command_config, &c); +return err ?: c.val; }static void commit_pager_choice (void )
@@ -509,6 +511,7 @@ static void cache_line_size(int *cacheline_sizep)int main (int argc,const char **argv) { +int err;const char *cmd;char sbuf[STRERR_BUFSIZE ];int value;
@@ -534,7 +537,9 @@ int main(int argc, const char **argv)srandom (time (NULL ));perf_config__init (); -perf_config (perf_default_config,NULL ); + err =perf_config (perf_default_config,NULL ); +if (err) +return err;set_buildid_dir (NULL );/* get debugfs/tracefs mount point from /proc/mounts */
tools/perf/util/callchain.c +14 -2
@@ -48,6 +48,8 @@ static int parse_callchain_mode(const char *value) callchain_param.mode =CHAIN_FOLDED ;return 0 ; } + +pr_err ("Invalid callchain mode: %s\n" , value);return -1 ; }
@@ -63,6 +65,8 @@ static int parse_callchain_order(const char *value) callchain_param.order_set = true;return 0 ; } + +pr_err ("Invalid callchain order: %s\n" , value);return -1 ; }
@@ -80,6 +84,8 @@ static int parse_callchain_sort_key(const char *value) callchain_param.branch_callstack =1 ;return 0 ; } + +pr_err ("Invalid callchain sort key: %s\n" , value);return -1 ; }
@@ -97,6 +103,8 @@ static int parse_callchain_value(const char *value) callchain_param.value =CCVAL_COUNT ;return 0 ; } + +pr_err ("Invalid callchain config key: %s\n" , value);return -1 ; }
@@ -210,13 +218,17 @@ int perf_callchain_config(const char *var, const char *value)return parse_callchain_sort_key (value);if (!strcmp (var,"threshold" )) { callchain_param.min_percent =strtod (value, &endptr); -if (value == endptr) +if (value == endptr) { +pr_err ("Invalid callchain threshold: %s\n" , value);return -1 ; + } }if (!strcmp (var,"print-limit" )) { callchain_param.print_limit =strtod (value, &endptr); -if (value == endptr) +if (value == endptr) { +pr_err ("Invalid callchain print limit: %s\n" , value);return -1 ; + } }return 0 ;
tools/perf/util/config.c +5 -4
@@ -386,8 +386,10 @@ static int perf_buildid_config(const char *var, const char *value)if (!strcmp (var,"buildid.dir" )) {const char *dir =perf_config_dirname (var, value); -if (!dir) +if (!dir) { +pr_err ("Invalid buildid directory!\n" );return -1 ; + }strncpy (buildid_dir, dir,MAXPATHLEN -1 ); buildid_dir[MAXPATHLEN -1 ] ='\0' ; }
@@ -405,10 +407,9 @@ static int perf_default_core_config(const char *var __maybe_unused,static int perf_ui_config (const char *var,const char *value) {/* Add other config variables here. */ -if (!strcmp (var,"ui.show-headers" )) { +if (!strcmp (var,"ui.show-headers" )) symbol_conf.show_hist_headers =perf_config_bool (var, value); -return 0 ; - } +return 0 ; }
tools/perf/util/data-convert-bt.c +5 -2
@@ -1473,7 +1473,7 @@ int bt_convert__perf2ctf(const char *input, const char *path, }, };struct ctf_writer *cw = &c.writer; -int err =-1 ; +int err;if (opts->all) { c.tool.comm = process_comm_event;
@@ -1481,12 +1481,15 @@ int bt_convert__perf2ctf(const char *input, const char *path, c.tool.fork = process_fork_event; } -perf_config (convert__config, &c); + err =perf_config (convert__config, &c); +if (err) +return err;/* CTF writer */ if (ctf_writer__init (cw, path))return -1 ; + err =-1 ;/* perf.data session */ session =perf_session__new (&file,0 , &c.tool);if (!session)
tools/perf/util/hist.c +3 -1
@@ -2439,8 +2439,10 @@ int parse_filter_percentage(const struct option *opt __maybe_unused, symbol_conf.filter_relative = true; else if (!strcmp(arg, "absolute")) symbol_conf.filter_relative = false; - else + else { +pr_debug ("Invalud percentage: %s\n" , arg);return -1 ; + }return 0 ; }
tools/perf/util/intel-pt.c +3 -1
@@ -2159,7 +2159,9 @@ int intel_pt_process_auxtrace_info(union perf_event *event,addr_filters__init (&pt->filts); -perf_config (intel_pt_perf_config, pt); + err =perf_config (intel_pt_perf_config, pt); +if (err) + goto err_free; err =auxtrace_queues__init (&pt->queues);if (err)
tools/perf/util/llvm-utils.c +3 -1
@@ -48,8 +48,10 @@ int perf_llvm_config(const char *var, const char *value) llvm_param.kbuild_opts =strdup (value); else if (!strcmp(var, "dump-obj")) llvm_param.dump_obj = !!perf_config_bool (var, value); - else + else { +pr_debug ("Invalid LLVM config option: %s\n" , value);return -1 ; + } llvm_param.user_set_param = true;return 0 ; }
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 5/14 tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h, {tools/,}arch/x86/include/asm/cpufeatures.h and {tools/,}arch/arm/include/uapi/asm/kvm.h
In reply to Arnaldo Carvalho de MeloFrom: Ingo Molnar <[email protected]>
The following upstream headers were updated:
- The x86 cpufeatures.h file picked up a couple of new feature entries
- The PowerPC and ARM KVM headers picked up new features
None of which requires changes to perf tooling, so refresh the tooling copy.
Solves these build time warnings:
Warning: arch/x86/include/asm/cpufeatures.h differs from kernel
Warning: arch/powerpc/include/uapi/asm/kvm.h differs from kernel
Warning: arch/arm/include/uapi/asm/kvm.h differs from kernel
--- tools/arch/arm/include/uapi/asm/kvm.h | 9 +++++++++ tools/arch/powerpc/include/uapi/asm/kvm.h | 5 +++++ tools/arch/x86/include/asm/cpufeatures.h | 11 +++++++++++ 3 files changed, 25 insertions(+)
tools/arch/arm/include/uapi/asm/kvm.h +9 -0
@@ -84,6 +84,15 @@ struct kvm_regs {#define KVM_VGIC_V2_DIST_SIZE 0x1000#define KVM_VGIC_V2_CPU_SIZE 0x2000 +/* Supported VGICv3 address types */ +#define KVM_VGIC_V3_ADDR_TYPE_DIST 2 +#define KVM_VGIC_V3_ADDR_TYPE_REDIST 3 +#define KVM_VGIC_ITS_ADDR_TYPE 4 + +#define KVM_VGIC_V3_DIST_SIZE SZ_64K +#define KVM_VGIC_V3_REDIST_SIZE (2 * SZ_64K) +#define KVM_VGIC_V3_ITS_SIZE (2 * SZ_64K) +#define KVM_ARM_VCPU_POWER_OFF 0/* CPU is started in OFF state */ #define KVM_ARM_VCPU_PSCI_0_2 1/* CPU uses PSCI v0.2 */
tools/arch/powerpc/include/uapi/asm/kvm.h +5 -0
@@ -573,6 +573,10 @@ struct kvm_get_htab_header {#define KVM_REG_PPC_SPRG9 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xba)#define KVM_REG_PPC_DBSR (KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xbb) +/* POWER9 registers */ +#define KVM_REG_PPC_TIDR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbc) +#define KVM_REG_PPC_PSSCR (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xbd) +/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs */
@@ -596,6 +600,7 @@ struct kvm_get_htab_header {#define KVM_REG_PPC_TM_VSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U32 | 0x67)#define KVM_REG_PPC_TM_DSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x68)#define KVM_REG_PPC_TM_TAR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x69) +#define KVM_REG_PPC_TM_XER (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x6a)/* PPC64 eXternal Interrupt Controller Specification */ #define KVM_DEV_XICS_GRP_SOURCES 1/* 64-bit source attributes */
tools/arch/x86/include/asm/cpufeatures.h +11 -0
@@ -105,6 +105,7 @@#define X86_FEATURE_AMD_DCM ( 3*32+27)/* multi-node processor */ #define X86_FEATURE_APERFMPERF ( 3*32+28)/* APERFMPERF */ #define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30)/* TSC doesn't stop in S3 state */ +#define X86_FEATURE_TSC_KNOWN_FREQ ( 3*32+31)/* TSC has known frequency */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 ( 4*32+ 0)/* "pni" SSE-3 */
@@ -188,10 +189,14 @@#define X86_FEATURE_CPB ( 7*32+ 2)/* AMD Core Performance Boost */ #define X86_FEATURE_EPB ( 7*32+ 3)/* IA32_ENERGY_PERF_BIAS support */ +#define X86_FEATURE_CAT_L3 ( 7*32+ 4)/* Cache Allocation Technology L3 */ +#define X86_FEATURE_CAT_L2 ( 7*32+ 5)/* Cache Allocation Technology L2 */ +#define X86_FEATURE_CDP_L3 ( 7*32+ 6)/* Code and Data Prioritization L3 */ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8)/* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9)/* AMD ProcFeedbackInterface */ +#define X86_FEATURE_INTEL_PPIN ( 7*32+14)/* Intel Processor Inventory Number */ #define X86_FEATURE_INTEL_PT ( 7*32+15)/* Intel Processor Trace */ #define X86_FEATURE_AVX512_4VNNIW (7*32+16)/* AVX-512 Neural Network Instructions */ #define X86_FEATURE_AVX512_4FMAPS (7*32+17)/* AVX-512 Multiply Accumulation Single precision */
@@ -220,11 +225,13 @@#define X86_FEATURE_RTM ( 9*32+11)/* Restricted Transactional Memory */ #define X86_FEATURE_CQM ( 9*32+12)/* Cache QoS Monitoring */ #define X86_FEATURE_MPX ( 9*32+14)/* Memory Protection Extension */ +#define X86_FEATURE_RDT_A ( 9*32+15)/* Resource Director Technology Allocation */ #define X86_FEATURE_AVX512F ( 9*32+16)/* AVX-512 Foundation */ #define X86_FEATURE_AVX512DQ ( 9*32+17)/* AVX-512 DQ (Double/Quad granular) Instructions */ #define X86_FEATURE_RDSEED ( 9*32+18)/* The RDSEED instruction */ #define X86_FEATURE_ADX ( 9*32+19)/* The ADCX and ADOX instructions */ #define X86_FEATURE_SMAP ( 9*32+20)/* Supervisor Mode Access Prevention */ +#define X86_FEATURE_AVX512IFMA ( 9*32+21)/* AVX-512 Integer Fused Multiply-Add instructions */ #define X86_FEATURE_CLFLUSHOPT ( 9*32+23)/* CLFLUSHOPT instruction */ #define X86_FEATURE_CLWB ( 9*32+24)/* CLWB instruction */ #define X86_FEATURE_AVX512PF ( 9*32+26)/* AVX-512 Prefetch */
@@ -278,8 +285,10 @@#define X86_FEATURE_AVIC (15*32+13)/* Virtual Interrupt Controller */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */ +#define X86_FEATURE_AVX512VBMI (16*32+ 1)/* AVX512 Vector Bit Manipulation instructions*/ #define X86_FEATURE_PKU (16*32+ 3)/* Protection Keys for Userspace */ #define X86_FEATURE_OSPKE (16*32+ 4)/* OS Protection Keys Enable */ +#define X86_FEATURE_RDPID (16*32+ 22)/* RDPID instruction */ /* AMD-defined CPU features, CPUID level 0x80000007 (ebx), word 17 */ #define X86_FEATURE_OVERFLOW_RECOV (17*32+0)/* MCA overflow recovery support */
@@ -310,4 +319,6 @@#define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ #define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote CPU */ +#define X86_BUG_AMD_E400 X86_BUG(13)/* CPU is among the affected by Erratum 400 */ +#endif /* _ASM_X86_CPUFEATURES_H */
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 6/14 perf callchain: Reference count maps
In reply to Arnaldo Carvalho de MeloFrom: Krister Johansen <[email protected]>
If dso__load_kcore frees all of the existing maps, but one has already been attached to a callchain cursor node, then we can get a SIGSEGV in any function that happens to try to use this invalid cursor. Use the existing map refcount mechanism to forestall cleanup of a map until the cursor iterates past the node.
--- tools/perf/util/callchain.c | 11 +++++++++-- tools/perf/util/callchain.h | 6 ++++++ tools/perf/util/hist.c | 7 +++++++ 3 files changed, 22 insertions(+), 2 deletions(-)
tools/perf/util/callchain.c +9 -2
@@ -449,7 +449,7 @@ fill_node(struct callchain_node *node, struct callchain_cursor *cursor) } call->ip = cursor_node->ip; call->ms.sym = cursor_node->sym; - call->ms.map = cursor_node->map; + call->ms.map =map__get (cursor_node->map);if (cursor_node->branch) { call->branch_count =1 ;
@@ -489,6 +489,7 @@ add_child(struct callchain_node *parent,list_for_each_entry_safe (call, tmp, &new->val, list) {list_del (&call->list); +map__zput (call->ms.map);free (call); }free (new);
@@ -773,6 +774,7 @@ merge_chain_branch(struct callchain_cursor *cursor, list->ms.map, list->ms.sym, false, NULL, 0, 0);list_del (&list->list); +map__zput (list->ms.map);free (list); }
@@ -823,7 +825,8 @@ int callchain_cursor_append(struct callchain_cursor *cursor, } node->ip = ip; - node->map = map; +map__zput (node->map); + node->map =map__get (map); node->sym = sym; node->branch = branch; node->nr_loop_iter = nr_loop_iter;
@@ -1154,11 +1157,13 @@ static void free_callchain_node(struct callchain_node *node)list_for_each_entry_safe (list, tmp, &node->parent_val, list) {list_del (&list->list); +map__zput (list->ms.map);free (list); }list_for_each_entry_safe (list, tmp, &node->val, list) {list_del (&list->list); +map__zput (list->ms.map);free (list); }
@@ -1222,6 +1227,7 @@ int callchain_node__make_parent_list(struct callchain_node *node) goto out; *new = *chain; new->has_children = false; +map__get (new->ms.map);list_add_tail (&new->list, &head); } parent = parent->parent;
@@ -1242,6 +1248,7 @@ int callchain_node__make_parent_list(struct callchain_node *node) out:list_for_each_entry_safe (chain, new, &head, list) {list_del (&chain->list); +map__zput (chain->ms.map);free (chain); }return -ENOMEM ;
tools/perf/util/callchain.h +6 -0
@@ -5,6 +5,7 @@#include <linux/list.h> #include <linux/rbtree.h> #include "event.h" +#include "map.h" #include "symbol.h" #define HELP_PAD "\t\t\t\t"
@@ -184,8 +185,13 @@ int callchain_merge(struct callchain_cursor *cursor,*/ static inline void callchain_cursor_reset (struct callchain_cursor *cursor) { +struct callchain_cursor_node *node; + cursor->nr =0 ; cursor->last = &cursor->first; + +for (node = cursor->first; node !=NULL ; node = node->next) +map__zput (node->map); } int callchain_cursor_append(struct callchain_cursor *cursor, u64 ip,
tools/perf/util/hist.c +7 -0
@@ -1,6 +1,7 @@#include "util.h" #include "build-id.h" #include "hist.h" +#include "map.h" #include "session.h" #include "sort.h" #include "evlist.h"
@@ -1019,6 +1020,10 @@ int hist_entry_iter__add(struct hist_entry_iter *iter, struct addr_location *al, int max_stack_depth, void *arg) { int err, err2; +struct map *alm =NULL ; + +if (al && al->map) + alm =map__get (al->map); err =sample__resolve_callchain (iter->sample, &callchain_cursor, &iter->parent, iter->evsel, al, max_stack_depth);
@@ -1058,6 +1063,8 @@ int hist_entry_iter__add(struct hist_entry_iter *iter, struct addr_location *al,if (!err) err = err2; +map__put (alm); +return err; }
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 7/14 tools lib bpf: Add BPF program pinning APIs
In reply to Arnaldo Carvalho de MeloFrom: Joe Stringer <[email protected]>
Add new APIs to pin a BPF program (or specific instances) to the filesystem. The user can specify the path full path within a BPF filesystem to pin the program.
bpf_program__pin_instance(prog, path, n) will pin the nth instance of 'prog' to the specified path.
bpf_program__pin(prog, path) will create the directory 'path' (if it does not exist) and pin each instance within that directory. For instance, path/0, path/1, path/2.
Committer notes:
- Add missing headers for mkdir()
- Check strdup() for failure
- Check snprintf >= size, not >, as == also means truncated, see 'man snprintf', return value.
- Conditionally define BPF_FS_MAGIC, as it isn't in magic.h in older systems and we're not yet having a tools/include/uapi/linux/magic.h copy.
- Do not include linux/magic.h, not present in older distros.
--- tools/lib/bpf/libbpf.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 3 ++ 2 files changed, 123 insertions(+)
tools/lib/bpf/libbpf.c +120 -0
@@ -4,6 +4,7 @@* Copyright (C) 2013-2015 Alexei Starovoitov <[email protected]> * Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. +* Copyright (C) 2017 Nicira, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public
@@ -22,6 +23,7 @@#include <stdlib.h> #include <stdio.h> #include <stdarg.h> +#include <libgen.h> #include <inttypes.h> #include <string.h> #include <unistd.h>
@@ -32,6 +34,10 @@#include <linux/kernel.h> #include <linux/bpf.h> #include <linux/list.h> +#include <linux/limits.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/vfs.h> #include <libelf.h> #include <gelf.h>
@@ -42,6 +48,10 @@#define EM_BPF 247#endif +#ifndef BPF_FS_MAGIC +#define BPF_FS_MAGIC 0xcafe4a11 +#endif +#define __printf (a, b) __attribute__((format(printf, a, b)))__printf (1 ,2 )
@@ -1237,6 +1247,116 @@ int bpf_object__load(struct bpf_object *obj)return err; } +static int check_path (const char *path) +{ +struct statfs st_fs; +char *dname, *dir; +int err =0 ; + +if (path ==NULL ) +return -EINVAL ; + + dname =strdup (path); +if (dname ==NULL ) +return -ENOMEM ; + + dir =dirname (dname); +if (statfs (dir, &st_fs)) { +pr_warning ("failed to statfs %s: %s\n" , dir,strerror (errno)); + err = -errno; + } +free (dname); + +if (!err && st_fs.f_type !=BPF_FS_MAGIC ) { +pr_warning ("specified path %s is not on BPF FS\n" , path); + err = -EINVAL ; + } + +return err; +} + +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (instance <0 || instance >= prog->instances.nr) { +pr_warning ("invalid prog instance %d of prog %s (max %d)\n" , + instance, prog->section_name, prog->instances.nr); +return -EINVAL ; + } + +if (bpf_obj_pin (prog->instances.fds[instance], path)) { +pr_warning ("failed to pin program: %s\n" ,strerror (errno)); +return -errno; + } +pr_debug ("pinned program '%s'\n" , path); + +return 0 ; +} + +static int make_dir (const char *path) +{ +int err =0 ; + +if (mkdir (path,0700 ) && errno !=EEXIST ) + err = -errno; + +if (err) +pr_warning ("failed to mkdir %s: %s\n" , path,strerror (-err)); +return err; +} + +int bpf_program__pin (struct bpf_program *prog,const char *path) +{ +int i, err; + + err =check_path (path); +if (err) +return err; + +if (prog ==NULL ) { +pr_warning ("invalid program pointer\n" ); +return -EINVAL ; + } + +if (prog->instances.nr <=0 ) { +pr_warning ("no instances of prog %s to pin\n" , + prog->section_name); +return -EINVAL ; + } + + err =make_dir (path); +if (err) +return err; + +for (i =0 ; i < prog->instances.nr; i++) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%d" , path, i); +if (len <0 ) +return -EINVAL ; +else if (len >=PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin_instance (prog, buf, i); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +3 -0
@@ -106,6 +106,9 @@ void *bpf_program__priv(struct bpf_program *prog);const char *bpf_program__title (struct bpf_program *prog,bool needs_copy);int bpf_program__fd (struct bpf_program *prog); +int bpf_program__pin_instance (struct bpf_program *prog,const char *path, +int instance); +int bpf_program__pin (struct bpf_program *prog,const char *path);struct bpf_insn ;
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 8/14 tools lib bpf: Add bpf_map__pin()
In reply to Arnaldo Carvalho de MeloFrom: Joe Stringer <[email protected]>
Add a new API to pin a BPF map to the filesystem. The user can specify the path full path within a BPF filesystem to pin the map.
--- tools/lib/bpf/libbpf.c | 22 ++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 1 + 2 files changed, 23 insertions(+)
tools/lib/bpf/libbpf.c +22 -0
@@ -1357,6 +1357,28 @@ int bpf_program__pin(struct bpf_program *prog, const char *path)return 0 ; } +int bpf_map__pin (struct bpf_map *map,const char *path) +{ +int err; + + err =check_path (path); +if (err) +return err; + +if (map ==NULL ) { +pr_warning ("invalid map pointer\n" ); +return -EINVAL ; + } + +if (bpf_obj_pin (map->fd, path)) { +pr_warning ("failed to pin map: %s\n" ,strerror (errno)); +return -errno; + } + +pr_debug ("pinned map '%s'\n" , path); +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +1 -0
@@ -236,6 +236,7 @@ typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);int bpf_map__set_priv (struct bpf_map *map,void *priv,bpf_map_clear_priv_t clear_priv);void *bpf_map__priv (struct bpf_map *map); +int bpf_map__pin (struct bpf_map *map,const char *path);long libbpf_get_error (const void *ptr);
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 9/14 tools lib bpf: Add bpf_object__pin()
In reply to Arnaldo Carvalho de MeloFrom: Joe Stringer <[email protected]>
Add a new API to pin a BPF object to the filesystem. The user can specify the path within a BPF filesystem to pin the object. Programs will be pinned under a subdirectory named the same as the program, with each instance appearing as a numbered file under that directory, and maps will be pinned under the path using the name of the map as the file basename.
For example, with the directory '/sys/fs/bpf/foo' and a BPF object which contains two instances of a program named 'bar', and a map named 'baz':
/sys/fs/bpf/foo/bar/0/sys/fs/bpf/foo/bar/1/sys/fs/bpf/foo/baz
--- tools/lib/bpf/libbpf.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 1 + 2 files changed, 54 insertions(+)
tools/lib/bpf/libbpf.c +53 -0
@@ -1379,6 +1379,59 @@ int bpf_map__pin(struct bpf_map *map, const char *path)return 0 ; } +int bpf_object__pin (struct bpf_object *obj,const char *path) +{ +struct bpf_program *prog; +struct bpf_map *map; +int err; + +if (!obj) +return -ENOENT ; + +if (!obj->loaded) { +pr_warning ("object not yet loaded; load it first\n" ); +return -ENOENT ; + } + + err =make_dir (path); +if (err) +return err; + +bpf_map__for_each (map, obj) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%s" , path, +bpf_map__name (map)); +if (len <0 ) +return -EINVAL ; +else if (len >=PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_map__pin (map, buf); +if (err) +return err; + } + +bpf_object__for_each_program (prog, obj) { +char buf[PATH_MAX ]; +int len; + + len =snprintf (buf,PATH_MAX ,"%s/%s" , path, + prog->section_name); +if (len <0 ) +return -EINVAL ; +else if (len >=PATH_MAX ) +return -ENAMETOOLONG ; + + err =bpf_program__pin (prog, buf); +if (err) +return err; + } + +return 0 ; +} +void bpf_object__close (struct bpf_object *obj) {size_t i;
tools/lib/bpf/libbpf.h +1 -0
@@ -65,6 +65,7 @@ struct bpf_object *bpf_object__open(const char *path);struct bpf_object *bpf_object__open_buffer (void *obj_buf,size_t obj_buf_sz,const char *name); +int bpf_object__pin (struct bpf_object *object,const char *path);void bpf_object__close (struct bpf_object *object);/* Load/unload object into/from kernel */
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 10/14 tools perf util: Make rm_rf(path) argument const
In reply to Arnaldo Carvalho de MeloFrom: Joe Stringer <[email protected]>
rm_rf() doesn't modify its path argument, and a future caller will pass a string constant into it to delete.
--- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/util.c +1 -1
@@ -85,7 +85,7 @@ int mkdir_p(char *path, mode_t mode)return (stat (path, &st) &&mkdir (path, mode)) ?-1 :0 ; } -int rm_rf (char *path) +int rm_rf (const char *path) {DIR *dir;int ret =0 ;
tools/perf/util/util.h +1 -1
@@ -209,7 +209,7 @@ static inline int sane_case(int x, int high) }int mkdir_p (char *path,mode_t mode); -int rm_rf (char *path); +int rm_rf (const char *path);struct strlist *lsdir (const char *name,bool (*filter)(const char *,struct dirent *));bool lsdir_no_dot_filter (const char *name,struct dirent *d);int copyfile (const char *from,const char *to);
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 11/14 tools lib api fs: Add bpf_fs filesystem detector
In reply to Arnaldo Carvalho de MeloFrom: Joe Stringer <[email protected]>
Allow mounting of the BPF filesystem at /sys/fs/bpf.
--- tools/lib/api/fs/fs.c | 16 ++++++++++++++++ tools/lib/api/fs/fs.h | 1 + 2 files changed, 17 insertions(+)
tools/lib/api/fs/fs.c +16 -0
@@ -38,6 +38,10 @@#define HUGETLBFS_MAGIC 0x958458f6#endif +#ifndef BPF_FS_MAGIC +#define BPF_FS_MAGIC 0xcafe4a11 +#endif +static const char *const sysfs__fs_known_mountpoints[] = {"/sys" ,0 ,
@@ -75,6 +79,11 @@ static const char * const hugetlbfs__known_mountpoints[] = { 0, }; +static const char *const bpf_fs__known_mountpoints[] = { +"/sys/fs/bpf" , +0 , +}; +struct fs {const char *name;const char *const *mounts;
@@ -89,6 +98,7 @@ enum {FS__DEBUGFS =2 ,FS__TRACEFS =3 ,FS__HUGETLBFS =4 , + FS__BPF_FS = 5, };#ifndef TRACEFS_MAGIC
@@ -121,6 +131,11 @@ static struct fs fs__entries[] = { .mounts = hugetlbfs__known_mountpoints, .magic = HUGETLBFS_MAGIC, }, + [FS__BPF_FS] = { + .name = "bpf", + .mounts = bpf_fs__known_mountpoints, + .magic = BPF_FS_MAGIC, + }, };static bool fs__read_mounts (struct fs *fs)
@@ -280,6 +295,7 @@ FS(procfs, FS__PROCFS);FS (debugfs,FS__DEBUGFS );FS (tracefs,FS__TRACEFS );FS (hugetlbfs,FS__HUGETLBFS ); +FS (bpf_fs,FS__BPF_FS );int filename__read_int (const char *filename,int *value) {
tools/lib/api/fs/fs.h +1 -0
@@ -22,6 +22,7 @@ FS(procfs) FS(debugfs) FS(tracefs) FS(hugetlbfs) +FS(bpf_fs)#undef FS
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 12/14 perf test: Add libbpf pinning test
In reply to Arnaldo Carvalho de MeloFrom: Joe Stringer <[email protected]>
Add a test for the newly added BPF object pinning functionality.
For example:
# tools/perf/perf test 37
37: BPF filter :
37.1: Basic BPF filtering : Ok
37.2: BPF pinning : Ok
37.3: BPF prologue generation : Ok
37.4: BPF relocation checker : Ok # tools/perf/perf test 37 -v 2>&1 | grep pinned
libbpf: pinned map '/sys/fs/bpf/perf_test/flip_table'
libbpf: pinned program '/sys/fs/bpf/perf_test/func=SyS_epoll_wait/0'--- tools/perf/tests/bpf.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-)
tools/perf/tests/bpf.c +41 -1
@@ -5,11 +5,13 @@#include <util/evlist.h> #include <linux/bpf.h> #include <linux/filter.h> +#include <api/fs/fs.h> #include <bpf/bpf.h> #include "tests.h" #include "llvm.h" #include "debug.h" #define NR_ITERS 111 +#define PERF_TEST_BPF_PATH "/sys/fs/bpf/perf_test"#ifdef HAVE_LIBBPF_SUPPORT
@@ -54,6 +56,7 @@ static struct {const char *msg_load_fail;int (*target_func)(void );int expect_result; +bool pin; } bpf_testcase_table[] = { { LLVM_TESTCASE_BASE,
@@ -63,6 +66,17 @@ static struct {"load bpf object failed" , &epoll_wait_loop, (NR_ITERS +1 ) /2 , + false, + }, + { +LLVM_TESTCASE_BASE , +"BPF pinning" , +"[bpf_pinning]" , +"fix kbuild first" , +"check your vmlinux setting?" , + &epoll_wait_loop, + (NR_ITERS +1 ) /2 , + true, }, #ifdef HAVE_BPF_PROLOGUE {
@@ -73,6 +87,7 @@ static struct {"check your vmlinux setting?" , &llseek_loop, (NR_ITERS +1 ) /4 , + false, }, #endif {
@@ -83,6 +98,7 @@ static struct { "libbpf error when dealing with relocation", NULL, 0, + false, }, };
@@ -226,10 +242,34 @@ static int __test__bpf(int idx) goto out; } -if (obj) +if (obj) { ret =do_test (obj, bpf_testcase_table[idx].target_func, bpf_testcase_table[idx].expect_result); +if (ret !=TEST_OK ) + goto out; +if (bpf_testcase_table[idx].pin) { +int err; + +if (!bpf_fs__mount ()) { +pr_debug ("BPF filesystem not mounted\n" ); + ret =TEST_FAIL ; + goto out; + } + err =mkdir (PERF_TEST_BPF_PATH ,0777 ); +if (err && errno !=EEXIST ) { +pr_debug ("Failed to make perf_test dir: %s\n" , +strerror (errno)); + ret =TEST_FAIL ; + goto out; + } +if (bpf_object__pin (obj,PERF_TEST_BPF_PATH )) + ret =TEST_FAIL ; +if (rm_rf (PERF_TEST_BPF_PATH )) + ret =TEST_FAIL ; + } + } + out:bpf__clear ();return ret;
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 13/14 perf tools: Create for_each_event macro for tracepoints iteration
In reply to Arnaldo Carvalho de MeloFrom: Taeung Song <[email protected]>
Similar to for_each_subsystem and for_each_event in util/parse-events.c, add new macro 'for_each_event' for easy iteration over the tracepoints in order to be more compact and readable.
--- tools/perf/util/trace-event-info.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-)
tools/perf/util/trace-event-info.c +18 -20
@@ -170,6 +170,12 @@ static bool name_in_tp_list(char *sys, struct tracepoint_path *tps)return false; } +#define for_each_event (dir, dent, tps) \ + while ((dent = readdir(dir))) \ + if (dent->d_type == DT_DIR && \ + (strcmp(dent->d_name, ".")) && \ + (strcmp(dent->d_name, ".."))) \ +static int copy_event_system (const char *sys,struct tracepoint_path *tps) {struct dirent *dent;
@@ -186,12 +192,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps)return -errno; } -while ((dent =readdir (dir))) { -if (dent->d_type !=DT_DIR || -strcmp (dent->d_name,"." ) ==0 || -strcmp (dent->d_name,".." ) ==0 || - !name_in_tp_list (dent->d_name, tps)) +for_each_event (dir, dent, tps) { +if (!name_in_tp_list (dent->d_name, tps))continue ; +if (asprintf (&format,"%s/%s/format" , sys, dent->d_name) <0 ) { err = -ENOMEM ; goto out;
@@ -210,12 +214,10 @@ static int copy_event_system(const char *sys, struct tracepoint_path *tps) }rewinddir (dir); -while ((dent =readdir (dir))) { -if (dent->d_type !=DT_DIR || -strcmp (dent->d_name,"." ) ==0 || -strcmp (dent->d_name,".." ) ==0 || - !name_in_tp_list (dent->d_name, tps)) +for_each_event (dir, dent, tps) { +if (!name_in_tp_list (dent->d_name, tps))continue ; +if (asprintf (&format,"%s/%s/format" , sys, dent->d_name) <0 ) { err = -ENOMEM ; goto out;
@@ -290,13 +292,11 @@ static int record_event_files(struct tracepoint_path *tps) goto out; } -while ((dent =readdir (dir))) { -if (dent->d_type !=DT_DIR || -strcmp (dent->d_name,"." ) ==0 || -strcmp (dent->d_name,".." ) ==0 || -strcmp (dent->d_name,"ftrace" ) ==0 || +for_each_event (dir, dent, tps) { +if (strcmp (dent->d_name,"ftrace" ) ==0 || !system_in_tp_list (dent->d_name, tps))continue ; + count++; }
@@ -307,13 +307,11 @@ static int record_event_files(struct tracepoint_path *tps) }rewinddir (dir); -while ((dent =readdir (dir))) { -if (dent->d_type !=DT_DIR || -strcmp (dent->d_name,"." ) ==0 || -strcmp (dent->d_name,".." ) ==0 || -strcmp (dent->d_name,"ftrace" ) ==0 || +for_each_event (dir, dent, tps) { +if (strcmp (dent->d_name,"ftrace" ) ==0 || !system_in_tp_list (dent->d_name, tps))continue ; +if (asprintf (&sys,"%s/%s" , path, dent->d_name) <0 ) { err = -ENOMEM ; goto out;
Signature · 1 line
2.9.3
Arnaldo Carvalho de Melo
maintainerPATCH 14/14 perf ftrace: Add ftrace.tracer config option
In reply to Arnaldo Carvalho de MeloFrom: Taeung Song <[email protected]>
Currently 'perf ftrace' command allows selecting 'function_graph' or 'function', defaulting to 'function_graph'.
Add ftrace.tracer config option to select the default tracer:
# cat ~/.perfconfig
[ftrace]
tracer = function # perf ftrace usleep 123456 | head -10
<...>-14450 [002] d... 10089.284231: finish_task_switch <-__schedule
<...>-14450 [002] .... 10089.284232: finish_wait <-pipe_wait
<...>-14450 [002] .... 10089.284232: mutex_lock <-pipe_wait
<...>-14450 [002] .... 10089.284232: _cond_resched <-mutex_lockCommitter notes:
Retesting it with invalid variables, invalid values for ftrace.tracer, and a valid one:
# cat ~/.perfconfig
[ftrace]
trace = function
# perf ftrace usleep 1
Error: wrong config key-value pair ftrace.trace=function
# cat ~/.perfconfig
[ftrace]
tracer = functin
# perf ftrace usleep 1
Please select "function_graph" (default) or "function"
Error: wrong config key-value pair ftrace.tracer=functin
# cat ~/.perfconfig
[ftrace]
tracer = function
# perf ftrace usleep 1 | head -5
<idle>-0 [000] d... 3855.820847: switch_mm_irqs_off <-__schedule
<...>-18550 [000] d... 3855.820849: finish_task_switch <-__schedule
<...>-18550 [000] d... 3855.820851: smp_irq_work_interrupt <-irq_work_interrupt
<...>-18550 [000] d... 3855.820851: irq_enter <-smp_irq_work_interrupt
<...>-18550 [000] d... 3855.820851: rcu_irq_enter <-irq_enter
#--- tools/perf/builtin-ftrace.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
tools/perf/builtin-ftrace.c +25 -0
@@ -17,6 +17,7 @@#include "evlist.h" #include "target.h" #include "thread_map.h" +#include "util/config.h" #define DEFAULT_TRACER "function_graph"
@@ -198,6 +199,26 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)return done ?0 :-1 ; } +static int perf_ftrace_config (const char *var,const char *value,void *cb) +{ +struct perf_ftrace *ftrace = cb; + +if (prefixcmp (var,"ftrace." )) +return 0 ; + +if (strcmp (var,"ftrace.tracer" )) +return -1 ; + +if (!strcmp (value,"function_graph" ) || + !strcmp (value,"function" )) { + ftrace->tracer = value; +return 0 ; + } + +pr_err ("Please select \"function_graph\" (default) or \"function\"\n" ); +return -1 ; +} +int cmd_ftrace (int argc,const char **argv,const char *prefix__maybe_unused ) {int ret;
@@ -218,6 +239,10 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused) OPT_END() }; + ret =perf_config (perf_ftrace_config, &ftrace); +if (ret <0 ) +return -1 ; + argc =parse_options (argc, argv, ftrace_options, ftrace_usage,PARSE_OPT_STOP_AT_NON_OPTION );if (!argc)
Signature · 1 line
2.9.3
Quoted 97 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
e2cf00c257f5bbc071b489b1dfbeaa30b6f12da6:Merge tag 'perf-core-for-mingo-4.11-20170126' of
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linuxinto perf/core (2017-01-26 16:20:59 +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.11-20170201for you to fetch changes up to
b05d1093987a78695766b71a2d723aa65b5c25c5:perf ftrace: Add ftrace.tracer config option (2017-01-31 16:20:09 -0300)
----------------------------------------------------------------
perf/core improvements and fixes:New features:
. Allow configuring a 'perf ftrace' default --tracer (Taeung Song)
Infrastructure:
. Sync
tools/arch/{powerpc,arm}/include/uapi/asm/kvm.hand
tools/arch/x86/include/asm/cpufeatures.h(Ingo Molnar). Add BPF program file system pinning APIs and respective
'perf test' entry (Joe Stringer). Make tools tree support 'make -s' (Josh Poimboeuf)
. Reference count maps in callchains, fixing SEGFAULT when
referencing maps after it is freed (Krister Johansen). Create
for_each_eventtrace points iterator (Taeung Song). Do not consider an error not to have any perfconfig file
(Arnaldo Carvalho de Melo. Propagate
perf_config()errors (Arnaldo Carvalho de Melo)Signed-off-by Arnaldo Carvalho de Melo <[email protected]>----------------------------------------------------------------
Arnaldo Carvalho de Melo (2):
perf config: Do not consider an error not to have any perfconfig file perf tools: Propagateperf_config()errorsIngo Molnar (1):
tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h, {tools/,}arch/x86/include/asm/cpufeatures.hand {tools/,}arch/arm/include/uapi/asm/kvm.hJoe Stringer (6):
tools lib bpf: Add BPF program pinning APIs tools lib bpf: Addbpf_map__pin()
tools lib bpf: Addbpf_object__pin()tools perf util: Makerm_rf(path)argument const tools lib api fs: Addbpf_fsfilesystem detector perf test: Add libbpf pinning testJosh Poimboeuf (1):
tools build: Add tools tree support for 'make -s'Krister Johansen (1):
perf callchain: Reference count mapsTaeung Song (3):
perf ftrace: Remove needless code setting default tracer perf tools: Createfor_each_eventmacro for tracepoints iteration perf ftrace: Add ftrace.tracer config optionMakefile | 6 +- tools/arch/arm/include/uapi/asm/kvm.h | 9 ++ tools/arch/powerpc/include/uapi/asm/kvm.h | 5 + tools/arch/x86/include/asm/cpufeatures.h | 11 ++ tools/build/Makefile.build | 10 ++ tools/lib/api/fs/fs.c | 16 +++ tools/lib/api/fs/fs.h | 1 + tools/lib/bpf/libbpf.c | 195 ++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 5 + tools/perf/builtin-ftrace.c | 30 ++++- tools/perf/builtin-help.c | 6 +- tools/perf/builtin-kmem.c | 8 +- tools/perf/builtin-record.c | 4 +- tools/perf/builtin-report.c | 4 +- tools/perf/builtin-top.c | 4 +- tools/perf/perf.c | 15 ++- tools/perf/tests/bpf.c | 42 ++++++- tools/perf/util/callchain.c | 27 ++++- tools/perf/util/callchain.h | 6 + tools/perf/util/config.c | 23 ++-- tools/perf/util/data-convert-bt.c | 7 +-
Quoted 8 lines
tools/perf/util/hist.c | 11 +- tools/perf/util/intel-pt.c | 4 +- tools/perf/util/llvm-utils.c | 4 +- tools/perf/util/trace-event-info.c | 38 +++--- tools/perf/util/util.c | 2 +- tools/perf/util/util.h | 2 +- tools/scripts/Makefile.include | 12 +- 28 files changed, 446 insertions(+), 61 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo