perfcounter fixes
Subsystems (4)
Linus,
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perfcounters-fixes-for-linus
Note, i was unsure about this commit:
f265426: perf_counter: Set the CONFIG_PERF_COUNTERS default to y if CONFIG_PROFILING=y
Is it proper to offer up a default-y if CONFIG_PROFILING is set to y already and default-off otherwise?
I kept this the last commit so we can zap it easily if it's not ok.
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (1):
perf top: Add mwait_idle_with_hints to skip_symbols[]
Ingo Molnar (2):
perf_counter tools: Fix link errors with older toolchains
perf_counter: Set the CONFIG_PERF_COUNTERS default to y if CONFIG_PROFILING=y
Peter Zijlstra (4):
tracing, perf_counter: Add help text to CONFIG_EVENT_PROFILE
perf_counter: Collapse inherit on read()
perf_counter: Full task tracing
perf report: Update for the new FORK/EXIT events
Roel Kluin (1):
perf: Fix read buffer overflow
Stoyan Gaydarov (1):
perf tools: Fix faulty check
include/linux/perf_counter.h | 13 +++++- init/Kconfig | 11 ++++- kernel/fork.c | 4 +- kernel/perf_counter.c | 101 +++++++++++++++++++++++++++++------------ tools/perf/Makefile | 2 +- tools/perf/builtin-report.c | 24 ++++++++-- tools/perf/builtin-top.c | 1 + tools/perf/util/quote.c | 2 +- tools/perf/util/symbol.c | 2 +- 9 files changed, 117 insertions(+), 43 deletions(-)
include/linux/perf_counter.h +12 -1
@@ -181,8 +181,9 @@ struct perf_counter_attr { freq : 1, /* use freq, not period */ inherit_stat : 1, /* per task counts */ enable_on_exec : 1, /* next exec enables */ + task : 1, /* trace fork/exit */ - __reserved_1 : 51; + __reserved_1 : 50;__u32 wakeup_events;/* wakeup every n events */ __u32 __reserved_2;
@@ -311,6 +312,15 @@ enum perf_event_type {/* * struct { * struct perf_event_header header; +* u32 pid, ppid; +* u32 tid, ptid; +* }; +*/ + PERF_EVENT_EXIT = 4, + +/* +* struct { +* struct perf_event_header header; * u64 time; * u64 id; * u64 stream_id;
@@ -323,6 +333,7 @@ enum perf_event_type {* struct { * struct perf_event_header header; * u32 pid, ppid; +* u32 tid, ptid; * }; */ PERF_EVENT_FORK = 7,
init/Kconfig +10 -1
@@ -940,6 +940,7 @@ menu "Performance Counters" config PERF_COUNTERS bool "Kernel Performance Counters" + default y if PROFILING depends on HAVE_PERF_COUNTERS select ANON_INODES help
@@ -961,9 +962,17 @@ config PERF_COUNTERS Say Y if unsure. config EVENT_PROFILE - bool "Tracepoint profile sources" + bool "Tracepoint profiling sources" depends on PERF_COUNTERS && EVENT_TRACING default y + help + Allow the use of tracepoints as software performance counters. + + When this is enabled, you can create perf counters based on + tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID + found in debugfs://tracing/events/*/*/id. (The -e/--events + option to the perf tool can parse and interpret symbolic + tracepoints, in the subsystem:tracepoint_name format.) endmenu
kernel/fork.c +1 -3
@@ -1269,6 +1269,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,write_unlock_irq (&tasklist_lock);proc_fork_connector (p);cgroup_post_fork (p); +perf_counter_fork (p);return p; bad_fork_free_pid:
@@ -1410,9 +1411,6 @@ long do_fork(unsigned long clone_flags,init_completion (&vfork); } -if (!(clone_flags &CLONE_THREAD )) -perf_counter_fork (p); -audit_finish_fork (p);tracehook_report_clone (regs, clone_flags, nr, p);
kernel/perf_counter.c +71 -30
223 lines not on this page · raw message
tools/perf/Makefile +1 -1
@@ -345,7 +345,7 @@ BUILTIN_OBJS += builtin-stat.o BUILTIN_OBJS += builtin-top.o PERFLIBS = $(LIB_FILE) -EXTLIBS = -lbfd +EXTLIBS = -lbfd -liberty # # Platform specific tweaks
tools/perf/builtin-report.c +19 -5
@@ -99,6 +99,7 @@ struct comm_event {struct fork_event {struct perf_event_header header;u32 pid, ppid; +u32 tid, ptid; };struct lost_event {
@@ -252,7 +253,7 @@ static int strcommon(const char *pathname) {int n =0 ; -while (pathname[n] == cwd[n] && n < cwdlen) +while (n < cwdlen && pathname[n] == cwd[n]) ++n;return n;
@@ -1608,15 +1609,27 @@ process_comm_event(event_t *event, unsigned long offset, unsigned long head) }static int -process_fork_event (event_t *event,unsigned long offset,unsigned long head) +process_task_event (event_t *event,unsigned long offset,unsigned long head) {struct thread *thread =threads__findnew (event->fork.pid);struct thread *parent =threads__findnew (event->fork.ppid); -dprintf ("%p [%p]: PERF_EVENT_FORK: %d:%d\n" , +dprintf ("%p [%p]: PERF_EVENT_%s: (%d:%d):(%d:%d)\n" , (void *)(offset + head), (void *)(long )(event->header.size), - event->fork.pid, event->fork.ppid); + event->header.type ==PERF_EVENT_FORK ?"FORK" :"EXIT" , + event->fork.pid, event->fork.tid, + event->fork.ppid, event->fork.ptid); + +/* +* A thread clone will have the same PID for both +* parent and child. +*/ +if (thread == parent) +return 0 ; + +if (event->header.type ==PERF_EVENT_EXIT ) +return 0 ;if (!thread || !parent ||thread__fork (thread, parent)) {dprintf ("problem processing PERF_EVENT_FORK, skipping event.\n" );
@@ -1706,7 +1719,8 @@ process_event(event_t *event, unsigned long offset, unsigned long head)return process_comm_event (event, offset, head);case PERF_EVENT_FORK : -return process_fork_event (event, offset, head); +case PERF_EVENT_EXIT : +return process_task_event (event, offset, head);case PERF_EVENT_LOST :return process_lost_event (event, offset, head);
tools/perf/builtin-top.c +1 -0
@@ -285,6 +285,7 @@ static const char *skip_symbols[] = {"enter_idle" ,"exit_idle" ,"mwait_idle" , +"mwait_idle_with_hints" ,"ppc64_runlatch_off" ,"pseries_dedicated_idle_sleep" ,NULL
tools/perf/util/quote.c +1 -1
@@ -318,7 +318,7 @@ char *quote_path_relative(const char *in, int len,strbuf_addch (out,'"' );if (prefix) {int off =0 ; -while (prefix[off] && off < len && prefix[off] == in[off]) +while (off < len && prefix[off] && prefix[off] == in[off])if (prefix[off] =='/' ) { prefix += off +1 ; in += off +1 ;
tools/perf/util/symbol.c +1 -1
@@ -565,7 +565,7 @@ static int dso__load_sym(struct dso *self, int fd, const char *name, goto out_elf_end; secstrs =elf_getdata (sec_strndx,NULL ); -if (symstrs ==NULL ) +if (secstrs ==NULL ) goto out_elf_end; nr_syms = shdr.sh_size / shdr.sh_entsize;
Quoted 19 lines · Ingo Molnar
Linus,
Please pull the latest perfcounters-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitperfcounters-fixes-for-linusNote, i was unsure about this commit:
f265426:
perf_counter: Set theCONFIG_PERF_COUNTERSdefault to y ifCONFIG_PROFILING=yIs it proper to offer up a default-y if
CONFIG_PROFILINGis set to y already and default-off otherwise?I kept this the last commit so we can zap it easily if it's not ok.
Thanks,
Ingo
Quoted 7 lines
------------------>
Arnaldo Carvalho de Melo (1):perf top: Add mwait_idle_with_hints to skip_symbols[]Ingo Molnar (2):
perf_countertools: Fix link errors with older toolchains
perf_counter: Set theCONFIG_PERF_COUNTERSdefault to y ifCONFIG_PROFILING=y
Setting CONFIG_PERF_COUNTERS=y per default for -rc6? Wouldn't this be something for the next merge window? Give people the chance to test this, changing default configurations shouln't be made this late in the release cycle.
-Robert
Signature · 3 lines
Advanced Micro Devices, Inc. Operating System Research Center email: [email protected]