leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf tools: Pass build_id object to filename__read_build_id()

Browse Source 
Pass a 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.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20201013192441.1299447-3-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2020-10-13 21:24:34 +02:00
committed by Arnaldo Carvalho de Melo
parent 0aba7f036a
commit f766819cd5
11 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tools/perf/util/symbol-minimal.c
View File

@@ -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 @@ out:
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;
}