* [GIT PULL 0/2] perf/urgent fixes
@ 2010-12-12 15:16 Arnaldo Carvalho de Melo
2010-12-12 15:16 ` [PATCH 1/2] perf probe: Fix use of kernel image path given by 'k' option Arnaldo Carvalho de Melo
2010-12-12 15:16 ` [PATCH 2/2] perf symbols: Stop using vmlinux files with no symbols Arnaldo Carvalho de Melo
0 siblings, 2 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-12-12 15:16 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, 2nddept-manager,
Francis Moreau, Franck Bui-Huu, Franck Bui-Huu, Masami Hiramatsu,
Arnaldo Carvalho de Melo
Hi Ingo,
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 perf/urgent
Regards,
- Arnaldo
Franck Bui-Huu (2):
perf probe: Fix use of kernel image path given by 'k' option
perf symbols: Stop using vmlinux files with no symbols
tools/perf/builtin-probe.c | 5 +++++
tools/perf/util/probe-event.c | 15 ++++++++++++---
tools/perf/util/symbol.c | 4 ++--
tools/perf/util/symbol.h | 2 ++
4 files changed, 21 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] perf probe: Fix use of kernel image path given by 'k' option 2010-12-12 15:16 [GIT PULL 0/2] perf/urgent fixes Arnaldo Carvalho de Melo @ 2010-12-12 15:16 ` Arnaldo Carvalho de Melo 2010-12-12 16:01 ` Masami Hiramatsu 2010-12-12 15:16 ` [PATCH 2/2] perf symbols: Stop using vmlinux files with no symbols Arnaldo Carvalho de Melo 1 sibling, 1 reply; 5+ messages in thread From: Arnaldo Carvalho de Melo @ 2010-12-12 15:16 UTC (permalink / raw) To: Ingo Molnar Cc: linux-kernel, Franck Bui-Huu, 2nddept-manager, Francis Moreau, Franck Bui-Huu, Masami Hiramatsu, Arnaldo Carvalho de Melo From: Franck Bui-Huu <fbuihuu@gmail.com> Users were not being able to have the explicitely specified vmlinux pathname used, instead a search on the vmlinux path was always being made. Reported-by: Francis Moreau <francis.moro@gmail.com> Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Francis Moreau <francis.moro@gmail.com> Cc: Franck Bui-Huu <vagabon.xyz@gmail.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> LPU-Reference: <m3hbelydz8.fsf_-_@gmail.com> Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/builtin-probe.c | 5 +++++ tools/perf/util/probe-event.c | 15 ++++++++++++--- tools/perf/util/symbol.c | 4 ++-- tools/perf/util/symbol.h | 2 ++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 2e000c0..add163c 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c @@ -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"); diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 3b6a529..b71acd6 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -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; } diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index d628c8d..439ab94 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -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; diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index 038f220..6c6eafd 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -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, -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] perf probe: Fix use of kernel image path given by 'k' option 2010-12-12 15:16 ` [PATCH 1/2] perf probe: Fix use of kernel image path given by 'k' option Arnaldo Carvalho de Melo @ 2010-12-12 16:01 ` Masami Hiramatsu 0 siblings, 0 replies; 5+ messages in thread From: Masami Hiramatsu @ 2010-12-12 16:01 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Ingo Molnar, linux-kernel, Franck Bui-Huu, 2nddept-manager, Francis Moreau, Franck Bui-Huu, Arnaldo Carvalho de Melo (2010/12/13 0:16), Arnaldo Carvalho de Melo wrote: > From: Franck Bui-Huu <fbuihuu@gmail.com> > > Users were not being able to have the explicitely specified vmlinux > pathname used, instead a search on the vmlinux path was always being > made. > > Reported-by: Francis Moreau <francis.moro@gmail.com> > Cc: 2nddept-manager@sdl.hitachi.co.jp > Cc: Francis Moreau <francis.moro@gmail.com> > Cc: Franck Bui-Huu <vagabon.xyz@gmail.com> > Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > LPU-Reference: <m3hbelydz8.fsf_-_@gmail.com> > Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Thanks! Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > --- > tools/perf/builtin-probe.c | 5 +++++ > tools/perf/util/probe-event.c | 15 ++++++++++++--- > tools/perf/util/symbol.c | 4 ++-- > tools/perf/util/symbol.h | 2 ++ > 4 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c > index 2e000c0..add163c 100644 > --- a/tools/perf/builtin-probe.c > +++ b/tools/perf/builtin-probe.c > @@ -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"); > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > index 3b6a529..b71acd6 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -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; > } > diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c > index d628c8d..439ab94 100644 > --- a/tools/perf/util/symbol.c > +++ b/tools/perf/util/symbol.c > @@ -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; > > diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h > index 038f220..6c6eafd 100644 > --- a/tools/perf/util/symbol.h > +++ b/tools/perf/util/symbol.h > @@ -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, -- Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: masami.hiramatsu.pt@hitachi.com ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] perf symbols: Stop using vmlinux files with no symbols 2010-12-12 15:16 [GIT PULL 0/2] perf/urgent fixes Arnaldo Carvalho de Melo 2010-12-12 15:16 ` [PATCH 1/2] perf probe: Fix use of kernel image path given by 'k' option Arnaldo Carvalho de Melo @ 2010-12-12 15:16 ` Arnaldo Carvalho de Melo 2010-12-12 16:02 ` Masami Hiramatsu 1 sibling, 1 reply; 5+ messages in thread From: Arnaldo Carvalho de Melo @ 2010-12-12 15:16 UTC (permalink / raw) To: Ingo Molnar Cc: linux-kernel, Franck Bui-Huu, 2nddept-manager, Francis Moreau, Franck Bui-Huu, Masami Hiramatsu, Arnaldo Carvalho de Melo From: Franck Bui-Huu <fbuihuu@gmail.com> Fail if the kernel image contains no symbol, allowing using other images in the vmlinux search path that may have a usable symtab. Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Francis Moreau <francis.moro@gmail.com> Cc: Franck Bui-Huu <vagabon.xyz@gmail.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> LPU-Reference: <m3d3p9ydx9.fsf_-_@gmail.com> Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/util/probe-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index b71acd6..61191c6 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -135,7 +135,7 @@ const char *kernel_get_module_path(const char *module) if (dso__load_vmlinux(dso, map, vmlinux_name, NULL) <= 0) return NULL; } else { - if (dso__load_vmlinux_path(dso, map, NULL) < 0) { + if (dso__load_vmlinux_path(dso, map, NULL) <= 0) { pr_debug("Failed to load kernel map.\n"); return NULL; } -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] perf symbols: Stop using vmlinux files with no symbols 2010-12-12 15:16 ` [PATCH 2/2] perf symbols: Stop using vmlinux files with no symbols Arnaldo Carvalho de Melo @ 2010-12-12 16:02 ` Masami Hiramatsu 0 siblings, 0 replies; 5+ messages in thread From: Masami Hiramatsu @ 2010-12-12 16:02 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Ingo Molnar, linux-kernel, Franck Bui-Huu, 2nddept-manager, Francis Moreau, Franck Bui-Huu, Arnaldo Carvalho de Melo (2010/12/13 0:16), Arnaldo Carvalho de Melo wrote: > From: Franck Bui-Huu <fbuihuu@gmail.com> > > Fail if the kernel image contains no symbol, allowing using other images > in the vmlinux search path that may have a usable symtab. > > Cc: 2nddept-manager@sdl.hitachi.co.jp > Cc: Francis Moreau <francis.moro@gmail.com> > Cc: Franck Bui-Huu <vagabon.xyz@gmail.com> > Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > LPU-Reference: <m3d3p9ydx9.fsf_-_@gmail.com> > Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Looks good for me:) Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> > --- > tools/perf/util/probe-event.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > index b71acd6..61191c6 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -135,7 +135,7 @@ const char *kernel_get_module_path(const char *module) > if (dso__load_vmlinux(dso, map, vmlinux_name, NULL) <= 0) > return NULL; > } else { > - if (dso__load_vmlinux_path(dso, map, NULL) < 0) { > + if (dso__load_vmlinux_path(dso, map, NULL) <= 0) { > pr_debug("Failed to load kernel map.\n"); > return NULL; > } -- Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: masami.hiramatsu.pt@hitachi.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-12 16:02 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-12-12 15:16 [GIT PULL 0/2] perf/urgent fixes Arnaldo Carvalho de Melo 2010-12-12 15:16 ` [PATCH 1/2] perf probe: Fix use of kernel image path given by 'k' option Arnaldo Carvalho de Melo 2010-12-12 16:01 ` Masami Hiramatsu 2010-12-12 15:16 ` [PATCH 2/2] perf symbols: Stop using vmlinux files with no symbols Arnaldo Carvalho de Melo 2010-12-12 16:02 ` Masami Hiramatsu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).