perf events tree changes for v3.19
Subsystems (2)
Linus,
Please pull the latest perf-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-core-for-linus
# HEAD: cfa0bd52d0ba9b852f76c7b3f1055edd5e5c7846 Merge tag 'perf-core-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
On the kernel side there's few changes, the one that stands out is PEBS machine state sampling support on x86, by Stephane Eranian.
On the tooling side:
User visible tooling changes:
- Don't open the DWARF info multiple times, keeping instead a dwfl handle in struct dso, greatly speeding up 'perf report' on powerpc. (Sukadev Bhattiprolu)
- Introduce PARSE_OPT_DISABLED option flag and use it to avoid showing undersired options in tools that provides frontends to 'perf record', like sched, kvm, etc (Namhyung Kim)
- Fallback to kallsyms when using the minimal 'ELF' loader (Arnaldo Carvalho de Melo)
- Fix annotation with kcore (Adrian Hunter)
- Support source line numbers in annotate using a hotkey (Andi Kleen)
- Callchain improvements including:
* Enable printing the srcline in the history
* Make get_srcline fall back to sym+offset (Andi Kleen)
- TUI hist_entry browser fixes, including showing missing overhead value for first level callchain. Detected comparing the output of --stdio/--gui (that matched) with --tui, that had this problem. (Namhyung Kim)
- Support handling complete branch stacks as histograms (Andi Kleen)
Tooling infrastructure changes:
- Prep work for supporting per-pkg and snapshot counters in 'perf stat' (Jiri Olsa)
- 'perf stat' refactorings, moving stuff from it to evsel.c to use in per-pkg/snapshot format changes (Jiri Olsa)
- Add per-pkg format file parsing (Matt Fleming)
- Clean up libelf feature support code (Namhyung Kim)
- Add gzip decompression support for kernel modules (Namhyung Kim)
- More prep patches for Intel PT, including a a thread stack and more stuff made available via the database export mechanism (Adrian Hunter)
- More Intel PT work, including a facility to export sample data (comms, threads, symbol names, etc) in a database friendly way, with an script to use this to create a postgresql database. (Adrian Hunter)
- Make sure that thread->mg->machine points to the machine where the thread exists (it was being set only for the kmaps kernel modules case, do it as well for the mmaps) and use it to shorten function signatures (Arnaldo Carvalho de Melo)
... and lots of other fixes and smaller improvements.
Thanks,
Ingo
------------------>
Adrian Hunter (20):
perf pmu: Let pmu's with no events show up on perf list
perf tools: Build programs to copy 32-bit compatibility
perf tools: Add support for 32-bit compatibility VDSOs
perf tools: Do not attempt to run perf-read-vdso32 if it wasn't built perf tools: Add facility to export data in database-friendly way perf scripting python: Extend interface to export data in a database-friendly way perf script: Add Python script to export to postgresql
perf tools: Add id index
perf session: Add perf_session__deliver_synth_event()
perf tools: Add a thread stack for synthesizing call chains
perf tools: Enhance the thread stack to output call/return data perf tools: Add branch type to db export
perf tools: Add branch_type and in_tx to Python export
perf tools: Add call information to the database export API
perf tools: Add call information to Python export
perf tools: Defer export of comms that were not 'set'
perf tools: Fix annotation with kcore
perf evlist: Do not poll events that use the system_wide flag
perf tools: Add perf-read-vdso32 and perf-read-vdsox32 to .gitignore perf tools: Only override the default :tid comm entry
Andi Kleen (15):
perf/x86/intel/uncore: Add scaling units to the EP iMC events perf/x86: Add INTEL_FLAGS_UEVENT_CONSTRAINT
perf/x86/intel: Use INTEL_FLAGS_UEVENT_CONSTRAINT for PRECDIST perf/x86/intel: Disallow flags for most Core2/Atom/Nehalem/Westmere events perf callchain: Factor out adding new call chain entries
perf callchain: Use al.addr to set up call chain
perf callchain: Use a common function to resolve symbol or name perf tools: Only print base source file for srcline
perf annotate: Support source line numbers in annotate
perf callchain: Enable printing the srcline in the history perf callchain: Make get_srcline fall back to sym+offset
perf tools: Allow to force redirect pr_debug to stderr.
perf callchain: Support handling complete branch stacks as histograms perf report: Add --branch-history option
perf report: In branch stack mode use address history sorting
Aravind Gopalakrishnan (1):
perf/x86/amd/ibs: Update IBS MSRs and feature definitions
Arnaldo Carvalho de Melo (11):
perf tools: Set thread->mg.machine in all places
perf tools: A thread's machine can be found via thread->mg->machine perf thread: Adopt resolve_callchain method from machine perf callchains: Use thread->mg->machine
perf tests: Remove misplaced __maybe_unused
perf tests: Use thread->mg->machine
perf pmu: Add proper error handling to print_pmu_events() perf tools: Use evlist__for_each in a few remaining places perf symbols: Fallback to kallsyms when using the minimal 'ELF' loader perf hists: Fix up srcline histogram key formatting
perf symbols: Move bfd_demangle stubbing to its only user
Jiri Olsa (15):
perf tools: Add test_and_set_bit function
perf script perl: Removing event cache as it's no longer needed perf script python: Removing event cache as it's no longer needed perf evsel: Do not call pevent_free_format when deleting tracepoint perf evsel: Fix ftrace:function event recording
perf evsel: Introduce perf_evsel__compute_deltas function perf evsel: Introduce perf_counts_values__scale function perf evsel: Introduce perf_evsel__read_cb function
perf tools: Add snapshot format file parsing
perf stat: Use perf_evsel__read_cb in read_counter
perf stat: Make read_counter work over the thread dimension perf stat: Use read_counter in read_counter_aggr
perf tools: Remove perf_evsel__read interface
perf stat: Add support for per-pkg counters
perf stat: Add support for snapshot counters
Kan Liang (1):
perf diff: Add missing handler for PERF_RECORD_MMAP2 events
Masami Hiramatsu (1):
perf probe: Add --quiet option to suppress output result message
Matt Fleming (1):
perf tools: Add per-pkg format file parsing
Namhyung Kim (17):
perf tools: Add PARSE_OPT_DISABLED flag
perf tools: Export usage string and option table of perf record perf kvm: Print kvm specific --help output
perf tools: Add support for exclusive option
perf probe: Use PARSE_OPT_EXCLUSIVE flag
perf symbols: Preparation for compressed kernel module support perf tools: Add gzip decompression support for kernel module perf build-id: Rename dsos__write_buildid_table()
perf build-id: Move build-id related functions to util/build-id.c perf record: Do not save pathname in ./debug/.build-id directory for vmlinux perf tools: Fix build-id matching on vmlinux
perf tools: Make vmlinux short name more like kallsyms short name perf build-id: Move disable_buildid_cache() to util/build-id.c perf tools: Clean up libelf feature support code
perf hists browser: Print overhead percent value for first-level callchain perf tools: Collapse first level callchain entry if it has sibling perf tools: Fix segfault due to invalid kernel dso access
Peter Zijlstra (1):
perf: Improve the perf_sample_data struct layout
Stephane Eranian (5):
perf: Add ability to sample machine state on interrupt perf/x86: Add support for sampling PEBS machine state registers perf tools: Add core support for sampling intr machine state regs perf/tests: Add interrupted state sample parsing test perf record: Add new -I option to sample interrupted machine state
Sukadev Bhattiprolu (1):
perf tools powerpc: Cache the DWARF debug info
WANG Chao (1):
perf test: fix typo in python test
Wang Nan (1):
perf tools: Ensure return negative value when write header error
arch/x86/include/asm/perf_event.h | 3 + arch/x86/include/uapi/asm/msr-index.h | 1 + arch/x86/kernel/cpu/perf_event.h | 4 + arch/x86/kernel/cpu/perf_event_amd_ibs.c | 15 + arch/x86/kernel/cpu/perf_event_intel_ds.c | 81 ++- .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 8 + include/linux/perf_event.h | 37 +- include/uapi/linux/perf_event.h | 15 +- kernel/events/core.c | 60 +- tools/perf/.gitignore | 2 + tools/perf/Documentation/perf-record.txt | 6 + tools/perf/Documentation/perf-report.txt | 12 +- tools/perf/Makefile.perf | 51 +- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 38 +- tools/perf/builtin-diff.c | 1 + tools/perf/builtin-inject.c | 4 +- tools/perf/builtin-kvm.c | 25 + tools/perf/builtin-probe.c | 65 +- tools/perf/builtin-record.c | 20 +- tools/perf/builtin-report.c | 31 +- tools/perf/builtin-script.c | 8 +- tools/perf/builtin-stat.c | 105 ++- tools/perf/builtin-timechart.c | 9 +- tools/perf/builtin-trace.c | 6 +- tools/perf/config/Makefile | 49 +- tools/perf/config/Makefile.arch | 8 + tools/perf/config/feature-checks/Makefile | 16 +- tools/perf/config/feature-checks/test-all.c | 5 + tools/perf/config/feature-checks/test-compile.c | 4 + tools/perf/config/feature-checks/test-zlib.c | 9 + tools/perf/perf-read-vdso.c | 34 + tools/perf/perf.h | 4 + .../scripts/python/bin/export-to-postgresql-record | 8 + .../scripts/python/bin/export-to-postgresql-report | 29 + tools/perf/scripts/python/export-to-postgresql.py | 444 ++++++++++++ tools/perf/tests/builtin-test.c | 2 +- tools/perf/tests/code-reading.c | 13 +- tools/perf/tests/dwarf-unwind.c | 18 +- tools/perf/tests/hists_filter.c | 2 +- tools/perf/tests/mmap-thread-lookup.c | 2 +- tools/perf/tests/sample-parsing.c | 55 +- tools/perf/ui/browsers/annotate.c | 13 +- tools/perf/ui/browsers/hists.c | 42 +- tools/perf/ui/gtk/hists.c | 11 +- tools/perf/ui/stdio/hist.c | 23 +- tools/perf/util/annotate.c | 34 +- tools/perf/util/annotate.h | 1 + tools/perf/util/build-id.c | 348 +++++++++- tools/perf/util/build-id.h | 12 + tools/perf/util/callchain.c | 37 +- tools/perf/util/callchain.h | 11 +- tools/perf/util/comm.h | 4 + tools/perf/util/db-export.c | 428 ++++++++++++ tools/perf/util/db-export.h | 107 +++ tools/perf/util/debug.c | 4 +- tools/perf/util/dso.c | 71 ++ tools/perf/util/dso.h | 13 + tools/perf/util/event.c | 20 +- tools/perf/util/event.h | 43 +- tools/perf/util/evlist.c | 38 +- tools/perf/util/evsel.c | 156 +++-- tools/perf/util/evsel.h | 50 +- tools/perf/util/find-vdso-map.c | 30 + tools/perf/util/header.c | 361 +--------- tools/perf/util/header.h | 8 +- tools/perf/util/include/linux/bitmap.h | 17 + tools/perf/util/include/linux/bitops.h | 2 + tools/perf/util/machine.c | 264 ++++++-- tools/perf/util/machine.h | 17 +- tools/perf/util/map.c | 10 +- tools/perf/util/map.h | 4 +- tools/perf/util/parse-events.c | 2 + tools/perf/util/parse-options.c | 78 ++- tools/perf/util/parse-options.h | 4 + tools/perf/util/pmu.c | 115 +++- tools/perf/util/pmu.h | 5 + tools/perf/util/probe-event.c | 18 +- .../perf/util/scripting-engines/trace-event-perl.c | 29 +- .../util/scripting-engines/trace-event-python.c | 440 +++++++++++- tools/perf/util/session.c | 185 ++++- tools/perf/util/session.h | 15 + tools/perf/util/sort.c | 8 +- tools/perf/util/srcline.c | 17 +- tools/perf/util/symbol-elf.c | 56 +- tools/perf/util/symbol-minimal.c | 1 - tools/perf/util/symbol.c | 19 +- tools/perf/util/symbol.h | 25 +- tools/perf/util/thread-stack.c | 747 +++++++++++++++++++++ tools/perf/util/thread-stack.h | 111 +++ tools/perf/util/thread.c | 14 +- tools/perf/util/thread.h | 9 +- tools/perf/util/tool.h | 3 +- tools/perf/util/unwind-libdw.c | 8 +- tools/perf/util/unwind-libunwind.c | 17 +- tools/perf/util/unwind.h | 2 - tools/perf/util/util.h | 10 +- tools/perf/util/vdso.c | 217 +++++- tools/perf/util/vdso.h | 4 +- tools/perf/util/zlib.c | 78 +++ 99 files changed, 4723 insertions(+), 1002 deletions(-) create mode 100644 tools/perf/config/feature-checks/test-compile.c create mode 100644 tools/perf/config/feature-checks/test-zlib.c create mode 100644 tools/perf/perf-read-vdso.c create mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-record create mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-report create mode 100644 tools/perf/scripts/python/export-to-postgresql.py create mode 100644 tools/perf/util/db-export.c create mode 100644 tools/perf/util/db-export.h create mode 100644 tools/perf/util/find-vdso-map.c create mode 100644 tools/perf/util/thread-stack.c create mode 100644 tools/perf/util/thread-stack.h create mode 100644 tools/perf/util/zlib.c
arch/x86/include/asm/perf_event.h +3 -0
@@ -177,6 +177,9 @@ struct x86_pmu_capability {#define IBS_CAPS_BRNTRGT (1U<<5)#define IBS_CAPS_OPCNTEXT (1U<<6)#define IBS_CAPS_RIPINVALIDCHK (1U<<7) +#define IBS_CAPS_OPBRNFUSE (1U<<8) +#define IBS_CAPS_FETCHCTLEXTD (1U<<9) +#define IBS_CAPS_OPDATA4 (1U<<10)#define IBS_CAPS_DEFAULT (IBS_CAPS_AVAIL \ | IBS_CAPS_FETCHSAM \
arch/x86/include/uapi/asm/msr-index.h +1 -0
@@ -206,6 +206,7 @@#define MSR_AMD64_IBSOP_REG_MASK ((1UL<<MSR_AMD64_IBSOP_REG_COUNT)-1)#define MSR_AMD64_IBSCTL 0xc001103a#define MSR_AMD64_IBSBRTARGET 0xc001103b +#define MSR_AMD64_IBSOPDATA4 0xc001103d#define MSR_AMD64_IBS_REG_COUNT_MAX 8/* includes MSR_AMD64_IBSBRTARGET */ /* Fam 16h MSRs */
arch/x86/kernel/cpu/perf_event.h +4 -0
@@ -253,6 +253,10 @@ struct cpu_hw_events {#define INTEL_UEVENT_CONSTRAINT (c, n) \ EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK) +/* Like UEVENT_CONSTRAINT, but match flags too */ +#define INTEL_FLAGS_UEVENT_CONSTRAINT (c, n) \ + EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS) +#define INTEL_PLD_CONSTRAINT (c, n) \ __EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS, \ HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_LDLAT)
arch/x86/kernel/cpu/perf_event_amd_ibs.c +15 -0
@@ -565,6 +565,21 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) perf_ibs->offset_max, offset + 1); }while (offset < offset_max); +if (event->attr.sample_type &PERF_SAMPLE_RAW ) { +/* +* Read IbsBrTarget and IbsOpData4 separately +* depending on their availability. +* Can't add to offset_max as they are staggered +*/ +if (ibs_caps &IBS_CAPS_BRNTRGT ) { +rdmsrl (MSR_AMD64_IBSBRTARGET , *buf++); + size++; + } +if (ibs_caps &IBS_CAPS_OPDATA4 ) { +rdmsrl (MSR_AMD64_IBSOPDATA4 , *buf++); + size++; + } + } ibs_data.size =sizeof (u64) * size; regs = *iregs;
arch/x86/kernel/cpu/perf_event_intel_ds.c +52 -29
126 lines not on this page · raw message
arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c +8 -0
@@ -449,7 +449,11 @@ static struct attribute *snbep_uncore_qpi_formats_attr[] = {static struct uncore_event_desc snbep_uncore_imc_events[] = {INTEL_UNCORE_EVENT_DESC (clockticks,"event=0xff,umask=0x00" ),INTEL_UNCORE_EVENT_DESC (cas_count_read,"event=0x04,umask=0x03" ), +INTEL_UNCORE_EVENT_DESC (cas_count_read.scale,"6.103515625e-5" ), +INTEL_UNCORE_EVENT_DESC (cas_count_read.unit,"MiB" ),INTEL_UNCORE_EVENT_DESC (cas_count_write,"event=0x04,umask=0x0c" ), +INTEL_UNCORE_EVENT_DESC (cas_count_write.scale,"6.103515625e-5" ), +INTEL_UNCORE_EVENT_DESC (cas_count_write.unit,"MiB" ), {/* end: all zeroes */ }, };
@@ -2036,7 +2040,11 @@ static struct intel_uncore_type hswep_uncore_ha = {static struct uncore_event_desc hswep_uncore_imc_events[] = {INTEL_UNCORE_EVENT_DESC (clockticks,"event=0x00,umask=0x00" ),INTEL_UNCORE_EVENT_DESC (cas_count_read,"event=0x04,umask=0x03" ), +INTEL_UNCORE_EVENT_DESC (cas_count_read.scale,"6.103515625e-5" ), +INTEL_UNCORE_EVENT_DESC (cas_count_read.unit,"MiB" ),INTEL_UNCORE_EVENT_DESC (cas_count_write,"event=0x04,umask=0x0c" ), +INTEL_UNCORE_EVENT_DESC (cas_count_write.scale,"6.103515625e-5" ), +INTEL_UNCORE_EVENT_DESC (cas_count_write.unit,"MiB" ), {/* end: all zeroes */ }, };
include/linux/perf_event.h +20 -17
@@ -79,7 +79,7 @@ struct perf_branch_stack {struct perf_branch_entry entries[0 ]; }; -struct perf_regs_user { +struct perf_regs {__u64 abi;struct pt_regs *regs; };
@@ -580,34 +580,40 @@ extern u64 perf_event_read_value(struct perf_event *event,struct perf_sample_data { -u64 type; +/* +* Fields set by perf_sample_data_init(), group so as to +* minimize the cachelines touched. +*/ +u64 addr; +struct perf_raw_record *raw; +struct perf_branch_stack *br_stack; +u64 period; +u64 weight; +u64 txn; +union perf_mem_data_src data_src; +/* +* The other fields, optionally {set,used} by +* perf_{prepare,output}_sample(). +*/ +u64 type;u64 ip;struct {u32 pid;u32 tid; } tid_entry;u64 time; -u64 addr;u64 id;u64 stream_id;struct {u32 cpu;u32 reserved; } cpu_entry; -u64 period; -union perf_mem_data_src data_src;struct perf_callchain_entry *callchain; -struct perf_raw_record *raw; -struct perf_branch_stack *br_stack; -struct perf_regs_user regs_user; +struct perf_regs regs_user; +struct perf_regs regs_intr;u64 stack_user_size; -u64 weight; -/* -* Transaction flags for abort events: -*/ -u64 txn; -}; +}____cacheline_aligned ;/* default value for data source */ #define PERF_MEM_NA (PERF_MEM_S(OP, NA) |\
@@ -624,9 +630,6 @@ static inline void perf_sample_data_init(struct perf_sample_data *data, data->raw =NULL ; data->br_stack =NULL ; data->period = period; - data->regs_user.abi =PERF_SAMPLE_REGS_ABI_NONE ; - data->regs_user.regs =NULL ; - data->stack_user_size =0 ; data->weight =0 ; data->data_src.val =PERF_MEM_NA ; data->txn =0 ;
include/uapi/linux/perf_event.h +14 -1
@@ -137,8 +137,9 @@ enum perf_event_sample_format {PERF_SAMPLE_DATA_SRC =1U <<15 ,PERF_SAMPLE_IDENTIFIER =1U <<16 ,PERF_SAMPLE_TRANSACTION =1U <<17 , +PERF_SAMPLE_REGS_INTR =1U <<18 , - PERF_SAMPLE_MAX = 1U << 18, /* non-ABI */ + PERF_SAMPLE_MAX = 1U << 19, /* non-ABI */ };/*
@@ -238,6 +239,7 @@ enum perf_event_read_format {#define PERF_ATTR_SIZE_VER2 80/* add: branch_sample_type */ #define PERF_ATTR_SIZE_VER3 96/* add: sample_regs_user */ /* add: sample_stack_user */ +#define PERF_ATTR_SIZE_VER4 104/* add: sample_regs_intr */ /* * Hardware event_id to monitor via a performance monitoring event:
@@ -334,6 +336,15 @@ struct perf_event_attr {/* Align to u64. */ __u32 __reserved_2; +/* +* Defines set of regs to dump for each sample +* state captured on: +* - precise = 0: PMU interrupt +* - precise > 0: sampled instruction +* +* See asm/perf_regs.h for details. +*/ +__u64 sample_regs_intr; };#define perf_flags (attr) (*(&(attr)->read_format + 1))
@@ -686,6 +697,8 @@ enum perf_event_type {* { u64 weight; } && PERF_SAMPLE_WEIGHT * { u64 data_src; } && PERF_SAMPLE_DATA_SRC * { u64 transaction; } && PERF_SAMPLE_TRANSACTION +* { u64 abi; # enum perf_sample_regs_abi +* u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_INTR * }; */ PERF_RECORD_SAMPLE = 9,
kernel/events/core.c +51 -9
114 lines not on this page · raw message
tools/perf/.gitignore +2 -0
@@ -2,6 +2,8 @@ PERF-CFLAGS PERF-GUI-VARS PERF-VERSION-FILE perf +perf-read-vdso32 +perf-read-vdsox32 perf-help perf-record perf-report
tools/perf/Documentation/perf-record.txt +6 -0
@@ -214,6 +214,12 @@ if combined with -a or -C options. After starting the program, wait msecs before measuring. This is useful to filter out the startup phase of the program, which is often very different. +-I:: +--intr-regs:: +Capture machine state (registers) at interrupt, i.e., on counter overflows for +each sample. List of captured registers depends on the architecture. This option +is off by default. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/Documentation/perf-report.txt +11 -1
@@ -159,7 +159,7 @@ OPTIONS --dump-raw-trace:: Dump raw trace in ASCII. --g [type,min[,limit],order[,key]]:: +-g [type,min[,limit],order[,key][,branch]]:: --call-graph:: Display call chains using type, min percent threshold, optional print limit and order.
@@ -177,6 +177,11 @@ OPTIONS - function: compare on functions - address: compare on individual code addresses + branch can be: + - branch: include last branch information in callgraph + when available. Usually more convenient to use --branch-history + for this. + Default: fractal,0.5,callee,function. --children::
@@ -266,6 +271,11 @@ OPTIONS branch stacks and it will automatically switch to the branch view mode, unless --no-branch-stack is used. +--branch-history:: + Add the addresses of sampled taken branches to the callstack. + This allows to examine the path the program took to each sample. + The data collection must have used -b (or -j) and -g. + --objdump=<path>:: Path to objdump binary.
tools/perf/Makefile.perf +45 -6
125 lines not on this page · raw message
tools/perf/arch/powerpc/util/skip-callchain-idx.c +24 -14
@@ -145,7 +145,7 @@ static Dwarf_Frame *get_dwarf_frame(Dwfl_Module *mod, Dwarf_Addr pc)* yet used) * -1 in case of errors */ -static int check_return_addr (const char *exec_file,Dwarf_Addr pc) +static int check_return_addr (struct dso *dso,Dwarf_Addr pc) {int rc =-1 ;Dwfl *dwfl;
@@ -156,15 +156,27 @@ static int check_return_addr(const char *exec_file, Dwarf_Addr pc)Dwarf_Addr end = pc;bool signalp; - dwfl =dwfl_begin (&offline_callbacks); -if (!dwfl) { -pr_debug ("dwfl_begin() failed: %s\n" ,dwarf_errmsg (-1 )); -return -1 ; - } + dwfl = dso->dwfl; -if (dwfl_report_offline (dwfl,"" , exec_file,-1 ) ==NULL ) { -pr_debug ("dwfl_report_offline() failed %s\n" ,dwarf_errmsg (-1 )); - goto out; +if (!dwfl) { + dwfl =dwfl_begin (&offline_callbacks); +if (!dwfl) { +pr_debug ("dwfl_begin() failed: %s\n" ,dwarf_errmsg (-1 )); +return -1 ; + } + +if (dwfl_report_offline (dwfl,"" , dso->long_name,-1 ) ==NULL ) { +pr_debug ("dwfl_report_offline() failed %s\n" , +dwarf_errmsg (-1 )); +/* +* We normally cache the DWARF debug info and never +* call dwfl_end(). But to prevent fd leak, free in +* case of error. +*/ +dwfl_end (dwfl); + goto out; + } + dso->dwfl = dwfl; } mod =dwfl_addrmodule (dwfl, pc);
@@ -194,7 +206,6 @@ static int check_return_addr(const char *exec_file, Dwarf_Addr pc) rc =check_return_reg (ra_regno, frame); out: -dwfl_end (dwfl);return rc; }
@@ -221,8 +232,7 @@ static int check_return_addr(const char *exec_file, Dwarf_Addr pc)* index: of callchain entry that needs to be ignored (if any) * -1 if no entry needs to be ignored or in case of errors */ -int arch_skip_callchain_idx (struct machine *machine,struct thread *thread, -struct ip_callchain *chain) +int arch_skip_callchain_idx (struct thread *thread,struct ip_callchain *chain) {struct addr_location al;struct dso *dso =NULL ;
@@ -235,7 +245,7 @@ int arch_skip_callchain_idx(struct machine *machine, struct thread *thread, ip = chain->ips[2 ]; -thread__find_addr_location (thread, machine,PERF_RECORD_MISC_USER , +thread__find_addr_location (thread,PERF_RECORD_MISC_USER ,MAP__FUNCTION , ip, &al);if (al.map)
@@ -246,7 +256,7 @@ int arch_skip_callchain_idx(struct machine *machine, struct thread *thread,return skip_slot; } - rc =check_return_addr (dso->long_name, ip); + rc =check_return_addr (dso, ip);pr_debug ("DSO %s, nr %" PRIx64", ip 0x%" PRIx64"rc %d\n" , dso->long_name, chain->nr, ip, rc);
tools/perf/builtin-diff.c +1 -0
@@ -357,6 +357,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,static struct perf_tool tool = { .sample = diff__process_sample_event, .mmap = perf_event__process_mmap, + .mmap2 = perf_event__process_mmap2, .comm = perf_event__process_comm, .exit = perf_event__process_exit, .fork = perf_event__process_fork,
tools/perf/builtin-inject.c +2 -2
@@ -217,8 +217,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, goto repipe; } -thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , - sample->ip, &al); +thread__find_addr_map (thread, cpumode,MAP__FUNCTION , sample->ip, &al);if (al.map !=NULL ) {if (!al.map->dso->hit) {
@@ -410,6 +409,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) .tracing_data = perf_event__repipe_op2_synth, .finished_round = perf_event__repipe_op2_synth, .build_id = perf_event__repipe_op2_synth, + .id_index = perf_event__repipe_op2_synth, }, .input_name = "-", .samples = LIST_HEAD_INIT(inject.samples),
tools/perf/builtin-kvm.c +25 -0
@@ -1132,6 +1132,10 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)"-m" ,"1024" , "-c", "1", }; +const char *const kvm_stat_record_usage[] = { +"perf kvm stat record [<options>]" , +NULL + };const char *const *events_tp; events_tp_size =0 ;
@@ -1159,6 +1163,27 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)for (j =1 ; j < (unsigned int )argc; j++, i++) rec_argv[i] = argv[j]; +set_option_flag (record_options,'e' ,"event" ,PARSE_OPT_HIDDEN ); +set_option_flag (record_options,0 ,"filter" ,PARSE_OPT_HIDDEN ); +set_option_flag (record_options,'R' ,"raw-samples" ,PARSE_OPT_HIDDEN ); + +set_option_flag (record_options,'F' ,"freq" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,0 ,"group" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'g' ,NULL ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,0 ,"call-graph" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'d' ,"data" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'T' ,"timestamp" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'P' ,"period" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'n' ,"no-samples" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'N' ,"no-buildid-cache" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'B' ,"no-buildid" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'G' ,"cgroup" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'b' ,"branch-any" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'j' ,"branch-filter" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,'W' ,"weight" ,PARSE_OPT_DISABLED ); +set_option_flag (record_options,0 ,"transaction" ,PARSE_OPT_DISABLED ); + + record_usage = kvm_stat_record_usage;return cmd_record (i, rec_argv,NULL ); }
tools/perf/builtin-probe.c +20 -45
115 lines not on this page · raw message
tools/perf/builtin-record.c +18 -2
@@ -200,6 +200,17 @@ static int process_buildids(struct record *rec)if (size ==0 )return 0 ; +/* +* During this process, it'll load kernel map and replace the +* dso->long_name to a real pathname it found. In this case +* we prefer the vmlinux path like +* /lib/modules/3.16.4/build/vmlinux +* +* rather than build-id path (in debug directory). +* $HOME/.debug/.build-id/f0/6e17aa50adf4d00b88925e03775de107611551 +*/ + symbol_conf.ignore_vmlinux_buildid = true; +return __perf_session__process_events (session, start, size - start, size, &build_id__mark_dso_hit_ops);
@@ -680,11 +691,12 @@ static int perf_record_config(const char *var, const char *value, void *cb)return perf_default_config (var, value, cb); } -static const char *const record_usage[] = { +static const char *const __record_usage[] = {"perf record [<options>] [<command>]" ,"perf record [<options>] -- <command> [<options>]" ,NULL }; +const char *const *record_usage = __record_usage;/* * XXX Ideally would be local to cmd_record() and passed to a record__new
@@ -725,7 +737,7 @@ const char record_callchain_help[] = CALLCHAIN_HELP "fp";* perf_evlist__prepare_workload, etc instead of fork+exec'in 'perf record', * using pipes, etc. */ -const struct option record_options[] = { +struct option __record_options[] = {OPT_CALLBACK ('e' ,"event" , &record.evlist,"event" ,"event selector. use 'perf list' to list available events" , parse_events_option),
@@ -799,9 +811,13 @@ const struct option record_options[] = { "sample transaction flags (special events only)"),OPT_BOOLEAN (0 ,"per-thread" , &record.opts.target.per_thread,"use per-thread mmaps" ), +OPT_BOOLEAN ('I' ,"intr-regs" , &record.opts.sample_intr_regs, +"Sample machine registers on interrupt" ), OPT_END() }; +struct option *record_options = __record_options; +int cmd_record (int argc,const char **argv,const char *prefix__maybe_unused ) {int err = -ENOMEM ;
tools/perf/builtin-report.c +25 -6
@@ -226,8 +226,9 @@ static int report__setup_sample_type(struct report *rep)return -EINVAL ; }if (symbol_conf.use_callchain) { -ui__error ("Selected -g but no callchain data. Did " -"you call 'perf record' without -g?\n" ); +ui__error ("Selected -g or --branch-history but no " +"callchain data. Did\n" +"you call 'perf record' without -g?\n" );return -1 ; } } else if (!rep->dont_use_callchains &&
@@ -575,6 +576,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)struct stat st;bool has_br_stack = false;int branch_mode =-1 ; +bool branch_call_mode = false;char callchain_default_opt[] ="fractal,0.5,callee" ;const char *const report_usage[] = {"perf report [<options>]" ,
@@ -637,8 +639,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) "regex filter to identify parent, see: '--sort parent'"),OPT_BOOLEAN ('x' ,"exclude-other" , &symbol_conf.exclude_other,"Only display entries with parent-match" ), -OPT_CALLBACK_DEFAULT ('g' ,"call-graph" , &report,"output_type,min_percent[,print_limit],call_order" , -"Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address). " +OPT_CALLBACK_DEFAULT ('g' ,"call-graph" , &report,"output_type,min_percent[,print_limit],call_order[,branch]" , +"Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address), add branches. " "Default: fractal,0.5,callee,function" , &report_parse_callchain_opt, callchain_default_opt),OPT_BOOLEAN (0 ,"children" , &symbol_conf.cumulate_callchain, "Accumulate callchains of children and show total overhead as well"),
@@ -684,7 +686,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)OPT_BOOLEAN (0 ,"group" , &symbol_conf.event_group,"Show event group information together" ),OPT_CALLBACK_NOOPT ('b' ,"branch-stack" , &branch_mode,"" , -"use branch records for histogram filling" , parse_branch_mode), +"use branch records for per branch histogram filling" , + parse_branch_mode), +OPT_BOOLEAN (0 ,"branch-history" , &branch_call_mode, +"add last branch records to call history" ),OPT_STRING (0 ,"objdump" , &objdump_path,"path" ,"objdump binary to use for disassembly and annotations" ), OPT_BOOLEAN(0, "demangle", &symbol_conf.demangle,
@@ -745,10 +750,24 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) has_br_stack =perf_header__has_feat (&session->header,HEADER_BRANCH_STACK ); -if ((branch_mode ==-1 && has_br_stack) || branch_mode ==1 ) { +/* +* Branch mode is a tristate: +* -1 means default, so decide based on the file having branch data. +* 0/1 means the user chose a mode. +*/ +if (((branch_mode ==-1 && has_br_stack) || branch_mode ==1 ) && + branch_call_mode ==-1 ) { sort__mode =SORT_MODE__BRANCH ; symbol_conf.cumulate_callchain = false; } +if (branch_call_mode) { + callchain_param.key =CCKEY_ADDRESS ; + callchain_param.branch_callstack =1 ; + symbol_conf.use_callchain = true; +callchain_register_param (&callchain_param); +if (sort_order ==NULL ) + sort_order ="srcline,symbol,dso" ; + }if (report.mem_mode) {if (sort__mode ==SORT_MODE__BRANCH ) {
tools/perf/builtin-script.c +3 -5
@@ -23,7 +23,6 @@ static char const *generate_script_lang;static bool debug_mode;static u64 last_timestamp;static u64 nr_unordered; -extern const struct option record_options[];static bool no_callchain;static bool latency_format;static bool system_wide;
@@ -379,7 +378,6 @@ static void print_sample_start(struct perf_sample *sample,static void print_sample_addr (union perf_event *event,struct perf_sample *sample, -struct machine *machine,struct thread *thread,struct perf_event_attr *attr) {
@@ -390,7 +388,7 @@ static void print_sample_addr(union perf_event *event,if (!sample_addr_correlates_sym (attr))return ; -perf_event__preprocess_sample_addr (event, sample, machine, thread, &al); +perf_event__preprocess_sample_addr (event, sample, thread, &al);if (PRINT_FIELD (SYM )) {printf (" " );
@@ -438,7 +436,7 @@ static void print_sample_bts(union perf_event *event, ((evsel->attr.sample_type & PERF_SAMPLE_ADDR) && !output[attr->type].user_set)) {printf (" => " ); -print_sample_addr (event, sample, al->machine, thread, attr); +print_sample_addr (event, sample, thread, attr); }if (print_srcline_last)
@@ -475,7 +473,7 @@ static void process_event(union perf_event *event, struct perf_sample *sample,event_format__print (evsel->tp_format, sample->cpu, sample->raw_data, sample->raw_size);if (PRINT_FIELD (ADDR )) -print_sample_addr (event, sample, al->machine, thread, attr); +print_sample_addr (event, sample, thread, attr);if (PRINT_FIELD (IP )) {if (!symbol_conf.use_callchain)
tools/perf/builtin-stat.c +96 -9
132 lines not on this page · raw message
tools/perf/builtin-timechart.c +5 -4
@@ -528,7 +528,7 @@ static const char *cat_backtrace(union perf_event *event, } tal.filtered =0 ; -thread__find_addr_location (al.thread, machine, cpumode, +thread__find_addr_location (al.thread, cpumode,MAP__FUNCTION , ip, &tal);if (tal.sym)
@@ -1963,7 +1963,7 @@ int cmd_timechart(int argc, const char **argv,NULL }; -const struct option record_options[] = { +const struct option timechart_record_options[] = {OPT_BOOLEAN ('P' ,"power-only" , &tchart.power_only,"output power data only" ),OPT_BOOLEAN ('T' ,"tasks-only" , &tchart.tasks_only,"output processes data only" ),
@@ -1972,7 +1972,7 @@ int cmd_timechart(int argc, const char **argv,OPT_BOOLEAN ('g' ,"callchain" , &tchart.with_backtrace,"record callchain" ), OPT_END() }; -const char *const record_usage[] = { +const char *const timechart_record_usage[] = {"perf timechart record [<options>]" ,NULL };
@@ -1985,7 +1985,8 @@ int cmd_timechart(int argc, const char **argv, }if (argc && !strncmp (argv[0 ],"rec" ,3 )) { - argc =parse_options (argc, argv, record_options, record_usage, + argc =parse_options (argc, argv, timechart_record_options, + timechart_record_usage,PARSE_OPT_STOP_AT_NON_OPTION );if (tchart.power_only && tchart.tasks_only) {
tools/perf/builtin-trace.c +3 -3
@@ -1846,7 +1846,7 @@ static int trace__pgfault(struct trace *trace,if (trace->summary_only)return 0 ; -thread__find_addr_location (thread, trace->host, cpumode,MAP__FUNCTION , +thread__find_addr_location (thread, cpumode,MAP__FUNCTION , sample->ip, &al);trace__fprintf_entry_head (trace, thread,0 , sample->time, trace->output);
@@ -1859,11 +1859,11 @@ static int trace__pgfault(struct trace *trace,fprintf (trace->output,"] => " ); -thread__find_addr_location (thread, trace->host, cpumode,MAP__VARIABLE , +thread__find_addr_location (thread, cpumode,MAP__VARIABLE , sample->addr, &al);if (!al.map) { -thread__find_addr_location (thread, trace->host, cpumode, +thread__find_addr_location (thread, cpumode,MAP__FUNCTION , sample->addr, &al);if (al.map)
tools/perf/config/Makefile +44 -5
97 lines not on this page · raw message
tools/perf/config/Makefile.arch +8 -0
@@ -21,3 +21,11 @@ ifeq ($(ARCH),x86_64) RAW_ARCH := x86_64 endif endif + +ifeq (${IS_X86_64}, 1) + IS_64_BIT := 1 +else ifeq ($(ARCH),x86) + IS_64_BIT := 0 +else + IS_64_BIT := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) +endif
tools/perf/config/feature-checks/Makefile +14 -2
@@ -27,7 +27,10 @@ FILES= \ test-libunwind-debug-frame.bin \ test-stackprotector-all.bin \ test-timerfd.bin \ - test-libdw-dwarf-unwind.bin + test-libdw-dwarf-unwind.bin \ + test-compile-32.bin \ + test-compile-x32.bin \ + test-zlib.bin CC := $(CROSS_COMPILE)gcc -MD PKG_CONFIG := $(CROSS_COMPILE)pkg-config
@@ -39,7 +42,7 @@ BUILD = $(CC) $(CFLAGS) -o $(OUTPUT)$@ $(patsubst %.bin,%.c,$@) $(LDFLAGS) ############################### test-all.bin: - $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl + $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz test-hello.bin: $(BUILD)
@@ -131,6 +134,15 @@ FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS) test-sync-compare-and-swap.bin: $(BUILD) -Werror +test-compile-32.bin: + $(CC) -m32 -o $(OUTPUT)$@ test-compile.c + +test-compile-x32.bin: + $(CC) -mx32 -o $(OUTPUT)$@ test-compile.c + +test-zlib.bin: + $(BUILD) -lz + -include *.d ###############################
tools/perf/config/feature-checks/test-all.c +5 -0
@@ -93,6 +93,10 @@# include "test-sync-compare-and-swap.c" #undef main +#define main main_test_zlib +# include "test-zlib.c" +#undef main +int main (int argc,char *argv[]) {main_test_libpython ();
@@ -116,6 +120,7 @@ int main(int argc, char *argv[])main_test_stackprotector_all ();main_test_libdw_dwarf_unwind ();main_test_sync_compare_and_swap (argc, argv); +main_test_zlib ();return 0 ; }
tools/perf/config/feature-checks/test-compile.c new file +4 -0
@@ -0,0 +1,4 @@ +int main (void ) +{ +return 0 ; +}
tools/perf/config/feature-checks/test-zlib.c new file +9 -0
@@ -0,0 +1,9 @@ +#include <zlib.h> + +int main (void ) +{ +z_stream zs; + +inflateInit (&zs); +return 0 ; +}
tools/perf/perf-read-vdso.c new file +34 -0
@@ -0,0 +1,34 @@ +#include <stdio.h> +#include <string.h> + +#define VDSO__MAP_NAME "[vdso]" + +/* +* Include definition of find_vdso_map() also used in util/vdso.c for +* building perf. +*/ +#include "util/find-vdso-map.c" + +int main (void ) +{ +void *start, *end; +size_t size, written; + +if (find_vdso_map (&start, &end)) +return 1 ; + + size = end - start; + +while (size) { + written =fwrite (start,1 , size, stdout); +if (!written) +return 1 ; + start += written; + size -= written; + } + +if (fflush (stdout)) +return 1 ; + +return 0 ; +}
tools/perf/perf.h +4 -0
@@ -52,6 +52,7 @@ struct record_opts {bool sample_weight;bool sample_time;bool period; +bool sample_intr_regs;unsigned int freq;unsigned int mmap_pages;unsigned int user_freq;
@@ -62,4 +63,7 @@ struct record_opts { unsigned initial_delay; }; +struct option ; +extern const char *const *record_usage; +extern struct option *record_options;#endif
tools/perf/scripts/python/bin/export-to-postgresql-record new file +8 -0
@@ -0,0 +1,8 @@ +#!/bin/bash + +# +# export perf data to a postgresql database. Can cover +# perf ip samples (excluding the tracepoints). No special +# record requirements, just record what you want to export. +# +perf record $@
tools/perf/scripts/python/bin/export-to-postgresql-report new file +29 -0
@@ -0,0 +1,29 @@ +#!/bin/bash +# description: export perf data to a postgresql database +# args: [database name] [columns] [calls] +n_args=0 +for i in "$@" +do + if expr match "$i" "-" > /dev/null ; then + break + fi + n_args=$(( $n_args + 1 )) +done +if [ "$n_args" -gt 3 ] ; then + echo "usage: export-to-postgresql-report [database name] [columns] [calls]" + exit +fi +if [ "$n_args" -gt 2 ] ; then + dbname=$1 + columns=$2 + calls=$3 + shift 3 +elif [ "$n_args" -gt 1 ] ; then + dbname=$1 + columns=$2 + shift 2 +elif [ "$n_args" -gt 0 ] ; then + dbname=$1 + shift +fi +perf script $@ -s "$PERF_EXEC_PATH"/scripts/python/export-to-postgresql.py $dbname $columns $calls
tools/perf/scripts/python/export-to-postgresql.py new file +444 -0
444 lines not on this page · raw message
tools/perf/tests/builtin-test.c +1 -1
@@ -85,7 +85,7 @@ static struct test { .func = test__hists_link, }, { - .desc = "Try 'use perf' in python, checking link problems", + .desc = "Try 'import perf' in python, checking link problems", .func = test__python_use, }, {
tools/perf/tests/code-reading.c +5 -8
@@ -133,8 +133,7 @@ static int read_via_objdump(const char *filename, u64 addr, void *buf, }static int read_object_code (u64 addr,size_t len,u8 cpumode, -struct thread *thread,struct machine *machine, -struct state *state) +struct thread *thread,struct state *state) {struct addr_location al;unsigned char buf1[BUFSZ ];
@@ -145,8 +144,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode,pr_debug ("Reading object code for memory address: %#" PRIx64"\n" , addr); -thread__find_addr_map (thread, machine, cpumode,MAP__FUNCTION , addr, - &al); +thread__find_addr_map (thread, cpumode,MAP__FUNCTION , addr, &al);if (!al.map || !al.map->dso) {pr_debug ("thread__find_addr_map failed\n" );return -1 ;
@@ -170,8 +168,8 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, len = al.map->end - addr;/* Read the object code using perf */ - ret_len =dso__data_read_offset (al.map->dso, machine, al.addr, buf1, - len); + ret_len =dso__data_read_offset (al.map->dso, thread->mg->machine, + al.addr, buf1, len);if (ret_len != len) {pr_debug ("dso__data_read_offset failed\n" );return -1 ;
@@ -264,8 +262,7 @@ static int process_sample_event(struct machine *machine, cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ; -return read_object_code (sample.ip,READLEN , cpumode, thread, machine, - state); +return read_object_code (sample.ip,READLEN , cpumode, thread, state); } static int process_event(struct machine *machine, struct perf_evlist *evlist,
tools/perf/tests/dwarf-unwind.c +9 -9
@@ -59,7 +59,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) } __attribute__ ((noinline)) -static int unwind_thread (struct thread *thread,struct machine *machine) +static int unwind_thread (struct thread *thread) {struct perf_sample sample;unsigned long cnt =0 ;
@@ -72,7 +72,7 @@ static int unwind_thread(struct thread *thread, struct machine *machine) goto out; } - err =unwind__get_entries (unwind_entry, &cnt, machine, thread, + err =unwind__get_entries (unwind_entry, &cnt, thread, &sample,MAX_STACK );if (err)pr_debug ("unwind failed\n" );
@@ -89,21 +89,21 @@ static int unwind_thread(struct thread *thread, struct machine *machine) } __attribute__ ((noinline)) -static int krava_3 (struct thread *thread,struct machine *machine) +static int krava_3 (struct thread *thread) { -return unwind_thread (thread, machine); +return unwind_thread (thread); } __attribute__ ((noinline)) -static int krava_2 (struct thread *thread,struct machine *machine) +static int krava_2 (struct thread *thread) { -return krava_3 (thread, machine); +return krava_3 (thread); } __attribute__ ((noinline)) -static int krava_1 (struct thread *thread,struct machine *machine) +static int krava_1 (struct thread *thread) { -return krava_2 (thread, machine); +return krava_2 (thread); }int test__dwarf_unwind (void )
@@ -137,7 +137,7 @@ int test__dwarf_unwind(void) goto out; } - err =krava_1 (thread, machine); + err =krava_1 (thread); out:machine__delete_threads (machine);
tools/perf/tests/hists_filter.c +1 -1
@@ -43,7 +43,7 @@ static struct sample fake_samples[] = { };static int add_hist_entries (struct perf_evlist *evlist, -struct machine *machine__maybe_unused ) +struct machine *machine) {struct perf_evsel *evsel;struct addr_location al;
tools/perf/tests/mmap-thread-lookup.c +1 -1
@@ -187,7 +187,7 @@ static int mmap_events(synth_cb synth)pr_debug ("looking for map %p\n" , td->map); -thread__find_addr_map (thread, machine, +thread__find_addr_map (thread,PERF_RECORD_MISC_USER ,MAP__FUNCTION , (unsigned long ) (td->map +1 ), &al);
tools/perf/tests/sample-parsing.c +40 -15
121 lines not on this page · raw message
tools/perf/ui/browsers/annotate.c +12 -1
@@ -27,6 +27,7 @@ static struct annotate_browser_opt {bool hide_src_code, use_offset, jump_arrows, + show_linenr, show_nr_jumps; } annotate_browser__opts = { .use_offset = true,
@@ -128,7 +129,11 @@ static void annotate_browser__write(struct ui_browser *browser, void *entry, intif (!*dl->line)slsmg_write_nstring (" " , width - pcnt_width);else if (dl->offset ==-1 ) { - printed =scnprintf (bf,sizeof (bf),"%*s " , +if (dl->line_nr && annotate_browser__opts.show_linenr) + printed =scnprintf (bf,sizeof (bf),"%-*d " , + ab->addr_width +1 , dl->line_nr); +else + printed =scnprintf (bf,sizeof (bf),"%*s " , ab->addr_width," " );slsmg_write_nstring (bf, printed);slsmg_write_nstring (dl->line, width - printed - pcnt_width +1 );
@@ -733,6 +738,7 @@ static int annotate_browser__run(struct annotate_browser *browser,"o Toggle disassembler output/simplified view\n" "s Toggle source code view\n" "/ Search string\n" +"k Toggle line numbers\n" "r Run available scripts\n" "? Search string backwards\n");continue ;
@@ -741,6 +747,10 @@ static int annotate_browser__run(struct annotate_browser *browser,script_browse (NULL );continue ; } +case 'k' : + annotate_browser__opts.show_linenr = + !annotate_browser__opts.show_linenr; +break ;case 'H' : nd = browser->curr_hot;break ;
@@ -984,6 +994,7 @@ static struct annotate_config { } annotate__configs[] = {ANNOTATE_CFG (hide_src_code),ANNOTATE_CFG (jump_arrows), +ANNOTATE_CFG (show_linenr),ANNOTATE_CFG (show_nr_jumps), ANNOTATE_CFG(use_offset), };
tools/perf/ui/browsers/hists.c +20 -22
92 lines not on this page · raw message
tools/perf/ui/gtk/hists.c +1 -10
@@ -89,15 +89,6 @@ void perf_gtk__init_hpp(void) perf_gtk__hpp_color_overhead_acc; } -static void callchain_list__sym_name (struct callchain_list *cl, -char *bf,size_t bfsize) -{ -if (cl->ms.sym) -scnprintf (bf, bfsize,"%s" , cl->ms.sym->name); -else -scnprintf (bf, bfsize,"%#" PRIx64, cl->ip); -} -static void perf_gtk__add_callchain (struct rb_root *root,GtkTreeStore *store,GtkTreeIter *parent,int col,u64 total) {
@@ -128,7 +119,7 @@ static void perf_gtk__add_callchain(struct rb_root *root, GtkTreeStore *store,scnprintf (buf,sizeof (buf),"%5.2f%%" , percent);gtk_tree_store_set (store, &iter,0 , buf,-1 ); -callchain_list__sym_name (chain, buf,sizeof (buf)); +callchain_list__sym_name (chain, buf,sizeof (buf), false);gtk_tree_store_set (store, &iter, col, buf,-1 );if (need_new_parent) {
tools/perf/ui/stdio/hist.c +9 -14
@@ -41,6 +41,7 @@ static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain, {int i;size_t ret =0 ; +char bf[1024 ]; ret +=callchain__fprintf_left_margin (fp, left_margin);for (i =0 ; i < depth; i++) {
@@ -56,11 +57,8 @@ static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_list *chain, }else ret +=fprintf (fp,"%s" ," " ); } -if (chain->ms.sym) - ret +=fprintf (fp,"%s\n" , chain->ms.sym->name); -else - ret +=fprintf (fp,"0x%0" PRIx64"\n" , chain->ip); - +fputs (callchain_list__sym_name (chain, bf,sizeof (bf), false), fp); +fputc ('\n' , fp);return ret; }
@@ -168,6 +166,7 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,struct rb_node *node;int i =0 ;int ret =0 ; +char bf[1024 ];/* * If have one single callchain root, don't bother printing
@@ -196,10 +195,8 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, }else ret +=callchain__fprintf_left_margin (fp, left_margin); -if (chain->ms.sym) - ret +=fprintf (fp," %s\n" , chain->ms.sym->name); -else - ret +=fprintf (fp," %p\n" , (void *)(long )chain->ip); + ret +=fprintf (fp,"%s\n" ,callchain_list__sym_name (chain, bf,sizeof (bf), + false));if (++entries_printed == callchain_param.print_limit)break ;
@@ -219,6 +216,7 @@ static size_t __callchain__fprintf_flat(FILE *fp, struct callchain_node *node, {struct callchain_list *chain;size_t ret =0 ; +char bf[1024 ];if (!node)return 0 ;
@@ -229,11 +227,8 @@ static size_t __callchain__fprintf_flat(FILE *fp, struct callchain_node *node,list_for_each_entry (chain, &node->val, list) {if (chain->ip >=PERF_CONTEXT_MAX )continue ; -if (chain->ms.sym) - ret +=fprintf (fp," %s\n" , chain->ms.sym->name); -else - ret +=fprintf (fp," %p\n" , - (void *)(long )chain->ip); + ret +=fprintf (fp," %s\n" ,callchain_list__sym_name (chain, + bf,sizeof (bf), false)); }return ret;
tools/perf/util/annotate.c +28 -6
@@ -17,11 +17,13 @@#include "debug.h" #include "annotate.h" #include "evsel.h" +#include <regex.h> #include <pthread.h> #include <linux/bitops.h> const char *disassembler_style;const char *objdump_path; +static regex_t file_lineno;static struct ins *ins__find (const char *name);static int disasm_line__parse (char *line,char **namep,char **rawp);
@@ -570,13 +572,15 @@ static int disasm_line__parse(char *line, char **namep, char **rawp)return -1 ; } -static struct disasm_line *disasm_line__new (s64 offset,char *line,size_t privsize) +static struct disasm_line *disasm_line__new (s64 offset,char *line, +size_t privsize,int line_nr) {struct disasm_line *dl =zalloc (sizeof (*dl) + privsize);if (dl !=NULL ) { dl->offset = offset; dl->line =strdup (line); + dl->line_nr = line_nr;if (dl->line ==NULL ) goto out_delete;
@@ -788,13 +792,15 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st* The ops.raw part will be parsed further according to type of the instruction. */ static int symbol__parse_objdump_line (struct symbol *sym,struct map *map, -FILE *file,size_t privsize) +FILE *file,size_t privsize, +int *line_nr) {struct annotation *notes =symbol__annotation (sym);struct disasm_line *dl;char *line =NULL , *parsed_line, *tmp, *tmp2, *c;size_t line_len;s64 line_ip, offset =-1 ; +regmatch_t match[2 ];if (getline (&line, &line_len, file) <0 )return -1 ;
@@ -812,6 +818,12 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, line_ip =-1 ; parsed_line = line; +/* /filename:linenr ? Save line number and ignore. */ +if (regexec (&file_lineno, line,2 , match,0 ) ==0 ) { + *line_nr =atoi (line + match[1 ].rm_so); +return 0 ; + } +/* * Strip leading spaces: */
@@ -842,8 +854,9 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, parsed_line = tmp2 +1 ; } - dl =disasm_line__new (offset, parsed_line, privsize); + dl =disasm_line__new (offset, parsed_line, privsize, *line_nr);free (line); + (*line_nr)++;if (dl ==NULL )return -1 ;
@@ -869,6 +882,11 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,return 0 ; } +static __attribute__((constructor))void symbol__init_regexpr (void ) +{ +regcomp (&file_lineno,"^/[^:]+:([0-9]+)" ,REG_EXTENDED ); +} +static void delete_last_nop (struct symbol *sym) {struct annotation *notes =symbol__annotation (sym);
@@ -904,6 +922,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)char symfs_filename[PATH_MAX ];struct kcore_extract kce;bool delete_extract = false; +int lineno =0 ;if (filename)symbol__join_symfs (symfs_filename, filename);
@@ -915,6 +934,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)return -ENOMEM ; } goto fallback; + }else if (dso__is_kcore (dso)) { + goto fallback; }else if (readlink (symfs_filename, command,sizeof (command)) <0 ||strstr (command,"[kernel.kallsyms]" ) ||access (symfs_filename,R_OK )) {
@@ -982,7 +1003,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize) snprintf(command, sizeof(command), "%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64 - " -d %s %s -C %s 2>/dev/null|grep -v %s|expand", + " -l -d %s %s -C %s 2>/dev/null|grep -v %s|expand", objdump_path ? objdump_path : "objdump", disassembler_style ? "-M " : "", disassembler_style ? disassembler_style : "",
@@ -999,7 +1020,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize) goto out_free_filename;while (!feof (file)) -if (symbol__parse_objdump_line (sym, map, file, privsize) <0 ) +if (symbol__parse_objdump_line (sym, map, file, privsize, + &lineno) <0 )break ;/*
@@ -1170,7 +1192,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, goto next; offset = start + i; - src_line->path =get_srcline (map->dso, offset); + src_line->path =get_srcline (map->dso, offset,NULL , false);insert_source_line (&tmp_root, src_line); next:
tools/perf/util/annotate.h +1 -0
@@ -58,6 +58,7 @@ struct disasm_line {char *line;char *name;struct ins *ins; +int line_nr;struct ins_operands ops; };
tools/perf/util/build-id.c +346 -2
363 lines not on this page · raw message
tools/perf/util/build-id.h +12 -0
@@ -15,4 +15,16 @@ char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size);int build_id__mark_dso_hit (struct perf_tool *tool,union perf_event *event,struct perf_sample *sample,struct perf_evsel *evsel,struct machine *machine); + +int dsos__hit_all (struct perf_session *session); + +bool perf_session__read_build_ids (struct perf_session *session,bool with_hits); +int perf_session__write_buildid_table (struct perf_session *session,int fd); +int perf_session__cache_build_ids (struct perf_session *session); + +int build_id_cache__add_s (const char *sbuild_id,const char *debugdir, +const char *name,bool is_kallsyms,bool is_vdso); +int build_id_cache__remove_s (const char *sbuild_id,const char *debugdir); +void disable_buildid_cache (void ); +#endif
tools/perf/util/callchain.c +35 -2
@@ -149,6 +149,10 @@ static int parse_callchain_sort_key(const char *value) callchain_param.key =CCKEY_ADDRESS ;return 0 ; } +if (!strncmp (value,"branch" ,strlen (value))) { + callchain_param.branch_callstack =1 ; +return 0 ; + }return -1 ; }
@@ -754,8 +758,8 @@ int sample__resolve_callchain(struct perf_sample *sample, struct symbol **parentif (symbol_conf.use_callchain || symbol_conf.cumulate_callchain || sort__has_parent) { -return machine__resolve_callchain (al->machine, evsel, al->thread, - sample, parent, al, max_stack); +return thread__resolve_callchain (al->thread, evsel, sample, + parent, al, max_stack); }return 0 ; }
@@ -808,3 +812,32 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node * out:return 1 ; } + +char *callchain_list__sym_name (struct callchain_list *cl, +char *bf,size_t bfsize,bool show_dso) +{ +int printed; + +if (cl->ms.sym) { +if (callchain_param.key ==CCKEY_ADDRESS && + cl->ms.map && !cl->srcline) + cl->srcline =get_srcline (cl->ms.map->dso, +map__rip_2objdump (cl->ms.map, + cl->ip), + cl->ms.sym, false); +if (cl->srcline) + printed =scnprintf (bf, bfsize,"%s %s" , + cl->ms.sym->name, cl->srcline); +else + printed =scnprintf (bf, bfsize,"%s" , cl->ms.sym->name); + }else + printed =scnprintf (bf, bfsize,"%#" PRIx64, cl->ip); + +if (show_dso) +scnprintf (bf + printed, bfsize - printed," %s" , + cl->ms.map ? + cl->ms.map->dso->short_name : +"unknown" ); + +return bf; +}
tools/perf/util/callchain.h +7 -4
@@ -63,6 +63,7 @@ struct callchain_param {sort_chain_func_t sort;enum chain_order order;enum chain_key key; +bool branch_callstack; };extern struct callchain_param callchain_param;
@@ -70,6 +71,7 @@ extern struct callchain_param callchain_param;struct callchain_list {u64 ip;struct map_symbol ms; +char *srcline;struct list_head list; };
@@ -184,15 +186,16 @@ static inline void callchain_cursor_snapshot(struct callchain_cursor *dest, }#ifdef HAVE_SKIP_CALLCHAIN_IDX -extern int arch_skip_callchain_idx (struct machine *machine, -struct thread *thread,struct ip_callchain *chain); +extern int arch_skip_callchain_idx (struct thread *thread,struct ip_callchain *chain);#else -static inline int arch_skip_callchain_idx (struct machine *machine__maybe_unused , -struct thread *thread__maybe_unused , +static inline int arch_skip_callchain_idx (struct thread *thread__maybe_unused ,struct ip_callchain *chain__maybe_unused ) {return -1 ; }#endif +char *callchain_list__sym_name (struct callchain_list *cl, +char *bf,size_t bfsize,bool show_dso); +#endif /* __PERF_CALLCHAIN_H */
tools/perf/util/comm.h +4 -0
@@ -12,6 +12,10 @@ struct comm {u64 start;struct list_head list;bool exec; +union {/* Tool specific area */ +void *priv; +u64 db_id; + }; };void comm__free (struct comm *comm);
tools/perf/util/db-export.c new file +428 -0
66 lines not on this page · raw message
tools/perf/util/db-export.h new file +107 -0
107 lines not on this page · raw message
tools/perf/util/dso.c +71 -0
71 lines not on this page · raw message
tools/perf/util/event.h +42 -1
43 lines not on this page · raw message
tools/perf/util/evsel.c +92 -64
156 lines not on this page · raw message
tools/perf/util/evsel.h +21 -29
50 lines not on this page · raw message
tools/perf/util/find-vdso-map.c new file +30 -0
Lines of this file are not shown. View the raw message.
tools/perf/util/header.c +10 -351
361 lines not on this page · raw message
tools/perf/util/include/linux/bitmap.h +17 -0
Lines of this file are not shown. View the raw message.
tools/perf/util/machine.c +204 -60
264 lines not on this page · raw message
tools/perf/util/parse-options.c +66 -12
78 lines not on this page · raw message
tools/perf/util/pmu.c +94 -21
115 lines not on this page · raw message
tools/perf/util/scripting-engines/trace-event-perl.c +6 -23
Lines of this file are not shown. View the raw message.
tools/perf/util/scripting-engines/trace-event-python.c +406 -34
440 lines not on this page · raw message
tools/perf/util/session.c +177 -8
185 lines not on this page · raw message
tools/perf/util/symbol-elf.c +55 -1
56 lines not on this page · raw message
tools/perf/util/thread-stack.c new file +747 -0
747 lines not on this page · raw message
tools/perf/util/thread-stack.h new file +111 -0
111 lines not on this page · raw message
tools/perf/util/vdso.c +185 -32
217 lines not on this page · raw message
tools/perf/util/zlib.c new file +78 -0
78 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.