Merge commit 'v2.6.32-rc5' into perf/probes

Conflicts:
	kernel/trace/trace_event_profile.c

Merge reason: update to -rc5 and resolve conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

5 files changed, 126 insertions, 75 deletions

diff --git a/tools/perf/util/module.c b/tools/perf/util/module.c
index 3d567fe59c79..0d8c85defcd2 100644
--- a/tools/perf/util/module.c
+++ b/tools/perf/util/module.c
@@ -4,6 +4,7 @@
 #include "module.h"
 
 #include <libelf.h>
+#include <libgen.h>
 #include <gelf.h>
 #include <elf.h>
 #include <dirent.h>
@@ -409,35 +410,40 @@ out_failure:
 static int mod_dso__load_module_paths(struct mod_dso *self)
 {
         struct utsname uts;
-        int count = 0, len;
+        int count = 0, len, err = -1;
         char *line = NULL;
         FILE *file;
-        char *path;
+        char *dpath, *dir;
         size_t n;
 
         if (uname(&uts) < 0)
-                goto out_failure;
+                return err;
 
         len = strlen("/lib/modules/");
         len += strlen(uts.release);
         len += strlen("/modules.dep");
 
-        path = calloc(1, len);
-        if (path == NULL)
-                goto out_failure;
+        dpath = calloc(1, len + 1);
+        if (dpath == NULL)
+                return err;
 
-        strcat(path, "/lib/modules/");
-        strcat(path, uts.release);
-        strcat(path, "/modules.dep");
+        strcat(dpath, "/lib/modules/");
+        strcat(dpath, uts.release);
+        strcat(dpath, "/modules.dep");
 
-        file = fopen(path, "r");
-        free(path);
+        file = fopen(dpath, "r");
         if (file == NULL)
                 goto out_failure;
 
+        dir = dirname(dpath);
+        if (!dir)
+                goto out_failure;
+        strcat(dir, "/");
+
         while (!feof(file)) {
-                char *name, *tmp;
                 struct module *module;
+                char *name, *path, *tmp;
+                FILE *modfile;
                 int line_len;
 
                 line_len = getline(&line, &n, file);
@@ -445,17 +451,41 @@ static int mod_dso__load_module_paths(struct mod_dso *self)
                         break;
 
                 if (!line)
-                        goto out_failure;
+                        break;
 
                 line[--line_len] = '\0'; /* \n */
 
-                path = strtok(line, ":");
+                path = strchr(line, ':');
+                if (!path)
+                        break;
+                *path = '\0';
+
+                path = strdup(line);
                 if (!path)
-                        goto out_failure;
+                        break;
+
+                if (!strstr(path, dir)) {
+                        if (strncmp(path, "kernel/", 7))
+                                break;
+
+                        free(path);
+                        path = calloc(1, strlen(dir) + strlen(line) + 1);
+                        if (!path)
+                                break;
+                        strcat(path, dir);
+                        strcat(path, line);
+                }
+
+                modfile = fopen(path, "r");
+                if (modfile == NULL)
+                        break;
+                fclose(modfile);
 
                 name = strdup(path);
-                name = strtok(name, "/");
+                if (!name)
+                        break;
 
+                name = strtok(name, "/");
                 tmp = name;
 
                 while (tmp) {
@@ -463,26 +493,25 @@ static int mod_dso__load_module_paths(struct mod_dso *self)
                         if (tmp)
                                 name = tmp;
                 }
+
                 name = strsep(&name, ".");
+                if (!name)
+                        break;
 
-                /* Quirk: replace '-' with '_' in sound modules */
+                /* Quirk: replace '-' with '_' in all modules */
                 for (len = strlen(name); len; len--) {
                         if (*(name+len) == '-')
                                 *(name+len) = '_';
                 }
 
                 module = module__new(name, path);
-                if (!module) {
-                        fprintf(stderr, "load_module_paths: allocation error\n");
-                        goto out_failure;
-                }
+                if (!module)
+                        break;
                 mod_dso__insert_module(self, module);
 
                 module->sections = sec_dso__new_dso("sections");
-                if (!module->sections) {
-                        fprintf(stderr, "load_module_paths: allocation error\n");
-                        goto out_failure;
-                }
+                if (!module->sections)
+                        break;
 
                 module->active = mod_dso__load_sections(module);
 
@@ -490,13 +519,20 @@ static int mod_dso__load_module_paths(struct mod_dso *self)
                         count++;
         }
 
-        free(line);
-        fclose(file);
-
-        return count;
+        if (feof(file))
+                err = count;
+        else
+                fprintf(stderr, "load_module_paths: modules.dep parsing failure!\n");
 
 out_failure:
-        return -1;
+        if (dpath)
+                free(dpath);
+        if (file)
+                fclose(file);
+        if (line)
+                free(line);
+
+        return err;
 }
 
 int mod_dso__load_modules(struct mod_dso *dso)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 13ab4b842d49..8cfb48cbbea0 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -165,33 +165,31 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
         DIR *sys_dir, *evt_dir;
         struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
         char id_buf[4];
-        int sys_dir_fd, fd;
+        int fd;
         u64 id;
         char evt_path[MAXPATHLEN];
+        char dir_path[MAXPATHLEN];
 
         if (valid_debugfs_mount(debugfs_path))
                 return NULL;
 
         sys_dir = opendir(debugfs_path);
         if (!sys_dir)
-                goto cleanup;
-        sys_dir_fd = dirfd(sys_dir);
+                return NULL;
 
         for_each_subsystem(sys_dir, sys_dirent, sys_next) {
-                int dfd = openat(sys_dir_fd, sys_dirent.d_name,
-                                 O_RDONLY|O_DIRECTORY), evt_dir_fd;
-                if (dfd == -1)
-                        continue;
-                evt_dir = fdopendir(dfd);
-                if (!evt_dir) {
-                        close(dfd);
+
+                snprintf(dir_path, MAXPATHLEN, "%s/%s", debugfs_path,
+                         sys_dirent.d_name);
+                evt_dir = opendir(dir_path);
+                if (!evt_dir)
                         continue;
-                }
-                evt_dir_fd = dirfd(evt_dir);
+
                 for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) {
-                        snprintf(evt_path, MAXPATHLEN, "%s/id",
+
+                        snprintf(evt_path, MAXPATHLEN, "%s/%s/id", dir_path,
                                  evt_dirent.d_name);
-                        fd = openat(evt_dir_fd, evt_path, O_RDONLY);
+                        fd = open(evt_path, O_RDONLY);
                         if (fd < 0)
                                 continue;
                         if (read(fd, id_buf, sizeof(id_buf)) < 0) {
@@ -225,7 +223,6 @@ struct tracepoint_path *tracepoint_id_to_path(u64 config)
                 closedir(evt_dir);
         }
 
-cleanup:
         closedir(sys_dir);
         return NULL;
 }
@@ -694,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 = '/';
@@ -761,28 +761,24 @@ static void print_tracepoint_events(void)
 {
         DIR *sys_dir, *evt_dir;
         struct dirent *sys_next, *evt_next, sys_dirent, evt_dirent;
-        int sys_dir_fd;
         char evt_path[MAXPATHLEN];
+        char dir_path[MAXPATHLEN];
 
         if (valid_debugfs_mount(debugfs_path))
                 return;
 
         sys_dir = opendir(debugfs_path);
         if (!sys_dir)
-                goto cleanup;
-        sys_dir_fd = dirfd(sys_dir);
+                return;
 
         for_each_subsystem(sys_dir, sys_dirent, sys_next) {
-                int dfd = openat(sys_dir_fd, sys_dirent.d_name,
-                                 O_RDONLY|O_DIRECTORY), evt_dir_fd;
-                if (dfd == -1)
-                        continue;
-                evt_dir = fdopendir(dfd);
-                if (!evt_dir) {
-                        close(dfd);
+
+                snprintf(dir_path, MAXPATHLEN, "%s/%s", debugfs_path,
+                         sys_dirent.d_name);
+                evt_dir = opendir(dir_path);
+                if (!evt_dir)
                         continue;
-                }
-                evt_dir_fd = dirfd(evt_dir);
+
                 for_each_event(sys_dirent, evt_dir, evt_dirent, evt_next) {
                         snprintf(evt_path, MAXPATHLEN, "%s:%s",
                                  sys_dirent.d_name, evt_dirent.d_name);
@@ -791,8 +787,6 @@ static void print_tracepoint_events(void)
                 }
                 closedir(evt_dir);
         }
-
-cleanup:
         closedir(sys_dir);
 }
 
diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c
index a778fd0f4ae4..856655d8b0b8 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;
@@ -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 fd3d9c8e90fc..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)
@@ -833,7 +832,7 @@ int dso__load_modules(struct dso *self, symbol_filter_t filter, int v)
         struct mod_dso *mods = mod_dso__new_dso("modules");
         struct module *pos;
         struct rb_node *next;
-        int err;
+        int err, count = 0;
 
         err = mod_dso__load_modules(mods);
 
@@ -852,14 +851,16 @@ int dso__load_modules(struct dso *self, symbol_filter_t filter, int v)
                         break;
 
                 next = rb_next(&pos->rb_node);
+                count += err;
         }
 
         if (err < 0) {
                 mod_dso__delete_modules(mods);
                 mod_dso__delete_self(mods);
+                return err;
         }
 
-        return err;
+        return count;
 }
 
 static inline void dso__fill_symbol_holes(struct dso *self)
@@ -913,8 +914,15 @@ int dso__load_kernel(struct dso *self, const char *vmlinux,
 
         if (vmlinux) {
                 err = dso__load_vmlinux(self, vmlinux, filter, v);
-                if (err > 0 && use_modules)
-                        err = dso__load_modules(self, filter, v);
+                if (err > 0 && use_modules) {
+                        int syms = dso__load_modules(self, filter, v);
+
+                        if (syms < 0) {
+                                fprintf(stderr, "dso__load_modules failed!\n");
+                                return syms;
+                        }
+                        err += syms;
+                }
         }
 
         if (err <= 0)
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 },