14 files changed, 101 insertions, 36 deletions

diff --git a/tools/perf/Documentation/perf-timechart.txt b/tools/perf/Documentation/perf-timechart.txt
index 1c2ed3090cce..a7910099d6fd 100644
--- a/tools/perf/Documentation/perf-timechart.txt
+++ b/tools/perf/Documentation/perf-timechart.txt
@@ -31,6 +31,9 @@ OPTIONS
 -w::
 --width=::
         Select the width of the SVG file (default: 1000)
+-p::
+--power-only::
+        Only output the CPU power section of the diagram
 
 
 SEE ALSO
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b5f1953b6144..742a32eee8fc 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -157,11 +157,18 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
 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
-ifndef NO_64BIT
-        ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))
-          M64 := -m64
-        endif
+#
+# Add -m32 for cross-builds:
+#
+ifdef NO_64BIT
+  MBITS := -m32
+else
+  #
+  # If we're on a 64-bit kernel, use -m64:
+  #
+  ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))
+    MBITS := -m64
+  endif
 endif
 
 # CFLAGS and LDFLAGS are for the users to override from the command line.
@@ -194,7 +201,7 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wold-style-definition
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes
 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement
 
-CFLAGS = $(M64) -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)
+CFLAGS = $(MBITS) -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -fstack-protector-all -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS)
 LDFLAGS = -lpthread -lrt -lelf -lm
 ALL_CFLAGS = $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
@@ -416,7 +423,7 @@ ifeq ($(uname_S),Darwin)
 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);
+        msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel and glibc-dev[el]);
 endif
 
 ifdef NO_DEMANGLE
@@ -728,7 +735,7 @@ $(BUILT_INS): perf$X
 common-cmds.h: util/generate-cmdlist.sh command-list.txt
 
 common-cmds.h: $(wildcard Documentation/perf-*.txt)
-        $(QUIET_GEN)util/generate-cmdlist.sh > $@+ && mv $@+ $@
+        $(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@
 
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
         $(QUIET_GEN)$(RM) $@ $@+ && \
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index a5a050af8e7d..3eeef339c787 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -41,6 +41,7 @@ static int			raw_samples			= 0;
 static int                      system_wide                     = 0;
 static int                      profile_cpu                     = -1;
 static pid_t                    target_pid                      = -1;
+static pid_t                    child_pid                       = -1;
 static int                      inherit                         = 1;
 static int                      force                           = 0;
 static int                      append_file                     = 0;
@@ -184,6 +185,9 @@ static void sig_handler(int sig)
 
 static void sig_atexit(void)
 {
+        if (child_pid != -1)
+                kill(child_pid, SIGTERM);
+
         if (signr == -1)
                 return;
 
@@ -610,6 +614,8 @@ static int __cmd_record(int argc, const char **argv)
                                 exit(-1);
                         }
                 }
+
+                child_pid = pid;
         }
 
         if (realtime_prio) {
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index ea9c15c0cdfe..ce2d5be4f30e 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1287,7 +1287,7 @@ static struct sort_dimension *available_sorts[] = {
 
 static LIST_HEAD(sort_list);
 
-static int sort_dimension__add(char *tok, struct list_head *list)
+static int sort_dimension__add(const char *tok, struct list_head *list)
 {
         int i;
 
@@ -1917,7 +1917,7 @@ static void setup_sorting(void)
 
         free(str);
 
-        sort_dimension__add((char *)"pid", &cmp_pid);
+        sort_dimension__add("pid", &cmp_pid);
 }
 
 static const char *record_args[] = {
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index e5f6ece65a13..3db31e7bf173 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -69,7 +69,8 @@ static int			run_idx				=  0;
 static int                      run_count                       =  1;
 static int                      inherit                         =  1;
 static int                      scale                           =  1;
-static int                      target_pid                      = -1;
+static pid_t                    target_pid                      = -1;
+static pid_t                    child_pid                       = -1;
 static int                      null_run                        =  0;
 
 static int                      fd[MAX_NR_CPUS][MAX_COUNTERS];
@@ -285,6 +286,8 @@ static int run_perf_stat(int argc __used, const char **argv)
                 exit(-1);
         }
 
+        child_pid = pid;
+
         /*
          * Wait for the child to be ready to exec.
          */
@@ -433,6 +436,9 @@ static void skip_signal(int signo)
 
 static void sig_atexit(void)
 {
+        if (child_pid != -1)
+                kill(child_pid, SIGTERM);
+
         if (signr == -1)
                 return;
 
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 4405681b3134..e8a510d935e5 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -46,6 +46,8 @@ static u64		turbo_frequency;
 
 static u64              first_time, last_time;
 
+static int              power_only;
+
 
 static struct perf_header       *header;
 
@@ -547,7 +549,7 @@ static void end_sample_processing(void)
         u64 cpu;
         struct power_event *pwr;
 
-        for (cpu = 0; cpu < numcpus; cpu++) {
+        for (cpu = 0; cpu <= numcpus; cpu++) {
                 pwr = malloc(sizeof(struct power_event));
                 if (!pwr)
                         return;
@@ -763,19 +765,40 @@ static void draw_wakeups(void)
                                         if (c->Y && c->start_time <= we->time && c->end_time >= we->time) {
                                                 if (p->pid == we->waker) {
                                                         from = c->Y;
-                                                        task_from = c->comm;
+                                                        task_from = strdup(c->comm);
                                                 }
                                                 if (p->pid == we->wakee) {
                                                         to = c->Y;
-                                                        task_to = c->comm;
+                                                        task_to = strdup(c->comm);
                                                 }
                                         }
                                         c = c->next;
                                 }
+                                c = p->all;
+                                while (c) {
+                                        if (p->pid == we->waker && !from) {
+                                                from = c->Y;
+                                                task_from = strdup(c->comm);
+                                        }
+                                        if (p->pid == we->wakee && !to) {
+                                                to = c->Y;
+                                                task_to = strdup(c->comm);
+                                        }
+                                        c = c->next;
+                                }
                         }
                         p = p->next;
                 }
 
+                if (!task_from) {
+                        task_from = malloc(40);
+                        sprintf(task_from, "[%i]", we->waker);
+                }
+                if (!task_to) {
+                        task_to = malloc(40);
+                        sprintf(task_to, "[%i]", we->wakee);
+                }
+
                 if (we->waker == -1)
                         svg_interrupt(we->time, to);
                 else if (from && to && abs(from - to) == 1)
@@ -783,6 +806,9 @@ static void draw_wakeups(void)
                 else
                         svg_partial_wakeline(we->time, from, task_from, to, task_to);
                 we = we->next;
+
+                free(task_from);
+                free(task_to);
         }
 }
 
@@ -871,7 +897,7 @@ static int determine_display_tasks(u64 threshold)
                 /* no exit marker, task kept running to the end */
                 if (p->end_time == 0)
                         p->end_time = last_time;
-                if (p->total_time >= threshold)
+                if (p->total_time >= threshold && !power_only)
                         p->display = 1;
 
                 c = p->all;
@@ -882,7 +908,7 @@ static int determine_display_tasks(u64 threshold)
                         if (c->start_time == 1)
                                 c->start_time = first_time;
 
-                        if (c->total_time >= threshold) {
+                        if (c->total_time >= threshold && !power_only) {
                                 c->display = 1;
                                 count++;
                         }
@@ -1134,6 +1160,8 @@ static const struct option options[] = {
                     "output file name"),
         OPT_INTEGER('w', "width", &svg_page_width,
                     "page width"),
+        OPT_BOOLEAN('p', "power-only", &power_only,
+                    "output power data only"),
         OPT_END()
 };
 
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 1ca88896eee4..a1b1d10912dc 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -686,6 +686,8 @@ static void handle_keypress(int c)
         switch (c) {
                 case 'd':
                         prompt_integer(&delay_secs, "Enter display delay");
+                        if (delay_secs < 1)
+                                delay_secs = 1;
                         break;
                 case 'e':
                         prompt_integer(&print_entries, "Enter display entries (lines)");
@@ -782,6 +784,7 @@ static const char *skip_symbols[] = {
         "exit_idle",
         "mwait_idle",
         "mwait_idle_with_hints",
+        "poll_idle",
         "ppc64_runlatch_off",
         "pseries_dedicated_idle_sleep",
         NULL
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index e9d256e2f47d..0c5e4f72f2ba 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -219,10 +219,6 @@ remap:
 more:
         event = (event_t *)(buf + head);
 
-        size = event->header.size;
-        if (!size)
-                size = 8;
-
         if (head + event->header.size >= page_size * mmap_window) {
                 unsigned long shift = page_size * (head / page_size);
                 int res;
@@ -237,7 +233,6 @@ more:
 
         size = event->header.size;
 
-
         if (!size || process_event(event, offset, head) < 0) {
 
                 /*
@@ -290,7 +285,6 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
                         usage_with_options(annotate_usage, options);
         }
 
-
         setup_pager();
 
         return __cmd_trace();
diff --git a/tools/perf/design.txt b/tools/perf/design.txt
index f1946d107b10..fdd42a824c98 100644
--- a/tools/perf/design.txt
+++ b/tools/perf/design.txt
@@ -455,3 +455,6 @@ will need at least this:
 
 If your architecture does have hardware capabilities, you can override the
 weak stub hw_perf_event_init() to register hardware counters.
+
+Architectures that have d-cache aliassing issues, such as Sparc and ARM,
+should select PERF_USE_VMALLOC in order to avoid these for perf mmap().
diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN
index c561d1538c03..54552a00a117 100755
--- a/tools/perf/util/PERF-VERSION-GEN
+++ b/tools/perf/util/PERF-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=PERF-VERSION-FILE
-DEF_VER=v0.0.1.PERF
+DEF_VER=v0.0.2.PERF
 
 LF='
 '
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 87c424de79ee..8cfb48cbbea0 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -691,7 +691,10 @@ static void store_event_type(const char *orgname)
         FILE *file;
         int id;
 
-        sprintf(filename, "/sys/kernel/debug/tracing/events/%s/id", orgname);
+        sprintf(filename, "%s/", debugfs_path);
+        strncat(filename, orgname, strlen(orgname));
+        strcat(filename, "/id");
+
         c = strchr(filename, ':');
         if (c)
                 *c = '/';
diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c
index a778fd0f4ae4..b3637db025a2 100644
--- a/tools/perf/util/svghelper.c
+++ b/tools/perf/util/svghelper.c
@@ -28,7 +28,7 @@ static u64 turbo_frequency, max_freq;
 
 int svg_page_width = 1000;
 
-#define MIN_TEXT_SIZE 0.001
+#define MIN_TEXT_SIZE 0.01
 
 static u64 total_height;
 static FILE *svgfile;
@@ -103,7 +103,7 @@ void open_svg(const char *filename, int cpus, int rows, u64 start, u64 end)
         fprintf(svgfile, "      rect.process2 { fill:rgb(180,180,180); fill-opacity:0.9; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
         fprintf(svgfile, "      rect.sample   { fill:rgb(  0,  0,255); fill-opacity:0.8; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
         fprintf(svgfile, "      rect.blocked  { fill:rgb(255,  0,  0); fill-opacity:0.5; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
-        fprintf(svgfile, "      rect.waiting  { fill:rgb(214,214,  0); fill-opacity:0.3; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
+        fprintf(svgfile, "      rect.waiting  { fill:rgb(224,214,  0); fill-opacity:0.8; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
         fprintf(svgfile, "      rect.WAITING  { fill:rgb(255,214, 48); fill-opacity:0.6; stroke-width:0;   stroke:rgb(  0,  0,  0); } \n");
         fprintf(svgfile, "      rect.cpu      { fill:rgb(192,192,192); fill-opacity:0.2; stroke-width:0.5; stroke:rgb(128,128,128); } \n");
         fprintf(svgfile, "      rect.pstate   { fill:rgb(128,128,128); fill-opacity:0.8; stroke-width:0; } \n");
@@ -217,6 +217,18 @@ static char *cpu_model(void)
                 }
                 fclose(file);
         }
+
+        /* CPU type */
+        file = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_frequencies", "r");
+        if (file) {
+                while (fgets(buf, 255, file)) {
+                        unsigned int freq;
+                        freq = strtoull(buf, NULL, 10);
+                        if (freq > max_freq)
+                                max_freq = freq;
+                }
+                fclose(file);
+        }
         return cpu_m;
 }
 
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 559fb06210f5..47ea0609a760 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -324,8 +324,7 @@ static inline int elf_sym__is_function(const GElf_Sym *sym)
 {
         return elf_sym__type(sym) == STT_FUNC &&
                sym->st_name != 0 &&
-               sym->st_shndx != SHN_UNDEF &&
-               sym->st_size != 0;
+               sym->st_shndx != SHN_UNDEF;
 }
 
 static inline int elf_sym__is_label(const GElf_Sym *sym)
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index f6a8437141c8..55c9659a56e2 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -618,7 +618,7 @@ static int test_type(enum event_type type, enum event_type expect)
 }
 
 static int test_type_token(enum event_type type, char *token,
-                    enum event_type expect, char *expect_tok)
+                    enum event_type expect, const char *expect_tok)
 {
         if (type != expect) {
                 die("Error: expected type %d but read %d",
@@ -650,7 +650,7 @@ static int read_expect_type(enum event_type expect, char **tok)
         return __read_expect_type(expect, tok, 1);
 }
 
-static int __read_expected(enum event_type expect, char *str, int newline_ok)
+static int __read_expected(enum event_type expect, const char *str, int newline_ok)
 {
         enum event_type type;
         char *token;
@@ -668,12 +668,12 @@ static int __read_expected(enum event_type expect, char *str, int newline_ok)
         return 0;
 }
 
-static int read_expected(enum event_type expect, char *str)
+static int read_expected(enum event_type expect, const char *str)
 {
         return __read_expected(expect, str, 1);
 }
 
-static int read_expected_item(enum event_type expect, char *str)
+static int read_expected_item(enum event_type expect, const char *str)
 {
         return __read_expected(expect, str, 0);
 }
@@ -1968,10 +1968,11 @@ static const struct flag flags[] = {
         { "NET_TX_SOFTIRQ", 2 },
         { "NET_RX_SOFTIRQ", 3 },
         { "BLOCK_SOFTIRQ", 4 },
-        { "TASKLET_SOFTIRQ", 5 },
-        { "SCHED_SOFTIRQ", 6 },
-        { "HRTIMER_SOFTIRQ", 7 },
-        { "RCU_SOFTIRQ", 8 },
+        { "BLOCK_IOPOLL_SOFTIRQ", 5 },
+        { "TASKLET_SOFTIRQ", 6 },
+        { "SCHED_SOFTIRQ", 7 },
+        { "HRTIMER_SOFTIRQ", 8 },
+        { "RCU_SOFTIRQ", 9 },
 
         { "HRTIMER_NORESTART", 0 },
         { "HRTIMER_RESTART", 1 },