tools/perf: add new option --ignore-vmlinux for perf top
PATCH 1/1 tools/perf: add new option --ignore-vmlinux for perf top
Running "perf top" on a machine with possibly invalid or non-matching vmlinux at the various places results in no symbol resolving despite /proc/kallsyms being present and valid.
Add a new option --ignore-vmlinux to explicitly indicate that we do not want to use these kernels and just use what we have (kallsyms).
---
Hey guys, I found that I'm still regularly rebasing this patch on new kernels. It would be nice if it could be merged, as it causes some burden on some production machines which have old vmlinux files at several places that we don't always want to risk removing just for running perf top.
tools/perf/builtin-top.c | 2 ++ tools/perf/util/symbol.c | 4 ++-- tools/perf/util/symbol.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
tools/perf/builtin-top.c +2 -0
@@ -1067,6 +1067,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) "list of cpus to monitor"),OPT_STRING ('k' ,"vmlinux" , &symbol_conf.vmlinux_name,"file" ,"vmlinux pathname" ), +OPT_BOOLEAN (0 ,"ignore-vmlinux" , &symbol_conf.ignore_vmlinux, +"don't load vmlinux even if found" ),OPT_BOOLEAN ('K' ,"hide_kernel_symbols" , &top.hide_kernel_symbols,"hide kernel symbols" ), OPT_UINTEGER('m', "mmap-pages", &opts->mmap_pages,
tools/perf/util/symbol.c +2 -2
@@ -968,7 +968,7 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map, goto do_kallsyms; } -if (symbol_conf.vmlinux_name !=NULL ) { +if (!symbol_conf.ignore_vmlinux && symbol_conf.vmlinux_name !=NULL ) { err =dso__load_vmlinux (dso, map, symbol_conf.vmlinux_name, filter);if (err >0 ) {
@@ -980,7 +980,7 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map,return err; } -if (vmlinux_path !=NULL ) { +if (!symbol_conf.ignore_vmlinux && vmlinux_path !=NULL ) { err =dso__load_vmlinux_path (dso, map, filter);if (err >0 ) goto out_fixup;
tools/perf/util/symbol.h +1 -0
@@ -85,6 +85,7 @@ struct symbol_conf {unsigned short priv_size;unsigned short nr_events;bool try_vmlinux_path, + ignore_vmlinux, show_kernel_path, use_modules, sort_by_name,
Signature · 1 line
1.7.12.2.21.g234cd45.dirty
tip-bot for Willy Tarreau
merge bot[tip:perf/core] perf symbols: Add new option --ignore-vmlinux for perf top
perf symbols: Add new option --ignore-vmlinux for perf top
Commit-ID: fc2be6968e99b5314f20e938a547d44dcb1c40eb Gitweb: http://git.kernel.org/tip/fc2be6968e99b5314f20e938a547d44dcb1c40eb Author: Willy Tarreau <[email protected]> AuthorDate: Sat, 14 Sep 2013 10:32:59 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 9 Oct 2013 11:42:20 -0300
perf symbols: Add new option --ignore-vmlinux for perf top
Running "perf top" on a machine with possibly invalid or non-matching vmlinux at the various places results in no symbol resolving despite /proc/kallsyms being present and valid.
Add a new option --ignore-vmlinux to explicitly indicate that we do not want to use these kernels and just use what we have (kallsyms).
--- tools/perf/builtin-top.c | 2 ++ tools/perf/util/symbol.c | 4 ++-- tools/perf/util/symbol.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
tools/perf/builtin-top.c +2 -0
@@ -1073,6 +1073,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) "list of cpus to monitor"),OPT_STRING ('k' ,"vmlinux" , &symbol_conf.vmlinux_name,"file" ,"vmlinux pathname" ), +OPT_BOOLEAN (0 ,"ignore-vmlinux" , &symbol_conf.ignore_vmlinux, +"don't load vmlinux even if found" ),OPT_BOOLEAN ('K' ,"hide_kernel_symbols" , &top.hide_kernel_symbols,"hide kernel symbols" ), OPT_CALLBACK('m', "mmap-pages", &opts->mmap_pages, "pages",
tools/perf/util/symbol.c +2 -2
@@ -1215,7 +1215,7 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map, goto do_kallsyms; } -if (symbol_conf.vmlinux_name !=NULL ) { +if (!symbol_conf.ignore_vmlinux && symbol_conf.vmlinux_name !=NULL ) { err =dso__load_vmlinux (dso, map, symbol_conf.vmlinux_name, filter);if (err >0 ) {
@@ -1227,7 +1227,7 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map,return err; } -if (vmlinux_path !=NULL ) { +if (!symbol_conf.ignore_vmlinux && vmlinux_path !=NULL ) { err =dso__load_vmlinux_path (dso, map, filter);if (err >0 )return err;
tools/perf/util/symbol.h +1 -0
@@ -85,6 +85,7 @@ struct symbol_conf {unsigned short priv_size;unsigned short nr_events;bool try_vmlinux_path, + ignore_vmlinux, show_kernel_path, use_modules, sort_by_name,