perf tools: fix buildid cache handling of kallsyms with kcore
Adrian Hunter
reviewerPATCH 1/1 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.
Signed-off-by Adrian Hunter <[email protected]>
--- 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
tip-bot for Adrian Hunter
merge bot[tip:perf/urgent] perf tools: Fix buildid cache handling of kallsyms with kcore
perf tools: Fix buildid cache handling of kallsyms with kcore
Commit-ID: 5b6a42fcb38f3230922239255698dd8c39382978 Gitweb: http://git.kernel.org/tip/5b6a42fcb38f3230922239255698dd8c39382978 Author: Adrian Hunter <[email protected]> AuthorDate: Thu, 12 Sep 2013 21:19:19 +0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 19 Sep 2013 11:32:17 -0300
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.
Signed-off-by Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
[ Kept 'struct foo' pointer as first parameter of foo__ prefixed functions ]
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/header.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-)
tools/perf/util/header.c +28 -13
@@ -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 list_head *head, +struct machine *machine, +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->kernel_dsos, machine, + machine->pid, kmisc, fd);if (err ==0 ) - err =__dsos__write_buildid_table (&machine->user_dsos, + err =__dsos__write_buildid_table (&machine->user_dsos, machine, machine->pid, umisc, fd);return err; }
@@ -375,23 +381,31 @@ out_free:return err; } -static int dso__cache_build_id (struct dso *dso,const char *debugdir) +static int dso__cache_build_id (struct dso *dso,struct machine *machine, +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 list_head *head, +struct machine *machine,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 (pos, machine, debugdir)) err =-1 ;return err;
@@ -399,8 +413,9 @@ static int __dsos__cache_build_ids(struct list_head *head, 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->kernel_dsos, machine, + debugdir); + ret |=__dsos__cache_build_ids (&machine->user_dsos, machine, debugdir);return ret; }