[PATCH] perf tools: Fix annotation with kcore

[PATCH] perf tools: Fix annotation with kcore

[Adrian Hunter]

Patch "perf tools: Fix build-id matching on vmlinux"
breaks annotation with kcore.  The problem is that
symbol__annotate() first gets the filename based on
the build-id which was previously not set.
This patch provides a quick fix, however there should
probably be only one way to determine the filename. e.g.
symbol__annotate() should use the same way as
dso__data_fd().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 tools/perf/util/annotate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 7dabde1..873c877 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -915,6 +915,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
 			return -ENOMEM;
 		}
 		goto fallback;
+	} else if (dso__is_kcore(dso)) {
+		goto fallback;
 	} else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
 		   strstr(command, "[kernel.kallsyms]") ||
 		   access(symfs_filename, R_OK)) {
-- 
1.9.1

Re: [PATCH] perf tools: Fix annotation with kcore

[Arnaldo Carvalho de Melo]

Em Tue, Nov 11, 2014 at 12:04:54PM +0200, Adrian Hunter escreveu:
> Patch "perf tools: Fix build-id matching on vmlinux"

So, I will check this, but please state for which branch this is
supposed to be applied, i.e. does it fixes perf/urgent stuff and thus
needs to go ASAP, or is this something that affects perf/core and thus
can wait till I process more urgent stuff?

- Arnaldo

> breaks annotation with kcore.  The problem is that
> symbol__annotate() first gets the filename based on
> the build-id which was previously not set.
> This patch provides a quick fix, however there should
> probably be only one way to determine the filename. e.g.
> symbol__annotate() should use the same way as
> dso__data_fd().
> 
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
>  tools/perf/util/annotate.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 7dabde1..873c877 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -915,6 +915,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
>  			return -ENOMEM;
>  		}
>  		goto fallback;
> +	} else if (dso__is_kcore(dso)) {
> +		goto fallback;
>  	} else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
>  		   strstr(command, "[kernel.kallsyms]") ||
>  		   access(symfs_filename, R_OK)) {
> -- 
> 1.9.1

Re: [PATCH] perf tools: Fix annotation with kcore

[Adrian Hunter]

On 11/11/14 15:05, Arnaldo Carvalho de Melo wrote:
> Em Tue, Nov 11, 2014 at 12:04:54PM +0200, Adrian Hunter escreveu:
>> Patch "perf tools: Fix build-id matching on vmlinux"
> 
> So, I will check this, but please state for which branch this is
> supposed to be applied, i.e. does it fixes perf/urgent stuff and thus
> needs to go ASAP, or is this something that affects perf/core and thus
> can wait till I process more urgent stuff?

It is perf/core so it can wait.

> 
> - Arnaldo
> 
>> breaks annotation with kcore.  The problem is that
>> symbol__annotate() first gets the filename based on
>> the build-id which was previously not set.
>> This patch provides a quick fix, however there should
>> probably be only one way to determine the filename. e.g.
>> symbol__annotate() should use the same way as
>> dso__data_fd().
>>
>> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
>> ---
>>  tools/perf/util/annotate.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
>> index 7dabde1..873c877 100644
>> --- a/tools/perf/util/annotate.c
>> +++ b/tools/perf/util/annotate.c
>> @@ -915,6 +915,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
>>  			return -ENOMEM;
>>  		}
>>  		goto fallback;
>> +	} else if (dso__is_kcore(dso)) {
>> +		goto fallback;
>>  	} else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
>>  		   strstr(command, "[kernel.kallsyms]") ||
>>  		   access(symfs_filename, R_OK)) {
>> -- 
>> 1.9.1
> 
> 

Re: [PATCH] perf tools: Fix annotation with kcore

[Arnaldo Carvalho de Melo]

Em Tue, Nov 11, 2014 at 12:04:54PM +0200, Adrian Hunter escreveu:
> Patch "perf tools: Fix build-id matching on vmlinux"
> breaks annotation with kcore.  The problem is that
> symbol__annotate() first gets the filename based on
> the build-id which was previously not set.
> This patch provides a quick fix, however there should
> probably be only one way to determine the filename. e.g.
> symbol__annotate() should use the same way as
> dso__data_fd().

Agreed, please provide a patch if you feel like cleaning this up :-)

- Arnaldo
 
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
>  tools/perf/util/annotate.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 7dabde1..873c877 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -915,6 +915,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
>  			return -ENOMEM;
>  		}
>  		goto fallback;
> +	} else if (dso__is_kcore(dso)) {
> +		goto fallback;
>  	} else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
>  		   strstr(command, "[kernel.kallsyms]") ||
>  		   access(symfs_filename, R_OK)) {
> -- 
> 1.9.1

[tip:perf/core] perf tools: Fix annotation with kcore

[tip-bot for Adrian Hunter]

Commit-ID:  ee205503f2333d639550eaed37abb455733510a3
Gitweb:     http://git.kernel.org/tip/ee205503f2333d639550eaed37abb455733510a3
Author:     Adrian Hunter <adrian.hunter@intel.com>
AuthorDate: Tue, 11 Nov 2014 12:04:54 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 19 Nov 2014 12:33:47 -0300

perf tools: Fix annotation with kcore

Patch "perf tools: Fix build-id matching on vmlinux" breaks annotation
with kcore.  The problem is that symbol__annotate() first gets the
filename based on the build-id which was previously not set.

This patch provides a quick fix, however there should probably be only
one way to determine the filename. e.g.  symbol__annotate() should use
the same way as dso__data_fd().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1415700294-30816-1-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/annotate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 7dabde1..873c877 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -915,6 +915,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)
 			return -ENOMEM;
 		}
 		goto fallback;
+	} else if (dso__is_kcore(dso)) {
+		goto fallback;
 	} else if (readlink(symfs_filename, command, sizeof(command)) < 0 ||
 		   strstr(command, "[kernel.kallsyms]") ||
 		   access(symfs_filename, R_OK)) {