perfcounters 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
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (2):
perf report: Add missing command line options to man page
perf symbol: Fix symbol parsing in certain cases: use the build-id as a symlink
Benjamin Herrenschmidt (1):
perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it
Pekka Enberg (1):
perf report: Make --sort comm,dso,symbol the default
Peter Zijlstra (4):
perf: Auto-detect libbfd
ftrace: Fix perf-tracepoint OOPS
perf: Auto-detect libelf
perf_counter: Fix double list iteration in per task precise stats
arch/powerpc/kernel/mpc7450-pmu.c | 3 +- arch/powerpc/kernel/power4-pmu.c | 3 +- arch/powerpc/kernel/power5+-pmu.c | 5 +- arch/powerpc/kernel/power5-pmu.c | 3 +- arch/powerpc/kernel/power6-pmu.c | 3 +- arch/powerpc/kernel/power7-pmu.c | 3 +- arch/powerpc/kernel/ppc970-pmu.c | 5 +- include/linux/ftrace_event.h | 8 +-- kernel/perf_counter.c | 2 +- kernel/trace/trace_event_profile.c | 2 +- kernel/trace/trace_events.c | 2 +- tools/perf/Documentation/perf-record.txt | 60 ++++++++++++++++++++- tools/perf/Makefile | 29 +++++++++- tools/perf/builtin-report.c | 4 +- tools/perf/util/symbol.c | 85 ++++++++++++++++++++++++++++- 15 files changed, 189 insertions(+), 28 deletions(-)
arch/powerpc/kernel/mpc7450-pmu.c +2 -1
@@ -407,7 +407,8 @@ struct power_pmu mpc7450_pmu = {static int init_mpc7450_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc/7450" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc/7450" ))return -ENODEV ;return register_power_pmu (&mpc7450_pmu);
arch/powerpc/kernel/power4-pmu.c +2 -1
@@ -606,7 +606,8 @@ static struct power_pmu power4_pmu = {static int init_power4_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power4" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power4" ))return -ENODEV ;return register_power_pmu (&power4_pmu);
arch/powerpc/kernel/power5+-pmu.c +3 -2
@@ -678,8 +678,9 @@ static struct power_pmu power5p_pmu = {static int init_power5p_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5+" ) - &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5++" )) +if (!cur_cpu_spec->oprofile_cpu_type || + (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5+" ) + &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5++" )))return -ENODEV ;return register_power_pmu (&power5p_pmu);
arch/powerpc/kernel/power5-pmu.c +2 -1
@@ -618,7 +618,8 @@ static struct power_pmu power5_pmu = {static int init_power5_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power5" ))return -ENODEV ;return register_power_pmu (&power5_pmu);
arch/powerpc/kernel/power6-pmu.c +2 -1
@@ -537,7 +537,8 @@ static struct power_pmu power6_pmu = {static int init_power6_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power6" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power6" ))return -ENODEV ;return register_power_pmu (&power6_pmu);
arch/powerpc/kernel/power7-pmu.c +2 -1
@@ -366,7 +366,8 @@ static struct power_pmu power7_pmu = {static int init_power7_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power7" )) +if (!cur_cpu_spec->oprofile_cpu_type || +strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/power7" ))return -ENODEV ;return register_power_pmu (&power7_pmu);
arch/powerpc/kernel/ppc970-pmu.c +3 -2
@@ -488,8 +488,9 @@ static struct power_pmu ppc970_pmu = {static int init_ppc970_pmu (void ) { -if (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970" ) - &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970MP" )) +if (!cur_cpu_spec->oprofile_cpu_type || + (strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970" ) + &&strcmp (cur_cpu_spec->oprofile_cpu_type,"ppc64/970MP" )))return -ENODEV ;return register_power_pmu (&ppc970_pmu);
include/linux/ftrace_event.h +3 -5
@@ -119,11 +119,9 @@ struct ftrace_event_call {void *filter;void *mod; -#ifdef CONFIG_EVENT_PROFILE -atomic_t profile_count; -int (*profile_enable)(struct ftrace_event_call *); -void (*profile_disable)(struct ftrace_event_call *); -#endif +atomic_t profile_count; +int (*profile_enable)(struct ftrace_event_call *); +void (*profile_disable)(struct ftrace_event_call *); };#define MAX_FILTER_PRED 32
kernel/perf_counter.c +1 -1
@@ -1104,7 +1104,7 @@ static void perf_counter_sync_stat(struct perf_counter_context *ctx,__perf_counter_sync_stat (counter, next_counter); counter =list_next_entry (counter, event_entry); - next_counter =list_next_entry (counter, event_entry); + next_counter =list_next_entry (next_counter, event_entry); } }
kernel/trace/trace_event_profile.c +1 -1
@@ -14,7 +14,7 @@ int ftrace_profile_enable(int event_id)mutex_lock (&event_mutex);list_for_each_entry (event, &ftrace_events, list) { -if (event->id == event_id) { +if (event->id == event_id && event->profile_enable) { ret = event->profile_enable (event);break ; }
kernel/trace/trace_events.c +1 -1
@@ -940,7 +940,7 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, entry =trace_create_file ("enable" ,0644 , call->dir, call, enable); -if (call->id) +if (call->id && call->profile_enable) entry =trace_create_file ("id" ,0444 , call->dir, call, id);
tools/perf/Documentation/perf-record.txt +57 -3
70 lines not on this page · raw message
tools/perf/Makefile +26 -3
@@ -158,8 +158,10 @@ uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') # If we're on a 64-bit kernel, use -m64 -ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M)) - M64 := -m64 +ifndef NO_64BIT + ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M)) + M64 := -m64 + endif endif # CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -345,7 +347,6 @@ BUILTIN_OBJS += builtin-stat.o BUILTIN_OBJS += builtin-top.o PERFLIBS = $(LIB_FILE) -EXTLIBS = -lbfd -liberty # # Platform specific tweaks
@@ -374,6 +375,28 @@ ifeq ($(uname_S),Darwin) PTHREAD_LIBS = endif +ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y) + msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel); +endif + +ifdef NO_DEMANGLE + BASIC_CFLAGS += -DNO_DEMANGLE +else + + has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd > /dev/null 2>&1 && echo y") + + has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y") + + ifeq ($(has_bfd),y) + EXTLIBS += -lbfd + else ifeq ($(has_bfd_iberty),y) + EXTLIBS += -lbfd -liberty + else + msg := $(warning No bfd.h/libbfd found, install binutils-dev[el] to gain symbol demangling) + BASIC_CFLAGS += -DNO_DEMANGLE + endif +endif + ifndef CC_LD_DYNPATH ifdef NO_R_TO_GCC_LINKER # Some gcc does not accept and pass -R to the linker to specify
tools/perf/builtin-report.c +2 -2
@@ -31,7 +31,7 @@static char const *input_name ="perf.data" ;static char *vmlinux =NULL ; -static char default_sort_order[] ="comm,dso" ; +static char default_sort_order[] ="comm,dso,symbol" ;static char *sort_order = default_sort_order;static char *dso_list_str, *comm_list_str, *sym_list_str, *col_width_list_str;
@@ -1424,7 +1424,7 @@ print_entries:if (sort_order == default_sort_order && parent_pattern == default_parent_pattern) {fprintf (fp,"#\n" ); -fprintf (fp,"# (For more details, try: perf report --sort comm,dso,symbol)\n" ); +fprintf (fp,"# (For a higher level overview, try: perf report --sort comm,dso)\n" );fprintf (fp,"#\n" ); }fprintf (fp,"\n" );
tools/perf/util/symbol.c +82 -3
106 lines not on this page · raw message