perf events updates
Subsystems (5)
Linus,
Please pull the latest perf events git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Fixes mostly, plus some late changes/cleanups.
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (3):
perf buildid-list: Fix copy'n'paste help message
perf symbols: dsos__read_build_ids() should read both user and kernel buildids perf symbols: perf_header__read_build_ids() offset'n'size should be u64
Arnd Bergmann (1):
perf events: hw_breakpoints: Don't include asm/hw_breakpoint.h in user space
Cyrill Gorcunov (1):
x86, perf events: Check if we have APIC enabled
Frederic Weisbecker (14):
hw-breakpoints: Add two reserved fields for future extensions
perf: Remove pointless union that wraps the hw breakpoint fields
perf: Remove unused struct perf_event::event_callback
hw-breakpoints: Drop callback and task parameters from modify helper
hw-breakpoints: Use overflow handler instead of the event callback
perf: Remove the "event" callback from perf events x86/perf: Exclude the debug stack from the callchains
x86: Fixup wrong debug exception frame link in stacktraces
x86: Fixup wrong irq frame link in stacktraces
hw-breakpoints: Zeroe the breakpoint attrs on initialization
hw-breakpoints: Fix task-bound breakpoint slot allocation
hw-breakpoints: Modify breakpoints without unregistering them tracing/kprobes: Fix field creation's bad error handling perf sched: Add max delay time snapshot
Ingo Molnar (1):
perf kmem: Fix unused argument build warning
Jean Delvare (1):
x86, perf probe: Fix warning in test_get_len()
Juha Leppanen (1):
perf probe: Fix strtailcmp() to compare s1and s2[0]
Julia Lawall (2):
perf tools: Correct size computation in tracepoint_id_to_path() perf tools: Correct size given to memset
Li Zefan (2):
perf kmem: Show usage if no option is specified perf tools: Align long options which have no short forms
Masami Hiramatsu (12):
x86 insn: Delete empty or incomplete inat-tables.c perf probe: Fix event namelist to duplicate string perf probe: Check e_snprintf() format string
perf probe: Use pr_debug for debug message
perf probe: Change event list format
perf probe: Change probe-added message more user-friendly perf probe: Fix add-probe command syntax without --add option perf probe: Remove event suffix number _0
perf probe: Support vmlinux on cwd by default
trace-kprobe: Support delete probe syntax
perf probe: Support --del option
perf probe: Update perf-probe document
Mike Frysinger (1):
sched: Mark sched_clock() as notrace
OGAWA Hirofumi (4):
perf timechart: Fix header handling
perf: Make common SAMPLE_EVENT parser perf tools: Misc small fixes
x86: Compile insn.c and inat.c only for KPROBES
Stephen Rothwell (1):
perf: hw_breakpoints: Fix percpu namespace clash
Tom Zanussi (2):
perf trace/scripting: Fix compile error when libperl not installed perf trace/scripting: Don't display 'scripting unsupported' msg unnecessarily
Ulrich Drepper (1):
perf tools: Optimize parse_subsystem_tracepoint_event()
Xiao Guangrong (10):
perf/sched: Fix 'perf sched trace'
perf_event: Fix raw event processing
perf_event: Fix __dsos__write_buildid_table()
perf_event: Eliminate raw->size
perf_event: Clean up __perf_event_init_context()
perf_event: Allocate children's perf_event_ctxp at the right time
perf_event: Cleanup for cpu_clock_perf_event_update() perf sched: Fix for getting task's execution time
perf_event: Fix perf_swevent_hrtimer() variable initialization
perf_event: Fix variable initialization in other codepaths
arch/x86/Kconfig.debug | 4 +- arch/x86/kernel/cpu/perf_event.c | 31 +++-- arch/x86/kernel/dumpstack_64.c | 33 +++++- arch/x86/kernel/entry_64.S | 6 +- arch/x86/kernel/hw_breakpoint.c | 5 +- arch/x86/kernel/ptrace.c | 68 +++++----- arch/x86/lib/Makefile | 4 +- arch/x86/tools/test_get_len.c | 2 +- include/linux/hw_breakpoint.h | 40 +++---- include/linux/perf_event.h | 41 +++--- include/linux/sched.h | 3 +- kernel/hw_breakpoint.c | 146 +++++++++++++--------- kernel/perf_event.c | 75 ++++++------ kernel/trace/trace_kprobe.c | 41 +++++-- kernel/trace/trace_ksym.c | 5 +- samples/hw_breakpoint/data_breakpoint.c | 7 +- tools/perf/Documentation/perf-kmem.txt | 13 +- tools/perf/Documentation/perf-probe.txt | 21 +++- tools/perf/builtin-buildid-list.c | 2 +- tools/perf/builtin-kmem.c | 123 ++++++++---------- tools/perf/builtin-probe.c | 80 +++++++++--- tools/perf/builtin-report.c | 39 +++--- tools/perf/builtin-sched.c | 212 ++++++++++++++----------------- tools/perf/builtin-timechart.c | 56 +++------ tools/perf/builtin-trace.c | 48 ++----- tools/perf/util/data_map.c | 4 +- tools/perf/util/data_map.h | 2 +- tools/perf/util/event.c | 67 ++++++++++ tools/perf/util/event.h | 17 +++- tools/perf/util/header.c | 9 +- tools/perf/util/parse-events.c | 17 +-- tools/perf/util/parse-options.c | 3 + tools/perf/util/probe-event.c | 133 +++++++++++++++++-- tools/perf/util/probe-event.h | 1 + tools/perf/util/probe-finder.c | 2 +- tools/perf/util/symbol.c | 5 +- tools/perf/util/trace-event-parse.c | 4 +- tools/perf/util/trace-event-perl.c | 67 ++++++++-- tools/perf/util/trace-event-perl.h | 4 + tools/perf/util/trace-event-read.c | 3 +- 40 files changed, 878 insertions(+), 565 deletions(-)
arch/x86/Kconfig.debug +2 -2
@@ -187,8 +187,8 @@ config HAVE_MMIOTRACE_SUPPORT def_bool y config X86_DECODER_SELFTEST - bool "x86 instruction decoder selftest" - depends on DEBUG_KERNEL + bool "x86 instruction decoder selftest" + depends on DEBUG_KERNEL && KPROBES ---help--- Perform x86 instruction decoder selftests at build time. This option is useful for checking the sanity of x86 instruction
arch/x86/kernel/cpu/perf_event.c +21 -10
@@ -1632,6 +1632,7 @@ static void intel_pmu_drain_bts_buffer(struct cpu_hw_events *cpuc) data.period = event->hw.last_period; data.addr =0 ; + data.raw =NULL ; regs.ip =0 ;/*
@@ -1749,6 +1750,7 @@ static int p6_pmu_handle_irq(struct pt_regs *regs)u64 val; data.addr =0 ; + data.raw =NULL ; cpuc = &__get_cpu_var (cpu_hw_events);
@@ -1794,6 +1796,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)u64 ack, status; data.addr =0 ; + data.raw =NULL ; cpuc = &__get_cpu_var (cpu_hw_events);
@@ -1857,6 +1860,7 @@ static int amd_pmu_handle_irq(struct pt_regs *regs)u64 val; data.addr =0 ; + data.raw =NULL ; cpuc = &__get_cpu_var (cpu_hw_events);
@@ -2062,12 +2066,6 @@ static __init int p6_pmu_init(void) x86_pmu = p6_pmu; -if (!cpu_has_apic) { -pr_info ("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n" ); -pr_info ("no hardware sampling interrupt available.\n" ); - x86_pmu.apic =0 ; - } -return 0 ; }
@@ -2159,6 +2157,16 @@ static __init int amd_pmu_init(void)return 0 ; } +static void __init pmu_check_apic (void ) +{ +if (cpu_has_apic) +return ; + + x86_pmu.apic =0 ; +pr_info ("no APIC, boot with the \"lapic\" boot parameter to force-enable it.\n" ); +pr_info ("no hardware sampling interrupt available.\n" ); +} +void __init init_hw_perf_events (void ) {int err;
@@ -2180,6 +2188,8 @@ void __init init_hw_perf_events(void)return ; } +pmu_check_apic (); +pr_cont ("%s PMU driver.\n" , x86_pmu.name);if (x86_pmu.num_events >X86_PMC_MAX_GENERIC ) {
@@ -2287,7 +2297,7 @@ void callchain_store(struct perf_callchain_entry *entry, u64 ip) static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry); static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry); -static DEFINE_PER_CPU(int, in_nmi_frame); +static DEFINE_PER_CPU(int, in_ignored_frame); static void
@@ -2303,8 +2313,9 @@ static void backtrace_warning(void *data, char *msg)static int backtrace_stack (void *data,char *name) { -per_cpu (in_nmi_frame,smp_processor_id ()) = -x86_is_stack_id (NMI_STACK , name); +per_cpu (in_ignored_frame,smp_processor_id ()) = +x86_is_stack_id (NMI_STACK , name) || +x86_is_stack_id (DEBUG_STACK , name);return 0 ; }
@@ -2313,7 +2324,7 @@ static void backtrace_address(void *data, unsigned long addr, int reliable) {struct perf_callchain_entry *entry = data; -if (per_cpu (in_nmi_frame,smp_processor_id ())) +if (per_cpu (in_ignored_frame,smp_processor_id ()))return ;if (reliable)
arch/x86/kernel/dumpstack_64.c +32 -1
@@ -101,6 +101,35 @@ static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,return NULL ; } +static inline int +in_irq_stack (unsigned long *stack,unsigned long *irq_stack, +unsigned long *irq_stack_end) +{ +return (stack >= irq_stack && stack < irq_stack_end); +} + +/* +* We are returning from the irq stack and go to the previous one. +* If the previous stack is also in the irq stack, then bp in the first +* frame of the irq stack points to the previous, interrupted one. +* Otherwise we have another level of indirection: We first save +* the bp of the previous stack, then we switch the stack to the irq one +* and save a new bp that links to the previous one. +* (See save_args()) +*/ +static inline unsigned long +fixup_bp_irq_link (unsigned long bp,unsigned long *stack, +unsigned long *irq_stack,unsigned long *irq_stack_end) +{ +#ifdef CONFIG_FRAME_POINTER +struct stack_frame *frame = (struct stack_frame *)bp; + +if (!in_irq_stack (stack, irq_stack, irq_stack_end)) +return (unsigned long )frame->next_frame; +#endif +return bp; +} +/* * x86-64 can have up to three kernel stacks: * process stack
@@ -173,7 +202,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, irq_stack = irq_stack_end - (IRQ_STACK_SIZE -64 ) /sizeof (*irq_stack); -if (stack >= irq_stack && stack < irq_stack_end) { +if (in_irq_stack (stack, irq_stack, irq_stack_end)) {if (ops->stack (data,"IRQ" ) <0 )break ; bp = print_context_stack(tinfo, stack, bp,
@@ -184,6 +213,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,* pointer (index -1 to end) in the IRQ stack: */ stack = (unsigned long *) (irq_stack_end[-1 ]); + bp =fixup_bp_irq_link (bp, stack, irq_stack, + irq_stack_end); irq_stack_end =NULL ; ops->stack (data,"EOI" );continue ;
arch/x86/kernel/entry_64.S +3 -3
@@ -1076,10 +1076,10 @@ ENTRY(\sym) TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ - PER_CPU(init_tss, %rbp) - subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) + PER_CPU(init_tss, %r12) + subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12) call \do_sym - addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) + addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%r12) jmp paranoid_exit /* %ebx: no swapgs flag */ CFI_ENDPROC END(\sym)
arch/x86/kernel/hw_breakpoint.c +2 -3
@@ -362,8 +362,7 @@ int arch_validate_hwbkpt_settings(struct perf_event *bp,return ret; } -if (bp->callback) - ret =arch_store_info (bp); + ret =arch_store_info (bp);if (ret <0 )return ret;
@@ -519,7 +518,7 @@ static int __kprobes hw_breakpoint_handler(struct die_args *args)break ; } - (bp->callback)(bp, args->regs); +perf_bp_event (bp, args->regs);rcu_read_unlock (); }
arch/x86/kernel/ptrace.c +33 -35
134 lines not on this page · raw message
arch/x86/lib/Makefile +2 -2
@@ -5,7 +5,7 @@ inat_tables_script = $(srctree)/arch/x86/tools/gen-insn-attr-x86.awk inat_tables_maps = $(srctree)/arch/x86/lib/x86-opcode-map.txt quiet_cmd_inat_tables = GEN $@ - cmd_inat_tables = $(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@ + cmd_inat_tables = $(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@ || rm -f $@ $(obj)/inat-tables.c: $(inat_tables_script) $(inat_tables_maps) $(call cmd,inat_tables)
@@ -20,7 +20,7 @@ lib-y := delay.o lib-y += thunk_$(BITS).o lib-y += usercopy_$(BITS).o getuser.o putuser.o lib-y += memcpy_$(BITS).o -lib-y += insn.o inat.o +lib-$(CONFIG_KPROBES) += insn.o inat.o obj-y += msr-reg.o msr-reg-export.o
arch/x86/tools/test_get_len.c +1 -1
@@ -113,7 +113,7 @@ int main(int argc, char **argv)char line[BUFSIZE ], sym[BUFSIZE ] ="<unknown>" ;unsigned char insn_buf[16 ];struct insn insn; -int insns =0 , c; +int insns =0 ;int warnings =0 ;parse_args (argc, argv);
include/linux/hw_breakpoint.h +17 -23
@@ -20,19 +20,18 @@ enum {#ifdef CONFIG_HAVE_HW_BREAKPOINT -/* As it's for in-kernel or ptrace use, we want it to be pinned */ -#define DEFINE_BREAKPOINT_ATTR (name) \ -struct perf_event_attr name = { \ - .type = PERF_TYPE_BREAKPOINT, \ - .size = sizeof(name), \ - .pinned = 1, \ -}; -static inline void hw_breakpoint_init (struct perf_event_attr *attr) { +memset (attr,0 ,sizeof (*attr)); + attr->type =PERF_TYPE_BREAKPOINT ; attr->size =sizeof (*attr); +/* +* As it's for in-kernel or ptrace use, we want it to be pinned +* and to call its callback every hits. +*/ attr->pinned =1 ; + attr->sample_period =1 ; }static inline unsigned long hw_breakpoint_addr (struct perf_event *bp)
@@ -52,27 +51,24 @@ static inline int hw_breakpoint_len(struct perf_event *bp)extern struct perf_event *register_user_hw_breakpoint (struct perf_event_attr *attr, -perf_callback_t triggered, +perf_overflow_handler_t triggered,struct task_struct *tsk);/* FIXME: only change from the attr, and don't unregister */ -extern struct perf_event * -modify_user_hw_breakpoint (struct perf_event *bp, -struct perf_event_attr *attr, -perf_callback_t triggered, -struct task_struct *tsk); +extern int +modify_user_hw_breakpoint (struct perf_event *bp,struct perf_event_attr *attr);/* * Kernel breakpoints are not associated with any particular thread. */ extern struct perf_event *register_wide_hw_breakpoint_cpu (struct perf_event_attr *attr, -perf_callback_t triggered, +perf_overflow_handler_t triggered,int cpu);extern struct perf_event **register_wide_hw_breakpoint (struct perf_event_attr *attr, -perf_callback_t triggered); +perf_overflow_handler_t triggered);extern int register_perf_hw_breakpoint (struct perf_event *bp);extern int __register_perf_hw_breakpoint (struct perf_event *bp);
@@ -93,20 +89,18 @@ static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp)static inline struct perf_event *register_user_hw_breakpoint (struct perf_event_attr *attr, -perf_callback_t triggered, +perf_overflow_handler_t triggered,struct task_struct *tsk) {return NULL ; } -static inline struct perf_event * +static inline int modify_user_hw_breakpoint (struct perf_event *bp, -struct perf_event_attr *attr, -perf_callback_t triggered, -struct task_struct *tsk) {return NULL ; } +struct perf_event_attr *attr) {return NULL ; }static inline struct perf_event *register_wide_hw_breakpoint_cpu (struct perf_event_attr *attr, -perf_callback_t triggered, +perf_overflow_handler_t triggered,int cpu) {return NULL ; }static inline struct perf_event **register_wide_hw_breakpoint (struct perf_event_attr *attr, -perf_callback_t triggered) {return NULL ; } +perf_overflow_handler_t triggered) {return NULL ; }static inline int register_perf_hw_breakpoint (struct perf_event *bp) {return -ENOSYS ; } static inline int
include/linux/perf_event.h +20 -21
96 lines not on this page · raw message
include/linux/sched.h +2 -1
@@ -1836,7 +1836,8 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)extern int sched_clock_stable;#endif -extern unsigned long long sched_clock (void ); +/* ftrace calls sched_clock() directly */ +extern unsigned long long notrace sched_clock (void );extern void sched_clock_init (void );extern u64 sched_clock_cpu (int cpu);
kernel/hw_breakpoint.c +88 -58
253 lines not on this page · raw message
kernel/perf_event.c +38 -37
178 lines not on this page · raw message
kernel/trace/trace_kprobe.c +30 -11
82 lines not on this page · raw message
kernel/trace/trace_ksym.c +3 -2
@@ -79,11 +79,12 @@ void ksym_collect_stats(unsigned long hbp_hit_addr) }#endif /* CONFIG_PROFILE_KSYM_TRACER */ -void ksym_hbp_handler (struct perf_event *hbp,void *data) +void ksym_hbp_handler (struct perf_event *hbp,int nmi, +struct perf_sample_data *data, +struct pt_regs *regs) {struct ring_buffer_event *event;struct ksym_trace_entry *entry; -struct pt_regs *regs = data;struct ring_buffer *buffer;int pc;
samples/hw_breakpoint/data_breakpoint.c +5 -2
@@ -41,7 +41,9 @@ module_param_string(ksym, ksym_name, KSYM_NAME_LEN, S_IRUGO);MODULE_PARM_DESC (ksym,"Kernel symbol to monitor; this module will report any" " write operations on the kernel symbol" ); -static void sample_hbp_handler (struct perf_event *temp,void *data) +static void sample_hbp_handler (struct perf_event *bp,int nmi, +struct perf_sample_data *data, +struct pt_regs *regs) {printk (KERN_INFO "%s value is changed\n" , ksym_name);dump_stack ();
@@ -51,8 +53,9 @@ static void sample_hbp_handler(struct perf_event *temp, void *data)static int __init hw_break_module_init (void ) {int ret; -DEFINE_BREAKPOINT_ATTR (attr); +struct perf_event_attr attr; +hw_breakpoint_init (&attr); attr.bp_addr =kallsyms_lookup_name (ksym_name); attr.bp_len =HW_BREAKPOINT_LEN_4 ; attr.bp_type =HW_BREAKPOINT_W |HW_BREAKPOINT_R ;
tools/perf/Documentation/perf-kmem.txt +8 -5
@@ -8,16 +8,16 @@ perf-kmem - Tool to trace/measure kernel memory(slab) properties SYNOPSIS -------- [verse] -'perf kmem' {record} [<options>] +'perf kmem' {record|stat} [<options>] DESCRIPTION ----------- -There's two variants of perf kmem: +There are two variants of perf kmem: 'perf kmem record <command>' to record the kmem events of an arbitrary workload. - 'perf kmem' to report kernel memory statistics. + 'perf kmem stat' to report kernel memory statistics. OPTIONS -------
@@ -25,8 +25,11 @@ OPTIONS --input=<file>:: Select the input file (default: perf.data) ---stat=<caller|alloc>:: - Select per callsite or per allocation statistics +--caller:: + Show per-callsite statistics + +--alloc:: + Show per-allocation statistics -s <key[,key2...]>:: --sort=<key[,key2...]>::
tools/perf/Documentation/perf-probe.txt +16 -5
@@ -8,10 +8,13 @@ perf-probe - Define new dynamic tracepoints SYNOPSIS -------- [verse] -'perf probe' [options] --add 'PROBE' [--add 'PROBE' ...] +'perf probe' [options] --add='PROBE' [...] or -'perf probe' [options] 'PROBE' ['PROBE' ...] - +'perf probe' [options] PROBE +or +'perf probe' [options] --del='[GROUP:]EVENT' [...] +or +'perf probe' --list DESCRIPTION -----------
@@ -31,8 +34,16 @@ OPTIONS Be more verbose (show parsed arguments, etc). -a:: ---add:: - Define a probe point (see PROBE SYNTAX for detail) +--add=:: + Define a probe event (see PROBE SYNTAX for detail). + +-d:: +--del=:: + Delete a probe event. + +-l:: +--list:: + List up current probe events. PROBE SYNTAX ------------
tools/perf/builtin-buildid-list.c +1 -1
@@ -19,7 +19,7 @@ static char const *input_name = "perf.data";static int force;static const char *const buildid_list_usage[] = { -"perf report [<options>]" , +"perf buildid-list [<options>]" ,NULL };
tools/perf/builtin-kmem.c +56 -67
235 lines not on this page · raw message
tools/perf/builtin-probe.c +64 -16
167 lines not on this page · raw message
tools/perf/builtin-report.c +18 -21
@@ -605,44 +605,41 @@ static int validate_chain(struct ip_callchain *chain, event_t *event)static int process_sample_event (event_t *event) { -u64 ip = event->ip.ip; -u64 period =1 ; -void *more_data = event->ip.__more_data; -struct ip_callchain *chain =NULL ; +struct sample_data data;int cpumode;struct addr_location al; -struct thread *thread =threads__findnew (event->ip.pid); +struct thread *thread; -if (sample_type &PERF_SAMPLE_PERIOD ) { - period = *(u64 *)more_data; - more_data +=sizeof (u64); - } +memset (&data,0 ,sizeof (data)); + data.period =1 ; + +event__parse_sample (event, sample_type, &data);dump_printf ("(IP, %d): %d/%d: %p period: %Ld\n" , event->header.misc, - event->ip.pid, event->ip.tid, - (void *)(long )ip, - (long long )period); + data.pid, data.tid, + (void *)(long )data.ip, + (long long )data.period);if (sample_type &PERF_SAMPLE_CALLCHAIN ) {unsigned int i; - chain = (void *)more_data; - -dump_printf ("... chain: nr:%Lu\n" , chain->nr); +dump_printf ("... chain: nr:%Lu\n" , data.callchain->nr); -if (validate_chain (chain, event) <0 ) { +if (validate_chain (data.callchain, event) <0 ) {pr_debug ("call-chain problem with event, " "skipping it.\n" );return 0 ; }if (dump_trace) { -for (i =0 ; i < chain->nr; i++) -dump_printf ("..... %2d: %016Lx\n" , i, chain->ips[i]); +for (i =0 ; i < data.callchain->nr; i++) +dump_printf ("..... %2d: %016Lx\n" , + i, data.callchain->ips[i]); } } + thread =threads__findnew (data.pid);if (thread ==NULL ) {pr_debug ("problem processing %d event, skipping it.\n" , event->header.type);
@@ -657,7 +654,7 @@ static int process_sample_event(event_t *event) cpumode = event->header.misc &PERF_RECORD_MISC_CPUMODE_MASK ;thread__find_addr_location (thread, cpumode, -MAP__FUNCTION , ip, &al,NULL ); +MAP__FUNCTION , data.ip, &al,NULL );/* * We have to do this here as we may have a dso with no symbol hit that * has a name longer than the ones with symbols sampled.
@@ -675,12 +672,12 @@ static int process_sample_event(event_t *event)if (sym_list && al.sym && !strlist__has_entry (sym_list, al.sym->name))return 0 ; -if (hist_entry__add (&al, chain, period)) { +if (hist_entry__add (&al, data.callchain, data.period)) {pr_debug ("problem incrementing symbol count, skipping event\n" );return -1 ; } - event__stats.total += period; + event__stats.total += data.period;return 0 ; }
tools/perf/builtin-sched.c +98 -114
407 lines not on this page · raw message
tools/perf/builtin-timechart.c +16 -38
90 lines not on this page · raw message
tools/perf/builtin-trace.c +15 -33
73 lines not on this page · raw message
tools/perf/util/data_map.c +2 -2
@@ -100,11 +100,11 @@ process_event(event_t *event, unsigned long offset, unsigned long head) } } -int perf_header__read_build_ids (int input,off_t offset,off_t size) +int perf_header__read_build_ids (int input,u64 offset,u64 size) {struct build_id_event bev;char filename[PATH_MAX ]; -off_t limit = offset + size; +u64 limit = offset + size;int err =-1 ;while (offset < limit) {
tools/perf/util/data_map.h +1 -1
@@ -27,6 +27,6 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,int full_paths, int *cwdlen, char **cwd); -int perf_header__read_build_ids (int input,off_t offset,off_t file_size); +int perf_header__read_build_ids (int input,u64 offset,u64 file_size);#endif
tools/perf/util/event.c +67 -0
70 lines not on this page · raw message
tools/perf/util/event.h +16 -1
@@ -56,11 +56,25 @@ struct read_event {u64 id; }; -struct sample_event { +struct sample_event {struct perf_event_header header;u64 array[]; }; +struct sample_data { +u64 ip; +u32 pid, tid; +u64 time; +u64 addr; +u64 id; +u64 stream_id; +u32 cpu; +u64 period; +struct ip_callchain *callchain; +u32 raw_size; +void *raw_data; +}; +#define BUILD_ID_SIZE 20struct build_id_event {
@@ -155,5 +169,6 @@ int event__process_task(event_t *self);struct addr_location ;int event__preprocess_sample (const event_t *self,struct addr_location *al,symbol_filter_t filter); +int event__parse_sample (event_t *event,u64 type,struct sample_data *data);#endif /* __PERF_RECORD_H */
tools/perf/util/header.c +7 -2
@@ -187,7 +187,9 @@ static int do_write(int fd, const void *buf, size_t size)static int __dsos__write_buildid_table (struct list_head *head,int fd) { +#define NAME_ALIGN 64struct dso *pos; +static const char zero_buf[NAME_ALIGN ];list_for_each_entry (pos, head, node) {int err;
@@ -197,14 +199,17 @@ static int __dsos__write_buildid_table(struct list_head *head, int fd)if (!pos->has_build_id)continue ; len = pos->long_name_len +1 ; - len =ALIGN (len,64 ); + len =ALIGN (len,NAME_ALIGN );memset (&b,0 ,sizeof (b));memcpy (&b.build_id, pos->build_id,sizeof (pos->build_id)); b.header.size =sizeof (b) + len; err =do_write (fd, &b,sizeof (b));if (err <0 )return err; - err =do_write (fd, pos->long_name, len); + err =do_write (fd, pos->long_name, pos->long_name_len +1 ); +if (err <0 ) +return err; + err =do_write (fd, zero_buf, len - pos->long_name_len -1 );if (err <0 )return err; }
tools/perf/util/parse-events.c +4 -13
@@ -197,7 +197,7 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)if (id == config) {closedir (evt_dir);closedir (sys_dir); - path =zalloc (sizeof (path)); + path =zalloc (sizeof (*path)); path->system =malloc (MAX_EVENT_LENGTH );if (!path->system) {free (path);
@@ -467,7 +467,6 @@ parse_subsystem_tracepoint_event(char *sys_name, char *flags)while ((evt_ent =readdir (evt_dir))) {char event_opt[MAX_EVOPT_LEN +1 ];int len; -unsigned int rem =MAX_EVOPT_LEN ;if (!strcmp (evt_ent->d_name,"." ) || !strcmp(evt_ent->d_name, "..")
@@ -475,20 +474,12 @@ parse_subsystem_tracepoint_event(char *sys_name, char *flags) || !strcmp(evt_ent->d_name, "filter"))continue ; - len =snprintf (event_opt,MAX_EVOPT_LEN ,"%s:%s" , sys_name, - evt_ent->d_name); + len =snprintf (event_opt,MAX_EVOPT_LEN ,"%s:%s%s%s" , sys_name, + evt_ent->d_name, flags ?":" :"" , + flags ?:"" );if (len <0 )return EVT_FAILED ; - rem -= len; -if (flags) { -if (rem <strlen (flags) +1 ) -return EVT_FAILED ; - -strcat (event_opt,":" ); -strcat (event_opt, flags); - } -if (parse_events (NULL , event_opt,0 ))return EVT_FAILED ; }
tools/perf/util/parse-options.c +3 -0
@@ -430,6 +430,9 @@ int usage_with_options_internal(const char * const *usagestr, pos =fprintf (stderr," " );if (opts->short_name) pos +=fprintf (stderr,"-%c" , opts->short_name); +else + pos +=fprintf (stderr," " ); +if (opts->long_name && opts->short_name) pos +=fprintf (stderr,", " );if (opts->long_name)
tools/perf/util/probe-event.c +118 -15
214 lines not on this page · raw message
tools/perf/util/probe-event.h +1 -0
@@ -10,6 +10,7 @@ extern void parse_trace_kprobe_event(const char *str, char **group, char **event, struct probe_point *pp);extern int synthesize_trace_kprobe_event (struct probe_point *pp);extern void add_trace_kprobe_events (struct probe_point *probes,int nr_probes); +extern void del_trace_kprobe_events (struct strlist *dellist);extern void show_perf_probe_events (void );/* Maximum index number of event-name postfix */
tools/perf/util/probe-finder.c +1 -1
@@ -106,7 +106,7 @@ static int strtailcmp(const char *s1, const char *s2) {int i1 =strlen (s1);int i2 =strlen (s2); -while (--i1 >0 && --i2 >0 ) { +while (--i1 >=0 && --i2 >=0 ) {if (s1[i1] != s2[i2])return s1[i1] - s2[i2]; }
tools/perf/util/symbol.c +3 -2
@@ -938,8 +938,9 @@ static bool __dsos__read_build_ids(struct list_head *head)bool dsos__read_build_ids (void ) { -return __dsos__read_build_ids (&dsos__kernel) || -__dsos__read_build_ids (&dsos__user); +bool kbuildids =__dsos__read_build_ids (&dsos__kernel), + ubuildids =__dsos__read_build_ids (&dsos__user); +return kbuildids || ubuildids; }/*
tools/perf/util/trace-event-parse.c +2 -2
@@ -177,7 +177,7 @@ void parse_proc_kallsyms(char *file, unsigned int size __unused) func_count++; } - func_list =malloc_or_die (sizeof (*func_list) * func_count +1 ); + func_list =malloc_or_die (sizeof (*func_list) * (func_count +1 )); i =0 ;while (list) {
@@ -1477,7 +1477,7 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok) goto out_free; field =malloc_or_die (sizeof (*field)); -memset (field,0 ,sizeof (field)); +memset (field,0 ,sizeof (*field)); value =arg_eval (arg); field->value =strdup (value);
tools/perf/util/trace-event-perl.c +55 -12
90 lines not on this page · raw message
tools/perf/util/trace-event-perl.h +4 -0
@@ -34,9 +34,13 @@ typedef int INTERP;#define dXSUB_SYS#define pTHX_static inline void newXS (const char *a,void *b,const char *c) {} +static void boot_Perf__Trace__Context(pTHX_ CV *cv) {} +static void boot_DynaLoader(pTHX_ CV *cv) {}#else #include <EXTERN.h> #include <perl.h> +void boot_Perf__Trace__Context(pTHX_ CV *cv); +void boot_DynaLoader(pTHX_ CV *cv);typedef PerlInterpreter *INTERP ;#endif
tools/perf/util/trace-event-read.c +2 -1
@@ -145,8 +145,9 @@ static void read_proc_kallsyms(void)if (!size)return ; - buf =malloc_or_die (size); + buf =malloc_or_die (size +1 );read_or_die (buf, size); + buf[size] ='\0' ;parse_proc_kallsyms (buf, size);