Merge: perf buildid-list sees no hit buildids in perf.data

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6597

JIRA: https://issues.redhat.com/browse/RHEL-83537

Hit buildids have been incorrectly stored in perf.data, thus the
`perf buildid-list --with-hits` command showed no hashes, which
has broken perf-archive.

With this fix, it should be working again.

Signed-off-by: Michael Petlan <[email protected]>

Approved-by: ashelat <[email protected]>
Approved-by: Jerome Marchand <[email protected]>
Approved-by: CKI KWF Bot <[email protected]>

Merged-by: Augusto Caringi <[email protected]>

Author: caringi

tools/perf/util/build-id.c

@@ -277,7 +277,7 @@ static int write_buildid(const char *name, size_t name_len, struct build_id *bid
 	struct perf_record_header_build_id b;
 	size_t len;
 
-	len = sizeof(b) + name_len + 1;
+	len = name_len + 1;
 	len = PERF_ALIGN(len, sizeof(u64));
 
 	memset(&b, 0, sizeof(b));
@@ -286,7 +286,7 @@ static int write_buildid(const char *name, size_t name_len, struct build_id *bid
 	misc |= PERF_RECORD_MISC_BUILD_ID_SIZE;
 	b.pid = pid;
 	b.header.misc = misc;
-	b.header.size = len;
+	b.header.size = sizeof(b) + len;
 
 	err = do_write(fd, &b, sizeof(b));
 	if (err < 0)