Skip to content

Commit 4a86d41

Browse files
namhyungacmel
authored andcommitted
perf tools: Allow build-id with trailing zeros
Currently perf saves a build-id with size but old versions assumes the size of 20. In case the build-id is less than 20 (like for MD5), it'd fill the rest with 0s. I saw a problem when old version of perf record saved a binary in the build-id cache and new version of perf reads the data. The symbols should be read from the build-id cache (as the path no longer has the same binary) but it failed due to mismatch in the build-id. symsrc__init: build id mismatch for /home/namhyung/.debug/.build-id/53/e4c2f42a4c61a2d632d92a72afa08f00000000/elf. The build-id event in the data has 20 byte build-ids, but it saw a different size (16) when it reads the build-id of the elf file in the build-id cache. $ readelf -n ~/.debug/.build-id/53/e4c2f42a4c61a2d632d92a72afa08f00000000/elf Displaying notes found in: .note.gnu.build-id Owner Data size Description GNU 0x00000010 NT_GNU_BUILD_ID (unique build ID bitstring) Build ID: 53e4c2f42a4c61a2d632d92a72afa08f Let's fix this by allowing trailing zeros if the size is different. Fixes: 39be8d0 ("perf tools: Pass build_id object to dso__build_id_equal()") Signed-off-by: Namhyung Kim <[email protected]> Acked-by: Jiri Olsa <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 99fc594 commit 4a86d41

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

tools/perf/util/dso.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,6 +1349,16 @@ void dso__set_build_id(struct dso *dso, struct build_id *bid)
13491349

13501350
bool dso__build_id_equal(const struct dso *dso, struct build_id *bid)
13511351
{
1352+
if (dso->bid.size > bid->size && dso->bid.size == BUILD_ID_SIZE) {
1353+
/*
1354+
* For the backward compatibility, it allows a build-id has
1355+
* trailing zeros.
1356+
*/
1357+
return !memcmp(dso->bid.data, bid->data, bid->size) &&
1358+
!memchr_inv(&dso->bid.data[bid->size], 0,
1359+
dso->bid.size - bid->size);
1360+
}
1361+
13521362
return dso->bid.size == bid->size &&
13531363
memcmp(dso->bid.data, bid->data, dso->bid.size) == 0;
13541364
}

0 commit comments

Comments
 (0)