perf:tools: figure out start address of kernel map from /proc/kallsyms
PATCH 2/2 perf:tools: figure out start address of kernel map from /proc/kallsyms
From: Ming Lei <[email protected]>
On ARM, module symbol start address is ahead of kernel symbol start address, so we can't suppose that the start address of kenerl map always is zero, otherwise may cause incorrect .start and .end of kernel map (caused by fixup) when there are modules loaded, then map_groups__find may return incorrect map for symbol query.
This patch always figures out the start address of kernel map from /proc/kallsyms if the file is available, so fix the issues on ARM for module loaded case.
This patch fixes the following issues on ARM when modules are loaded:
- vmlinux symbol can't be found by kallsyms maps doing 'perf test'
- module symbols are parsed mistakenlly when doing 'perf top'/'perf report'
--- tools/perf/util/symbol.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-)
tools/perf/util/symbol.c +59 -1
@@ -2183,14 +2183,72 @@ static struct dso *machine__create_kernel(struct machine *self)return kernel; } +/*figure out the start address of kernel map from /proc/kallsyms*/ +static u64 __machine_get_kernel_start_addr (struct machine *self) +{ +char *line =NULL ; +size_t n; +u64 start_addr =0 ; +FILE *file; +const char *filename; +char path[PATH_MAX ]; + +if (machine__is_default_guest (self)) { + filename = symbol_conf.default_guest_kallsyms; +if (!filename) + goto out_failure; + }else { +sprintf (path,"%s/proc/kallsyms" , self->root_dir); + filename = path; + } + + file =fopen (filename,"r" ); + +if (file ==NULL ) + goto out_failure; + +while (!feof (file)) { +u64 start =0 ; +int line_len, len; + + line_len =getline (&line, &n, file); +if (line_len <0 || !line) +break ; + + line[--line_len] ='\0' ;/* \n */ + +/*if the line is for module symbol, skip it*/ +if (strchr (line,'[' )) +continue ; + + len =hex2u64 (line, &start); + + len++; +if (len +2 >= line_len) +continue ; + + start_addr = start; +break ; + } + +free (line); +fclose (file); +return start_addr; + +out_failure: +return start_addr; +} +int __machine__create_kernel_maps (struct machine *self,struct dso *kernel) {enum map_type type; +u64 start; + start =__machine_get_kernel_start_addr (self);for (type =0 ; type <MAP__NR_TYPES ; ++type) {struct kmap *kmap; - self->vmlinux_maps[type] =map__new2 (0 , kernel, type); + self->vmlinux_maps[type] =map__new2 (start, kernel, type);if (self->vmlinux_maps[type] ==NULL )return -1 ;
Signature · 1 line
1.7.3
Em Wed, Nov 24, 2010 at 07:35:33PM +0800, [email protected] escreveu:
Quoted 46 lines
From: Ming Lei <[email protected]>
On ARM, module symbol start address is ahead of kernel symbol start address, so we can't suppose that the start address of kenerl map always is zero, otherwise may cause incorrect .start and .end of kernel map (caused by fixup) when there are modules loaded, then
map_groups__findmay return incorrect map for symbol query.This patch always figures out the start address of kernel map from
/proc/kallsymsif the file is available, so fix the issues on ARM for module loaded case.This patch fixes the following issues on ARM when modules are loaded:
- vmlinux symbol can't be found by kallsyms maps doing 'perf test'
- module symbols are parsed mistakenlly when doing 'perf top'/'perf report'Cc Ian Munsie <[email protected]>Cc Ingo Molnar <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Tom Zanussi <[email protected]>Signed-off-by Ming Lei <[email protected]>--- tools/perf/util/symbol.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-)tools/perf/util/symbol.c +10
-0@@ -2183,14 +2183,72 @@ static struct dso *machine__create_kernel(struct machine *self)return kernel; } +/*figure out the start address of kernel map from /proc/kallsyms*/ +static u64 __machine_get_kernel_start_addr (struct machine *self) +{ +char *line =NULL ; +size_t n; +u64 start_addr =0 ; +FILE *file; +const char *filename; +char path[PATH_MAX ]; +
tools/perf/util/symbol.c static struct dso *machine__create_kernel(struct machine *self) · line 2205
Quoted 10 lines
tools/perf/util/symbol.c +10
-0+if (machine__is_default_guest (self)) { + filename = symbol_conf.default_guest_kallsyms; +if (!filename) + goto out_failure; + }else { +sprintf (path,"%s/proc/kallsyms" , self->root_dir); + filename = path; + } + + file =fopen (filename,"r" );
Can you please use kallsyms__parse()? Please take a look at event__synthesize_kernel_mmap as it also uses it.
Quoted 19 lines
tools/perf/util/symbol.c +19
-0+if (file ==NULL ) + goto out_failure; + +while (!feof (file)) { +u64 start =0 ; +int line_len, len; + + line_len =getline (&line, &n, file); +if (line_len <0 || !line) +break ; + + line[--line_len] ='\0' ;/* \n */ + +/*if the line is for module symbol, skip it*/ +if (strchr (line,'[' )) +continue ; + + len =hex2u64 (line, &start); +
tools/perf/util/symbol.c static struct dso *machine__create_kernel(struct machine *self) · line 2235
Quoted 10 lines
tools/perf/util/symbol.c +10
-0+ len++; +if (len +2 >= line_len) +continue ; + + start_addr = start; +break ; + } + +free (line); +fclose (file);
Out failure could be here, avoiding one return case.
Quoted 22 lines
tools/perf/util/symbol.c +9
-1+return start_addr; + +out_failure: +return start_addr; +} +int __machine__create_kernel_maps (struct machine *self,struct dso *kernel) {enum map_type type; +u64 start; + start =__machine_get_kernel_start_addr (self);for (type =0 ; type <MAP__NR_TYPES ; ++type) {struct kmap *kmap; - self->vmlinux_maps[type] =map__new2 (0 , kernel, type); + self->vmlinux_maps[type] =map__new2 (start, kernel, type);if (self->vmlinux_maps[type] ==NULL )return -1 ;Signature · 1 line
1.7.3
2010/11/24 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 2 lines
Can you please use
kallsyms__parse()? Please take a look atevent__synthesize_kernel_mmapas it also uses it.
Good idea, but kallsyms__parse does not pass a parameter which indicates if it is a module or kernel symbol to process handler.
So could you agree on adding one parameter which indicates if the current symbol is module symbol to process handler?
If so, I can use kallsyms__parse.
thanks,
Signature · 1 line
Lei Ming
Em Wed, Nov 24, 2010 at 10:38:29PM +0800, Ming Lei escreveu:
Quoted 11 lines
2010/11/24 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 2 lines
Can you please use
kallsyms__parse()? Please take a look atevent__synthesize_kernel_mmapas it also uses it.Good idea, but
kallsyms__parsedoes not pass a parameter which indicates if it is a module or kernel symbol to process handler.So could you agree on adding one parameter which indicates if the current symbol is module symbol to process handler?
If so, I can use
kallsyms__parse.
It passes, for a line like:
ffffffffa00361ce t serio_raw_connect [serio_raw]
The process callback will receive:
process_symbol(arg=callback arg,
symbol_name="serio_raw_connect [serio_raw]",
symbol_type='T', start=0xffffffffa00361ce)That is how we figure out if it is a module when splitting the kallsyms into modules, as kallsyms__parse is also used in:
dso__load_kallsyms
dso__load_all_kallsyms
kallsyms__parse
- Arnaldo