AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

perf tools: Pass build_id object to build_id__sprintf()

Browse Source 
Passing 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

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20201013192441.1299447-5-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:36 +02:00 committed by Arnaldo Carvalho de Melo
parent 3ff1b8c8cc
commit bf5411695a
12 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/builtin-buildid-cache.c
View File

@ -186,7 +186,7 @@ static int build_id_cache__add_file(const char *filename, struct nsinfo *nsi)
return -1; 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, err = build_id_cache__add_s(sbuild_id, filename, nsi,
false, false); false, false);
pr_debug("Adding %s %s: %s\n", sbuild_id, filename, 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; 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); err = build_id_cache__remove_s(sbuild_id);
pr_debug("Removing %s %s: %s\n", sbuild_id, filename, pr_debug("Removing %s %s: %s\n", sbuild_id, filename,
err ? "FAIL" : "Ok"); err ? "FAIL" : "Ok");
@ -314,7 +314,7 @@ static int build_id_cache__update_file(const char *filename, struct nsinfo *nsi)
} }
err = 0; 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)) if (build_id_cache__cached(sbuild_id))
err = build_id_cache__remove_s(sbuild_id); err = build_id_cache__remove_s(sbuild_id);

2
tools/perf/tests/sdt.c
View File

@ -37,7 +37,7 @@ static int build_id_cache__add_file(const char *filename)
return err; 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); err = build_id_cache__add_s(sbuild_id, filename, NULL, false, false);
if (err < 0) if (err < 0)
pr_debug("Failed to add build id cache of %s\n", filename); pr_debug("Failed to add build id cache of %s\n", filename);

3
tools/perf/util/annotate.c
View File

@ -1578,8 +1578,7 @@ int symbol__strerror_disassemble(struct map_symbol *ms, int errnum, char *buf, s
char *build_id_msg = NULL; char *build_id_msg = NULL;
if (dso->has_build_id) { if (dso->has_build_id) {
build_id__sprintf(dso->bid.data, build_id__sprintf(&dso->bid, bf + 15);
sizeof(dso->bid.data), bf + 15);
build_id_msg = bf; build_id_msg = bf;
} }
scnprintf(buf, buflen, scnprintf(buf, buflen,

30
tools/perf/util/build-id.c
View File

@ -37,6 +37,7 @@
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/zalloc.h> #include <linux/zalloc.h>
#include <asm/bug.h>
static bool no_buildid_cache; static bool no_buildid_cache;
@ -95,13 +96,13 @@ struct perf_tool build_id__mark_dso_hit_ops = {
.ordered_events = true, .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; char *bid = bf;
const u8 *raw = build_id; const u8 *raw = build_id->data;
int i; size_t i;
for (i = 0; i < len; ++i) { for (i = 0; i < build_id->size; ++i) {
sprintf(bid, "%02x", *raw); sprintf(bid, "%02x", *raw);
++raw; ++raw;
bid += 2; bid += 2;
@ -125,7 +126,7 @@ int sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id)
if (ret < 0) if (ret < 0)
return ret; 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) 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) if (ret < 0)
return ret; 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 */ /* 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) if (!dso->has_build_id)
return NULL; 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); linkname = build_id_cache__linkname(sbuild_id, NULL, 0);
if (!linkname) if (!linkname)
return NULL; return NULL;
@ -767,13 +768,13 @@ int build_id_cache__add_s(const char *sbuild_id, const char *name,
return err; 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, const char *name, struct nsinfo *nsi,
bool is_kallsyms, bool is_vdso) bool is_kallsyms, bool is_vdso)
{ {
char sbuild_id[SBUILD_ID_SIZE]; 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, return build_id_cache__add_s(sbuild_id, name, nsi, is_kallsyms,
is_vdso); is_vdso);
@ -839,8 +840,8 @@ static int dso__cache_build_id(struct dso *dso, struct machine *machine)
is_kallsyms = true; is_kallsyms = true;
name = machine->mmap_name; name = machine->mmap_name;
} }
return build_id_cache__add_b(dso->bid.data, sizeof(dso->bid.data), name, return build_id_cache__add_b(&dso->bid, name, dso->nsinfo,
dso->nsinfo, is_kallsyms, is_vdso); is_kallsyms, is_vdso);
} }
static int __dsos__cache_build_ids(struct list_head *head, 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; 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;
}

3
tools/perf/util/build-id.h
View File

@ -19,7 +19,8 @@ extern struct perf_tool build_id__mark_dso_hit_ops;
struct dso; struct dso;
struct feat_fd; 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 sysfs__sprintf_build_id(const char *root_dir, char *sbuild_id);
int filename__sprintf_build_id(const char *pathname, 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, char *build_id_cache__kallsyms_path(const char *sbuild_id, char *bf,

6
tools/perf/util/dso.c
View File

@ -172,9 +172,7 @@ int dso__read_binary_type_filename(const struct dso *dso,
break; break;
} }
build_id__sprintf(dso->bid.data, build_id__sprintf(&dso->bid, build_id_hex);
sizeof(dso->bid.data),
build_id_hex);
len = __symbol__join_symfs(filename, size, "/usr/lib/debug/.build-id/"); len = __symbol__join_symfs(filename, size, "/usr/lib/debug/.build-id/");
snprintf(filename + len, size - len, "%.2s/%s.debug", snprintf(filename + len, size - len, "%.2s/%s.debug",
build_id_hex, build_id_hex + 2); 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]; 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); return fprintf(fp, "%s", sbuild_id);
} }

3
tools/perf/util/header.c
View File

@ -2095,8 +2095,7 @@ static int __event_process_build_id(struct perf_record_header_build_id *bev,
free(m.name); free(m.name);
} }
build_id__sprintf(dso->bid.data, sizeof(dso->bid.data), build_id__sprintf(&dso->bid, sbuild_id);
sbuild_id);
pr_debug("build id event received for %s: %s\n", pr_debug("build id event received for %s: %s\n",
dso->long_name, sbuild_id); dso->long_name, sbuild_id);
dso__put(dso); dso__put(dso);

4
tools/perf/util/map.c
View File

@ -331,9 +331,7 @@ int map__load(struct map *map)
if (map->dso->has_build_id) { if (map->dso->has_build_id) {
char sbuild_id[SBUILD_ID_SIZE]; char sbuild_id[SBUILD_ID_SIZE];
build_id__sprintf(map->dso->bid.data, build_id__sprintf(&map->dso->bid, sbuild_id);
sizeof(map->dso->bid.data),
sbuild_id);
pr_debug("%s with build id %s not found", name, sbuild_id); pr_debug("%s with build id %s not found", name, sbuild_id);
} else } else
pr_debug("Failed to open %s", name); pr_debug("Failed to open %s", name);

9
tools/perf/util/probe-event.c
View File

@ -473,7 +473,7 @@ static struct debuginfo *open_from_debuginfod(struct dso *dso, struct nsinfo *ns
if (!c) if (!c)
return NULL; 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, fd = debuginfod_find_debuginfo(c, (const unsigned char *)sbuild_id,
0, &path); 0, &path);
if (fd >= 0) 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, static int __show_line_range(struct line_range *lr, const char *module,
bool user) bool user)
{ {
struct build_id bid;
int l = 1; int l = 1;
struct int_node *ln; struct int_node *ln;
struct debuginfo *dinfo; struct debuginfo *dinfo;
@ -1025,8 +1026,10 @@ static int __show_line_range(struct line_range *lr, const char *module,
if (!ret) if (!ret)
ret = debuginfo__find_line_range(dinfo, lr); ret = debuginfo__find_line_range(dinfo, lr);
} }
if (dinfo->build_id) if (dinfo->build_id) {
build_id__sprintf(dinfo->build_id, BUILD_ID_SIZE, sbuild_id); build_id__init(&bid, dinfo->build_id, BUILD_ID_SIZE);
build_id__sprintf(&bid, sbuild_id);
}
debuginfo__delete(dinfo); debuginfo__delete(dinfo);
if (ret == 0 || ret == -ENOENT) { if (ret == 0 || ret == -ENOENT) {
pr_warning("Specified source line is not found.\n"); pr_warning("Specified source line is not found.\n");

8
tools/perf/util/probe-finder.c
View File

@ -949,6 +949,7 @@ static int probe_point_lazy_walker(const char *fname, int lineno,
/* Find probe points from lazy pattern */ /* Find probe points from lazy pattern */
static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf) static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
{ {
struct build_id bid;
char sbuild_id[SBUILD_ID_SIZE] = ""; char sbuild_id[SBUILD_ID_SIZE] = "";
int ret = 0; int ret = 0;
char *fpath; char *fpath;
@ -957,9 +958,10 @@ static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
const char *comp_dir; const char *comp_dir;
comp_dir = cu_get_comp_dir(&pf->cu_die); comp_dir = cu_get_comp_dir(&pf->cu_die);
if (pf->dbg->build_id) if (pf->dbg->build_id) {
build_id__sprintf(pf->dbg->build_id, build_id__init(&bid, pf->dbg->build_id, BUILD_ID_SIZE);
BUILD_ID_SIZE, sbuild_id); build_id__sprintf(&bid, sbuild_id);
}
ret = find_source_path(pf->fname, sbuild_id, comp_dir, &fpath); ret = find_source_path(pf->fname, sbuild_id, comp_dir, &fpath);
if (ret < 0) { if (ret < 0) {
pr_warning("Failed to find source file path.\n"); pr_warning("Failed to find source file path.\n");

2
tools/perf/util/scripting-engines/trace-event-python.c
View File

@ -1064,7 +1064,7 @@ static int python_export_dso(struct db_export *dbe, struct dso *dso,
char sbuild_id[SBUILD_ID_SIZE]; char sbuild_id[SBUILD_ID_SIZE];
PyObject *t; 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); t = tuple_new(5);

2
tools/perf/util/symbol.c
View File

@ -2152,7 +2152,7 @@ static char *dso__find_kallsyms(struct dso *dso, struct map *map)
goto proc_kallsyms; 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 */ /* Find kallsyms in build-id cache with kcore */
scnprintf(path, sizeof(path), "%s/%s/%s", scnprintf(path, sizeof(path), "%s/%s/%s",