perf tools: kcore improvements
Adrian Hunter
reviewerv7 cover perf tools: kcore improvements
Hi
Here are some improvements for using kcore (version 7). There are 3 improvements:
- validate that kcore matches the perf.data modules
- workaround objdump difficulties with kcore
- add kcore to the build-id cache
Changes in V7:
perf tools: validate kcore module addresses
Dropped because it has been applied
perf tools: workaround objdump difficulties with kcore
Dropped because it has been applied
perf tools: Add map_groups__find_ams()
New patch
perf tools: fix annotate_browser__callq()
Changed to use map_groups__find_ams()
perf tools: find kcore symbols on other maps
Changed to use map_groups__find_ams()
perf tools: another fix for annotate_browser__callq()
New patch
Changes in V6:
perf tools: make a separate function to parse /proc/modules
Dropped because it has been applied
perf tools: workaround objdump difficulties with kcore
Renamed some functions and reordered parameters
perf buildid-cache: add ability to add kcore to the cache
Renamed some functions and reordered parameters
Changes in V5:
perf tools: make a separate function to parse /proc/modules
Use scnprintf not snprintf
perf tools: validate kcore module addresses
Fix check for mi->name not allocated
perf buildid-cache: add ability to add kcore to the cache
Use scnprintf not snprintf
perf tools: add ability to find kcore in build-id cache
Use scnprintf not snprintf
Changes in V4:
perf tools: fix path unpopulated in machine__create_modules()
Dropped because it has been applied
perf buildid-cache: add ability to add kcore to the cache
Tweaked Documentation/perf-buildid-cache.txt
perf tools: add ability to find kcore in build-id cache
Changed to check read access to /proc/kcore before skipping the buildid cache
Changes in V3:
perf tools: workaround objdump difficulties with kcore
change strncpy to strlcpy
perf buildid-cache: add ability to add kcore to the cache
change strncpy to strlcpy
perf tools: add ability to find kcore in build-id cache
change strncpy to strlcpy
Changes in V2:
perf tools: fix buildid cache handling of kallsyms with kcore
Dropped because it has been applied
perf tools: fix path unpopulated in machine__create_modules()
Use 'modules' pointer
Adrian Hunter (6):
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 perf tools: another fix for annotate_browser__callq()
Arnaldo Carvalho de Melo (1):
perf tools: Add map_groups__find_ams()
tools/perf/Documentation/perf-buildid-cache.txt | 13 + tools/perf/builtin-buildid-cache.c | 148 +++++++++- tools/perf/ui/browsers/annotate.c | 24 +- tools/perf/util/annotate.c | 22 +- tools/perf/util/map.c | 48 +++- tools/perf/util/map.h | 7 + tools/perf/util/symbol-elf.c | 358 ++++++++++++++++++++++++ tools/perf/util/symbol-minimal.c | 6 + tools/perf/util/symbol.c | 188 ++++++++++--- tools/perf/util/symbol.h | 3 + tools/perf/util/util.c | 18 +- tools/perf/util/util.h | 1 + 12 files changed, 761 insertions(+), 75 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH v7 1/7 perf tools: Add map_groups__find_ams()
From: Arnaldo Carvalho de Melo <[email protected]>
Add a function to find a symbol using an ip that
might be on a different map.
--- tools/perf/util/map.c | 17 +++++++++++++++++ tools/perf/util/map.h | 4 ++++ 2 files changed, 21 insertions(+)
tools/perf/util/map.c +17 -0
@@ -371,6 +371,23 @@ struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,return NULL ; } +int map_groups__find_ams (struct addr_map_symbol *ams,symbol_filter_t filter) +{ +if (ams->addr < ams->map->start || ams->addr > ams->map->end) { +if (ams->map->groups ==NULL ) +return -1 ; + ams->map =map_groups__find (ams->map->groups, ams->map->type, + ams->addr); +if (ams->map ==NULL ) +return -1 ; + } + + ams->al_addr = ams->map->map_ip (ams->map, ams->addr); + ams->sym =map__find_symbol (ams->map, ams->al_addr, filter); + +return ams->sym ?0 :-1 ; +} +size_t __map_groups__fprintf_maps (struct map_groups *mg,enum map_type type,int verbose,FILE *fp) {
tools/perf/util/map.h +4 -0
@@ -167,6 +167,10 @@ struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,struct map **mapp, symbol_filter_t filter); +struct addr_map_symbol ; + +int map_groups__find_ams (struct addr_map_symbol *ams,symbol_filter_t filter); +static inline struct symbol *map_groups__find_function_by_name(struct map_groups *mg, const char *name, struct map **mapp,
Signature · 1 line
1.7.11.7
tip-bot for Arnaldo Carvalho de Melo
merge bot[tip:perf/core] perf symbols: Add map_groups__find_ams()
perf symbols: Add map_groups__find_ams()
Commit-ID: 4e987712740a3634c19a6fedaf12577b26775dc5 Gitweb: http://git.kernel.org/tip/4e987712740a3634c19a6fedaf12577b26775dc5 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 14 Oct 2013 13:43:38 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 10:29:02 -0300
perf symbols: Add map_groups__find_ams()
Add a function to find a symbol using an ip that might be on a different map.
--- tools/perf/util/map.c | 17 +++++++++++++++++ tools/perf/util/map.h | 4 ++++ 2 files changed, 21 insertions(+)
tools/perf/util/map.c +17 -0
@@ -371,6 +371,23 @@ struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,return NULL ; } +int map_groups__find_ams (struct addr_map_symbol *ams,symbol_filter_t filter) +{ +if (ams->addr < ams->map->start || ams->addr > ams->map->end) { +if (ams->map->groups ==NULL ) +return -1 ; + ams->map =map_groups__find (ams->map->groups, ams->map->type, + ams->addr); +if (ams->map ==NULL ) +return -1 ; + } + + ams->al_addr = ams->map->map_ip (ams->map, ams->addr); + ams->sym =map__find_symbol (ams->map, ams->al_addr, filter); + +return ams->sym ?0 :-1 ; +} +size_t __map_groups__fprintf_maps (struct map_groups *mg,enum map_type type,int verbose,FILE *fp) {
tools/perf/util/map.h +4 -0
@@ -167,6 +167,10 @@ struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,struct map **mapp, symbol_filter_t filter); +struct addr_map_symbol ; + +int map_groups__find_ams (struct addr_map_symbol *ams,symbol_filter_t filter); +static inline struct symbol *map_groups__find_function_by_name(struct map_groups *mg, const char *name, struct map **mapp,
Adrian Hunter
reviewerPATCH v7 2/7 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 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
tools/perf/ui/browsers/annotate.c +10 -11
@@ -442,35 +442,34 @@ static bool annotate_browser__callq(struct annotate_browser *browser, {struct map_symbol *ms = browser->b.priv;struct disasm_line *dl = browser->selection; -struct symbol *sym = ms->sym;struct annotation *notes; -struct symbol *target; -u64 ip; +struct addr_map_symbol target = { + .map = ms->map, + .addr = dl->ops.target.addr, + };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 ); -if (target ==NULL ) { +if (map_groups__find_ams (&target,NULL )) {ui_helpline__puts ("The called function was not found." );return true; } - notes =symbol__annotation (target); + notes =symbol__annotation (target.sym);pthread_mutex_lock (¬es->lock); -if (notes->src ==NULL &&symbol__alloc_hist (target) <0 ) { +if (notes->src ==NULL &&symbol__alloc_hist (target.sym) <0 ) {pthread_mutex_unlock (¬es->lock);ui__warning ("Not enough memory for annotating '%s' symbol!\n" , - target->name); + target.sym->name);return true; }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.sym, target.map, evsel, hbt); +sym_title (ms->sym, ms->map, title,sizeof (title));ui_browser__show_title (&browser->b, title);return true; }
Signature · 1 line
1.7.11.7
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf annotate: Fix annotate_browser__callq()
perf annotate: Fix annotate_browser__callq()
Commit-ID: 1179e11bbb655162e83b33e17a97c45d3fe292da Gitweb: http://git.kernel.org/tip/1179e11bbb655162e83b33e17a97c45d3fe292da Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 14 Oct 2013 13:43:39 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 10:29:27 -0300
perf annotate: Fix annotate_browser__callq()
When 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 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
tools/perf/ui/browsers/annotate.c +10 -11
@@ -442,35 +442,34 @@ static bool annotate_browser__callq(struct annotate_browser *browser, {struct map_symbol *ms = browser->b.priv;struct disasm_line *dl = browser->selection; -struct symbol *sym = ms->sym;struct annotation *notes; -struct symbol *target; -u64 ip; +struct addr_map_symbol target = { + .map = ms->map, + .addr = dl->ops.target.addr, + };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 ); -if (target ==NULL ) { +if (map_groups__find_ams (&target,NULL )) {ui_helpline__puts ("The called function was not found." );return true; } - notes =symbol__annotation (target); + notes =symbol__annotation (target.sym);pthread_mutex_lock (¬es->lock); -if (notes->src ==NULL &&symbol__alloc_hist (target) <0 ) { +if (notes->src ==NULL &&symbol__alloc_hist (target.sym) <0 ) {pthread_mutex_unlock (¬es->lock);ui__warning ("Not enough memory for annotating '%s' symbol!\n" , - target->name); + target.sym->name);return true; }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.sym, target.map, evsel, hbt); +sym_title (ms->sym, ms->map, title,sizeof (title));ui_browser__show_title (&browser->b, title);return true; }
Adrian Hunter
reviewerPATCH v7 3/7 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 | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
tools/perf/util/annotate.c +9 -13
@@ -825,20 +825,16 @@ 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 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); - } +struct addr_map_symbol target = { + .map = map, + .addr = dl->ops.target.addr, + }; + +if (!map_groups__find_ams (&target,NULL ) && + target.sym->start == target.al_addr) + dl->ops.target.name =strdup (target.sym->name); }disasm__add (¬es->src->source, dl);
Signature · 1 line
1.7.11.7
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf annotate: Find kcore symbols on other maps
perf annotate: Find kcore symbols on other maps
Commit-ID: 6e427ab02c8886ca6c9ecdbb318e68fe8f605469 Gitweb: http://git.kernel.org/tip/6e427ab02c8886ca6c9ecdbb318e68fe8f605469 Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 14 Oct 2013 13:43:40 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 10:29:20 -0300
perf annotate: Find kcore symbols on other maps
Use the new map_groups__find_ams() method to find kcore symbols on other maps.
--- tools/perf/util/annotate.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
tools/perf/util/annotate.c +9 -13
@@ -825,20 +825,16 @@ 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 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); - } +struct addr_map_symbol target = { + .map = map, + .addr = dl->ops.target.addr, + }; + +if (!map_groups__find_ams (&target,NULL ) && + target.sym->start == target.al_addr) + dl->ops.target.name =strdup (target.sym->name); }disasm__add (¬es->src->source, dl);
Adrian Hunter
reviewerPATCH v7 4/7 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
@@ -243,6 +243,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
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf tools: Add copyfile_mode()
perf tools: Add copyfile_mode()
Commit-ID: 9a17d7268d71674f0bbff6821f7d8e6dc0ece19a Gitweb: http://git.kernel.org/tip/9a17d7268d71674f0bbff6821f7d8e6dc0ece19a Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 14 Oct 2013 13:43:41 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 10:29:23 -0300
perf tools: Add copyfile_mode()
Add 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
@@ -243,6 +243,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);
Adrian Hunter
reviewerPATCH v7 5/7 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 | 13 + tools/perf/builtin-buildid-cache.c | 148 +++++++++- 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, 568 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-buildid-cache.txt +13 -0
@@ -21,6 +21,19 @@ 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 may 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. All 3 files are created with read + permissions for root only. 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 +147 -1
175 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 kcore_extract__delete(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
@@ -270,4 +270,7 @@ struct kcore_extract {int kcore_extract__create (struct kcore_extract *kce);void kcore_extract__delete (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
Re: [PATCH V7 5/7] perf buildid-cache: add ability to add kcore to the cache
Em Mon, Oct 14, 2013 at 01:43:42PM +0300, Adrian Hunter escreveu:
Quoted 1 line
+static int
kcore_copy__compare_fds(int from, int to)
<SNIP>
Quoted 4 lines
tools/perf/util/symbol-elf.c +4
-0+while (1 ) { +/* Use read because mmap won't work on proc files */ + ret =read (from, buf_from, page_size); +if (ret <0 )
tools/perf/util/symbol-elf.c static off_t kcore__write(struct kcore *kcore) · line 1415
Quoted 10 lines
tools/perf/util/symbol-elf.c +10
-0+return -1 ; +if (!ret) +return 0 ; + n = ret; + len = ret; +while (n) { + ret =read (to, buf_to, n); +if (ret <=0 ) +return -1 ; + n -= ret;
You can't go on potentially rewriting 'buf_to' like that, consider using readn().
Quoted 6 lines
tools/perf/util/symbol-elf.c +6
-0+ } + +if (memcmp (buf_from, buf_to, len)) +return -1 ; + } +}
Adrian Hunter
reviewerRe: [PATCH V7 5/7] perf buildid-cache: add ability to add kcore to the cache
kcore 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 | 13 + tools/perf/builtin-buildid-cache.c | 148 +++++++++- tools/perf/util/symbol-elf.c | 366 ++++++++++++++++++++++++ tools/perf/util/symbol-minimal.c | 6 + tools/perf/util/symbol.c | 41 +++ tools/perf/util/symbol.h | 3 + 6 files changed, 576 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-buildid-cache.txt +13 -0
@@ -21,6 +21,19 @@ 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 may 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. All 3 files are created with read + permissions for root only. 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 +147 -1
175 lines not on this page · raw message
tools/perf/util/symbol-elf.c +366 -0
372 lines not on this page · raw message
tools/perf/util/symbol-minimal.c +6 -0
@@ -317,6 +317,12 @@ void kcore_extract__delete(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
@@ -270,4 +270,7 @@ struct kcore_extract {int kcore_extract__create (struct kcore_extract *kce);void kcore_extract__delete (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
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf buildid-cache: Add ability to add kcore to the cache
perf buildid-cache: Add ability to add kcore to the cache
Commit-ID: fc1b691d7651d9496e912de7e0fc73a5be3294af Gitweb: http://git.kernel.org/tip/fc1b691d7651d9496e912de7e0fc73a5be3294af Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 14 Oct 2013 16:57:29 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 12:20:38 -0300
perf buildid-cache: Add ability to add kcore to the cache
kcore 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.
[ renamed 'index' to 'idx' to avoid shadowing string.h symbol in f12,
use at least one member initializer when initializing a struct to zeros, also to fix the build on f12 ]
--- tools/perf/Documentation/perf-buildid-cache.txt | 13 + tools/perf/builtin-buildid-cache.c | 148 +++++++++- tools/perf/util/symbol-elf.c | 366 ++++++++++++++++++++++++ tools/perf/util/symbol-minimal.c | 6 + tools/perf/util/symbol.c | 41 +++ tools/perf/util/symbol.h | 3 + 6 files changed, 576 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-buildid-cache.txt +13 -0
@@ -21,6 +21,19 @@ 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 may 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. All 3 files are created with read + permissions for root only. 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 +147 -1
175 lines not on this page · raw message
tools/perf/util/symbol-elf.c +366 -0
372 lines not on this page · raw message
tools/perf/util/symbol-minimal.c +6 -0
@@ -317,6 +317,12 @@ void kcore_extract__delete(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
@@ -270,4 +270,7 @@ struct kcore_extract {int kcore_extract__create (struct kcore_extract *kce);void kcore_extract__delete (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 */
Adrian Hunter
reviewerPATCH v7 6/7 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 | 147 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 103 insertions(+), 44 deletions(-)
tools/perf/util/symbol.c +103 -44
@@ -1442,6 +1442,105 @@ 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 ; +scnprintf (kallsyms_filename,sizeof (kallsyms_filename), +"%s/%s/kallsyms" , dir, dent->d_name); +if (!validate_kcore_modules (kallsyms_filename, map)) { +strlcpy (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; +int fd; + +/* If no cached kcore go with /proc/kallsyms */ +scnprintf (path,sizeof (path),"%s/[kernel.kcore]/%s" , + buildid_dir, sbuild_id); + d =opendir (path); +if (!d) + goto proc_kallsyms; +closedir (d); + +/* +* Do not check the build-id cache, until we know we cannot use +* /proc/kcore. +*/ + fd =open ("/proc/kcore" ,O_RDONLY ); +if (fd !=-1 ) { +close (fd); +/* 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; + } + +scnprintf (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) {
@@ -1490,51 +1589,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
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf symbols: Add ability to find kcore in build-id cache
perf symbols: Add ability to find kcore in build-id cache
Commit-ID: 0544d4225c52ca31ab2a55b22ddce1392d8f45a4 Gitweb: http://git.kernel.org/tip/0544d4225c52ca31ab2a55b22ddce1392d8f45a4 Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 14 Oct 2013 13:43:43 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 10:29:25 -0300
perf symbols: Add ability to find kcore in build-id cache
When 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 | 147 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 103 insertions(+), 44 deletions(-)
tools/perf/util/symbol.c +103 -44
@@ -1401,6 +1401,105 @@ 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 ; +scnprintf (kallsyms_filename,sizeof (kallsyms_filename), +"%s/%s/kallsyms" , dir, dent->d_name); +if (!validate_kcore_modules (kallsyms_filename, map)) { +strlcpy (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; +int fd; + +/* If no cached kcore go with /proc/kallsyms */ +scnprintf (path,sizeof (path),"%s/[kernel.kcore]/%s" , + buildid_dir, sbuild_id); + d =opendir (path); +if (!d) + goto proc_kallsyms; +closedir (d); + +/* +* Do not check the build-id cache, until we know we cannot use +* /proc/kcore. +*/ + fd =open ("/proc/kcore" ,O_RDONLY ); +if (fd !=-1 ) { +close (fd); +/* 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; + } + +scnprintf (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) {
@@ -1449,51 +1548,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);
Adrian Hunter
reviewerPATCH v7 7/7 perf tools: another fix for annotate_browser__callq()
In reply to Adrian HunterThe target address is provided by objdump and is not necessary a memory address. Add a helper to get the correct address.
--- tools/perf/ui/browsers/annotate.c | 7 +++++-- tools/perf/util/map.c | 31 ++++++++++++++++++++++++++++++- tools/perf/util/map.h | 3 +++ 3 files changed, 38 insertions(+), 3 deletions(-)
tools/perf/ui/browsers/annotate.c +5 -2
@@ -445,14 +445,17 @@ static bool annotate_browser__callq(struct annotate_browser *browser,struct annotation *notes;struct addr_map_symbol target = { .map = ms->map, - .addr = dl->ops.target.addr, + .addr =map__objdump_2mem (ms->map, dl->ops.target.addr), };char title[SYM_TITLE_MAX_SIZE ];if (!ins__is_call (dl->ins))return false; -if (map_groups__find_ams (&target,NULL )) { +if (map_groups__find_ams (&target,NULL ) || +map__rip_2objdump (target.map, target.map->map_ip (target.map, + target.addr)) != + dl->ops.target.addr) {ui_helpline__puts ("The called function was not found." );return true; }
tools/perf/util/map.c +30 -1
@@ -252,10 +252,16 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp)return fprintf (fp,"%s" , dsoname); } -/* +/** +* map__rip_2objdump - convert symbol start address to objdump address. +* @map: memory map +* @rip: symbol start address +* * objdump wants/reports absolute IPs for ET_EXEC, and RIPs for ET_DYN. * map->dso->adjust_symbols==1 for ET_EXEC-like cases except ET_REL which is * relative to section start. +* +* Return: Address suitable for passing to "objdump --start-address=" */ u64 map__rip_2objdump (struct map *map,u64 rip) {
@@ -268,6 +274,29 @@ u64 map__rip_2objdump(struct map *map, u64 rip)return map->unmap_ip (map, rip); } +/** +* map__objdump_2mem - convert objdump address to a memory address. +* @map: memory map +* @ip: objdump address +* +* Closely related to map__rip_2objdump(), this function takes an address from +* objdump and converts it to a memory address. Note this assumes that @map +* contains the address. To be sure the result is valid, check it forwards +* e.g. map__rip_2objdump(map->map_ip(map, map__objdump_2mem(map, ip))) == ip +* +* Return: Memory address. +*/ +u64 map__objdump_2mem (struct map *map,u64 ip) +{ +if (!map->dso->adjust_symbols) +return map->unmap_ip (map, ip); + +if (map->dso->rel) +return map->unmap_ip (map, ip + map->pgoff); + +return ip; +} +void map_groups__init (struct map_groups *mg) {int i;
tools/perf/util/map.h +3 -0
@@ -84,6 +84,9 @@ static inline u64 identity__map_ip(struct map *map __maybe_unused, u64 ip)/* rip/ip <-> addr suitable for passing to `objdump --start-address=` */ u64 map__rip_2objdump (struct map *map,u64 rip); +/* objdump address -> memory address */ +u64 map__objdump_2mem (struct map *map,u64 ip); +struct symbol ;typedef int (*symbol_filter_t )(struct map *map,struct symbol *sym);
Signature · 1 line
1.7.11.7
tip-bot for Adrian Hunter
merge bot[tip:perf/core] perf annotate: Another fix for annotate_browser__callq()
perf annotate: Another fix for annotate_browser__callq()
Commit-ID: 1d5077bdd9a10c4297cded139989bb9ee2998a6c Gitweb: http://git.kernel.org/tip/1d5077bdd9a10c4297cded139989bb9ee2998a6c Author: Adrian Hunter <[email protected]> AuthorDate: Mon, 14 Oct 2013 13:43:44 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 14 Oct 2013 12:21:18 -0300
perf annotate: Another fix for annotate_browser__callq()
The target address is provided by objdump and is not necessary a memory address. Add a helper to get the correct address.
--- tools/perf/ui/browsers/annotate.c | 7 +++++-- tools/perf/util/map.c | 31 ++++++++++++++++++++++++++++++- tools/perf/util/map.h | 3 +++ 3 files changed, 38 insertions(+), 3 deletions(-)
tools/perf/ui/browsers/annotate.c +5 -2
@@ -445,14 +445,17 @@ static bool annotate_browser__callq(struct annotate_browser *browser,struct annotation *notes;struct addr_map_symbol target = { .map = ms->map, - .addr = dl->ops.target.addr, + .addr =map__objdump_2mem (ms->map, dl->ops.target.addr), };char title[SYM_TITLE_MAX_SIZE ];if (!ins__is_call (dl->ins))return false; -if (map_groups__find_ams (&target,NULL )) { +if (map_groups__find_ams (&target,NULL ) || +map__rip_2objdump (target.map, target.map->map_ip (target.map, + target.addr)) != + dl->ops.target.addr) {ui_helpline__puts ("The called function was not found." );return true; }
tools/perf/util/map.c +30 -1
@@ -252,10 +252,16 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp)return fprintf (fp,"%s" , dsoname); } -/* +/** +* map__rip_2objdump - convert symbol start address to objdump address. +* @map: memory map +* @rip: symbol start address +* * objdump wants/reports absolute IPs for ET_EXEC, and RIPs for ET_DYN. * map->dso->adjust_symbols==1 for ET_EXEC-like cases except ET_REL which is * relative to section start. +* +* Return: Address suitable for passing to "objdump --start-address=" */ u64 map__rip_2objdump (struct map *map,u64 rip) {
@@ -268,6 +274,29 @@ u64 map__rip_2objdump(struct map *map, u64 rip)return map->unmap_ip (map, rip); } +/** +* map__objdump_2mem - convert objdump address to a memory address. +* @map: memory map +* @ip: objdump address +* +* Closely related to map__rip_2objdump(), this function takes an address from +* objdump and converts it to a memory address. Note this assumes that @map +* contains the address. To be sure the result is valid, check it forwards +* e.g. map__rip_2objdump(map->map_ip(map, map__objdump_2mem(map, ip))) == ip +* +* Return: Memory address. +*/ +u64 map__objdump_2mem (struct map *map,u64 ip) +{ +if (!map->dso->adjust_symbols) +return map->unmap_ip (map, ip); + +if (map->dso->rel) +return map->unmap_ip (map, ip + map->pgoff); + +return ip; +} +void map_groups__init (struct map_groups *mg) {int i;
tools/perf/util/map.h +3 -0
@@ -84,6 +84,9 @@ static inline u64 identity__map_ip(struct map *map __maybe_unused, u64 ip)/* rip/ip <-> addr suitable for passing to `objdump --start-address=` */ u64 map__rip_2objdump (struct map *map,u64 rip); +/* objdump address -> memory address */ +u64 map__objdump_2mem (struct map *map,u64 ip); +struct symbol ;typedef int (*symbol_filter_t )(struct map *map,struct symbol *sym);