[PATCH] perf symbol: Do not apply symfs for an absolute vmlinux path

[PATCH] perf symbol: Do not apply symfs for an absolute vmlinux path

[Namhyung Kim]

From: Namhyung Kim <namhyung.kim@lge.com>

If an user gives both of --symfs and --vmlinux option, the vmlinux
will be searched under the symfs directory.  This is somewhat
confusing since vmlinux often lives in kernel build directory or
somewhere other than user space binaries.

So it'd be better not adding symfs prefix for a vmlinux if it has an
absolute pathname.

Reported-by: Kwanghyun Yoo <ykh815.yoo@lge.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/symbol.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index d5528e1cc03a..02718e728d59 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -888,8 +888,11 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
 	char symfs_vmlinux[PATH_MAX];
 	enum dso_binary_type symtab_type;
 
-	snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",
-		 symbol_conf.symfs, vmlinux);
+	if (vmlinux[0] == '/')
+		snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s", vmlinux);
+	else
+		snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",
+			 symbol_conf.symfs, vmlinux);
 
 	if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
 		symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX;
-- 
1.7.11.7

Re: [PATCH] perf symbol: Do not apply symfs for an absolute vmlinux path

[David Ahern]

On 7/17/13 2:08 AM, Namhyung Kim wrote:
> From: Namhyung Kim <namhyung.kim@lge.com>
>
> If an user gives both of --symfs and --vmlinux option, the vmlinux
> will be searched under the symfs directory.  This is somewhat
> confusing since vmlinux often lives in kernel build directory or
> somewhere other than user space binaries.
>
> So it'd be better not adding symfs prefix for a vmlinux if it has an
> absolute pathname.
>
> Reported-by: Kwanghyun Yoo <ykh815.yoo@lge.com>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>

Acked-by: David Ahern <dsahern@gmail.com>

Re: [PATCH] perf symbol: Do not apply symfs for an absolute vmlinux path

[Arnaldo Carvalho de Melo]

Em Wed, Jul 17, 2013 at 07:31:32AM -0600, David Ahern escreveu:
> On 7/17/13 2:08 AM, Namhyung Kim wrote:
> >From: Namhyung Kim <namhyung.kim@lge.com>
> >
> >If an user gives both of --symfs and --vmlinux option, the vmlinux
> >will be searched under the symfs directory.  This is somewhat
> >confusing since vmlinux often lives in kernel build directory or
> >somewhere other than user space binaries.
> >
> >So it'd be better not adding symfs prefix for a vmlinux if it has an
> >absolute pathname.
> >
> >Reported-by: Kwanghyun Yoo <ykh815.yoo@lge.com>
> >Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> 

Thanks, applied.

- Arnaldo

[tip:perf/core] perf symbols: Do not apply symfs for an absolute vmlinux path

[tip-bot for Namhyung Kim]

Commit-ID:  5698d2c99ec11006b4c241ebad5252289902b358
Gitweb:     http://git.kernel.org/tip/5698d2c99ec11006b4c241ebad5252289902b358
Author:     Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Wed, 17 Jul 2013 17:08:15 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 17 Jul 2013 12:23:57 -0300

perf symbols: Do not apply symfs for an absolute vmlinux path

If an user gives both of --symfs and --vmlinux option, the vmlinux will
be searched under the symfs directory.  This is somewhat confusing since
vmlinux often lives in kernel build directory or somewhere other than
user space binaries.

So it'd be better not adding symfs prefix for a vmlinux if it has an
absolute pathname.

Reported-by: Kwanghyun Yoo <ykh815.yoo@lge.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1374048495-3643-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index d5528e1..02718e7 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -888,8 +888,11 @@ int dso__load_vmlinux(struct dso *dso, struct map *map,
 	char symfs_vmlinux[PATH_MAX];
 	enum dso_binary_type symtab_type;
 
-	snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",
-		 symbol_conf.symfs, vmlinux);
+	if (vmlinux[0] == '/')
+		snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s", vmlinux);
+	else
+		snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",
+			 symbol_conf.symfs, vmlinux);
 
 	if (dso->kernel == DSO_TYPE_GUEST_KERNEL)
 		symtab_type = DSO_BINARY_TYPE__GUEST_VMLINUX;