perf tools: Add support for build id with different sizes
Jiri Olsa
reviewerv2 cover perf tools: Add support for build id with different sizes
hi,
currently we support only one storage size (20 bytes) for build ids. That fits for SHA1 build ids, but there can in theory be any size. The gcc linker supports also MD5, which is 16 bytes.
Currently the MD5 build id will be stored in .debug cache with additional zeros, like:
$ find ~/.debug .../.debug/.build-id/a5/0e350e97c43b4708d09bcd85ebfff700000000 ... .../buildid-ex-md5/a50e350e97c43b4708d09bcd85ebfff700000000 .../buildid-ex-md5/a50e350e97c43b4708d09bcd85ebfff700000000/elf .../buildid-ex-md5/a50e350e97c43b4708d09bcd85ebfff700000000/probes
And the same reflected in buildid-list as well:
$ perf buildid-list 17f4e448cc746582ea1881528deb549f7fdb3fd5 [kernel.kallsyms] a50e350e97c43b4708d09bcd85ebfff700000000 .../buildid-ex-md5
This will cause problems in future when we will ask debuginfod for binaries/debuginfo based on build id.
This patchset is adding 'struct build_id' object, that holds the build id data and size and use it to store build ids and changes all related functions to use it.
Also available in:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git
perf/build_id_size
v2 changes:
- rebased on current perf/core
- updated test to build its own binaries [Namhyung]
thanks,
jirka
---
Jiri Olsa (9):
perf tools: Use build_id object in dso
perf tools: Pass build_id object to filename__read_build_id perf tools: Pass build id object to sysfs__read_build_id perf tools: Pass build_id object to build_id__sprintf perf tools: Pass build_id object to dso__set_build_id perf tools: Pass build_id object to dso__build_id_equal perf tools: Add size to struct perf_record_header_build_id perf tools: Align buildid list output for short build ids perf tools: Add build id shell test
tools/lib/perf/include/perf/event.h | 12 +++++++++++- tools/perf/bench/inject-buildid.c | 4 ++-- tools/perf/builtin-buildid-cache.c | 25 ++++++++++++------------ tools/perf/builtin-inject.c | 4 +--- tools/perf/tests/pe-file-parsing.c | 10 +++++----- tools/perf/tests/sdt.c | 6 +++--- tools/perf/tests/shell/buildid.sh | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/annotate.c | 3 +-- tools/perf/util/build-id.c | 48 +++++++++++++++++++++++++++------------------- tools/perf/util/build-id.h | 8 +++++++- tools/perf/util/dso.c | 23 ++++++++++------------ tools/perf/util/dso.h | 7 +++---- tools/perf/util/dsos.c | 9 +++++---- tools/perf/util/header.c | 15 ++++++++++----- tools/perf/util/map.c | 4 +--- tools/perf/util/probe-event.c | 9 ++++++--- tools/perf/util/probe-finder.c | 8 +++++--- tools/perf/util/scripting-engines/trace-event-python.c | 2 +- tools/perf/util/symbol-elf.c | 35 +++++++++++++++++++-------------- tools/perf/util/symbol-minimal.c | 31 +++++++++++++++--------------- tools/perf/util/symbol.c | 15 +++++++-------- tools/perf/util/symbol.h | 5 +++-- tools/perf/util/synthetic-events.c | 2 +- 23 files changed, 260 insertions(+), 126 deletions(-) create mode 100755 tools/perf/tests/shell/buildid.sh
Jiri Olsa
reviewerPATCH v2 1/9 perf tools: Use build_id object in dso
Replace build_id byte array with struct build_id object and all the code that references it.
The objective is to carry size together with build id array, so it's better to keep both together.
This is preparatory change for following patches, and there's no functional change.
--- tools/perf/bench/inject-buildid.c | 4 ++-- tools/perf/builtin-buildid-cache.c | 2 +- tools/perf/builtin-inject.c | 4 ++-- tools/perf/util/annotate.c | 4 ++-- tools/perf/util/build-id.c | 6 +++--- tools/perf/util/build-id.h | 5 +++++ tools/perf/util/dso.c | 18 +++++++++--------- tools/perf/util/dso.h | 2 +- tools/perf/util/dsos.c | 4 ++-- tools/perf/util/header.c | 2 +- tools/perf/util/map.c | 4 ++-- tools/perf/util/probe-event.c | 2 +- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/symbol.c | 2 +- tools/perf/util/synthetic-events.c | 2 +- 15 files changed, 34 insertions(+), 29 deletions(-)
tools/perf/bench/inject-buildid.c +2 -2
@@ -79,12 +79,12 @@ static int add_dso(const char *fpath, const struct stat *sb __maybe_unused, int typeflag, struct FTW *ftwbuf __maybe_unused) { struct bench_dso *dso = &dsos[nr_dsos]; -unsigned char build_id[BUILD_ID_SIZE ]; +struct build_id bid;if (typeflag ==FTW_D || typeflag ==FTW_SL )return 0 ; -if (filename__read_build_id (fpath, build_id,BUILD_ID_SIZE ) <0 ) +if (filename__read_build_id (fpath, bid.data,sizeof (bid.data)) <0 )return 0 ; dso->name =realpath (fpath,NULL );
tools/perf/builtin-buildid-cache.c +1 -1
@@ -284,7 +284,7 @@ static bool dso__missing_buildid_cache(struct dso *dso, int parm __maybe_unused)pr_warning ("Problems with %s file, consider removing it from the cache\n" , filename); - }else if (memcmp (dso->build_id, build_id,sizeof (dso->build_id))) { + }else if (memcmp (dso->bid.data, build_id,sizeof (dso->bid.data))) {pr_warning ("Problems with %s file, consider removing it from the cache\n" , filename); }
tools/perf/builtin-inject.c +2 -2
@@ -522,8 +522,8 @@ static int dso__read_build_id(struct dso *dso)return 0 ;nsinfo__mountns_enter (dso->nsinfo, &nsc); -if (filename__read_build_id (dso->long_name, dso->build_id, -sizeof (dso->build_id)) >0 ) { +if (filename__read_build_id (dso->long_name, dso->bid.data, +sizeof (dso->bid.data)) >0 ) { dso->has_build_id = true; }nsinfo__mountns_exit (&nsc);
tools/perf/util/annotate.c +2 -2
@@ -1578,8 +1578,8 @@ int symbol__strerror_disassemble(struct map_symbol *ms, int errnum, char *buf, schar *build_id_msg =NULL ;if (dso->has_build_id) { -build_id__sprintf (dso->build_id, -sizeof (dso->build_id), bf +15 ); +build_id__sprintf (dso->bid.data, +sizeof (dso->bid.data), bf +15 ); build_id_msg = bf; } scnprintf(buf, buflen,
tools/perf/util/build-id.c +3 -3
@@ -272,7 +272,7 @@ char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size,if (!dso->has_build_id)return NULL ; -build_id__sprintf (dso->build_id,sizeof (dso->build_id), sbuild_id); +build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id); linkname =build_id_cache__linkname (sbuild_id,NULL ,0 );if (!linkname)return NULL ;
@@ -355,7 +355,7 @@ static int machine__write_buildid_table(struct machine *machine, in_kernel = pos->kernel ||is_kernel_module (name,PERF_RECORD_MISC_CPUMODE_UNKNOWN ); - err =write_buildid (name, name_len, pos->build_id, machine->pid, + err =write_buildid (name, name_len, pos->bid.data, machine->pid, in_kernel ? kmisc : umisc, fd);if (err)break ;
@@ -841,7 +841,7 @@ static int dso__cache_build_id(struct dso *dso, struct machine *machine) is_kallsyms = true; name = machine->mmap_name; } -return build_id_cache__add_b (dso->build_id,sizeof (dso->build_id), name, +return build_id_cache__add_b (dso->bid.data,sizeof (dso->bid.data), name, dso->nsinfo, is_kallsyms, is_vdso); }
tools/perf/util/build-id.h +5 -0
@@ -8,6 +8,11 @@#include "tool.h" #include <linux/types.h> +struct build_id { +u8 data[BUILD_ID_SIZE ]; +size_t size; +}; +struct nsinfo ;extern struct perf_tool build_id__mark_dso_hit_ops;
tools/perf/util/dso.c +9 -9
@@ -172,8 +172,8 @@ int dso__read_binary_type_filename(const struct dso *dso,break ; } -build_id__sprintf (dso->build_id, -sizeof (dso->build_id), +build_id__sprintf (dso->bid.data, +sizeof (dso->bid.data), build_id_hex); len =__symbol__join_symfs (filename, size,"/usr/lib/debug/.build-id/" ); snprintf(filename + len, size - len, "%.2s/%s.debug",
@@ -1330,13 +1330,13 @@ void dso__put(struct dso *dso)void dso__set_build_id (struct dso *dso,void *build_id) { -memcpy (dso->build_id, build_id,sizeof (dso->build_id)); +memcpy (dso->bid.data, build_id,sizeof (dso->bid.data)); dso->has_build_id =1 ; }bool dso__build_id_equal (const struct dso *dso,u8 *build_id) { -return memcmp (dso->build_id, build_id,sizeof (dso->build_id)) ==0 ; +return memcmp (dso->bid.data, build_id,sizeof (dso->bid.data)) ==0 ; }void dso__read_running_kernel_build_id (struct dso *dso,struct machine *machine)
@@ -1346,8 +1346,8 @@ void dso__read_running_kernel_build_id(struct dso *dso, struct machine *machine)if (machine__is_default_guest (machine))return ;sprintf (path,"%s/sys/kernel/notes" , machine->root_dir); -if (sysfs__read_build_id (path, dso->build_id, -sizeof (dso->build_id)) ==0 ) +if (sysfs__read_build_id (path, dso->bid.data, +sizeof (dso->bid.data)) ==0 ) dso->has_build_id = true; }
@@ -1365,8 +1365,8 @@ int dso__kernel_module_get_build_id(struct dso *dso,"%s/sys/module/%.*s/notes/.note.gnu.build-id" , root_dir, (int)strlen(name) - 1, name); -if (sysfs__read_build_id (filename, dso->build_id, -sizeof (dso->build_id)) ==0 ) +if (sysfs__read_build_id (filename, dso->bid.data, +sizeof (dso->bid.data)) ==0 ) dso->has_build_id = true;return 0 ;
@@ -1376,7 +1376,7 @@ size_t dso__fprintf_buildid(struct dso *dso, FILE *fp) {char sbuild_id[SBUILD_ID_SIZE ]; -build_id__sprintf (dso->build_id,sizeof (dso->build_id), sbuild_id); +build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id);return fprintf (fp,"%s" , sbuild_id); }
tools/perf/util/dso.h +1 -1
@@ -176,7 +176,7 @@ struct dso {bool sorted_by_name;bool loaded;u8 rel; -u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid;u64 text_offset;const char *short_name;const char *long_name;
tools/perf/util/dsos.c +2 -2
@@ -73,8 +73,8 @@ bool __dsos__read_build_ids(struct list_head *head, bool with_hits)continue ; }nsinfo__mountns_enter (pos->nsinfo, &nsc); -if (filename__read_build_id (pos->long_name, pos->build_id, -sizeof (pos->build_id)) >0 ) { +if (filename__read_build_id (pos->long_name, pos->bid.data, +sizeof (pos->bid.data)) >0 ) { have_build_id = true; pos->has_build_id = true; }
tools/perf/util/header.c +1 -1
@@ -2095,7 +2095,7 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,free (m.name); } -build_id__sprintf (dso->build_id,sizeof (dso->build_id), +build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id);pr_debug ("build id event received for %s: %s\n" , dso->long_name, sbuild_id);
tools/perf/util/map.c +2 -2
@@ -331,8 +331,8 @@ int map__load(struct map *map)if (map->dso->has_build_id) {char sbuild_id[SBUILD_ID_SIZE ]; -build_id__sprintf (map->dso->build_id, -sizeof (map->dso->build_id), +build_id__sprintf (map->dso->bid.data, +sizeof (map->dso->bid.data), sbuild_id);pr_debug ("%s with build id %s not found" , name, sbuild_id); }else
tools/perf/util/probe-event.c +1 -1
@@ -473,7 +473,7 @@ static struct debuginfo *open_from_debuginfod(struct dso *dso, struct nsinfo *nsif (!c)return NULL ; -build_id__sprintf (dso->build_id,BUILD_ID_SIZE , sbuild_id); +build_id__sprintf (dso->bid.data,BUILD_ID_SIZE , sbuild_id); fd =debuginfod_find_debuginfo (c, (const unsigned char *)sbuild_id,0 , &path);if (fd >=0 )
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -1064,7 +1064,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,char sbuild_id[SBUILD_ID_SIZE ];PyObject *t; -build_id__sprintf (dso->build_id,sizeof (dso->build_id), sbuild_id); +build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id); t =tuple_new (5 );
tools/perf/util/symbol.c +1 -1
@@ -2153,7 +2153,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map) goto proc_kallsyms; } -build_id__sprintf (dso->build_id,sizeof (dso->build_id), sbuild_id); +build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id);/* Find kallsyms in build-id cache with kcore */ scnprintf(path, sizeof(path), "%s/%s/%s",
tools/perf/util/synthetic-events.c +1 -1
@@ -1961,7 +1961,7 @@ int perf_event__synthesize_build_id(struct perf_tool *tool, struct dso *pos, u16 len = pos->long_name_len +1 ; len =PERF_ALIGN (len,NAME_ALIGN ); -memcpy (&ev.build_id.build_id, pos->build_id,sizeof (pos->build_id)); +memcpy (&ev.build_id.build_id, pos->bid.data,sizeof (pos->bid.data)); ev.build_id.header.type =PERF_RECORD_HEADER_BUILD_ID ; ev.build_id.header.misc = misc; ev.build_id.pid = machine->pid;
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v2 2/9 perf tools: Pass build_id object to filename__read_build_id
In reply to Jiri OlsaPassing build_id object to filename__read_build_id function, so it can populate the size of the build_id object.
Changing filename__read_build_id code for both elf/non-elf code.
--- tools/perf/bench/inject-buildid.c | 2 +- tools/perf/builtin-buildid-cache.c | 25 +++++++++++----------- tools/perf/builtin-inject.c | 4 +--- tools/perf/tests/pe-file-parsing.c | 10 ++++----- tools/perf/tests/sdt.c | 6 +++--- tools/perf/util/build-id.c | 8 +++---- tools/perf/util/dsos.c | 3 +-- tools/perf/util/symbol-elf.c | 16 ++++++++------ tools/perf/util/symbol-minimal.c | 34 +++++++++++++++++------------- tools/perf/util/symbol.c | 6 +++--- tools/perf/util/symbol.h | 3 ++- 11 files changed, 60 insertions(+), 57 deletions(-)
tools/perf/bench/inject-buildid.c +1 -1
@@ -84,7 +84,7 @@ static int add_dso(const char *fpath, const struct stat *sb __maybe_unused,if (typeflag ==FTW_D || typeflag ==FTW_SL )return 0 ; -if (filename__read_build_id (fpath, bid.data,sizeof (bid.data)) <0 ) +if (filename__read_build_id (fpath, &bid) <0 )return 0 ; dso->name =realpath (fpath,NULL );
tools/perf/builtin-buildid-cache.c +12 -13
@@ -174,19 +174,19 @@ static int build_id_cache__add_kcore(const char *filename, bool force)static int build_id_cache__add_file (const char *filename,struct nsinfo *nsi) {char sbuild_id[SBUILD_ID_SIZE ]; -u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid;int err;struct nscookie nsc;nsinfo__mountns_enter (nsi, &nsc); - err =filename__read_build_id (filename, &build_id,sizeof (build_id)); + err =filename__read_build_id (filename, &bid);nsinfo__mountns_exit (&nsc);if (err <0 ) {pr_debug ("Couldn't read a build-id in %s\n" , filename);return -1 ; } -build_id__sprintf (build_id,sizeof (build_id), sbuild_id); +build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); err =build_id_cache__add_s (sbuild_id, filename, nsi, false, false); pr_debug("Adding %s %s: %s\n", sbuild_id, filename,
@@ -196,21 +196,21 @@ static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)static int build_id_cache__remove_file (const char *filename,struct nsinfo *nsi) { -u8 build_id[BUILD_ID_SIZE ];char sbuild_id[SBUILD_ID_SIZE ]; +struct build_id bid;struct nscookie nsc;int err;nsinfo__mountns_enter (nsi, &nsc); - err =filename__read_build_id (filename, &build_id,sizeof (build_id)); + err =filename__read_build_id (filename, &bid);nsinfo__mountns_exit (&nsc);if (err <0 ) {pr_debug ("Couldn't read a build-id in %s\n" , filename);return -1 ; } -build_id__sprintf (build_id,sizeof (build_id), sbuild_id); +build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); err =build_id_cache__remove_s (sbuild_id);pr_debug ("Removing %s %s: %s\n" , sbuild_id, filename, err ?"FAIL" :"Ok" );
@@ -274,17 +274,16 @@ static int build_id_cache__purge_all(void)static bool dso__missing_buildid_cache (struct dso *dso,int parm__maybe_unused ) {char filename[PATH_MAX ]; -u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid;if (dso__build_id_filename (dso, filename,sizeof (filename), false) && -filename__read_build_id (filename, build_id, -sizeof (build_id)) !=sizeof (build_id)) { +filename__read_build_id (filename, &bid) ==-1 ) {if (errno ==ENOENT )return false;pr_warning ("Problems with %s file, consider removing it from the cache\n" , filename); - }else if (memcmp (dso->bid.data, build_id,sizeof (dso->bid.data))) { + }else if (memcmp (dso->bid.data, bid.data, bid.size)) {pr_warning ("Problems with %s file, consider removing it from the cache\n" , filename); }
@@ -300,14 +299,14 @@ static int build_id_cache__fprintf_missing(struct perf_session *session, FILE *fstatic int build_id_cache__update_file (const char *filename,struct nsinfo *nsi) { -u8 build_id[BUILD_ID_SIZE ];char sbuild_id[SBUILD_ID_SIZE ]; +struct build_id bid;struct nscookie nsc;int err;nsinfo__mountns_enter (nsi, &nsc); - err =filename__read_build_id (filename, &build_id,sizeof (build_id)); + err =filename__read_build_id (filename, &bid);nsinfo__mountns_exit (&nsc);if (err <0 ) {pr_debug ("Couldn't read a build-id in %s\n" , filename);
@@ -315,7 +314,7 @@ static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi) } err =0 ; -build_id__sprintf (build_id,sizeof (build_id), sbuild_id); +build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id);if (build_id_cache__cached (sbuild_id)) err =build_id_cache__remove_s (sbuild_id);
tools/perf/builtin-inject.c +1 -3
@@ -522,10 +522,8 @@ static int dso__read_build_id(struct dso *dso)return 0 ;nsinfo__mountns_enter (dso->nsinfo, &nsc); -if (filename__read_build_id (dso->long_name, dso->bid.data, -sizeof (dso->bid.data)) >0 ) { +if (filename__read_build_id (dso->long_name, &dso->bid) >0 ) dso->has_build_id = true; - }nsinfo__mountns_exit (&nsc);return dso->has_build_id ?0 :-1 ;
tools/perf/tests/pe-file-parsing.c +5 -5
@@ -24,7 +24,7 @@ static int run_dir(const char *d) {char filename[PATH_MAX ];char debugfile[PATH_MAX ]; -char build_id[BUILD_ID_SIZE ]; +struct build_id bid;char debuglink[PATH_MAX ];char expect_build_id[] = {0x5a ,0x0f ,0xd8 ,0x82 ,0xb5 ,0x30 ,0x84 ,0x22 ,
@@ -36,10 +36,10 @@ static int run_dir(const char *d)int ret;scnprintf (filename,PATH_MAX ,"%s/pe-file.exe" , d); - ret =filename__read_build_id (filename, build_id,BUILD_ID_SIZE ); + ret =filename__read_build_id (filename, &bid);TEST_ASSERT_VAL ("Failed to read build_id" , ret ==sizeof (expect_build_id)); -TEST_ASSERT_VAL ("Wrong build_id" , !memcmp (build_id, expect_build_id, +TEST_ASSERT_VAL ("Wrong build_id" , !memcmp (bid.data, expect_build_id,sizeof (expect_build_id))); ret =filename__read_debuglink (filename, debuglink,PATH_MAX );
@@ -48,10 +48,10 @@ static int run_dir(const char *d) !strcmp(debuglink, expect_debuglink));scnprintf (debugfile,PATH_MAX ,"%s/%s" , d, debuglink); - ret =filename__read_build_id (debugfile, build_id,BUILD_ID_SIZE ); + ret =filename__read_build_id (debugfile, &bid);TEST_ASSERT_VAL ("Failed to read debug file build_id" , ret ==sizeof (expect_build_id)); -TEST_ASSERT_VAL ("Wrong build_id" , !memcmp (build_id, expect_build_id, +TEST_ASSERT_VAL ("Wrong build_id" , !memcmp (bid.data, expect_build_id,sizeof (expect_build_id))); dso =dso__new (filename);
tools/perf/tests/sdt.c +3 -3
@@ -28,16 +28,16 @@ static int target_function(void)static int build_id_cache__add_file (const char *filename) {char sbuild_id[SBUILD_ID_SIZE ]; -u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid;int err; - err =filename__read_build_id (filename, &build_id,sizeof (build_id)); + err =filename__read_build_id (filename, &bid);if (err <0 ) {pr_debug ("Failed to read build id of %s\n" , filename);return err; } -build_id__sprintf (build_id,sizeof (build_id), sbuild_id); +build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); err =build_id_cache__add_s (sbuild_id, filename,NULL , false, false);if (err <0 )pr_debug ("Failed to add build id cache of %s\n" , filename);
tools/perf/util/build-id.c +3 -5
@@ -130,16 +130,14 @@ int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)int filename__sprintf_build_id (const char *pathname,char *sbuild_id) { -u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid;int ret; - ret =filename__read_build_id (pathname, build_id,sizeof (build_id)); + ret =filename__read_build_id (pathname, &bid);if (ret <0 )return ret; -else if (ret !=sizeof (build_id)) -return -EINVAL ; -return build_id__sprintf (build_id,sizeof (build_id), sbuild_id); +return build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); }/* asnprintf consolidates asprintf and snprintf */
tools/perf/util/dsos.c +1 -2
@@ -73,8 +73,7 @@ bool __dsos__read_build_ids(struct list_head *head, bool with_hits)continue ; }nsinfo__mountns_enter (pos->nsinfo, &nsc); -if (filename__read_build_id (pos->long_name, pos->bid.data, -sizeof (pos->bid.data)) >0 ) { +if (filename__read_build_id (pos->long_name, &pos->bid) >0 ) { have_build_id = true; pos->has_build_id = true; }
tools/perf/util/symbol-elf.c +10 -6
@@ -534,8 +534,9 @@ static int elf_read_build_id(Elf *elf, void *bf, size_t size)#ifdef HAVE_LIBBFD_BUILDID_SUPPORT -int filename__read_build_id (const char *filename,void *bf,size_t size) +int filename__read_build_id (const char *filename,struct build_id *bid) { +size_t size =sizeof (bid->data);int err =-1 ;bfd *abfd;
@@ -551,9 +552,9 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)if (!abfd->build_id || abfd->build_id->size > size) goto out_close; -memcpy (bf, abfd->build_id->data, abfd->build_id->size); -memset (bf + abfd->build_id->size,0 , size - abfd->build_id->size); - err = abfd->build_id->size; +memcpy (bid->data, abfd->build_id->data, abfd->build_id->size); +memset (bid->data + abfd->build_id->size,0 , size - abfd->build_id->size); + err = bid->size = abfd->build_id->size; out_close:bfd_close (abfd);
@@ -562,8 +563,9 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)#else // HAVE_LIBBFD_BUILDID_SUPPORT -int filename__read_build_id (const char *filename,void *bf,size_t size) +int filename__read_build_id (const char *filename,struct build_id *bid) { +size_t size =sizeof (bid->data);int fd, err =-1 ;Elf *elf;
@@ -580,7 +582,9 @@ int filename__read_build_id(const char *filename, void *bf, size_t size) goto out_close; } - err =elf_read_build_id (elf, bf, size); + err =elf_read_build_id (elf, bid->data, size); +if (err >0 ) + bid->size = err;elf_end (elf); out_close:
tools/perf/util/symbol-minimal.c +19 -15
@@ -31,9 +31,10 @@ static bool check_need_swap(int file_endian)#define NT_GNU_BUILD_ID 3 -static int read_build_id (void *note_data,size_t note_len,void *bf, -size_t size,bool need_swap) +static int read_build_id (void *note_data,size_t note_len,struct build_id *bid, +bool need_swap) { +size_t size =sizeof (bid->data);struct {u32 n_namesz;u32 n_descsz;
@@ -63,8 +64,9 @@ static int read_build_id(void *note_data, size_t note_len, void *bf, nhdr->n_namesz == sizeof("GNU")) {if (memcmp (name,"GNU" ,sizeof ("GNU" )) ==0 ) {size_t sz =min (size, descsz); -memcpy (bf, ptr, sz); -memset (bf + sz,0 , size - sz); +memcpy (bid->data, ptr, sz); +memset (bid->data + sz,0 , size - sz); + bid->size = sz;return 0 ; } }
@@ -84,7 +86,7 @@ int filename__read_debuglink(const char *filename __maybe_unused,/* * Just try PT_NOTE header otherwise fails */ -int filename__read_build_id (const char *filename,void *bf,size_t size) +int filename__read_build_id (const char *filename,struct build_id *bid) {FILE *fp;int ret =-1 ;
@@ -156,9 +158,9 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)if (fread (buf, buf_size,1 , fp) !=1 ) goto out_free; - ret =read_build_id (buf, buf_size, bf, size, need_swap); + ret =read_build_id (buf, buf_size, bid, need_swap);if (ret ==0 ) - ret = size; + ret = bid->size;break ; } }else {
@@ -207,9 +209,9 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)if (fread (buf, buf_size,1 , fp) !=1 ) goto out_free; - ret =read_build_id (buf, buf_size, bf, size, need_swap); + ret =read_build_id (buf, buf_size, bid, need_swap);if (ret ==0 ) - ret = size; + ret = bid->size;break ; } }
@@ -220,8 +222,9 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)return ret; } -int sysfs__read_build_id (const char *filename,void *build_id,size_t size) +int sysfs__read_build_id (const char *filename,void *build_id,size_t size__maybe_unused ) { +struct build_id bid;int fd;int ret =-1 ;struct stat stbuf;
@@ -243,7 +246,9 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size)if (read (fd, buf, buf_size) != (ssize_t ) buf_size) goto out_free; - ret =read_build_id (buf, buf_size, build_id, size, false); + ret =read_build_id (buf, buf_size, &bid, false); +if (ret >0 ) +memcpy (build_id, bid.data, bid.size); out_free:free (buf); out:
@@ -339,16 +344,15 @@ int dso__load_sym(struct dso *dso, struct map *map __maybe_unused, struct symsrc *runtime_ss __maybe_unused, int kmodule __maybe_unused) { -unsigned char build_id[BUILD_ID_SIZE ]; +struct build_id bid;int ret; ret =fd__is_64_bit (ss->fd);if (ret >=0 ) dso->is_64_bit = ret; -if (filename__read_build_id (ss->name, build_id,BUILD_ID_SIZE ) >0 ) { -dso__set_build_id (dso, build_id); - } +if (filename__read_build_id (ss->name, &bid) >0 ) +dso__set_build_id (dso, bid.data);return 0 ; }
tools/perf/util/symbol.c +3 -3
@@ -1755,7 +1755,7 @@ int dso__load(struct dso *dso, struct map *map)struct symsrc *syms_ss =NULL , *runtime_ss =NULL ;bool kmod;bool perfmap; -unsigned char build_id[BUILD_ID_SIZE ]; +struct build_id bid;struct nscookie nsc;char newmapname[PATH_MAX ];const char *map_path = dso->long_name;
@@ -1817,8 +1817,8 @@ int dso__load(struct dso *dso, struct map *map)if (!dso->has_build_id &&is_regular_file (dso->long_name)) {__symbol__join_symfs (name,PATH_MAX , dso->long_name); -if (filename__read_build_id (name, build_id,BUILD_ID_SIZE ) >0 ) -dso__set_build_id (dso, build_id); +if (filename__read_build_id (name, &bid) >0 ) +dso__set_build_id (dso, bid.data); }/*
tools/perf/util/symbol.h +2 -1
@@ -23,6 +23,7 @@ struct dso;struct map ;struct maps ;struct option ; +struct build_id ;/* * libelf 0.8.x and earlier do not support ELF_C_READ_MMAP;
@@ -142,7 +143,7 @@ struct symbol *dso__next_symbol(struct symbol *sym);enum dso_type dso__type_fd (int fd); -int filename__read_build_id (const char *filename,void *bf,size_t size); +int filename__read_build_id (const char *filename,struct build_id *id);int sysfs__read_build_id (const char *filename,void *bf,size_t size); int modules__parse(const char *filename, void *arg, int (*process_module)(void *arg, const char *name,
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v2 3/9 perf tools: Pass build id object to sysfs__read_build_id
In reply to Jiri OlsaPassing build id object to sysfs__read_build_id function, so it can populate the size of the build_id object.
--- tools/perf/util/build-id.c | 6 +++--- tools/perf/util/dso.c | 6 ++---- tools/perf/util/symbol-elf.c | 11 +++++------ tools/perf/util/symbol-minimal.c | 7 ++----- tools/perf/util/symbol.c | 7 +++---- tools/perf/util/symbol.h | 2 +- 6 files changed, 16 insertions(+), 23 deletions(-)
tools/perf/util/build-id.c +3 -3
@@ -113,7 +113,7 @@ int build_id__sprintf(const u8 *build_id, int len, char *bf)int sysfs__sprintf_build_id (const char *root_dir,char *sbuild_id) {char notes[PATH_MAX ]; -u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid;int ret;if (!root_dir)
@@ -121,11 +121,11 @@ int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)scnprintf (notes,sizeof (notes),"%s/sys/kernel/notes" , root_dir); - ret =sysfs__read_build_id (notes, build_id,sizeof (build_id)); + ret =sysfs__read_build_id (notes, &bid);if (ret <0 )return ret; -return build_id__sprintf (build_id,sizeof (build_id), sbuild_id); +return build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); }int filename__sprintf_build_id (const char *pathname,char *sbuild_id)
tools/perf/util/dso.c +2 -4
@@ -1346,8 +1346,7 @@ void dso__read_running_kernel_build_id(struct dso *dso, struct machine *machine)if (machine__is_default_guest (machine))return ;sprintf (path,"%s/sys/kernel/notes" , machine->root_dir); -if (sysfs__read_build_id (path, dso->bid.data, -sizeof (dso->bid.data)) ==0 ) +if (sysfs__read_build_id (path, &dso->bid) ==0 ) dso->has_build_id = true; }
@@ -1365,8 +1364,7 @@ int dso__kernel_module_get_build_id(struct dso *dso,"%s/sys/module/%.*s/notes/.note.gnu.build-id" , root_dir, (int)strlen(name) - 1, name); -if (sysfs__read_build_id (filename, dso->bid.data, -sizeof (dso->bid.data)) ==0 ) +if (sysfs__read_build_id (filename, &dso->bid) ==0 ) dso->has_build_id = true;return 0 ;
tools/perf/util/symbol-elf.c +5 -6
@@ -595,13 +595,11 @@ int filename__read_build_id(const char *filename, struct build_id *bid)#endif // HAVE_LIBBFD_BUILDID_SUPPORT -int sysfs__read_build_id (const char *filename,void *build_id,size_t size) +int sysfs__read_build_id (const char *filename,struct build_id *bid) { +size_t size =sizeof (bid->data);int fd, err =-1 ; -if (size <BUILD_ID_SIZE ) - goto out; - fd =open (filename,O_RDONLY );if (fd <0 ) goto out;
@@ -622,8 +620,9 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size)break ;if (memcmp (bf,"GNU" ,sizeof ("GNU" )) ==0 ) {size_t sz =min (descsz, size); -if (read (fd, build_id, sz) == (ssize_t )sz) { -memset (build_id + sz,0 , size - sz); +if (read (fd, bid->data, sz) == (ssize_t )sz) { +memset (bid->data + sz,0 , size - sz); + bid->size = sz; err =0 ;break ; }
tools/perf/util/symbol-minimal.c +2 -5
@@ -222,9 +222,8 @@ int filename__read_build_id(const char *filename, struct build_id *bid)return ret; } -int sysfs__read_build_id (const char *filename,void *build_id,size_t size__maybe_unused ) +int sysfs__read_build_id (const char *filename,struct build_id *bid) { -struct build_id bid;int fd;int ret =-1 ;struct stat stbuf;
@@ -246,9 +245,7 @@ int sysfs__read_build_id(const char *filename, void *build_id, size_t size __mayif (read (fd, buf, buf_size) != (ssize_t ) buf_size) goto out_free; - ret =read_build_id (buf, buf_size, &bid, false); -if (ret >0 ) -memcpy (build_id, bid.data, bid.size); + ret =read_build_id (buf, buf_size, bid, false); out_free:free (buf); out:
tools/perf/util/symbol.c +3 -4
@@ -2122,7 +2122,7 @@ static bool filename__readable(const char *file)static char *dso__find_kallsyms (struct dso *dso,struct map *map) { -u8 host_build_id[BUILD_ID_SIZE ]; +struct build_id bid;char sbuild_id[SBUILD_ID_SIZE ];bool is_host = false;char path[PATH_MAX ];
@@ -2135,9 +2135,8 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map) 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); +if (sysfs__read_build_id ("/sys/kernel/notes" , &bid) ==0 ) + is_host =dso__build_id_equal (dso, bid.data);/* Try a fast path for /proc/kallsyms if possible */ if (is_host) {
tools/perf/util/symbol.h +1 -1
@@ -144,7 +144,7 @@ struct symbol *dso__next_symbol(struct symbol *sym);enum dso_type dso__type_fd (int fd);int filename__read_build_id (const char *filename,struct build_id *id); -int sysfs__read_build_id (const char *filename,void *bf,size_t size); +int sysfs__read_build_id (const char *filename,struct build_id *bid);int modules__parse (const char *filename,void *arg,int (*process_module)(void *arg,const char *name,u64 start,u64 size));
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v2 4/9 perf tools: Pass build_id object to build_id__sprintf
In reply to Jiri OlsaPassing build_id object to build_id__sprintf function, so it can operate with the proper size of build id.
This will create proper md5 build id readable names, like following:
a50e350e97c43b4708d09bcd85ebfff7
instead of:
a50e350e97c43b4708d09bcd85ebfff700000000
--- tools/perf/builtin-buildid-cache.c | 6 ++-- tools/perf/tests/sdt.c | 2 +- tools/perf/util/annotate.c | 3 +- tools/perf/util/build-id.c | 30 ++++++++++++------- tools/perf/util/build-id.h | 3 +- tools/perf/util/dso.c | 6 ++-- tools/perf/util/header.c | 3 +- tools/perf/util/map.c | 4 +-- tools/perf/util/probe-event.c | 9 ++++-- tools/perf/util/probe-finder.c | 8 +++-- .../scripting-engines/trace-event-python.c | 2 +- tools/perf/util/symbol.c | 2 +- 12 files changed, 43 insertions(+), 35 deletions(-)
tools/perf/builtin-buildid-cache.c +3 -3
@@ -186,7 +186,7 @@ static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)return -1 ; } -build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); +build_id__sprintf (&bid, sbuild_id); err =build_id_cache__add_s (sbuild_id, filename, nsi, false, false); pr_debug("Adding %s %s: %s\n", sbuild_id, filename,
@@ -210,7 +210,7 @@ static int build_id_cache__remove_file(const char *filename, struct nsinfo *nsi)return -1 ; } -build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); +build_id__sprintf (&bid, sbuild_id); err =build_id_cache__remove_s (sbuild_id);pr_debug ("Removing %s %s: %s\n" , sbuild_id, filename, err ?"FAIL" :"Ok" );
@@ -314,7 +314,7 @@ static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi) } err =0 ; -build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); +build_id__sprintf (&bid, sbuild_id);if (build_id_cache__cached (sbuild_id)) err =build_id_cache__remove_s (sbuild_id);
tools/perf/tests/sdt.c +1 -1
@@ -37,7 +37,7 @@ static int build_id_cache__add_file(const char *filename)return err; } -build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); +build_id__sprintf (&bid, sbuild_id); err =build_id_cache__add_s (sbuild_id, filename,NULL , false, false);if (err <0 )pr_debug ("Failed to add build id cache of %s\n" , filename);
tools/perf/util/annotate.c +1 -2
@@ -1578,8 +1578,7 @@ int symbol__strerror_disassemble(struct map_symbol *ms, int errnum, char *buf, schar *build_id_msg =NULL ;if (dso->has_build_id) { -build_id__sprintf (dso->bid.data, -sizeof (dso->bid.data), bf +15 ); +build_id__sprintf (&dso->bid, bf +15 ); build_id_msg = bf; } scnprintf(buf, buflen,
tools/perf/util/build-id.c +19 -11
@@ -37,6 +37,7 @@#include <linux/ctype.h> #include <linux/zalloc.h> +#include <asm/bug.h> static bool no_buildid_cache;
@@ -95,13 +96,13 @@ struct perf_tool build_id__mark_dso_hit_ops = { .ordered_events = true, }; -int build_id__sprintf (const u8 *build_id,int len,char *bf) +int build_id__sprintf (const struct build_id *build_id,char *bf) {char *bid = bf; -const u8 *raw = build_id; -int i; +const u8 *raw = build_id->data; +size_t i; -for (i =0 ; i < len; ++i) { +for (i =0 ; i < build_id->size; ++i) {sprintf (bid,"%02x" , *raw); ++raw; bid +=2 ;
@@ -125,7 +126,7 @@ int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)if (ret <0 )return ret; -return build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); +return build_id__sprintf (&bid, sbuild_id); }int filename__sprintf_build_id (const char *pathname,char *sbuild_id)
@@ -137,7 +138,7 @@ int filename__sprintf_build_id(const char *pathname, char *sbuild_id)if (ret <0 )return ret; -return build_id__sprintf (bid.data,sizeof (bid.data), sbuild_id); +return build_id__sprintf (&bid, sbuild_id); }/* asnprintf consolidates asprintf and snprintf */
@@ -270,7 +271,7 @@ char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size,if (!dso->has_build_id)return NULL ; -build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id); +build_id__sprintf (&dso->bid, sbuild_id); linkname =build_id_cache__linkname (sbuild_id,NULL ,0 );if (!linkname)return NULL ;
@@ -767,13 +768,13 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,return err; } -static int build_id_cache__add_b (const u8 *build_id,size_t build_id_size, +static int build_id_cache__add_b (const struct build_id *bid,const char *name,struct nsinfo *nsi,bool is_kallsyms,bool is_vdso) {char sbuild_id[SBUILD_ID_SIZE ]; -build_id__sprintf (build_id, build_id_size, sbuild_id); +build_id__sprintf (bid, sbuild_id);return build_id_cache__add_s (sbuild_id, name, nsi, is_kallsyms, is_vdso);
@@ -839,8 +840,8 @@ static int dso__cache_build_id(struct dso *dso, struct machine *machine) is_kallsyms = true; name = machine->mmap_name; } -return build_id_cache__add_b (dso->bid.data,sizeof (dso->bid.data), name, - dso->nsinfo, is_kallsyms, is_vdso); +return build_id_cache__add_b (&dso->bid, name, dso->nsinfo, + is_kallsyms, is_vdso); } static int __dsos__cache_build_ids(struct list_head *head,
@@ -900,3 +901,10 @@ bool perf_session__read_build_ids(struct perf_session *session, bool with_hits)return ret; } + +void build_id__init (struct build_id *bid,const u8 *data,size_t size) +{ +WARN_ON (size >BUILD_ID_SIZE ); +memcpy (bid->data, data, size); + bid->size = size; +}
tools/perf/util/build-id.h +2 -1
@@ -19,7 +19,8 @@ extern struct perf_tool build_id__mark_dso_hit_ops;struct dso ;struct feat_fd ; -int build_id__sprintf (const u8 *build_id,int len,char *bf); +void build_id__init (struct build_id *bid,const u8 *data,size_t size); +int build_id__sprintf (const struct build_id *build_id,char *bf);int sysfs__sprintf_build_id (const char *root_dir,char *sbuild_id);int filename__sprintf_build_id (const char *pathname,char *sbuild_id); char *build_id_cache__kallsyms_path(const char *sbuild_id, char *bf,
tools/perf/util/dso.c +2 -4
@@ -172,9 +172,7 @@ int dso__read_binary_type_filename(const struct dso *dso,break ; } -build_id__sprintf (dso->bid.data, -sizeof (dso->bid.data), - build_id_hex); +build_id__sprintf (&dso->bid, build_id_hex); len =__symbol__join_symfs (filename, size,"/usr/lib/debug/.build-id/" );snprintf (filename + len, size - len,"%.2s/%s.debug" , build_id_hex, build_id_hex +2 );
@@ -1374,7 +1372,7 @@ size_t dso__fprintf_buildid(struct dso *dso, FILE *fp) {char sbuild_id[SBUILD_ID_SIZE ]; -build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id); +build_id__sprintf (&dso->bid, sbuild_id);return fprintf (fp,"%s" , sbuild_id); }
tools/perf/util/header.c +1 -2
@@ -2095,8 +2095,7 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,free (m.name); } -build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), - sbuild_id); +build_id__sprintf (&dso->bid, sbuild_id);pr_debug ("build id event received for %s: %s\n" , dso->long_name, sbuild_id);dso__put (dso);
tools/perf/util/map.c +1 -3
@@ -331,9 +331,7 @@ int map__load(struct map *map)if (map->dso->has_build_id) {char sbuild_id[SBUILD_ID_SIZE ]; -build_id__sprintf (map->dso->bid.data, -sizeof (map->dso->bid.data), - sbuild_id); +build_id__sprintf (&map->dso->bid, sbuild_id);pr_debug ("%s with build id %s not found" , name, sbuild_id); }else pr_debug ("Failed to open %s" , name);
tools/perf/util/probe-event.c +6 -3
@@ -473,7 +473,7 @@ static struct debuginfo *open_from_debuginfod(struct dso *dso, struct nsinfo *nsif (!c)return NULL ; -build_id__sprintf (dso->bid.data,BUILD_ID_SIZE , sbuild_id); +build_id__sprintf (&dso->bid, sbuild_id); fd =debuginfod_find_debuginfo (c, (const unsigned char *)sbuild_id,0 , &path);if (fd >=0 )
@@ -1005,6 +1005,7 @@ static int _show_one_line(FILE *fp, int l, bool skip, bool show_num)static int __show_line_range (struct line_range *lr,const char *module,bool user) { +struct build_id bid;int l =1 ;struct int_node *ln;struct debuginfo *dinfo;
@@ -1025,8 +1026,10 @@ static int __show_line_range(struct line_range *lr, const char *module,if (!ret) ret =debuginfo__find_line_range (dinfo, lr); } -if (dinfo->build_id) -build_id__sprintf (dinfo->build_id,BUILD_ID_SIZE , sbuild_id); +if (dinfo->build_id) { +build_id__init (&bid, dinfo->build_id,BUILD_ID_SIZE ); +build_id__sprintf (&bid, sbuild_id); + }debuginfo__delete (dinfo);if (ret ==0 || ret == -ENOENT ) {pr_warning ("Specified source line is not found.\n" );
tools/perf/util/probe-finder.c +5 -3
@@ -949,6 +949,7 @@ static int probe_point_lazy_walker(const char *fname, int lineno,/* Find probe points from lazy pattern */ static int find_probe_point_lazy (Dwarf_Die *sp_die,struct probe_finder *pf) { +struct build_id bid;char sbuild_id[SBUILD_ID_SIZE ] ="" ;int ret =0 ;char *fpath;
@@ -957,9 +958,10 @@ static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)const char *comp_dir; comp_dir =cu_get_comp_dir (&pf->cu_die); -if (pf->dbg->build_id) -build_id__sprintf (pf->dbg->build_id, -BUILD_ID_SIZE , sbuild_id); +if (pf->dbg->build_id) { +build_id__init (&bid, pf->dbg->build_id,BUILD_ID_SIZE ); +build_id__sprintf (&bid, sbuild_id); + } ret =find_source_path (pf->fname, sbuild_id, comp_dir, &fpath);if (ret <0 ) {pr_warning ("Failed to find source file path.\n" );
tools/perf/util/scripting-engines/trace-event-python.c +1 -1
@@ -1064,7 +1064,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,char sbuild_id[SBUILD_ID_SIZE ];PyObject *t; -build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id); +build_id__sprintf (&dso->bid, sbuild_id); t =tuple_new (5 );
tools/perf/util/symbol.c +1 -1
@@ -2152,7 +2152,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map) goto proc_kallsyms; } -build_id__sprintf (dso->bid.data,sizeof (dso->bid.data), sbuild_id); +build_id__sprintf (&dso->bid, sbuild_id);/* Find kallsyms in build-id cache with kcore */ scnprintf(path, sizeof(path), "%s/%s/%s",
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v2 5/9 perf tools: Pass build_id object to dso__set_build_id
In reply to Jiri OlsaPassing build_id object to dso__set_build_id, so it's easier to initialize dos's build id object.
--- tools/perf/util/dso.c | 4 ++-- tools/perf/util/dso.h | 2 +- tools/perf/util/header.c | 4 +++- tools/perf/util/symbol-minimal.c | 2 +- tools/perf/util/symbol.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-)
tools/perf/util/dso.c +2 -2
@@ -1326,9 +1326,9 @@ void dso__put(struct dso *dso)dso__delete (dso); } -void dso__set_build_id (struct dso *dso,void *build_id) +void dso__set_build_id (struct dso *dso,struct build_id *bid) { -memcpy (dso->bid.data, build_id,sizeof (dso->bid.data)); + dso->bid = *bid; dso->has_build_id =1 ; }
tools/perf/util/dso.h +1 -1
@@ -260,7 +260,7 @@ bool dso__sorted_by_name(const struct dso *dso);void dso__set_sorted_by_name (struct dso *dso);void dso__sort_by_name (struct dso *dso); -void dso__set_build_id (struct dso *dso,void *build_id); +void dso__set_build_id (struct dso *dso,struct build_id *bid);bool dso__build_id_equal (const struct dso *dso,u8 *build_id);void dso__read_running_kernel_build_id (struct dso *dso,struct machine *machine);
tools/perf/util/header.c +3 -1
@@ -2082,8 +2082,10 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, dso =machine__findnew_dso (machine, filename);if (dso !=NULL ) {char sbuild_id[SBUILD_ID_SIZE ]; +struct build_id bid; -dso__set_build_id (dso, &bev->build_id); +build_id__init (&bid, bev->build_id,BUILD_ID_SIZE ); +dso__set_build_id (dso, &bid);if (dso_space !=DSO_SPACE__USER ) {struct kmod_path m = { .name =NULL , };
tools/perf/util/symbol-minimal.c +1 -1
@@ -349,7 +349,7 @@ int dso__load_sym(struct dso *dso, struct map *map __maybe_unused, dso->is_64_bit = ret;if (filename__read_build_id (ss->name, &bid) >0 ) -dso__set_build_id (dso, bid.data); +dso__set_build_id (dso, &bid);return 0 ; }
tools/perf/util/symbol.c +1 -1
@@ -1818,7 +1818,7 @@ int dso__load(struct dso *dso, struct map *map) is_regular_file(dso->long_name)) {__symbol__join_symfs (name,PATH_MAX , dso->long_name);if (filename__read_build_id (name, &bid) >0 ) -dso__set_build_id (dso, bid.data); +dso__set_build_id (dso, &bid); }/*
Signature · 1 line
2.26.2
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 5/9] perf tools: Pass build_id object to dso__set_build_id
Em Tue, Oct 13, 2020 at 09:24:37PM +0200, Jiri Olsa escreveu:
Quoted 18 lines
Passing
build_idobject todso__set_build_id, so it's easier to initialize dos's build id object.Acked-by Ian Rogers <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/dso.c | 4 ++-- tools/perf/util/dso.h | 2 +- tools/perf/util/header.c | 4 +++- tools/perf/util/symbol-minimal.c | 2 +- tools/perf/util/symbol.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-)tools/perf/util/dso.c +0
-0
tools/perf/util/dso.c void dso__put(struct dso *dso) · line 1331
Quoted 8 lines
tools/perf/util/dso.c +2
-2@@ -1326,9 +1326,9 @@ void dso__put(struct dso *dso)dso__delete (dso); } -void dso__set_build_id (struct dso *dso,void *build_id) +void dso__set_build_id (struct dso *dso,struct build_id *bid) { -memcpy (dso->bid.data, build_id,sizeof (dso->bid.data)); + dso->bid = *bid;
Can't we use bid->size here?
dso->bid.size = bid->size; memcpy(dso->bid.data, bid->data, bid->size));
?
Not worth it? Probably :-)
- Arnaldo
Quoted 61 lines
tools/perf/util/dso.c +0
-0dso->has_build_id =1 ; }tools/perf/util/dso.h +1
-1@@ -260,7 +260,7 @@ bool dso__sorted_by_name(const struct dso *dso);void dso__set_sorted_by_name (struct dso *dso);void dso__sort_by_name (struct dso *dso); -void dso__set_build_id (struct dso *dso,void *build_id); +void dso__set_build_id (struct dso *dso,struct build_id *bid);bool dso__build_id_equal (const struct dso *dso,u8 *build_id);void dso__read_running_kernel_build_id (struct dso *dso,struct machine *machine);tools/perf/util/header.c +3
-1@@ -2082,8 +2082,10 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, dso =machine__findnew_dso (machine, filename);if (dso !=NULL ) {char sbuild_id[SBUILD_ID_SIZE ]; +struct build_id bid; -dso__set_build_id (dso, &bev->build_id); +build_id__init (&bid, bev->build_id,BUILD_ID_SIZE ); +dso__set_build_id (dso, &bid);if (dso_space !=DSO_SPACE__USER ) {struct kmod_path m = { .name =NULL , };tools/perf/util/symbol-minimal.c +1
-1@@ -349,7 +349,7 @@ int dso__load_sym(struct dso *dso, struct map *map __maybe_unused, dso->is_64_bit = ret;if (filename__read_build_id (ss->name, &bid) >0 ) -dso__set_build_id (dso, bid.data); +dso__set_build_id (dso, &bid);return 0 ; }tools/perf/util/symbol.c +1
-1@@ -1818,7 +1818,7 @@ int dso__load(struct dso *dso, struct map *map) is_regular_file(dso->long_name)) {__symbol__join_symfs (name,PATH_MAX , dso->long_name);if (filename__read_build_id (name, &bid) >0 ) -dso__set_build_id (dso, bid.data); +dso__set_build_id (dso, &bid); }/* Signature · 1 line
2.26.2
Signature · 1 line
- Arnaldo
Re: [PATCH 5/9] perf tools: Pass build_id object to dso__set_build_id
Quoted 30 lines · Arnaldo Carvalho de Melo
Em Tue, Oct 13, 2020 at 09:24:37PM +0200, Jiri Olsa escreveu:
Quoted 18 lines
Passing
build_idobject todso__set_build_id, so it's easier to initialize dos's build id object.Acked-by Ian Rogers <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/dso.c | 4 ++-- tools/perf/util/dso.h | 2 +- tools/perf/util/header.c | 4 +++- tools/perf/util/symbol-minimal.c | 2 +- tools/perf/util/symbol.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-)tools/perf/util/dso.c +0
-0tools/perf/util/dso.c void dso__put(struct dso *dso) · line 1331
Quoted 8 lines
tools/perf/util/dso.c +2
-2@@ -1326,9 +1326,9 @@ void dso__put(struct dso *dso)dso__delete (dso); } -void dso__set_build_id (struct dso *dso,void *build_id) +void dso__set_build_id (struct dso *dso,struct build_id *bid) { -memcpy (dso->bid.data, build_id,sizeof (dso->bid.data)); + dso->bid = *bid;Can't we use
bid->sizehere?
Quoted 6 lines
dso->bid.size = bid->size; memcpy(dso->bid.data, bid->data, bid->size));?
Not worth it? Probably :-)
yea, I wonder compiler will do the same thing in both cases, but I don't know ;-)
I wanted to demonstrate that it's the same object
jirka
Jiri Olsa
reviewerPATCH v2 6/9 perf tools: Pass build_id object to dso__build_id_equal
In reply to Jiri OlsaPassing build_id object to dso__build_id_equal, so we can properly check build id with different size than sha1.
--- tools/perf/util/dso.c | 5 +++-- tools/perf/util/dso.h | 2 +- tools/perf/util/symbol-elf.c | 8 ++++++-- tools/perf/util/symbol.c | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-)
tools/perf/util/dso.c +3 -2
@@ -1332,9 +1332,10 @@ void dso__set_build_id(struct dso *dso, struct build_id *bid) dso->has_build_id =1 ; } -bool dso__build_id_equal (const struct dso *dso,u8 *build_id) +bool dso__build_id_equal (const struct dso *dso,struct build_id *bid) { -return memcmp (dso->bid.data, build_id,sizeof (dso->bid.data)) ==0 ; +return dso->bid.size == bid->size && +memcmp (dso->bid.data, bid->data, dso->bid.size) ==0 ; }void dso__read_running_kernel_build_id (struct dso *dso,struct machine *machine)
tools/perf/util/dso.h +1 -1
@@ -261,7 +261,7 @@ void dso__set_sorted_by_name(struct dso *dso);void dso__sort_by_name (struct dso *dso);void dso__set_build_id (struct dso *dso,struct build_id *bid); -bool dso__build_id_equal (const struct dso *dso,u8 *build_id); +bool dso__build_id_equal (const struct dso *dso,struct build_id *bid);void dso__read_running_kernel_build_id (struct dso *dso,struct machine *machine);int dso__kernel_module_get_build_id (struct dso *dso,const char *root_dir);
tools/perf/util/symbol-elf.c +6 -2
@@ -834,13 +834,17 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,/* Always reject images with a mismatched build-id: */ if (dso->has_build_id && !symbol_conf.ignore_vmlinux_buildid) {u8 build_id[BUILD_ID_SIZE ]; +struct build_id bid; +int size; -if (elf_read_build_id (elf, build_id,BUILD_ID_SIZE ) <0 ) { + size =elf_read_build_id (elf, build_id,BUILD_ID_SIZE ); +if (size <=0 ) { dso->load_errno =DSO_LOAD_ERRNO__CANNOT_READ_BUILDID ; goto out_elf_end; } -if (!dso__build_id_equal (dso, build_id)) { +build_id__init (&bid, build_id, size); +if (!dso__build_id_equal (dso, &bid)) {pr_debug ("%s: build id mismatch for %s.\n" , __func__, name); dso->load_errno =DSO_LOAD_ERRNO__MISMATCHING_BUILDID ; goto out_elf_end;
tools/perf/util/symbol.c +1 -1
@@ -2136,7 +2136,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map) }if (sysfs__read_build_id ("/sys/kernel/notes" , &bid) ==0 ) - is_host =dso__build_id_equal (dso, bid.data); + is_host =dso__build_id_equal (dso, &bid);/* Try a fast path for /proc/kallsyms if possible */ if (is_host) {
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v2 7/9 perf tools: Add size to struct perf_record_header_build_id
In reply to Jiri OlsaWe do not store size with build ids in perf data, but there's enough space to do it. Adding misc bit PERF_RECORD_MISC_BUILD_ID_SIZE to mark build id event with size.
With this fix the dso with md5 build id will have correct build id data and will be usable for debuginfod processing if needed (coming in following patches).
--- tools/lib/perf/include/perf/event.h | 12 +++++++++++- tools/perf/util/build-id.c | 8 +++++--- tools/perf/util/header.c | 10 +++++++--- 3 files changed, 23 insertions(+), 7 deletions(-)
tools/lib/perf/include/perf/event.h +11 -1
@@ -201,10 +201,20 @@ struct perf_record_header_tracing_data {__u32 size; }; +#define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15) +struct perf_record_header_build_id {struct perf_event_header header;pid_t pid; -__u8 build_id[24 ]; +union { +__u8 build_id[24 ]; +struct { +__u8 data[20 ]; +__u8 size; +__u8 reserved1__; +__u16 reserved2__; + }; + };char filename[]; };
tools/perf/util/build-id.c +5 -3
@@ -296,7 +296,7 @@ char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size,continue ; \ else -static int write_buildid(const char *name, size_t name_len, u8 *build_id, +static int write_buildid(const char *name, size_t name_len, struct build_id *bid,pid_t pid,u16 misc,struct feat_fd *fd) {int err;
@@ -307,7 +307,9 @@ static int write_buildid(const char *name, size_t name_len, u8 *build_id, len =PERF_ALIGN (len,NAME_ALIGN );memset (&b,0 ,sizeof (b)); -memcpy (&b.build_id, build_id,BUILD_ID_SIZE ); +memcpy (&b.data, bid->data, bid->size); + b.size = (u8 ) bid->size; + misc |=PERF_RECORD_MISC_BUILD_ID_SIZE ; b.pid = pid; b.header.misc = misc; b.header.size =sizeof (b) + len;
@@ -354,7 +356,7 @@ static int machine__write_buildid_table(struct machine *machine, in_kernel = pos->kernel ||is_kernel_module (name,PERF_RECORD_MISC_CPUMODE_UNKNOWN ); - err =write_buildid (name, name_len, pos->bid.data, machine->pid, + err =write_buildid (name, name_len, &pos->bid, machine->pid, in_kernel ? kmisc : umisc, fd);if (err)break ;
tools/perf/util/header.c +7 -3
@@ -2083,8 +2083,12 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,if (dso !=NULL ) {char sbuild_id[SBUILD_ID_SIZE ];struct build_id bid; +size_t size =BUILD_ID_SIZE ; -build_id__init (&bid, bev->build_id,BUILD_ID_SIZE ); +if (bev->header.misc &PERF_RECORD_MISC_BUILD_ID_SIZE ) + size = bev->size; + +build_id__init (&bid, bev->data, size);dso__set_build_id (dso, &bid);if (dso_space !=DSO_SPACE__USER ) {
@@ -2098,8 +2102,8 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, }build_id__sprintf (&dso->bid, sbuild_id); -pr_debug ("build id event received for %s: %s\n" , - dso->long_name, sbuild_id); +pr_debug ("build id event received for %s: %s [%lu]\n" , + dso->long_name, sbuild_id, size);dso__put (dso); }
Signature · 1 line
2.26.2
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 7/9] perf tools: Add size to struct perf_record_header_build_id
Em Tue, Oct 13, 2020 at 09:24:39PM +0200, Jiri Olsa escreveu:
Quoted 32 lines
We do not store size with build ids in perf data, but there's enough space to do it. Adding misc bit
PERF_RECORD_MISC_BUILD_ID_SIZEto mark build id event with size.With this fix the dso with md5 build id will have correct build id data and will be usable for debuginfod processing if needed (coming in following patches).
Acked-by Ian Rogers <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/perf/event.h | 12 +++++++++++- tools/perf/util/build-id.c | 8 +++++--- tools/perf/util/header.c | 10 +++++++--- 3 files changed, 23 insertions(+), 7 deletions(-)tools/lib/perf/include/perf/event.h +3
-1@@ -201,10 +201,20 @@ struct perf_record_header_tracing_data {__u32 size; }; +#define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15) +struct perf_record_header_build_id {struct perf_event_header header;pid_t pid; -__u8 build_id[24 ]; +union {
tools/lib/perf/include/perf/event.h struct perf_record_header_tracing_data { · line 219
Quoted 10 lines
tools/lib/perf/include/perf/event.h +8
-0+__u8 build_id[24 ]; +struct { +__u8 data[20 ]; +__u8 size; +__u8 reserved1__; +__u16 reserved2__; + }; + };char filename[]; };
Hey, shouldn't we just append the extra info at the end, i.e. keep it like:
struct perf_record_header_build_id {
struct perf_event_header header;
pid_t pid; __u8 build_id[24]; char filename[]; __u8 size;
};
No need for PERF_RECORD_MISC_BUILD_ID_SIZE, older tools will continue working with new perf data files.
OTOH BUILD_ID_SIZE is 20 and the space on this header is 24, so the last 4 bytes were not being used, so older tools don't look into it, they should continue working, have you tested this case? I.e. getting the perf binary in, say, fedora and check that it works with this new perf_record_header_build_id layout?
- Arnaldo
Quoted 65 lines
tools/perf/util/build-id.c +5
-3@@ -296,7 +296,7 @@ char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size,continue ; \ else -static int write_buildid(const char *name, size_t name_len, u8 *build_id, +static int write_buildid(const char *name, size_t name_len, struct build_id *bid,pid_t pid,u16 misc,struct feat_fd *fd) {int err;@@ -307,7 +307,9 @@ static int write_buildid(const char *name, size_t name_len, u8 *build_id, len =PERF_ALIGN (len,NAME_ALIGN );memset (&b,0 ,sizeof (b)); -memcpy (&b.build_id, build_id,BUILD_ID_SIZE ); +memcpy (&b.data, bid->data, bid->size); + b.size = (u8 ) bid->size; + misc |=PERF_RECORD_MISC_BUILD_ID_SIZE ; b.pid = pid; b.header.misc = misc; b.header.size =sizeof (b) + len;@@ -354,7 +356,7 @@ static int machine__write_buildid_table(struct machine *machine, in_kernel = pos->kernel ||is_kernel_module (name,PERF_RECORD_MISC_CPUMODE_UNKNOWN ); - err =write_buildid (name, name_len, pos->bid.data, machine->pid, + err =write_buildid (name, name_len, &pos->bid, machine->pid, in_kernel ? kmisc : umisc, fd);if (err)break ;tools/perf/util/header.c +7
-3@@ -2083,8 +2083,12 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,if (dso !=NULL ) {char sbuild_id[SBUILD_ID_SIZE ];struct build_id bid; +size_t size =BUILD_ID_SIZE ; -build_id__init (&bid, bev->build_id,BUILD_ID_SIZE ); +if (bev->header.misc &PERF_RECORD_MISC_BUILD_ID_SIZE ) + size = bev->size; + +build_id__init (&bid, bev->data, size);dso__set_build_id (dso, &bid);if (dso_space !=DSO_SPACE__USER ) {@@ -2098,8 +2102,8 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, }build_id__sprintf (&dso->bid, sbuild_id); -pr_debug ("build id event received for %s: %s\n" , - dso->long_name, sbuild_id); +pr_debug ("build id event received for %s: %s [%lu]\n" , + dso->long_name, sbuild_id, size);dso__put (dso); }Signature · 1 line
2.26.2
Signature · 1 line
- Arnaldo
Re: [PATCH 7/9] perf tools: Add size to struct perf_record_header_build_id
Quoted 53 lines · Arnaldo Carvalho de Melo
Em Tue, Oct 13, 2020 at 09:24:39PM +0200, Jiri Olsa escreveu:
Quoted 32 lines
We do not store size with build ids in perf data, but there's enough space to do it. Adding misc bit
PERF_RECORD_MISC_BUILD_ID_SIZEto mark build id event with size.With this fix the dso with md5 build id will have correct build id data and will be usable for debuginfod processing if needed (coming in following patches).
Acked-by Ian Rogers <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/perf/event.h | 12 +++++++++++- tools/perf/util/build-id.c | 8 +++++--- tools/perf/util/header.c | 10 +++++++--- 3 files changed, 23 insertions(+), 7 deletions(-)tools/lib/perf/include/perf/event.h +3
-1@@ -201,10 +201,20 @@ struct perf_record_header_tracing_data {__u32 size; }; +#define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15) +struct perf_record_header_build_id {struct perf_event_header header;pid_t pid; -__u8 build_id[24 ]; +union {tools/lib/perf/include/perf/event.h struct perf_record_header_tracing_data { · line 219
Quoted 10 lines
tools/lib/perf/include/perf/event.h +8
-0+__u8 build_id[24 ]; +struct { +__u8 data[20 ]; +__u8 size; +__u8 reserved1__; +__u16 reserved2__; + }; + };char filename[]; };Hey, shouldn't we just append the extra info at the end, i.e. keep it like:
struct
perf_record_header_build_id{tools/lib/perf/include/perf/event.h +0
-0struct perf_event_header header;pid_t pid;__u8 build_id[24]; char filename[]; __u8 size;
Quoted 5 lines
};
No need for
PERF_RECORD_MISC_BUILD_ID_SIZE, older tools will continue working with new perf data files.
hum, then how would we tell if the last byte (size) is present or not?
Quoted 6 lines
OTOH
BUILD_ID_SIZEis 20 and the space on this header is 24, so the last 4 bytes were not being used, so older tools don't look into it, they should continue working, have you tested this case? I.e. getting the perf binary in, say, fedora and check that it works with this newperf_record_header_build_idlayout?
yes, that still works (tested), because we copied only 20 bytes of the build_id[24] and did not care about the rest
jirka
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 7/9] perf tools: Add size to struct perf_record_header_build_id
Em Wed, Oct 14, 2020 at 03:21:46PM +0200, Jiri Olsa escreveu:
Quoted 56 lines · Arnaldo Carvalho de Melo
Quoted 54 lines
Em Tue, Oct 13, 2020 at 09:24:39PM +0200, Jiri Olsa escreveu:
Quoted 32 lines
We do not store size with build ids in perf data, but there's enough space to do it. Adding misc bit
PERF_RECORD_MISC_BUILD_ID_SIZEto mark build id event with size.With this fix the dso with md5 build id will have correct build id data and will be usable for debuginfod processing if needed (coming in following patches).
Acked-by Ian Rogers <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/perf/event.h | 12 +++++++++++- tools/perf/util/build-id.c | 8 +++++--- tools/perf/util/header.c | 10 +++++++--- 3 files changed, 23 insertions(+), 7 deletions(-)tools/lib/perf/include/perf/event.h +3
-1@@ -201,10 +201,20 @@ struct perf_record_header_tracing_data {__u32 size; }; +#define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15) +struct perf_record_header_build_id {struct perf_event_header header;pid_t pid; -__u8 build_id[24 ]; +union {tools/lib/perf/include/perf/event.h struct perf_record_header_tracing_data { · line 219
Quoted 10 lines
tools/lib/perf/include/perf/event.h +8
-0+__u8 build_id[24 ]; +struct { +__u8 data[20 ]; +__u8 size; +__u8 reserved1__; +__u16 reserved2__; + }; + };char filename[]; };Hey, shouldn't we just append the extra info at the end, i.e. keep it like:
struct
perf_record_header_build_id{tools/lib/perf/include/perf/event.h +0
-0struct perf_event_header header;pid_t pid;__u8 build_id[24]; char filename[]; __u8 size;};
Quoted 4 lines
Quoted 2 lines
No need for
PERF_RECORD_MISC_BUILD_ID_SIZE, older tools will continue working with new perf data files.hum, then how would we tell if the last byte (size) is present or not?
IT would be different than '\0' ;-)
- Arnaldo
Quoted 9 lines
Quoted 6 lines
OTOH
BUILD_ID_SIZEis 20 and the space on this header is 24, so the last 4 bytes were not being used, so older tools don't look into it, they should continue working, have you tested this case? I.e. getting the perf binary in, say, fedora and check that it works with this newperf_record_header_build_idlayout?yes, that still works (tested), because we copied only 20 bytes of the build_id[24] and did not care about the rest
Great that you actually tested it.
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 7/9] perf tools: Add size to struct perf_record_header_build_id
In reply to Jiri OlsaEm Tue, Oct 13, 2020 at 09:24:39PM +0200, Jiri Olsa escreveu:
Quoted 95 lines
We do not store size with build ids in perf data, but there's enough space to do it. Adding misc bit
PERF_RECORD_MISC_BUILD_ID_SIZEto mark build id event with size.With this fix the dso with md5 build id will have correct build id data and will be usable for debuginfod processing if needed (coming in following patches).
Acked-by Ian Rogers <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/perf/include/perf/event.h | 12 +++++++++++- tools/perf/util/build-id.c | 8 +++++--- tools/perf/util/header.c | 10 +++++++--- 3 files changed, 23 insertions(+), 7 deletions(-)tools/lib/perf/include/perf/event.h +11
-1@@ -201,10 +201,20 @@ struct perf_record_header_tracing_data {__u32 size; }; +#define PERF_RECORD_MISC_BUILD_ID_SIZE (1 << 15) +struct perf_record_header_build_id {struct perf_event_header header;pid_t pid; -__u8 build_id[24 ]; +union { +__u8 build_id[24 ]; +struct { +__u8 data[20 ]; +__u8 size; +__u8 reserved1__; +__u16 reserved2__; + }; + };char filename[]; };tools/perf/util/build-id.c +5
-3@@ -296,7 +296,7 @@ char *dso__build_id_filename(const struct dso *dso, char *bf, size_t size,continue ; \ else -static int write_buildid(const char *name, size_t name_len, u8 *build_id, +static int write_buildid(const char *name, size_t name_len, struct build_id *bid,pid_t pid,u16 misc,struct feat_fd *fd) {int err;@@ -307,7 +307,9 @@ static int write_buildid(const char *name, size_t name_len, u8 *build_id, len =PERF_ALIGN (len,NAME_ALIGN );memset (&b,0 ,sizeof (b)); -memcpy (&b.build_id, build_id,BUILD_ID_SIZE ); +memcpy (&b.data, bid->data, bid->size); + b.size = (u8 ) bid->size; + misc |=PERF_RECORD_MISC_BUILD_ID_SIZE ; b.pid = pid; b.header.misc = misc; b.header.size =sizeof (b) + len;@@ -354,7 +356,7 @@ static int machine__write_buildid_table(struct machine *machine, in_kernel = pos->kernel ||is_kernel_module (name,PERF_RECORD_MISC_CPUMODE_UNKNOWN ); - err =write_buildid (name, name_len, pos->bid.data, machine->pid, + err =write_buildid (name, name_len, &pos->bid, machine->pid, in_kernel ? kmisc : umisc, fd);if (err)break ;tools/perf/util/header.c +5
-1@@ -2083,8 +2083,12 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,if (dso !=NULL ) {char sbuild_id[SBUILD_ID_SIZE ];struct build_id bid; +size_t size =BUILD_ID_SIZE ; -build_id__init (&bid, bev->build_id,BUILD_ID_SIZE ); +if (bev->header.misc &PERF_RECORD_MISC_BUILD_ID_SIZE ) + size = bev->size; + +build_id__init (&bid, bev->data, size);dso__set_build_id (dso, &bid);if (dso_space !=DSO_SPACE__USER ) {
tools/perf/util/header.c static int __event_process_build_id(struct perf_record_header_build_id *bev, · line 2106
Quoted 7 lines
tools/perf/util/header.c +2
-2@@ -2098,8 +2102,8 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev, }build_id__sprintf (&dso->bid, sbuild_id); -pr_debug ("build id event received for %s: %s\n" , - dso->long_name, sbuild_id); +pr_debug ("build id event received for %s: %s [%lu]\n" , + dso->long_name, sbuild_id, size);
util/header.c: In function '__event_process_build_id':util/header.c:2105:3: error: format '%lu' expects argument of type 'long unsigned int', but argument 6 has type 'size_t' [-Werror=format=]
pr_debug("build id event received for %s: %s [%lu]\n",
^
Fixing this to '%zd'
- Arnaldo
Quoted 6 lines
tools/perf/util/header.c +0
-0dso__put (dso); }Signature · 1 line
2.26.2
Signature · 1 line
- Arnaldo
Jiri Olsa
reviewerPATCH v2 8/9 perf tools: Align buildid list output for short build ids
In reply to Jiri OlsaWith shorter md5 build ids we need to align their
paths properly with other build ids:
$ perf buildid-list 17f4e448cc746582ea1881528deb549f7fdb3fd5 [kernel.kallsyms] a50e350e97c43b4708d09bcd85ebfff7 .../tools/perf/buildid-ex-md5 1805c738c8f3ec0f47b7ea09080c28f34d18a82b /usr/lib64/ld-2.31.so
--- tools/perf/util/dso.c | 2 +- tools/perf/util/dso.h | 1 - tools/perf/util/dsos.c | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-)
tools/perf/util/dso.c +1 -1
@@ -1369,7 +1369,7 @@ int dso__kernel_module_get_build_id(struct dso *dso,return 0 ; } -size_t dso__fprintf_buildid (struct dso *dso,FILE *fp) +static size_t dso__fprintf_buildid (struct dso *dso,FILE *fp) {char sbuild_id[SBUILD_ID_SIZE ];
tools/perf/util/dso.h +0 -1
@@ -362,7 +362,6 @@ struct dso *machine__findnew_kernel(struct machine *machine, const char *name,void dso__reset_find_symbol_cache (struct dso *dso); -size_t dso__fprintf_buildid (struct dso *dso,FILE *fp);size_t dso__fprintf_symbols_by_name (struct dso *dso,FILE *fp);size_t dso__fprintf (struct dso *dso,FILE *fp);
tools/perf/util/dsos.c +4 -2
@@ -287,10 +287,12 @@ size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp,size_t ret =0 ;list_for_each_entry (pos, head, node) { +char sbuild_id[SBUILD_ID_SIZE ]; +if (skip &&skip (pos, parm))continue ; - ret +=dso__fprintf_buildid (pos, fp); - ret +=fprintf (fp," %s\n" , pos->long_name); +build_id__sprintf (&pos->bid, sbuild_id); + ret +=fprintf (fp,"%-40s %s\n" , sbuild_id, pos->long_name); }return ret; }
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v2 9/9 perf tools: Add build id shell test
In reply to Jiri OlsaAdding test for build id cache that adds binary
with sha1 and md5 build ids and verifies it's
added properly.
The test updates build id cache with perf record
and perf buildid-cache -a.
--- tools/perf/tests/shell/buildid.sh | 101 ++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100755 tools/perf/tests/shell/buildid.sh
tools/perf/tests/shell/buildid.sh new file +101 -0
@@ -0,0 +1,101 @@ +#!/bin/sh +# build id cache operations +# SPDX-License-Identifier: GPL-2.0 + +# skip if there's no readelf +if ! [ -x "$(command -v readelf)" ]; then + echo "failed: no readelf, install binutils" + exit 2 +fi + +# skip if there's no compiler +if ! [ -x "$(command -v cc)" ]; then + echo "failed: no compiler, install gcc" + exit 2 +fi + +ex_md5=$(mktemp /tmp/perf.ex.MD5.XXX) +ex_sha1=$(mktemp /tmp/perf.ex.SHA1.XXX) + +echo 'int main(void) { return 0; }' | cc -Wl,--build-id=sha1 -o ${ex_sha1} -x c - +echo 'int main(void) { return 0; }' | cc -Wl,--build-id=md5 -o ${ex_md5} -x c - + +echo "test binaries: ${ex_sha1} ${ex_md5}" + +check() +{ + id=`readelf -n ${1} 2>/dev/null | grep 'Build ID' | awk '{print $3}'` + + echo "build id: ${id}" + + link=${build_id_dir}/.build-id/${id:0:2}/${id:2} + echo "link: ${link}" + + if [ ! -h $link ]; then + echo "failed: link ${link} does not exist" + exit 1 + fi + + file=${build_id_dir}/.build-id/${id:0:2}/`readlink ${link}`/elf + echo "file: ${file}" + + if [ ! -x $file ]; then + echo "failed: file ${file} does not exist" + exit 1 + fi + + diff ${file} ${1} + if [ $? -ne 0 ]; then + echo "failed: ${file} do not match" + exit 1 + fi + + echo "OK for ${1}" +} + +test_add() +{ + build_id_dir=$(mktemp -d /tmp/perf.debug.XXX) + perf="perf --buildid-dir ${build_id_dir}" + + ${perf} buildid-cache -v -a ${1} + if [ $? -ne 0 ]; then + echo "failed: add ${1} to build id cache" + exit 1 + fi + + check ${1} + + rm -rf ${build_id_dir} +} + +test_record() +{ + data=$(mktemp /tmp/perf.data.XXX) + build_id_dir=$(mktemp -d /tmp/perf.debug.XXX) + perf="perf --buildid-dir ${build_id_dir}" + + ${perf} record --buildid-all -o ${data} ${1} + if [ $? -ne 0 ]; then + echo "failed: record ${1}" + exit 1 + fi + + check ${1} + + rm -rf ${build_id_dir} + rm -rf ${data} +} + +# add binaries manual via perf buildid-cache -a +test_add ${ex_sha1} +test_add ${ex_md5} + +# add binaries via perf record post processing +test_record ${ex_sha1} +test_record ${ex_md5} + +# cleanup +rm ${ex_sha1} ${ex_md5} + +exit ${err}
Signature · 1 line
2.26.2