perf tools: kcore improvements
Adrian Hunter
reviewercover perf tools: kcore improvements
Hi
Here are some improvements for using kcore. There are 3 improvements:
- validate that kcore matches the perf.data modules
- workaround objdump difficulties with kcore
- add kcore to the build-id cache
Note that I have included:
perf tools: fix buildid cache handling of kallsyms with kcore
which has been sent earlier.
Adrian Hunter (11):
perf tools: fix buildid cache handling of kallsyms with kcore perf tools: fix path unpopulated in machine__create_modules() perf tools: make a separate function to parse /proc/modules perf tools: validate kcore module addresses
perf tools: workaround objdump difficulties with kcore perf tools: add map__find_other_map_symbol()
perf tools: fix annotate_browser__callq()
perf tools: find kcore symbols on other maps
perf tools: add copyfile_mode()
perf buildid-cache: add ability to add kcore to the cache perf tools: add ability to find kcore in build-id cache
tools/perf/Documentation/perf-buildid-cache.txt | 12 + tools/perf/builtin-buildid-cache.c | 146 +++++- tools/perf/ui/browsers/annotate.c | 10 +- tools/perf/util/annotate.c | 36 +- tools/perf/util/header.c | 44 +- tools/perf/util/machine.c | 76 +--- tools/perf/util/map.c | 27 ++ tools/perf/util/map.h | 2 + tools/perf/util/symbol-elf.c | 579 ++++++++++++++++++++++++ tools/perf/util/symbol-minimal.c | 15 + tools/perf/util/symbol.c | 431 +++++++++++++++--- tools/perf/util/symbol.h | 20 + tools/perf/util/util.c | 18 +- tools/perf/util/util.h | 1 + 14 files changed, 1263 insertions(+), 154 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH 1/11 perf tools: fix buildid cache handling of kallsyms with kcore
When kallsyms is used with kcore the dso long_name becomes the kcore file name. That prevents the buildid cache from caching kallsyms. (There is no support at present for caching kcore). Fix by changing it so that the kallsyms name is used in that case instead.
--- tools/perf/util/header.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-)
tools/perf/util/header.c +30 -14
@@ -199,9 +199,11 @@ static int write_buildid(char *name, size_t name_len, u8 *build_id,return write_padded (fd, name, name_len +1 , len); } -static int __dsos__write_buildid_table (struct list_head *head,pid_t pid, -u16 misc,int fd) +static int __dsos__write_buildid_table (struct machine *machine, +struct list_head *head,pid_t pid, +u16 misc,int fd) { +char nm[PATH_MAX ];struct dso *pos;dsos__for_each_with_build_id (pos, head) {
@@ -215,6 +217,10 @@ static int __dsos__write_buildid_table(struct list_head *head, pid_t pid,if (is_vdso_map (pos->short_name)) { name = (char *)VDSO__MAP_NAME ; name_len =sizeof (VDSO__MAP_NAME ) +1 ; + }else if (dso__is_kcore (pos)) { +machine__mmap_name (machine, nm,sizeof (nm)); + name = nm; + name_len =strlen (nm) +1 ; }else { name = pos->long_name; name_len = pos->long_name_len +1 ;
@@ -240,10 +246,10 @@ static int machine__write_buildid_table(struct machine *machine, int fd) umisc =PERF_RECORD_MISC_GUEST_USER ; } - err =__dsos__write_buildid_table (&machine->kernel_dsos, machine->pid, - kmisc, fd); + err =__dsos__write_buildid_table (machine, &machine->kernel_dsos, + machine->pid, kmisc, fd);if (err ==0 ) - err =__dsos__write_buildid_table (&machine->user_dsos, + err =__dsos__write_buildid_table (machine, &machine->user_dsos, machine->pid, umisc, fd);return err; }
@@ -375,32 +381,42 @@ out_free:return err; } -static int dso__cache_build_id (struct dso *dso,const char *debugdir) +static int dso__cache_build_id (struct machine *machine,struct dso *dso, +const char *debugdir) {bool is_kallsyms = dso->kernel && dso->long_name[0 ] !='/' ;bool is_vdso =is_vdso_map (dso->short_name); +char *name = dso->long_name; +char nm[PATH_MAX ]; -return build_id_cache__add_b (dso->build_id,sizeof (dso->build_id), - dso->long_name, debugdir, - is_kallsyms, is_vdso); +if (dso__is_kcore (dso)) { + is_kallsyms = true; +machine__mmap_name (machine, nm,sizeof (nm)); + name = nm; + } +return build_id_cache__add_b (dso->build_id,sizeof (dso->build_id), name, + debugdir, is_kallsyms, is_vdso); } -static int __dsos__cache_build_ids (struct list_head *head,const char *debugdir) +static int __dsos__cache_build_ids (struct machine *machine, +struct list_head *head,const char *debugdir) {struct dso *pos;int err =0 ;dsos__for_each_with_build_id (pos, head) -if (dso__cache_build_id (pos, debugdir)) +if (dso__cache_build_id (machine, pos, debugdir)) err =-1 ;return err; } -static int machine__cache_build_ids (struct machine *machine,const char *debugdir) +static int machine__cache_build_ids (struct machine *machine, +const char *debugdir) { -int ret =__dsos__cache_build_ids (&machine->kernel_dsos, debugdir); - ret |=__dsos__cache_build_ids (&machine->user_dsos, debugdir); +int ret =__dsos__cache_build_ids (machine, &machine->kernel_dsos, + debugdir); + ret |=__dsos__cache_build_ids (machine, &machine->user_dsos, debugdir);return ret; }
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 2/11 perf tools: fix path unpopulated in machine__create_modules()
In reply to Adrian HunterIn machine__create_modules() the 'path' char array was used in a call to symbol__restricted_filename() without always being populated.
--- tools/perf/util/machine.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
tools/perf/util/machine.c +4 -7
@@ -782,20 +782,17 @@ static int machine__create_modules(struct machine *machine)size_t n;FILE *file;struct map *map; -const char *modules;char path[PATH_MAX ];if (machine__is_default_guest (machine)) - modules = symbol_conf.default_guest_modules; -else { -sprintf (path,"%s/proc/modules" , machine->root_dir); - modules = path; - } +strncpy (path, symbol_conf.default_guest_modules,PATH_MAX ); +else +snprintf (path,PATH_MAX ,"%s/proc/modules" , machine->root_dir);if (symbol__restricted_filename (path,"/proc/modules" ))return -1 ; - file =fopen (modules,"r" ); + file =fopen (path,"r" );if (file ==NULL )return -1 ;
Signature · 1 line
1.7.11.7
Re: [PATCH 02/11] perf tools: fix path unpopulated in machine__create_modules()
Em Mon, Sep 16, 2013 at 01:52:43PM +0300, Adrian Hunter escreveu:
Quoted 3 lines
In
machine__create_modules()the 'path' char array was used in a call tosymbol__restricted_filename()without always being populated.
Isn't this equivalent and shorter?
[acme@zoo linux]$ git diff
tools/perf/util/machine.c +1 -1
@@ -792,7 +792,7 @@ static int machine__create_modules(struct machine *machine) modules = path; } -if (symbol__restricted_filename (path,"/proc/modules" )) +if (symbol__restricted_filename (modules,"/proc/modules" ))return -1 ; file =fopen (modules,"r" );
[acme@zoo linux]$
- Arnaldo
Quoted 36 lines
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/util/machine.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)tools/perf/util/machine.c +4
-7@@ -782,20 +782,17 @@ static int machine__create_modules(struct machine *machine)size_t n;FILE *file;struct map *map; -const char *modules;char path[PATH_MAX ];if (machine__is_default_guest (machine)) - modules = symbol_conf.default_guest_modules; -else { -sprintf (path,"%s/proc/modules" , machine->root_dir); - modules = path; - } +strncpy (path, symbol_conf.default_guest_modules,PATH_MAX ); +else +snprintf (path,PATH_MAX ,"%s/proc/modules" , machine->root_dir);if (symbol__restricted_filename (path,"/proc/modules" ))return -1 ; - file =fopen (modules,"r" ); + file =fopen (path,"r" );if (file ==NULL )return -1 ;Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 3/11 perf tools: make a separate function to parse /proc/modules
In reply to Adrian HunterMake a separate function to parse /proc/modules
so that it can be reused.
--- tools/perf/util/machine.c | 67 +++++++++++++---------------------------------- tools/perf/util/symbol.c | 58 ++++++++++++++++++++++++++++++++++++++++ tools/perf/util/symbol.h | 3 +++ 3 files changed, 79 insertions(+), 49 deletions(-)
tools/perf/util/machine.c +18 -49
@@ -776,12 +776,22 @@ static int machine__set_modules_path(struct machine *machine)return map_groups__set_modules_path_dir (&machine->kmaps, modules_path); } -static int machine__create_modules (struct machine *machine) +static int machine__create_module (void *arg,const char *name,u64 start) { -char *line =NULL ; -size_t n; -FILE *file; +struct machine *machine = arg;struct map *map; + + map =machine__new_module (machine, start, name); +if (map ==NULL ) +return -1 ; + +dso__kernel_module_get_build_id (map->dso, machine->root_dir); + +return 0 ; +} + +static int machine__create_modules (struct machine *machine) +{char path[PATH_MAX ];if (machine__is_default_guest (machine))
@@ -792,56 +802,15 @@ static int machine__create_modules(struct machine *machine)if (symbol__restricted_filename (path,"/proc/modules" ))return -1 ; - file =fopen (path,"r" ); -if (file ==NULL ) +if (modules__parse (path, machine, machine__create_module))return -1 ; -while (!feof (file)) { -char name[PATH_MAX ]; -u64 start; -char *sep; -int line_len; - - line_len =getline (&line, &n, file); -if (line_len <0 ) -break ; - -if (!line) - goto out_failure; - - line[--line_len] ='\0' ;/* \n */ - - sep =strrchr (line,'x' ); -if (sep ==NULL ) -continue ; - -hex2u64 (sep +1 , &start); - - sep =strchr (line,' ' ); -if (sep ==NULL ) -continue ; - - *sep ='\0' ; - -snprintf (name,sizeof (name),"[%s]" , line); - map =machine__new_module (machine, start, name); -if (map ==NULL ) - goto out_delete_line; -dso__kernel_module_get_build_id (map->dso, machine->root_dir); - } +if (!machine__set_modules_path (machine)) +return 0 ; -free (line); -fclose (file); +pr_debug ("Problems setting modules path maps, continuing anyway...\n" ); -if (machine__set_modules_path (machine) <0 ) { -pr_debug ("Problems setting modules path maps, continuing anyway...\n" ); - }return 0 ; - -out_delete_line: -free (line); -out_failure: -return -1 ; }int machine__create_kernel_maps (struct machine *machine)
tools/perf/util/symbol.c +58 -0
64 lines not on this page · raw message
tools/perf/util/symbol.h +3 -0
@@ -222,6 +222,9 @@ int sysfs__read_build_id(const char *filename, void *bf, size_t size);int kallsyms__parse (const char *filename,void *arg,int (*process_symbol)(void *arg,const char *name,char type,u64 start)); +int modules__parse (const char *filename,void *arg, +int (*process_module)(void *arg,const char *name, +u64 start));int filename__read_debuglink (const char *filename,char *debuglink,size_t size);
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 4/11 perf tools: validate kcore module addresses
In reply to Adrian HunterBefore using kcore we need to check that modules are in memory at the same addresses that they were when data was recorded.
This is done because, while we could remap symbols to different addresses, the object code linkages would still be different which would provide an erroneous view of the object code.
--- tools/perf/util/symbol.c | 194 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 173 insertions(+), 21 deletions(-)
tools/perf/util/symbol.c +173 -21
@@ -797,51 +797,199 @@ bool symbol__restricted_filename(const char *filename,return restricted; } -struct kcore_mapfn_data { -struct dso *dso; -enum map_type type; -struct list_head maps; +struct module_info { +struct rb_node rb_node; +char *name; +u64 start; }; -static int kcore_mapfn (u64 start,u64 len,u64 pgoff,void *data) +static void add_module (struct module_info *mi,struct rb_root *modules) { -struct kcore_mapfn_data *md = data; -struct map *map; +struct rb_node **p = &modules->rb_node; +struct rb_node *parent =NULL ; +struct module_info *m; - map =map__new2 (start, md->dso, md->type); -if (map ==NULL ) +while (*p !=NULL ) { + parent = *p; + m = rb_entry(parent, struct module_info, rb_node); +if (strcmp (mi->name, m->name) <0 ) + p = &(*p)->rb_left; +else + p = &(*p)->rb_right; + } +rb_link_node (&mi->rb_node, parent, p); +rb_insert_color (&mi->rb_node, modules); +} + +static void delete_modules (struct rb_root *modules) +{ +struct module_info *mi; +struct rb_node *next =rb_first (modules); + +while (next) { + mi = rb_entry(next, struct module_info, rb_node); + next =rb_next (&mi->rb_node); +rb_erase (&mi->rb_node, modules); +free (mi->name); +free (mi); + } +} + +static struct module_info *find_module (const char *name, +struct rb_root *modules) +{ +struct rb_node *n = modules->rb_node; + +while (n) { +struct module_info *m; +int cmp; + + m = rb_entry(n, struct module_info, rb_node); + cmp =strcmp (name, m->name); +if (cmp <0 ) + n = n->rb_left; +else if (cmp >0 ) + n = n->rb_right; +else +return m; + } + +return NULL ; +} + +static int __read_proc_modules (void *arg,const char *name,u64 start) +{ +struct rb_root *modules = arg; +struct module_info *mi; + + mi =zalloc (sizeof (struct module_info )); +if (!mi)return -ENOMEM ; - map->end = map->start + len; - map->pgoff = pgoff; + mi->name =strdup (name); + mi->start = start; -list_add (&map->node, &md->maps); +add_module (mi, modules); + +if (!mi->name) +return -ENOMEM ; + +return 0 ; +} + +static int read_proc_modules (const char *filename,struct rb_root *modules) +{ +if (symbol__restricted_filename (filename,"/proc/modules" )) +return -1 ; + +if (modules__parse (filename, modules, __read_proc_modules)) { +delete_modules (modules); +return -1 ; + }return 0 ; } +static int do_validate_kcore_modules (const char *filename,struct map *map, +struct map_groups *kmaps) +{ +struct rb_root modules =RB_ROOT ; +struct map *old_map; +int err; + + err =read_proc_modules (filename, &modules); +if (err) +return err; + + old_map =map_groups__first (kmaps, map->type); +while (old_map) { +struct map *next =map_groups__next (old_map); +struct module_info *mi; + +if (old_map == map || old_map->start == map->start) { +/* The kernel map */ + old_map = next; +continue ; + } + +/* Module must be in memory at the same address */ + mi =find_module (old_map->dso->short_name, &modules); +if (!mi || mi->start != old_map->start) { + err = -EINVAL ; + goto out; + } + + old_map = next; + } +out: +delete_modules (&modules); +return err; +} +/* -* If kallsyms is referenced by name then we look for kcore in the same +* If kallsyms is referenced by name then we look for filename in the same * directory. */ -static bool kcore_filename_from_kallsyms_filename (char *kcore_filename, -const char *kallsyms_filename) +static bool filename_from_kallsyms_filename (char *filename, +const char *basename, +const char *kallsyms_filename) {char *name; -strcpy (kcore_filename, kallsyms_filename); - name =strrchr (kcore_filename,'/' ); +strcpy (filename, kallsyms_filename); + name =strrchr (filename,'/' );if (!name)return false; -if (!strcmp (name,"/kallsyms" )) { -strcpy (name,"/kcore" ); + name +=1 ; + +if (!strcmp (name,"kallsyms" )) { +strcpy (name, basename);return true; }return false; } +static int validate_kcore_modules (const char *kallsyms_filename, +struct map *map) +{ +struct map_groups *kmaps =map__kmap (map)->kmaps; +char modules_filename[PATH_MAX ]; + +if (!filename_from_kallsyms_filename (modules_filename,"modules" , + kallsyms_filename)) +return -EINVAL ; + +if (do_validate_kcore_modules (modules_filename, map, kmaps)) +return -EINVAL ; + +return 0 ; +} + +struct kcore_mapfn_data { +struct dso *dso; +enum map_type type; +struct list_head maps; +}; + +static int kcore_mapfn (u64 start,u64 len,u64 pgoff,void *data) +{ +struct kcore_mapfn_data *md = data; +struct map *map; + + map =map__new2 (start, md->dso, md->type); +if (map ==NULL ) +return -ENOMEM ; + + map->end = map->start + len; + map->pgoff = pgoff; + +list_add (&map->node, &md->maps); + +return 0 ; +} +static int dso__load_kcore (struct dso *dso,struct map *map,const char *kallsyms_filename) {
@@ -858,8 +1006,12 @@ static int dso__load_kcore(struct dso *dso, struct map *map,if (map != machine->vmlinux_maps[map->type])return -EINVAL ; -if (!kcore_filename_from_kallsyms_filename (kcore_filename, - kallsyms_filename)) +if (!filename_from_kallsyms_filename (kcore_filename,"kcore" , + kallsyms_filename)) +return -EINVAL ; + +/* All modules must be present at their original addresses */ +if (validate_kcore_modules (kallsyms_filename, map))return -EINVAL ; md.dso = dso;
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 5/11 perf tools: workaround objdump difficulties with kcore
In reply to Adrian Hunterobjdump fails to annotate module symbols when looking at kcore. Workaround this by extracting object code from kcore and putting it in a temporary file for objdump to use instead. The temporary file is created to look like kcore but contains only the function being disassembled.
--- tools/perf/util/annotate.c | 21 ++++ tools/perf/util/symbol-elf.c | 221 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/symbol-minimal.c | 9 ++ tools/perf/util/symbol.h | 14 +++ 4 files changed, 265 insertions(+)
tools/perf/util/annotate.c +21 -0
@@ -879,6 +879,8 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)FILE *file;int err =0 ;char symfs_filename[PATH_MAX ]; +struct kcore_extract kce; +bool delete_extract = false;if (filename) { snprintf(symfs_filename, sizeof(symfs_filename), "%s%s",
@@ -940,6 +942,23 @@ fallback:pr_debug ("annotating [%p] %30s : [%p] %30s\n" , dso, dso->long_name, sym, sym->name); +if (dso__is_kcore (dso)) { + kce.kcore_filename = symfs_filename; + kce.addr =map__rip_2objdump (map, sym->start); + kce.offs = sym->start; + kce.len = sym->end +1 - sym->start; +if (!create_kcore_extract (&kce)) { + delete_extract = true; +strncpy (symfs_filename, kce.extract_filename, +sizeof (symfs_filename)); +if (free_filename) { +free (filename); + free_filename = false; + } + filename = symfs_filename; + } + } +snprintf (command,sizeof (command),"%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64
@@ -972,6 +991,8 @@ fallback:pclose (file); out_free_filename: +if (delete_extract) +delete_kcore_extract (&kce);if (free_filename)free (filename);return err;
tools/perf/util/symbol-elf.c +221 -0
227 lines not on this page · raw message
tools/perf/util/symbol-minimal.c +9 -0
@@ -308,6 +308,15 @@ int file__read_maps(int fd __maybe_unused, bool exe __maybe_unused,return -1 ; } +int create_kcore_extract (struct kcore_extract *kce__maybe_unused ) +{ +return -1 ; +} + +void delete_kcore_extract (struct kcore_extract *kce__maybe_unused ) +{ +} +void symbol__elf_init (void ) { }
tools/perf/util/symbol.h +14 -0
@@ -255,4 +255,18 @@ typedef int (*mapfn_t)(u64 start, u64 len, u64 pgoff, void *data);int file__read_maps (int fd,bool exe,mapfn_t mapfn,void *data,bool *is_64_bit); +#define PERF_KCORE_EXTRACT "/tmp/perf-kcore-XXXXXX" + +struct kcore_extract { +char *kcore_filename; +u64 addr; +u64 offs; +u64 len; +char extract_filename[sizeof (PERF_KCORE_EXTRACT )]; +int fd; +}; + +int create_kcore_extract (struct kcore_extract *kce); +void delete_kcore_extract (struct kcore_extract *kce); +#endif /* __PERF_SYMBOL */
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 6/11 perf tools: add map__find_other_map_symbol()
In reply to Adrian HunterAdd a function to find a symbol using an ip that
might be on a different map.
--- tools/perf/util/map.c | 27 +++++++++++++++++++++++++++ tools/perf/util/map.h | 2 ++ 2 files changed, 29 insertions(+)
tools/perf/util/map.c +27 -0
@@ -213,6 +213,33 @@ struct symbol *map__find_symbol_by_name(struct map *map, const char *name,return dso__find_symbol_by_name (map->dso, map->type, name); } +struct symbol *map__find_other_map_symbol (struct map **map_ptr,u64 *ip_ptr, +symbol_filter_t filter) +{ +struct map *map = *map_ptr; +u64 ip = *ip_ptr; +struct map *sym_map =NULL ; +struct symbol *sym; + +if (ip >= map->start && ip <= map->end) + sym_map = map; +else if (map->groups) + sym_map =map_groups__find (map->groups, map->type, ip); + +if (!sym_map) +return NULL ; + + ip = sym_map->map_ip (sym_map, ip); + + sym =map__find_symbol (sym_map, ip, filter); +if (sym) { + *map_ptr = sym_map; + *ip_ptr = ip; + } + +return sym; +} +struct map *map__clone (struct map *map) {return memdup (map,sizeof (*map));
tools/perf/util/map.h +2 -0
@@ -106,6 +106,8 @@ struct symbol *map__find_symbol(struct map *map, u64 addr, symbol_filter_t filter);struct symbol *map__find_symbol_by_name (struct map *map,const char *name,symbol_filter_t filter); +struct symbol *map__find_other_map_symbol (struct map **map_ptr,u64 *ip_ptr, +symbol_filter_t filter);void map__fixup_start (struct map *map);void map__fixup_end (struct map *map);
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 7/11 perf tools: fix annotate_browser__callq()
In reply to Adrian HunterWhen following a call, annotate_browser__callq() uses the current symbol's map to look up the target ip. That will not work if the target ip is on a map with a different mapping (i.e. start - pgoff is different).
--- tools/perf/ui/browsers/annotate.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
tools/perf/ui/browsers/annotate.c +6 -4
@@ -445,14 +445,16 @@ static bool annotate_browser__callq(struct annotate_browser *browser,struct symbol *sym = ms->sym;struct annotation *notes;struct symbol *target; +struct map *map;u64 ip;char title[SYM_TITLE_MAX_SIZE ];if (!ins__is_call (dl->ins))return false; - ip = ms->map->map_ip (ms->map, dl->ops.target.addr); - target =map__find_symbol (ms->map, ip,NULL ); + map = ms->map; + ip = dl->ops.target.addr; + target =map__find_other_map_symbol (&map, &ip,NULL );if (target ==NULL ) {ui_helpline__puts ("The called function was not found." );return true;
@@ -469,8 +471,8 @@ static bool annotate_browser__callq(struct annotate_browser *browser, }pthread_mutex_unlock (¬es->lock); -symbol__tui_annotate (target, ms->map, evsel, hbt); -sym_title (sym, ms->map, title,sizeof (title)); +symbol__tui_annotate (target, map, evsel, hbt); +sym_title (sym, map, title,sizeof (title));ui_browser__show_title (&browser->b, title);return true; }
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 8/11 perf tools: find kcore symbols on other maps
In reply to Adrian HunterUse the new map__find_other_map_symbol() to
find kcore symbols on other maps.
--- tools/perf/util/annotate.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
tools/perf/util/annotate.c +5 -10
@@ -825,20 +825,15 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, dl->ops.target.offset = dl->ops.target.addr -map__rip_2objdump (map, sym->start); -/* -* kcore has no symbols, so add the call target name if it is on the -* same map. -*/ +/* kcore has no symbols, so add the call target name */ if (dl->ins &&ins__is_call (dl->ins) && !dl->ops.target.name) { +struct map *map_ptr = map;struct symbol *s;u64 ip = dl->ops.target.addr; -if (ip >= map->start && ip <= map->end) { - ip = map->map_ip (map, ip); - s =map__find_symbol (map, ip,NULL ); -if (s && s->start == ip) - dl->ops.target.name =strdup (s->name); - } + s =map__find_other_map_symbol (&map_ptr, &ip,NULL ); +if (s && s->start == ip) + dl->ops.target.name =strdup (s->name); }disasm__add (¬es->src->source, dl);
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 9/11 perf tools: add copyfile_mode()
In reply to Adrian HunterAdd a function to copy a file specifying the
permissions to use for the created file.
--- tools/perf/util/util.c | 18 +++++++++++++----- tools/perf/util/util.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-)
tools/perf/util/util.c +13 -5
@@ -55,17 +55,20 @@ int mkdir_p(char *path, mode_t mode)return (stat (path, &st) &&mkdir (path, mode)) ?-1 :0 ; } -static int slow_copyfile (const char *from,const char *to) +static int slow_copyfile (const char *from,const char *to,mode_t mode) { -int err =0 ; +int err =-1 ;char *line =NULL ;size_t n;FILE *from_fp =fopen (from,"r" ), *to_fp; +mode_t old_umask;if (from_fp ==NULL ) goto out; + old_umask =umask (mode ^0777 ); to_fp =fopen (to,"w" ); +umask (old_umask);if (to_fp ==NULL ) goto out_fclose_from;
@@ -82,7 +85,7 @@ out:return err; } -int copyfile (const char *from,const char *to) +int copyfile_mode (const char *from,const char *to,mode_t mode) {int fromfd, tofd;struct stat st;
@@ -93,13 +96,13 @@ int copyfile(const char *from, const char *to) goto out;if (st.st_size ==0 )/* /proc? do it slowly... */ -return slow_copyfile (from, to); +return slow_copyfile (from, to, mode); fromfd =open (from,O_RDONLY );if (fromfd <0 ) goto out; - tofd =creat (to,0755 ); + tofd =creat (to, mode);if (tofd <0 ) goto out_close_from;
@@ -121,6 +124,11 @@ out:return err; } +int copyfile (const char *from,const char *to) +{ +return copyfile_mode (from, to,0755 ); +} +unsigned long convert_unit (unsigned long value,char *unit) { *unit =' ' ;
tools/perf/util/util.h +1 -0
@@ -241,6 +241,7 @@ static inline int sane_case(int x, int high)int mkdir_p (char *path,mode_t mode);int copyfile (const char *from,const char *to); +int copyfile_mode (const char *from,const char *to,mode_t mode);s64 perf_atoll (const char *str);char **argv_split (const char *str,int *argcp);
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 10/11 perf buildid-cache: add ability to add kcore to the cache
In reply to Adrian Hunterkcore can be used to view the running kernel object code. However, kcore changes as modules are loaded and unloaded, and when the kernel decides to modify its own code. Consequently it is useful to create a copy of kcore at a particular time. Unlike vmlinux, kcore is not unique for a given build-id. And in addition, the kallsyms and modules files are also needed. The tool therefore creates a directory:
~/.debug/[kernel.kcore]/<build-id>/<YYYYmmddHHMMSShh>
which contains: kcore, kallsyms and modules.
Note that the copied kcore contains only code sections. See the kcore_copy() function for how that is determined.
The tool will not make additional copies of kcore if there is already one with the same modules at the same addresses.
Currently, perf tools will not look for kcore in the cache. That is addressed in another patch.
--- tools/perf/Documentation/perf-buildid-cache.txt | 12 + tools/perf/builtin-buildid-cache.c | 146 +++++++++- tools/perf/util/symbol-elf.c | 358 ++++++++++++++++++++++++ tools/perf/util/symbol-minimal.c | 6 + tools/perf/util/symbol.c | 41 +++ tools/perf/util/symbol.h | 3 + 6 files changed, 565 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-buildid-cache.txt +12 -0
@@ -21,6 +21,18 @@ OPTIONS -a:: --add=:: Add specified file to the cache. +-k:: +--kcore:: + Add specified kcore file to the cache. For the current host that is + /proc/kcore which requires root permissions to read. Be aware that + running 'perf buildid-cache' as root will update root's build-id cache + not the user's. Use the -v option to see where the file is created. + Note that the copied file contains only code sections not the whole core + image. Note also that files "kallsyms" and "modules" must also be in the + same directory and are also copied. kcore will not be added if there + is already a kcore in the cache (with the same build-id) that has the + same modules at the same addresses. Use the -v option to see if a copy + of kcore is actually made. -r:: --remove=:: Remove specified file from the cache.
tools/perf/builtin-buildid-cache.c +145 -1
173 lines not on this page · raw message
tools/perf/util/symbol-elf.c +358 -0
364 lines not on this page · raw message
tools/perf/util/symbol-minimal.c +6 -0
@@ -317,6 +317,12 @@ void delete_kcore_extract(struct kcore_extract *kce __maybe_unused) { } +int kcore_copy (const char *from_dir__maybe_unused , +const char *to_dir__maybe_unused ) +{ +return -1 ; +} +void symbol__elf_init (void ) { }
tools/perf/util/symbol.c +41 -0
47 lines not on this page · raw message
tools/perf/util/symbol.h +3 -0
@@ -269,4 +269,7 @@ struct kcore_extract {int create_kcore_extract (struct kcore_extract *kce);void delete_kcore_extract (struct kcore_extract *kce); +int kcore_copy (const char *from_dir,const char *to_dir); +int compare_proc_modules (const char *from,const char *to); +#endif /* __PERF_SYMBOL */
Signature · 1 line
1.7.11.7
Adrian Hunter
reviewerPATCH 11/11 perf tools: add ability to find kcore in build-id cache
In reply to Adrian HunterWhen no vmlinux is found, tools will use kallsyms and, if possible, kcore. Add the ability to find kcore in the build-id cache.
--- tools/perf/util/symbol.c | 138 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 94 insertions(+), 44 deletions(-)
tools/perf/util/symbol.c +94 -44
@@ -1439,6 +1439,96 @@ out:return err; } +static int find_matching_kcore (struct map *map,char *dir,size_t dir_sz) +{ +char kallsyms_filename[PATH_MAX ]; +struct dirent *dent; +int ret =-1 ; +DIR *d; + + d =opendir (dir); +if (!d) +return -1 ; + +while (1 ) { + dent =readdir (d); +if (!dent) +break ; +if (dent->d_type !=DT_DIR ) +continue ; +snprintf (kallsyms_filename,sizeof (kallsyms_filename), +"%s/%s/kallsyms" , dir, dent->d_name); +if (!validate_kcore_modules (kallsyms_filename, map)) { +strncpy (dir, kallsyms_filename, dir_sz); + ret =0 ; +break ; + } + } + +closedir (d); + +return ret; +} + +static char *dso__find_kallsyms (struct dso *dso,struct map *map) +{ +u8 host_build_id[BUILD_ID_SIZE ]; +char sbuild_id[BUILD_ID_SIZE *2 +1 ]; +bool is_host = false; +char path[PATH_MAX ]; + +if (!dso->has_build_id) { +/* +* Last resort, if we don't have a build-id and couldn't find +* any vmlinux file, try the running kernel kallsyms table. +*/ + goto proc_kallsyms; + } + +if (sysfs__read_build_id ("/sys/kernel/notes" , host_build_id, +sizeof (host_build_id)) ==0 ) + is_host =dso__build_id_equal (dso, host_build_id); + +build_id__sprintf (dso->build_id,sizeof (dso->build_id), sbuild_id); + +/* Use /proc/kallsyms if possible */ +if (is_host) { +DIR *d; + +/* If no cached kcore go with /proc/kallsyms */ +snprintf (path,sizeof (path),"%s/[kernel.kcore]/%s" , + buildid_dir, sbuild_id); + d =opendir (path); +if (!d) + goto proc_kallsyms; +closedir (d); + +/* If module maps match go with /proc/kallsyms */ +if (!validate_kcore_modules ("/proc/kallsyms" , map)) + goto proc_kallsyms; + +/* Find kallsyms in build-id cache with kcore */ +if (!find_matching_kcore (map, path,sizeof (path))) +return strdup (path); + + goto proc_kallsyms; + } + +snprintf (path,sizeof (path),"%s/[kernel.kallsyms]/%s" , + buildid_dir, sbuild_id); + +if (access (path,F_OK )) { +pr_err ("No kallsyms or vmlinux with build-id %s was found\n" , + sbuild_id); +return NULL ; + } + +return strdup (path); + +proc_kallsyms: +return strdup ("/proc/kallsyms" ); +} +static int dso__load_kernel_sym (struct dso *dso,struct map *map,symbol_filter_t filter) {
@@ -1487,51 +1577,11 @@ static int dso__load_kernel_sym(struct dso *dso, struct map *map,if (symbol_conf.symfs[0 ] !=0 )return -1 ; -/* -* Say the kernel DSO was created when processing the build-id header table, -* we have a build-id, so check if it is the same as the running kernel, -* using it if it is. -*/ -if (dso->has_build_id) { -u8 kallsyms_build_id[BUILD_ID_SIZE ]; -char sbuild_id[BUILD_ID_SIZE *2 +1 ]; - -if (sysfs__read_build_id ("/sys/kernel/notes" , kallsyms_build_id, -sizeof (kallsyms_build_id)) ==0 ) { -if (dso__build_id_equal (dso, kallsyms_build_id)) { - kallsyms_filename ="/proc/kallsyms" ; - goto do_kallsyms; - } - } -/* -* Now look if we have it on the build-id cache in -* $HOME/.debug/[kernel.kallsyms]. -*/ -build_id__sprintf (dso->build_id,sizeof (dso->build_id), - sbuild_id); - -if (asprintf (&kallsyms_allocated_filename, -"%s/.debug/[kernel.kallsyms]/%s" , -getenv ("HOME" ), sbuild_id) ==-1 ) { -pr_err ("Not enough memory for kallsyms file lookup\n" ); -return -1 ; - } - - kallsyms_filename = kallsyms_allocated_filename; + kallsyms_allocated_filename =dso__find_kallsyms (dso, map); +if (!kallsyms_allocated_filename) +return -1 ; -if (access (kallsyms_filename,F_OK )) { -pr_err ("No kallsyms or vmlinux with build-id %s " -"was found\n" , sbuild_id); -free (kallsyms_allocated_filename); -return -1 ; - } - }else { -/* -* Last resort, if we don't have a build-id and couldn't find -* any vmlinux file, try the running kernel kallsyms table. -*/ - kallsyms_filename ="/proc/kallsyms" ; - } + kallsyms_filename = kallsyms_allocated_filename; do_kallsyms: err =dso__load_kallsyms (dso, kallsyms_filename, map, filter);
Signature · 1 line
1.7.11.7