perf fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (1):
perf buildid-list: Fix error return for success
Franck Bui-Huu (3):
perf probe: Fix use of kernel image path given by 'k' option perf symbols: Stop using vmlinux files with no symbols perf buildid-cache: Fix symbolic link handling
Masami Hiramatsu (2):
perf tools: Fix lazy wildcard matching perf probe: Fix to support libdwfl older than 0.148
tools/perf/builtin-buildid-list.c | 3 +- tools/perf/builtin-probe.c | 5 ++ tools/perf/util/header.c | 10 +++-- tools/perf/util/probe-event.c | 15 +++++- tools/perf/util/probe-finder.c | 85 ++++++++++++++++++++++++------------- tools/perf/util/string.c | 2 +- tools/perf/util/symbol.c | 4 +- tools/perf/util/symbol.h | 2 + 8 files changed, 84 insertions(+), 42 deletions(-)
tools/perf/builtin-buildid-list.c +1 -2
@@ -36,7 +36,6 @@ static const struct option options[] = {static int __cmd_buildid_list (void ) { -int err =-1 ;struct perf_session *session; session =perf_session__new (input_name,O_RDONLY , force, false);
@@ -49,7 +48,7 @@ static int __cmd_buildid_list(void)perf_session__fprintf_dsos_buildid (session, stdout, with_hits);perf_session__delete (session); -return err; +return 0 ; }int cmd_buildid_list (int argc,const char **argv,const char *prefix__used )
tools/perf/builtin-probe.c +5 -0
@@ -249,6 +249,11 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) !params.show_lines))usage_with_options (probe_usage, options); +/* +* Only consider the user's kernel image path if given. +*/ + symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name ==NULL ); +if (params.list_events) {if (params.mod_events) {pr_err (" Error: Don't use --list with --add/--del.\n" );
tools/perf/util/header.c +6 -4
@@ -265,15 +265,16 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, const char *name, bool is_kallsyms) { const size_t size = PATH_MAX; -char *filename =malloc (size), +char *realname =realpath (name,NULL ), + *filename =malloc (size), *linkname =malloc (size), *targetname;int len, err =-1 ; -if (filename ==NULL || linkname ==NULL ) +if (realname ==NULL || filename ==NULL || linkname ==NULL ) goto out_free; len =snprintf (filename, size,"%s%s%s" , - debugdir, is_kallsyms ?"/" :"" , name); + debugdir, is_kallsyms ?"/" :"" , realname);if (mkdir_p (filename,0755 )) goto out_free;
@@ -283,7 +284,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,if (is_kallsyms) {if (copyfile ("/proc/kallsyms" , filename)) goto out_free; - }else if (link (name, filename) &©file (name, filename)) + }else if (link (realname, filename) &©file (name, filename)) goto out_free; }
@@ -300,6 +301,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,if (symlink (targetname, linkname) ==0 ) err =0 ; out_free: +free (realname);free (filename);free (linkname);return err;
tools/perf/util/probe-event.c +12 -3
@@ -114,6 +114,8 @@ static struct symbol *__find_kernel_function_by_name(const char *name,const char *kernel_get_module_path (const char *module) {struct dso *dso; +struct map *map; +const char *vmlinux_name;if (module) {list_for_each_entry (dso, &machine.kernel_dsos, node) {
@@ -123,10 +125,17 @@ const char *kernel_get_module_path(const char *module) }pr_debug ("Failed to find module %s.\n" , module);return NULL ; + } + + map = machine.vmlinux_maps[MAP__FUNCTION ]; + dso = map->dso; + + vmlinux_name = symbol_conf.vmlinux_name; +if (vmlinux_name) { +if (dso__load_vmlinux (dso, map, vmlinux_name,NULL ) <=0 ) +return NULL ; }else { - dso = machine.vmlinux_maps[MAP__FUNCTION ]->dso; -if (dso__load_vmlinux_path (dso, - machine.vmlinux_maps[MAP__FUNCTION ],NULL ) <0 ) { +if (dso__load_vmlinux_path (dso, map,NULL ) <=0 ) {pr_debug ("Failed to load kernel map.\n" );return NULL ; }
tools/perf/util/probe-finder.c +55 -30
114 lines not on this page · raw message
tools/perf/util/string.c +1 -1
@@ -259,7 +259,7 @@ static bool __match_glob(const char *str, const char *pat, bool ignore_space)if (!*pat)/* Tail wild card matches all */ return true;while (*str) -if (strglobmatch (str++, pat)) +if (__match_glob (str++, pat, ignore_space))return true; }return !*str && !*pat;
tools/perf/util/symbol.c +2 -2
@@ -1780,8 +1780,8 @@ out_failure:return -1 ; } -static int dso__load_vmlinux (struct dso *self,struct map *map, -const char *vmlinux,symbol_filter_t filter) +int dso__load_vmlinux (struct dso *self,struct map *map, +const char *vmlinux,symbol_filter_t filter) {int err =-1 , fd;
tools/perf/util/symbol.h +2 -0
@@ -166,6 +166,8 @@ void dso__sort_by_name(struct dso *self, enum map_type type);struct dso *__dsos__findnew (struct list_head *head,const char *name);int dso__load (struct dso *self,struct map *map,symbol_filter_t filter); +int dso__load_vmlinux (struct dso *self,struct map *map, +const char *vmlinux,symbol_filter_t filter);int dso__load_vmlinux_path (struct dso *self,struct map *map,symbol_filter_t filter); int dso__load_kallsyms(struct dso *self, const char *filename, struct map *map,