perf annotate arch clean up
Subsystems (4)
Ian Rogers
reviewerv3 cover perf annotate arch clean up
3 initial memory leak fix patches for perf annotate.
Move the disasm.c #included arch files into a new util/annotate-arch directory. Make the code compile standalone. Try to better encapsulate architecture specific code within the files and with a arch__new_<arch> function that allows additional data to be associated with the struct arch using the standard container_of trick.
Make the lookup of struct arch use the ELF machine gather from a thread rather than an evsel. For example, the evsel can't determine the difference between EM_386 and EM_X86_64 so generally the latter has currently been used. This means the dwarf registers are off as register 1 is CX with EM_386 and DX with EM_X86_64. To facilitate this change map_symbol is refactored to use a struct thread rather than a struct maps, the maps being obtainable from the thread.
To make in and out arguments clearer, for safety, etc. try to constify struct arch and its related structs.
v3: Fix arch initialization on arm, arm64, powerpc and sparc as spotted by Suchit
Karunakaranw.
v2: Add a patch to fix a domain info memory leak that was blocking
leak sanitizer analysis. Fix more map_symbol leaks or uses after reference count put (Suchit Karunakaranw <[email protected]>). Try to repro annotate test crash (James Clark) but suspect it was addressed in the other reference count fixes.
https://lore.kernel.org/lkml/[email protected]/
v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (12):
perf header: Fix memory leaks in process_cpu_domain_info perf annotate: Fix args leak of map_symbol
perf maps: Fix reference count leak in maps__find_ams
perf disasm: Constify use of struct arch
perf disasm: Constify use of struct ins_op
perf disasm: Constify use of struct ins
perf disasm: Rework the string arch__is to use the ELF machine perf disasm: Don't include C files from the arch directory perf disasm: Refactor ins__is_call/jump to avoid exposing arch ins_ops perf map_symbol: Switch from holding maps to holding thread perf disasm: Refactor arch__find and initialization of arch structs perf disasm: Minor layout tweaks for struct arch
tools/perf/arch/arc/annotate/instructions.c | 11 -
.../perf/arch/riscv64/annotate/instructions.c | 36 --
tools/perf/ui/browsers/annotate.c | 6 +-
tools/perf/ui/browsers/hists.c | 3 +-
tools/perf/util/Build | 1 +
tools/perf/util/addr_location.c | 4 -
tools/perf/util/addr_location.h | 1 -
tools/perf/util/annotate-arch/Build | 11 +
tools/perf/util/annotate-arch/annotate-arc.c | 18 +
.../annotate-arch/annotate-arm.c} | 50 +-
.../annotate-arch/annotate-arm64.c} | 59 +--
.../annotate-arch/annotate-csky.c} | 29 +-
.../annotate-arch/annotate-loongarch.c} | 71 +--
.../annotate-arch/annotate-mips.c} | 29 +-
.../annotate-arch/annotate-powerpc.c} | 127 +++++-
.../util/annotate-arch/annotate-riscv64.c | 41 ++
.../annotate-arch/annotate-s390.c} | 70 +--
.../annotate-arch/annotate-sparc.c} | 28 +-
.../annotate-arch/annotate-x86.c} | 89 ++--
tools/perf/util/annotate-data.c | 12 +-
tools/perf/util/annotate-data.h | 2 +-
tools/perf/util/annotate.c | 88 ++--
tools/perf/util/annotate.h | 10 +-
tools/perf/util/callchain.c | 12 +-
tools/perf/util/capstone.c | 18 +-
tools/perf/util/db-export.c | 1 -
tools/perf/util/disasm.c | 428 +++++++-----------
tools/perf/util/disasm.h | 95 ++--
tools/perf/util/event.c | 2 -
tools/perf/util/header.c | 17 +-
tools/perf/util/hist.c | 18 +-
tools/perf/util/llvm.c | 8 +-
tools/perf/util/machine.c | 13 +-
tools/perf/util/map_symbol.c | 5 +-
tools/perf/util/map_symbol.h | 3 +-
tools/perf/util/maps.c | 1 +
tools/perf/util/sort.c | 2 +-
tools/perf/util/unwind-libdw.c | 2 +-
tools/perf/util/unwind-libunwind-local.c | 2 +-
39 files changed, 775 insertions(+), 648 deletions(-)
delete mode 100644 tools/perf/arch/arc/annotate/instructions.c
delete mode 100644 tools/perf/arch/riscv64/annotate/instructions.c
create mode 100644 tools/perf/util/annotate-arch/Build
create mode 100644 tools/perf/util/annotate-arch/annotate-arc.c
rename tools/perf/{arch/arm/annotate/instructions.c => util/annotate-arch/annotate-arm.c} (59%)
rename tools/perf/{arch/arm64/annotate/instructions.c => util/annotate-arch/annotate-arm64.c} (70%)
rename tools/perf/{arch/csky/annotate/instructions.c => util/annotate-arch/annotate-csky.c} (67%)
rename tools/perf/{arch/loongarch/annotate/instructions.c => util/annotate-arch/annotate-loongarch.c} (60%)
rename tools/perf/{arch/mips/annotate/instructions.c => util/annotate-arch/annotate-mips.c} (59%)
rename tools/perf/{arch/powerpc/annotate/instructions.c => util/annotate-arch/annotate-powerpc.c} (73%)
create mode 100644 tools/perf/util/annotate-arch/annotate-riscv64.c
rename tools/perf/{arch/s390/annotate/instructions.c => util/annotate-arch/annotate-s390.c} (66%)
rename tools/perf/{arch/sparc/annotate/instructions.c => util/annotate-arch/annotate-sparc.c} (85%)
rename tools/perf/{arch/x86/annotate/instructions.c => util/annotate-arch/annotate-x86.c} (93%)Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 1/12 perf header: Fix memory leaks in process_cpu_domain_info
do_read_string returns a string in allocated memory, for some reason there was unused memory allocations and unnecessary strdups. Remove these and make the "perf annotate basic tests" leak sanitizer clean.
--- tools/perf/util/header.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-)
tools/perf/util/header.c +4 -13
@@ -3634,6 +3634,7 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unusedif (!d_info)return -1 ; +assert (cd_map[cpu]->domains[domain] ==NULL ); cd_map[cpu]->domains[domain] = d_info; d_info->domain = domain;
@@ -3642,30 +3643,20 @@ static int process_cpu_domain_info(struct feat_fd *ff, void *data __maybe_unusedif (!dname)return -1 ; - d_info->dname =zalloc (strlen (dname) +1 ); -if (!d_info->dname) -return -1 ; - - d_info->dname =strdup (dname); + d_info->dname = dname; } cpumask =do_read_string (ff);if (!cpumask)return -1 ; - d_info->cpumask =zalloc (strlen (cpumask) +1 ); -if (!d_info->cpumask) -return -1 ; - d_info->cpumask =strdup (cpumask); + d_info->cpumask = cpumask; cpulist =do_read_string (ff);if (!cpulist)return -1 ; - d_info->cpulist =zalloc (strlen (cpulist) +1 ); -if (!d_info->cpulist) -return -1 ; - d_info->cpulist =strdup (cpulist); + d_info->cpulist = cpulist; } }
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 2/12 perf annotate: Fix args leak of map_symbol
In reply to Ian Rogersmap_symbol__exit needs calling on an annotate_args.ms, however, rather than introduce proper reference count handling to symbol__annotate just switch to passing the map_symbol pointer parameter around, making the puts the caller's responsibility.
Fix a number of cases to ensure the map in a map_symbol has a reference count increment and add the then necessary map_symbol_exits.
--- .../arch/loongarch/annotate/instructions.c | 14 ++++---- tools/perf/arch/s390/annotate/instructions.c | 11 +++--- tools/perf/util/annotate.c | 2 +- tools/perf/util/capstone.c | 14 ++++---- tools/perf/util/disasm.c | 36 ++++++++++--------- tools/perf/util/disasm.h | 2 +- tools/perf/util/llvm.c | 6 ++-- 7 files changed, 47 insertions(+), 38 deletions(-)
tools/perf/arch/loongarch/annotate/instructions.c +8 -6
@@ -10,9 +10,7 @@ static int loongarch_call__parse(struct arch *arch, struct ins_operands *ops, st {char *c, *endptr, *tok, *name;struct map *map = ms->map; -struct addr_map_symbol target = { - .ms = { .map = map, }, - }; +struct addr_map_symbol target; c =strchr (ops->raw,'#' );if (c++ ==NULL )
@@ -38,12 +36,16 @@ static int loongarch_call__parse(struct arch *arch, struct ins_operands *ops, stif (ops->target.name ==NULL )return -1 ; - target.addr =map__objdump_2mem (map, ops->target.addr); + target = (struct addr_map_symbol ) { + .ms = { .map =map__get (map), }, + .addr =map__objdump_2mem (map, ops->target.addr), + };if (maps__find_ams (ms->maps, &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym; +addr_map_symbol__exit (&target);return 0 ; }
@@ -58,7 +60,7 @@ static int loongarch_jump__parse(struct arch *arch, struct ins_operands *ops, ststruct map *map = ms->map;struct symbol *sym = ms->sym;struct addr_map_symbol target = { - .ms = { .map = map, }, + .ms = { .map =map__get (map), }, };const char *c =strchr (ops->raw,'#' );u64 start, end;
@@ -90,7 +92,7 @@ static int loongarch_jump__parse(struct arch *arch, struct ins_operands *ops, st }else { ops->target.offset_avail = false; } - +addr_map_symbol__exit (&target);return 0 ; }
tools/perf/arch/s390/annotate/instructions.c +7 -4
@@ -6,9 +6,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops, {char *endptr, *tok, *name;struct map *map = ms->map; -struct addr_map_symbol target = { - .ms = { .map = map, }, - }; +struct addr_map_symbol target; tok =strchr (ops->raw,',' );if (!tok)
@@ -36,12 +34,17 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops,if (ops->target.name ==NULL )return -1 ; - target.addr =map__objdump_2mem (map, ops->target.addr); + + target = (struct addr_map_symbol ) { + .ms = { .map =map__get (map), }, + .addr =map__objdump_2mem (map, ops->target.addr), + };if (maps__find_ams (ms->maps, &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym; +addr_map_symbol__exit (&target);return 0 ; }
tools/perf/util/annotate.c +1 -1
@@ -1031,7 +1031,7 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,return 0 ; args.arch = arch; - args.ms = *ms; + args.ms = ms;if (notes->src ==NULL ) { notes->src =annotated_source__new ();
tools/perf/util/capstone.c +7 -7
@@ -143,7 +143,7 @@ static void print_capstone_detail(cs_insn *insn, char *buf, size_t len, struct annotate_args *args, u64 addr) { int i; -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct symbol *sym;/* TODO: support more architectures */
@@ -222,7 +222,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, {#ifdef HAVE_LIBCAPSTONE_SUPPORT struct annotation *notes =symbol__annotation (sym); -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct dso *dso =map__dso (map);u64 start =map__rip_2objdump (map, sym->start);u64 offset;
@@ -256,7 +256,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, args->line = disasm_buf; args->line_nr =0 ; args->fileloc =NULL ; - args->ms.sym = sym; + args->ms->sym = sym; dl =disasm_line__new (args);if (dl ==NULL )
@@ -268,7 +268,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, !strcmp(args->options->disassembler_style, "att")) disassembler_style = true; -if (capstone_init (maps__machine (args->ms.maps), &handle, is_64bit, disassembler_style) <0 ) +if (capstone_init (maps__machine (args->ms->maps), &handle, is_64bit, disassembler_style) <0 ) goto err; needs_cs_close = true;
@@ -345,7 +345,7 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused, {#ifdef HAVE_LIBCAPSTONE_SUPPORT struct annotation *notes =symbol__annotation (sym); -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct dso *dso =map__dso (map);struct nscookie nsc;u64 start =map__rip_2objdump (map, sym->start);
@@ -382,7 +382,7 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused, !strcmp(args->options->disassembler_style, "att")) disassembler_style = true; -if (capstone_init (maps__machine (args->ms.maps), &handle, is_64bit, disassembler_style) <0 ) +if (capstone_init (maps__machine (args->ms->maps), &handle, is_64bit, disassembler_style) <0 ) goto err; needs_cs_close = true;
@@ -408,7 +408,7 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused, args->line = disasm_buf; args->line_nr =0 ; args->fileloc =NULL ; - args->ms.sym = sym; + args->ms->sym = sym; dl =disasm_line__new (args);if (dl ==NULL )
tools/perf/util/disasm.c +20 -16
@@ -269,9 +269,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s {char *endptr, *tok, *name;struct map *map = ms->map; -struct addr_map_symbol target = { - .ms = { .map = map, }, - }; +struct addr_map_symbol target; ops->target.addr =strtoull (ops->raw, &endptr,16 );
@@ -296,12 +294,16 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_sif (ops->target.name ==NULL )return -1 ; find_target: - target.addr =map__objdump_2mem (map, ops->target.addr); + target = (struct addr_map_symbol ) { + .ms = { .map =map__get (map), }, + .addr =map__objdump_2mem (map, ops->target.addr), + };if (maps__find_ams (ms->maps, &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym; +addr_map_symbol__exit (&target);return 0 ; indirect_call:
@@ -366,7 +368,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_sstruct map *map = ms->map;struct symbol *sym = ms->sym;struct addr_map_symbol target = { - .ms = { .map = map, }, + .ms = { .map =map__get (map), }, };const char *c =strchr (ops->raw,',' );u64 start, end;
@@ -440,7 +442,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s }else { ops->target.offset_avail = false; } - +addr_map_symbol__exit (&target);return 0 ; }
@@ -1046,7 +1048,7 @@ static size_t disasm_line_size(int nr)struct disasm_line *disasm_line__new (struct annotate_args *args) {struct disasm_line *dl =NULL ; -struct annotation *notes =symbol__annotation (args->ms.sym); +struct annotation *notes =symbol__annotation (args->ms->sym);int nr = notes->src->nr_events; dl =zalloc (disasm_line_size (nr));
@@ -1064,7 +1066,7 @@ struct disasm_line *disasm_line__new(struct annotate_args *args) }else if (disasm_line__parse (dl->al.line, &dl->ins.name, &dl->ops.raw) <0 ) goto out_free_line; -disasm_line__init_ins (dl, args->arch, &args->ms); +disasm_line__init_ins (dl, args->arch, args->ms); }return dl;
@@ -1119,7 +1121,7 @@ static int symbol__parse_objdump_line(struct symbol *sym,struct annotate_args *args, char *parsed_line, int *line_nr, char **fileloc) { - struct map *map = args->ms.map; + struct map *map = args->ms->map;struct annotation *notes =symbol__annotation (sym);struct disasm_line *dl;char *tmp;
@@ -1151,7 +1153,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, args->line = parsed_line; args->line_nr = *line_nr; args->fileloc = *fileloc; - args->ms.sym = sym; + args->ms->sym = sym; dl =disasm_line__new (args); (*line_nr)++;
@@ -1169,12 +1171,14 @@ static int symbol__parse_objdump_line(struct symbol *sym,if (dl->ins.ops &&ins__is_call (&dl->ins) && !dl->ops.target.sym) {struct addr_map_symbol target = { .addr = dl->ops.target.addr, - .ms = { .map = map, }, + .ms = { .map =map__get (map), }, }; -if (!maps__find_ams (args->ms.maps, &target) && +if (!maps__find_ams (args->ms->maps, &target) && target.ms.sym->start == target.al_addr) dl->ops.target.sym = target.ms.sym; + +addr_map_symbol__exit (&target); }annotation_line__add (&dl->al, ¬es->src->source);
@@ -1338,7 +1342,7 @@ static int symbol__disassemble_raw(char *filename, struct symbol *sym, struct annotate_args *args) {struct annotation *notes =symbol__annotation (sym); -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct dso *dso =map__dso (map);u64 start =map__rip_2objdump (map, sym->start);u64 end =map__rip_2objdump (map, sym->end);
@@ -1375,7 +1379,7 @@ static int symbol__disassemble_raw(char *filename, struct symbol *sym, args->line = disasm_buf; args->line_nr =0 ; args->fileloc =NULL ; - args->ms.sym = sym; + args->ms->sym = sym; dl =disasm_line__new (args);if (dl ==NULL )
@@ -1501,7 +1505,7 @@ static int symbol__disassemble_objdump(const char *filename, struct symbol *sym, struct annotate_args *args) {struct annotation_options *opts = &annotate_opts; -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct dso *dso =map__dso (map);char *command;FILE *file;
@@ -1644,7 +1648,7 @@ static int symbol__disassemble_objdump(const char *filename, struct symbol *sym,int symbol__disassemble (struct symbol *sym,struct annotate_args *args) {struct annotation_options *options = args->options; -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct dso *dso =map__dso (map);char symfs_filename[PATH_MAX ];bool delete_extract = false;
tools/perf/util/disasm.h +1 -1
@@ -97,7 +97,7 @@ struct ins_ops {struct annotate_args {struct arch *arch; -struct map_symbol ms; +struct map_symbol *ms;struct annotation_options *options;s64 offset;char *line;
tools/perf/util/llvm.c +3 -3
@@ -118,7 +118,7 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, {#ifdef HAVE_LIBLLVM_SUPPORT struct annotation *notes =symbol__annotation (sym); -struct map *map = args->ms.map; +struct map *map = args->ms->map;struct dso *dso =map__dso (map);u64 start =map__rip_2objdump (map, sym->start);/* Malloc-ed buffer containing instructions read from disk. */
@@ -184,7 +184,7 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, args->line = disasm_buf; args->line_nr =0 ; args->fileloc =NULL ; - args->ms.sym = sym; + args->ms->sym = sym; dl =disasm_line__new (args);if (dl ==NULL )
@@ -242,7 +242,7 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, &line_storage_len); args->line_nr =0 ; args->fileloc =NULL ; - args->ms.sym = sym; + args->ms->sym = sym;llvm_addr2line (filename, pc, &args->fileloc, (unsigned int *)&args->line_nr, false,NULL );
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 3/12 perf maps: Fix reference count leak in maps__find_ams
In reply to Ian Rogersams and so ams->ms.map is an in argument, however, it is also overwritten. As a map is reference counted, ensure a map__put is done before overwriting it.
--- tools/perf/util/maps.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/maps.c +1 -0
@@ -708,6 +708,7 @@ int maps__find_ams(struct maps *maps, struct addr_map_symbol *ams)if (ams->addr <map__start (ams->ms.map) || ams->addr >=map__end (ams->ms.map)) {if (maps ==NULL )return -1 ; +map__put (ams->ms.map); ams->ms.map =maps__find (maps, ams->addr);if (ams->ms.map ==NULL )return -1 ;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 4/12 perf disasm: Constify use of struct arch
In reply to Ian RogersThe struct arch holds variables that are read but not written, except during some initialization. Change most uses to be for a "const struct arch *" version to capture this immutability.
--- tools/perf/arch/arm64/annotate/instructions.c | 2 +- .../arch/loongarch/annotate/instructions.c | 12 ++++-- tools/perf/arch/s390/annotate/instructions.c | 7 ++-- tools/perf/arch/x86/annotate/instructions.c | 4 +- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/util/annotate-data.c | 2 +- tools/perf/util/annotate-data.h | 2 +- tools/perf/util/annotate.c | 28 ++++++------- tools/perf/util/annotate.h | 10 ++--- tools/perf/util/disasm.c | 42 ++++++++++--------- tools/perf/util/disasm.h | 14 +++---- 11 files changed, 67 insertions(+), 58 deletions(-)
tools/perf/arch/arm64/annotate/instructions.c +1 -1
@@ -10,7 +10,7 @@ struct arm64_annotate { jump_insn; }; -static int arm64_mov__parse (struct arch *arch__maybe_unused , +static int arm64_mov__parse (const struct arch *arch__maybe_unused ,struct ins_operands *ops,struct map_symbol *ms__maybe_unused ,struct disasm_line *dl__maybe_unused )
tools/perf/arch/loongarch/annotate/instructions.c +8 -4
@@ -5,8 +5,10 @@* Copyright (C) 2020-2023 Loongson Technology Corporation Limited */ -static int loongarch_call__parse (struct arch *arch,struct ins_operands *ops,struct map_symbol *ms, -struct disasm_line *dl__maybe_unused ) +static int loongarch_call__parse (const struct arch *arch,struct ins_operands *ops, +struct map_symbol *ms, +struct disasm_line *dl__maybe_unused ) + {char *c, *endptr, *tok, *name;struct map *map = ms->map;
@@ -54,8 +56,10 @@ static struct ins_ops loongarch_call_ops = { .scnprintf = call__scnprintf, }; -static int loongarch_jump__parse (struct arch *arch,struct ins_operands *ops,struct map_symbol *ms, -struct disasm_line *dl__maybe_unused ) +static int loongarch_jump__parse (const struct arch *arch,struct ins_operands *ops, +struct map_symbol *ms, +struct disasm_line *dl__maybe_unused ) + {struct map *map = ms->map;struct symbol *sym = ms->sym;
tools/perf/arch/s390/annotate/instructions.c +4 -3
@@ -1,8 +1,9 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> -static int s390_call__parse (struct arch *arch,struct ins_operands *ops, -struct map_symbol *ms,struct disasm_line *dl__maybe_unused ) +static int s390_call__parse (const struct arch *arch,struct ins_operands *ops, +struct map_symbol *ms, +struct disasm_line *dl__maybe_unused ) {char *endptr, *tok, *name;struct map *map = ms->map;
@@ -53,7 +54,7 @@ static struct ins_ops s390_call_ops = { .scnprintf = call__scnprintf, }; -static int s390_mov__parse (struct arch *arch__maybe_unused , +static int s390_mov__parse (const struct arch *arch__maybe_unused ,struct ins_operands *ops,struct map_symbol *ms__maybe_unused ,struct disasm_line *dl__maybe_unused )
tools/perf/arch/x86/annotate/instructions.c +2 -2
@@ -119,7 +119,7 @@ static struct ins x86__instructions[] = { { .name = "xorps", .ops = &mov_ops, }, }; -static bool amd__ins_is_fused (struct arch *arch,const char *ins1, +static bool amd__ins_is_fused (const struct arch *arch,const char *ins1,const char *ins2) {if (strstr (ins2,"jmp" ))
@@ -142,7 +142,7 @@ static bool amd__ins_is_fused(struct arch *arch, const char *ins1,return false; } -static bool intel__ins_is_fused (struct arch *arch,const char *ins1, +static bool intel__ins_is_fused (const struct arch *arch,const char *ins1,const char *ins2) {if (arch->family !=6 || arch->model <0x1e ||strstr (ins2,"jmp" ))
tools/perf/ui/browsers/annotate.c +1 -1
@@ -30,7 +30,7 @@ struct annotate_browser {struct rb_root entries;struct rb_node *curr_hot;struct annotation_line *selection; -struct arch *arch; +const struct arch *arch;/* * perf top can delete hist_entry anytime. Callers should make sure * its lifetime.
tools/perf/util/annotate-data.c +1 -1
@@ -160,7 +160,7 @@ bool has_reg_type(struct type_state *state, int reg)return (unsigned )reg <ARRAY_SIZE (state->regs); } -static void init_type_state (struct type_state *state,struct arch *arch) +static void init_type_state (struct type_state *state,const struct arch *arch) {memset (state,0 ,sizeof (*state));INIT_LIST_HEAD (&state->stack_vars);
tools/perf/util/annotate-data.h +1 -1
@@ -117,7 +117,7 @@ extern struct annotated_data_type canary_type;*/ struct data_loc_info {/* These are input field, should be filled by caller */ -struct arch *arch; +const struct arch *arch;struct thread *thread;struct map_symbol *ms;u64 ip;
tools/perf/util/annotate.c +14 -14
@@ -761,7 +761,7 @@ static int disasm_line__print(struct disasm_line *dl, u64 start, int addr_fmt_wi }static struct annotated_data_type * -__hist_entry__get_data_type (struct hist_entry *he,struct arch *arch, +__hist_entry__get_data_type (struct hist_entry *he,const struct arch *arch,struct debuginfo *dbg,struct disasm_line *dl,int *type_offset);
@@ -980,11 +980,11 @@ void symbol__calc_percent(struct symbol *sym, struct evsel *evsel)annotation__calc_percent (notes, evsel,symbol__size (sym)); } -int evsel__get_arch (struct evsel *evsel,struct arch **parch) +int evsel__get_arch (struct evsel *evsel,const struct arch **parch) {struct perf_env *env =evsel__env (evsel);const char *arch_name =perf_env__arch (env); -struct arch *arch; +const struct arch *arch;int err;if (!arch_name) {
@@ -999,7 +999,7 @@ int evsel__get_arch(struct evsel *evsel, struct arch **parch) }if (arch->init) { - err = arch->init (arch, env ? env->cpuid :NULL ); + err = arch->init ((struct arch *)arch, env ? env->cpuid :NULL );if (err) {pr_err ("%s: failed to initialize %s arch priv area\n" , __func__, arch->name);
@@ -1010,14 +1010,14 @@ int evsel__get_arch(struct evsel *evsel, struct arch **parch) }int symbol__annotate (struct map_symbol *ms,struct evsel *evsel, -struct arch **parch) +const struct arch **parch) {struct symbol *sym = ms->sym;struct annotation *notes =symbol__annotation (sym);struct annotate_args args = { .options = &annotate_opts, }; -struct arch *arch =NULL ; +const struct arch *arch =NULL ;int err, nr; err =evsel__get_arch (evsel, &arch);
@@ -2204,7 +2204,7 @@ void annotation_line__write(struct annotation_line *al, struct annotation *notes }int symbol__annotate2 (struct map_symbol *ms,struct evsel *evsel, -struct arch **parch) +const struct arch **parch) {struct symbol *sym = ms->sym;struct annotation *notes =symbol__annotation (sym);
@@ -2457,7 +2457,7 @@ int annotate_check_args(void)* to revisit the format when it handles different architecture. * Fills @reg and @offset when return 0. */ -static int extract_reg_offset (struct arch *arch,const char *str, +static int extract_reg_offset (const struct arch *arch,const char *str,struct annotated_op_loc *op_loc) {char *p;
@@ -2538,7 +2538,7 @@ static int extract_reg_offset(struct arch *arch, const char *str,* # dst_reg1 = rbx, dst_reg2 = rcx, dst_mem = 1 * # dst_multi_regs = 1, dst_offset = 8 */ -int annotate_get_insn_location (struct arch *arch,struct disasm_line *dl, +int annotate_get_insn_location (const struct arch *arch,struct disasm_line *dl,struct annotated_insn_loc *loc) {struct ins_operands *ops;
@@ -2673,7 +2673,7 @@ static struct annotated_item_stat *annotate_data_stat(struct list_head *head,return istat; } -static bool is_stack_operation (struct arch *arch,struct disasm_line *dl) +static bool is_stack_operation (const struct arch *arch,struct disasm_line *dl) {if (arch__is (arch,"x86" )) { if (!strncmp(dl->ins.name, "push", 4) ||
@@ -2686,7 +2686,7 @@ static bool is_stack_operation(struct arch *arch, struct disasm_line *dl)return false; } -static bool is_stack_canary (struct arch *arch,struct annotated_op_loc *loc) +static bool is_stack_canary (const struct arch *arch,struct annotated_op_loc *loc) {/* On x86_64, %gs:40 is used for stack canary */ if (arch__is (arch,"x86" )) {
@@ -2702,7 +2702,7 @@ static bool is_stack_canary(struct arch *arch, struct annotated_op_loc *loc)* Returns true if the instruction has a memory operand without * performing a load/store */ -static bool is_address_gen_insn (struct arch *arch,struct disasm_line *dl) +static bool is_address_gen_insn (const struct arch *arch,struct disasm_line *dl) {if (arch__is (arch,"x86" )) {if (!strncmp (dl->ins.name,"lea" ,3 ))
@@ -2791,7 +2791,7 @@ void debuginfo_cache__delete(void) }static struct annotated_data_type * -__hist_entry__get_data_type (struct hist_entry *he,struct arch *arch, +__hist_entry__get_data_type (struct hist_entry *he,const struct arch *arch,struct debuginfo *dbg,struct disasm_line *dl,int *type_offset) {
@@ -2895,7 +2895,7 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he) {struct map_symbol *ms = &he->ms;struct evsel *evsel =hists_to_evsel (he->hists); -struct arch *arch; +const struct arch *arch;struct disasm_line *dl;struct annotated_data_type *mem_type;struct annotated_item_stat *istat;
tools/perf/util/annotate.h +5 -5
@@ -202,7 +202,7 @@ struct annotation_write_ops {struct annotation_print_data {struct hist_entry *he;struct evsel *evsel; -struct arch *arch; +const struct arch *arch;struct debuginfo *dbg;/* save data type info keyed by al->offset */ struct hashmap *type_hash;
@@ -441,10 +441,10 @@ void symbol__annotate_zero_histograms(struct symbol *sym);int symbol__annotate (struct map_symbol *ms,struct evsel *evsel, -struct arch **parch); +const struct arch **parch);int symbol__annotate2 (struct map_symbol *ms,struct evsel *evsel, -struct arch **parch); +const struct arch **parch);enum symbol_disassemble_errno {SYMBOL_ANNOTATE_ERRNO__SUCCESS =0 ,
@@ -546,7 +546,7 @@ struct annotated_insn_loc { i++, op_loc++)/* Get detailed location info in the instruction */ -int annotate_get_insn_location (struct arch *arch,struct disasm_line *dl, +int annotate_get_insn_location (const struct arch *arch,struct disasm_line *dl,struct annotated_insn_loc *loc);/* Returns a data type from the sample instruction (if any) */
@@ -586,5 +586,5 @@ int annotation_br_cntr_entry(char **str, int br_cntr_nr, u64 *br_cntr, int num_aggr, struct evsel *evsel);int annotation_br_cntr_abbr_list (char **str,struct evsel *evsel,bool header); -int evsel__get_arch (struct evsel *evsel,struct arch **parch); +int evsel__get_arch (struct evsel *evsel,const struct arch **parch);#endif /* __PERF_ANNOTATE_H */
tools/perf/util/disasm.c +23 -19
134 lines not on this page · raw message
tools/perf/util/disasm.h +7 -7
@@ -30,7 +30,7 @@ struct arch {unsigned int model;unsigned int family;int (*init)(struct arch *arch,char *cpuid); -bool (*ins_is_fused)(struct arch *arch,const char *ins1, +bool (*ins_is_fused)(const struct arch *arch,const char *ins1,const char *ins2);struct {char comment_char;
@@ -89,14 +89,14 @@ struct ins_operands {struct ins_ops {void (*free)(struct ins_operands *ops); -int (*parse)(struct arch *arch,struct ins_operands *ops,struct map_symbol *ms, +int (*parse)(const struct arch *arch,struct ins_operands *ops,struct map_symbol *ms,struct disasm_line *dl);int (*scnprintf)(struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name); };struct annotate_args { -struct arch *arch; +const struct arch *arch;struct map_symbol *ms;struct annotation_options *options;s64 offset;
@@ -105,14 +105,14 @@ struct annotate_args {char *fileloc; }; -struct arch *arch__find (const char *name); -bool arch__is (struct arch *arch,const char *name); +const struct arch *arch__find (const char *name); +bool arch__is (const struct arch *arch,const char *name); -struct ins_ops *ins__find (struct arch *arch,const char *name,struct disasm_line *dl); +struct ins_ops *ins__find (const struct arch *arch,const char *name,struct disasm_line *dl);bool ins__is_call (const struct ins *ins);bool ins__is_jump (const struct ins *ins); -bool ins__is_fused (struct arch *arch,const char *ins1,const char *ins2); +bool ins__is_fused (const struct arch *arch,const char *ins1,const char *ins2);bool ins__is_ret (const struct ins *ins);bool ins__is_lock (const struct ins *ins);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 5/12 perf disasm: Constify use of struct ins_op
In reply to Ian RogersThe struct ins_op holds variables to function pointers that are read but not written. Change uses to be for a "const struct ins_op *" version to capture this immutability.
--- tools/perf/arch/arm/annotate/instructions.c | 4 +- tools/perf/arch/arm64/annotate/instructions.c | 6 +-- tools/perf/arch/csky/annotate/instructions.c | 6 +-- .../arch/loongarch/annotate/instructions.c | 8 ++-- tools/perf/arch/mips/annotate/instructions.c | 4 +- .../perf/arch/powerpc/annotate/instructions.c | 6 +-- .../perf/arch/riscv64/annotate/instructions.c | 4 +- tools/perf/arch/s390/annotate/instructions.c | 8 ++-- tools/perf/arch/sparc/annotate/instructions.c | 4 +- tools/perf/util/disasm.c | 46 +++++++++---------- tools/perf/util/disasm.h | 6 +-- 11 files changed, 51 insertions(+), 51 deletions(-)
tools/perf/arch/arm/annotate/instructions.c +2 -2
@@ -11,10 +11,10 @@ struct arm_annotate { jump_insn; }; -static struct ins_ops *arm__associate_instruction_ops (struct arch *arch,const char *name) +static const struct ins_ops *arm__associate_instruction_ops (struct arch *arch,const char *name) {struct arm_annotate *arm = arch->priv; -struct ins_ops *ops; +const struct ins_ops *ops;regmatch_t match[2 ];if (!regexec (&arm->call_insn, name,2 , match,0 ))
tools/perf/arch/arm64/annotate/instructions.c +3 -3
@@ -63,15 +63,15 @@ static int arm64_mov__parse(const struct arch *arch __maybe_unused,static int mov__scnprintf (struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name); -static struct ins_ops arm64_mov_ops = { +static const struct ins_ops arm64_mov_ops = { .parse = arm64_mov__parse, .scnprintf = mov__scnprintf, }; -static struct ins_ops *arm64__associate_instruction_ops (struct arch *arch,const char *name) +static const struct ins_ops *arm64__associate_instruction_ops (struct arch *arch,const char *name) {struct arm64_annotate *arm = arch->priv; -struct ins_ops *ops; +const struct ins_ops *ops;regmatch_t match[2 ];if (!regexec (&arm->jump_insn, name,2 , match,0 ))
tools/perf/arch/csky/annotate/instructions.c +3 -3
@@ -3,10 +3,10 @@#include <linux/compiler.h> -static struct ins_ops *csky__associate_ins_ops (struct arch *arch, -const char *name) +static const struct ins_ops *csky__associate_ins_ops (struct arch *arch, +const char *name) { -struct ins_ops *ops =NULL ; +const struct ins_ops *ops =NULL ;/* catch all kind of jumps */ if (!strcmp(name, "bt") ||
tools/perf/arch/loongarch/annotate/instructions.c +4 -4
@@ -51,7 +51,7 @@ static int loongarch_call__parse(const struct arch *arch, struct ins_operands *oreturn 0 ; } -static struct ins_ops loongarch_call_ops = { +static const struct ins_ops loongarch_call_ops = { .parse = loongarch_call__parse, .scnprintf = call__scnprintf, };
@@ -100,15 +100,15 @@ static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *oreturn 0 ; } -static struct ins_ops loongarch_jump_ops = { +static const struct ins_ops loongarch_jump_ops = { .parse = loongarch_jump__parse, .scnprintf = jump__scnprintf, };static -struct ins_ops *loongarch__associate_ins_ops (struct arch *arch,const char *name) +const struct ins_ops *loongarch__associate_ins_ops (struct arch *arch,const char *name) { -struct ins_ops *ops =NULL ; +const struct ins_ops *ops =NULL ;if (!strcmp (name,"bl" )) ops = &loongarch_call_ops;
tools/perf/arch/mips/annotate/instructions.c +2 -2
@@ -1,9 +1,9 @@// SPDX-License-Identifier: GPL-2.0 static -struct ins_ops *mips__associate_ins_ops (struct arch *arch,const char *name) +const struct ins_ops *mips__associate_ins_ops (struct arch *arch,const char *name) { -struct ins_ops *ops =NULL ; +const struct ins_ops *ops =NULL ; if (!strncmp(name, "bal", 3) || !strncmp(name, "bgezal", 6) ||
tools/perf/arch/powerpc/annotate/instructions.c +3 -3
@@ -1,10 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> -static struct ins_ops *powerpc__associate_instruction_ops (struct arch *arch,const char *name) +static const struct ins_ops *powerpc__associate_instruction_ops (struct arch *arch,const char *name) {int i; -struct ins_ops *ops; +const struct ins_ops *ops;/* * - Interested only if instruction starts with 'b'.
@@ -189,7 +189,7 @@ static int cmp_offset(const void *a, const void *b)return (val1->value - val2->value); } -static struct ins_ops *check_ppc_insn (struct disasm_line *dl) +static const struct ins_ops *check_ppc_insn (struct disasm_line *dl) {int raw_insn = dl->raw.raw_insn;int opcode =PPC_OP (raw_insn);
tools/perf/arch/riscv64/annotate/instructions.c +2 -2
@@ -1,9 +1,9 @@// SPDX-License-Identifier: GPL-2.0 static -struct ins_ops *riscv64__associate_ins_ops (struct arch *arch,const char *name) +const struct ins_ops *riscv64__associate_ins_ops (struct arch *arch,const char *name) { -struct ins_ops *ops =NULL ; +const struct ins_ops *ops =NULL ; if (!strncmp(name, "jal", 3) || !strncmp(name, "jr", 2) ||
tools/perf/arch/s390/annotate/instructions.c +4 -4
@@ -49,7 +49,7 @@ static int s390_call__parse(const struct arch *arch, struct ins_operands *ops,return 0 ; } -static struct ins_ops s390_call_ops = { +static const struct ins_ops s390_call_ops = { .parse = s390_call__parse, .scnprintf = call__scnprintf, };
@@ -103,14 +103,14 @@ static int s390_mov__parse(const struct arch *arch __maybe_unused, } -static struct ins_ops s390_mov_ops = { +static const struct ins_ops s390_mov_ops = { .parse = s390_mov__parse, .scnprintf = mov__scnprintf, }; -static struct ins_ops *s390__associate_ins_ops (struct arch *arch,const char *name) +static const struct ins_ops *s390__associate_ins_ops (struct arch *arch,const char *name) { -struct ins_ops *ops =NULL ; +const struct ins_ops *ops =NULL ;/* catch all kind of jumps */ if (strchr(name, 'j') ||
tools/perf/arch/sparc/annotate/instructions.c +2 -2
@@ -117,9 +117,9 @@ static int is_branch_float_cond(const char *cond)return 0 ; } -static struct ins_ops *sparc__associate_instruction_ops (struct arch *arch,const char *name) +static const struct ins_ops *sparc__associate_instruction_ops (struct arch *arch,const char *name) { -struct ins_ops *ops =NULL ; +const struct ins_ops *ops =NULL ; if (!strcmp(name, "call") || !strcmp(name, "jmp") ||
tools/perf/util/disasm.c +23 -23
128 lines not on this page · raw message
tools/perf/util/disasm.h +3 -3
@@ -22,7 +22,7 @@ struct arch {struct ins *instructions;size_t nr_instructions;size_t nr_instructions_allocated; -struct ins_ops *(*associate_instruction_ops)(struct arch *arch,const char *name); +const struct ins_ops *(*associate_instruction_ops)(struct arch *arch,const char *name);bool sorted_instructions;bool initialized;const char *insn_suffix;
@@ -52,7 +52,7 @@ struct arch {struct ins {const char *name; -struct ins_ops *ops; +const struct ins_ops *ops; };struct ins_operands {
@@ -108,7 +108,7 @@ struct annotate_args {const struct arch *arch__find (const char *name);bool arch__is (const struct arch *arch,const char *name); -struct ins_ops *ins__find (const struct arch *arch,const char *name,struct disasm_line *dl); +const struct ins_ops *ins__find (const struct arch *arch,const char *name,struct disasm_line *dl);bool ins__is_call (const struct ins *ins);bool ins__is_jump (const struct ins *ins);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 6/12 perf disasm: Constify use of struct ins
In reply to Ian RogersThe struct ins holds variables that are read but not written, except during some initialization. Change most uses to be for a "const struct ins *" version to capture this immutability. So the x86__instructions can be const pre-sort it and make the sorted variable true.
--- tools/perf/arch/arm64/annotate/instructions.c | 2 +- tools/perf/arch/x86/annotate/instructions.c | 26 +++++++++++---- tools/perf/util/disasm.c | 32 ++++++++++--------- tools/perf/util/disasm.h | 4 +-- 4 files changed, 40 insertions(+), 24 deletions(-)
tools/perf/arch/arm64/annotate/instructions.c +1 -1
@@ -60,7 +60,7 @@ static int arm64_mov__parse(const struct arch *arch __maybe_unused,return -1 ; } -static int mov__scnprintf (struct ins *ins,char *bf,size_t size, +static int mov__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name);static const struct ins_ops arm64_mov_ops = {
tools/perf/arch/x86/annotate/instructions.c +20 -6
@@ -7,7 +7,7 @@* So this table should not have entries with the suffix unless it's * a complete different instruction than ones without the suffix. */ -static struct ins x86__instructions[] = { +static const struct ins x86__instructions[] = { { .name ="adc" , .ops = &mov_ops, }, { .name ="add" , .ops = &mov_ops, }, { .name ="addsd" , .ops = &mov_ops, },
@@ -19,9 +19,9 @@ static struct ins x86__instructions[] = { { .name = "btr", .ops = &mov_ops, }, { .name = "bts", .ops = &mov_ops, }, { .name = "call", .ops = &call_ops, }, + { .name = "cmovae", .ops = &mov_ops, }, { .name = "cmovbe", .ops = &mov_ops, }, { .name = "cmove", .ops = &mov_ops, }, - { .name = "cmovae", .ops = &mov_ops, }, { .name = "cmp", .ops = &mov_ops, }, { .name = "cmpxch", .ops = &mov_ops, }, { .name = "cmpxchg", .ops = &mov_ops, },
@@ -73,23 +73,23 @@ static struct ins x86__instructions[] = { { .name = "movaps", .ops = &mov_ops, }, { .name = "movdqa", .ops = &mov_ops, }, { .name = "movdqu", .ops = &mov_ops, }, + { .name = "movsb", .ops = &mov_ops, }, { .name = "movsd", .ops = &mov_ops, }, + { .name = "movsl", .ops = &mov_ops, }, { .name = "movss", .ops = &mov_ops, }, - { .name = "movsb", .ops = &mov_ops, }, { .name = "movsw", .ops = &mov_ops, }, - { .name = "movsl", .ops = &mov_ops, }, { .name = "movupd", .ops = &mov_ops, }, { .name = "movups", .ops = &mov_ops, }, { .name = "movzb", .ops = &mov_ops, }, - { .name = "movzw", .ops = &mov_ops, }, { .name = "movzl", .ops = &mov_ops, }, + { .name = "movzw", .ops = &mov_ops, }, { .name = "mulsd", .ops = &mov_ops, }, { .name = "mulss", .ops = &mov_ops, }, { .name = "nop", .ops = &nop_ops, }, { .name = "or", .ops = &mov_ops, }, { .name = "orps", .ops = &mov_ops, }, - { .name = "pand", .ops = &mov_ops, }, { .name = "paddq", .ops = &mov_ops, }, + { .name = "pand", .ops = &mov_ops, }, { .name = "pcmpeqb", .ops = &mov_ops, }, { .name = "por", .ops = &mov_ops, }, { .name = "rcl", .ops = &mov_ops, },
@@ -202,6 +202,20 @@ static int x86__annotate_init(struct arch *arch, char *cpuid)if (x86__cpuid_parse (arch, cpuid)) err =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; } + +#ifndef NDEBUG + { +static bool sorted_check; + +if (!sorted_check) { +for (size_t i =0 ; i < arch->nr_instructions -1 ; i++) { +assert (strcmp (arch->instructions[i].name, + arch->instructions[i +1 ].name) <=0 ); + } + sorted_check = true; + } + } +#endif arch->e_machine =EM_X86_64 ; arch->e_flags =0 ; arch->initialized = true;
tools/perf/util/disasm.c +17 -15
@@ -43,9 +43,9 @@ static const struct ins_ops ret_ops;static const struct ins_ops load_store_ops;static const struct ins_ops arithmetic_ops; -static int jump__scnprintf (struct ins *ins,char *bf,size_t size, +static int jump__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name); -static int call__scnprintf (struct ins *ins,char *bf,size_t size, +static int call__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name);static void ins__sort (struct arch *arch);
@@ -66,7 +66,8 @@ static int arch__grow_instructions(struct arch *arch) goto grow_from_non_allocated_table; new_nr_allocated = arch->nr_instructions_allocated +128 ; - new_instructions =realloc (arch->instructions, new_nr_allocated *sizeof (struct ins )); + new_instructions =realloc ((void *)arch->instructions, + new_nr_allocated *sizeof (struct ins ));if (new_instructions ==NULL )return -1 ;
@@ -93,7 +94,7 @@ static int arch__associate_ins_ops(struct arch *arch, const char *name, const st arch__grow_instructions(arch))return -1 ; - ins = &arch->instructions[arch->nr_instructions]; + ins = (struct ins *)&arch->instructions[arch->nr_instructions]; ins->name =strdup (name);if (!ins->name)return -1 ;
@@ -146,6 +147,7 @@ static struct arch architectures[] = { .init = x86__annotate_init, .instructions = x86__instructions, .nr_instructions = ARRAY_SIZE(x86__instructions), + .sorted_instructions = true, .insn_suffix = "bwlq", .objdump = { .comment_char = '#',
@@ -241,13 +243,13 @@ static void ins_ops__delete(struct ins_operands *ops)zfree (&ops->target.name); } -static int ins__raw_scnprintf (struct ins *ins,char *bf,size_t size, +static int ins__raw_scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) {return scnprintf (bf, size,"%-*s %s" , max_ins_name, ins->name, ops->raw); } -static int ins__scnprintf (struct ins *ins,char *bf,size_t size, +static int ins__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) {if (ins->ops->scnprintf)
@@ -319,7 +321,7 @@ static int call__parse(const struct arch *arch, struct ins_operands *ops, struct goto find_target; } -static int call__scnprintf (struct ins *ins,char *bf,size_t size, +static int call__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) {if (ops->target.sym)
@@ -446,7 +448,7 @@ static int jump__parse(const struct arch *arch, struct ins_operands *ops, structreturn 0 ; } -static int jump__scnprintf (struct ins *ins,char *bf,size_t size, +static int jump__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) {const char *c;
@@ -551,7 +553,7 @@ static int lock__parse(const struct arch *arch, struct ins_operands *ops, structreturn 0 ; } -static int lock__scnprintf (struct ins *ins,char *bf,size_t size, +static int lock__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) {int printed;
@@ -680,7 +682,7 @@ static int mov__parse(const struct arch *arch, struct ins_operands *ops,return -1 ; } -static int mov__scnprintf (struct ins *ins,char *bf,size_t size, +static int mov__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) { return scnprintf(bf, size, "%-*s %s,%s", max_ins_name, ins->name,
@@ -699,7 +701,7 @@ static const struct ins_ops mov_ops = {#define ADD_ZERO_EXT_XO_FORM 202#define SUB_ZERO_EXT_XO_FORM 200 -static int arithmetic__scnprintf (struct ins *ins,char *bf,size_t size, +static int arithmetic__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) { return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
@@ -743,7 +745,7 @@ static const struct ins_ops arithmetic_ops = { .scnprintf = arithmetic__scnprintf, }; -static int load_store__scnprintf (struct ins *ins,char *bf,size_t size, +static int load_store__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) { return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
@@ -806,7 +808,7 @@ static int dec__parse(const struct arch *arch __maybe_unused, struct ins_operandreturn 0 ; } -static int dec__scnprintf (struct ins *ins,char *bf,size_t size, +static int dec__scnprintf (const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name) { return scnprintf(bf, size, "%-*s %s", max_ins_name, ins->name,
@@ -818,7 +820,7 @@ static const struct ins_ops dec_ops = { .scnprintf = dec__scnprintf, }; -static int nop__scnprintf (struct ins *ins__maybe_unused ,char *bf,size_t size, +static int nop__scnprintf (const struct ins *ins__maybe_unused ,char *bf,size_t size,struct ins_operands *ops__maybe_unused ,int max_ins_name) {return scnprintf (bf, size,"%-*s" , max_ins_name,"nop" );
@@ -866,7 +868,7 @@ static void ins__sort(struct arch *arch) {const int nmemb = arch->nr_instructions; -qsort (arch->instructions, nmemb,sizeof (struct ins ), ins__cmp); +qsort ((void *)arch->instructions, nmemb,sizeof (struct ins ), ins__cmp); } static const struct ins_ops *__ins__find(const struct arch *arch, const char *name,
tools/perf/util/disasm.h +2 -2
@@ -19,7 +19,7 @@ struct disasm_line;struct arch {const char *name; -struct ins *instructions; +const struct ins *instructions;size_t nr_instructions;size_t nr_instructions_allocated;const struct ins_ops *(*associate_instruction_ops)(struct arch *arch,const char *name);
@@ -91,7 +91,7 @@ struct ins_ops {void (*free)(struct ins_operands *ops);int (*parse)(const struct arch *arch,struct ins_operands *ops,struct map_symbol *ms,struct disasm_line *dl); -int (*scnprintf)(struct ins *ins,char *bf,size_t size, +int (*scnprintf)(const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name); };
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 7/12 perf disasm: Rework the string arch__is to use the ELF machine
In reply to Ian RogersAdd new arch__is_x86 and arch__is_powerpc functions that avoid string comparisons and use the ELF machine. Remove arch__is that is no longer used.
--- tools/perf/util/annotate-data.c | 10 +++++----- tools/perf/util/annotate.c | 16 ++++++++-------- tools/perf/util/capstone.c | 2 +- tools/perf/util/disasm.c | 15 ++++++++++----- tools/perf/util/disasm.h | 3 ++- tools/perf/util/llvm.c | 2 +- 6 files changed, 27 insertions(+), 21 deletions(-)
tools/perf/util/annotate-data.c +5 -5
@@ -165,7 +165,7 @@ static void init_type_state(struct type_state *state, const struct arch *arch)memset (state,0 ,sizeof (*state));INIT_LIST_HEAD (&state->stack_vars); -if (arch__is (arch,"x86" )) { +if (arch__is_x86 (arch)) { state->regs[0 ].caller_saved = true; state->regs[1 ].caller_saved = true; state->regs[2 ].caller_saved = true;
@@ -526,7 +526,7 @@ static enum type_match_result check_variable(struct data_loc_info *dloc, needs_pointer = false; else if (reg == dloc->fbreg || is_fbreg) needs_pointer = false; - else if (arch__is(dloc->arch, "x86") && reg == X86_REG_SP) + else if (arch__is_x86(dloc->arch) && reg == X86_REG_SP) needs_pointer = false;/* Get the type of the variable */
@@ -1071,7 +1071,7 @@ static void delete_var_types(struct die_var_type *var_types)/* should match to is_stack_canary() in util/annotate.c */ static void setup_stack_canary (struct data_loc_info *dloc) { -if (arch__is (dloc->arch,"x86" )) { +if (arch__is_x86 (dloc->arch)) { dloc->op->segment =INSN_SEG_X86_GS ; dloc->op->imm = true; dloc->op->offset =40 ;
@@ -1311,7 +1311,7 @@ static enum type_match_result check_matching_type(struct type_state *state,/* Direct this-cpu access like "%gs:0x34740" */ if (dloc->op->segment ==INSN_SEG_X86_GS && dloc->op->imm && -arch__is (dloc->arch,"x86" )) { +arch__is_x86 (dloc->arch)) {pr_debug_dtp ("this-cpu var" ); addr = dloc->op->offset;
@@ -1397,7 +1397,7 @@ static enum type_match_result find_data_type_insn(struct data_loc_info *dloc,static int arch_supports_insn_tracking (struct data_loc_info *dloc) { -if ((arch__is (dloc->arch,"x86" )) || (arch__is (dloc->arch,"powerpc" ))) +if ((arch__is_x86 (dloc->arch)) || (arch__is_powerpc (dloc->arch)))return 1 ;return 0 ; }
tools/perf/util/annotate.c +8 -8
@@ -2474,7 +2474,7 @@ static int extract_reg_offset(const struct arch *arch, const char *str,* %gs:0x18(%rbx). In that case it should skip the part. */ if (*str == arch->objdump.register_char) { -if (arch__is (arch,"x86" )) { +if (arch__is_x86 (arch)) {/* FIXME: Handle other segment registers */ if (!strncmp (str,"%gs:" ,4 )) op_loc->segment =INSN_SEG_X86_GS ;
@@ -2571,7 +2571,7 @@ int annotate_get_insn_location(const struct arch *arch, struct disasm_line *dl, op_loc->reg2 =-1 ;if (insn_str ==NULL ) { -if (!arch__is (arch,"powerpc" )) +if (!arch__is_powerpc (arch))continue ; }
@@ -2580,7 +2580,7 @@ int annotate_get_insn_location(const struct arch *arch, struct disasm_line *dl,* required fields for op_loc, ie reg1, reg2, offset from the * raw instruction. */ -if (arch__is (arch,"powerpc" )) { +if (arch__is_powerpc (arch)) { op_loc->mem_ref = mem_ref; op_loc->multi_regs = multi_regs;get_powerpc_regs (dl->raw.raw_insn, !i, op_loc);
@@ -2591,7 +2591,7 @@ int annotate_get_insn_location(const struct arch *arch, struct disasm_line *dl, }else {char *s, *p =NULL ; -if (arch__is (arch,"x86" )) { +if (arch__is_x86 (arch)) {/* FIXME: Handle other segment registers */ if (!strncmp (insn_str,"%gs:" ,4 )) { op_loc->segment =INSN_SEG_X86_GS ;
@@ -2675,7 +2675,7 @@ static struct annotated_item_stat *annotate_data_stat(struct list_head *head,static bool is_stack_operation (const struct arch *arch,struct disasm_line *dl) { -if (arch__is (arch,"x86" )) { +if (arch__is_x86 (arch)) { if (!strncmp(dl->ins.name, "push", 4) || !strncmp(dl->ins.name, "pop", 3) || !strncmp(dl->ins.name, "call", 4) ||
@@ -2689,7 +2689,7 @@ static bool is_stack_operation(const struct arch *arch, struct disasm_line *dl)static bool is_stack_canary (const struct arch *arch,struct annotated_op_loc *loc) {/* On x86_64, %gs:40 is used for stack canary */ -if (arch__is (arch,"x86" )) { +if (arch__is_x86 (arch)) {if (loc->segment ==INSN_SEG_X86_GS && loc->imm && loc->offset ==40 )return true;
@@ -2704,7 +2704,7 @@ static bool is_stack_canary(const struct arch *arch, struct annotated_op_loc *lo*/ static bool is_address_gen_insn (const struct arch *arch,struct disasm_line *dl) { -if (arch__is (arch,"x86" )) { +if (arch__is_x86 (arch)) {if (!strncmp (dl->ins.name,"lea" ,3 ))return true; }
@@ -2847,7 +2847,7 @@ __hist_entry__get_data_type(struct hist_entry *he, const struct arch *arch, }/* This CPU access in kernel - pretend PC-relative addressing */ -if (dso__kernel (map__dso (ms->map)) &&arch__is (arch,"x86" ) && +if (dso__kernel (map__dso (ms->map)) &&arch__is_x86 (arch) && op_loc->segment ==INSN_SEG_X86_GS && op_loc->imm) { dloc.var_addr = op_loc->offset; op_loc->reg1 =DWARF_REG_PC ;
tools/perf/util/capstone.c +1 -1
@@ -147,7 +147,7 @@ static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,struct symbol *sym;/* TODO: support more architectures */ -if (!arch__is (args->arch,"x86" )) +if (!arch__is_x86 (args->arch))return ;if (insn->detail ==NULL )
tools/perf/util/disasm.c +10 -5
@@ -228,9 +228,14 @@ const struct arch *arch__find(const char *name)return bsearch (name, architectures, nmemb,sizeof (struct arch ), arch__key_cmp); } -bool arch__is (const struct arch *arch,const char *name) +bool arch__is_x86 (const struct arch *arch) { -return !strcmp (arch->name, name); +return arch->e_machine ==EM_386 || arch->e_machine ==EM_X86_64 ; +} + +bool arch__is_powerpc (const struct arch *arch) +{ +return arch->e_machine ==EM_PPC || arch->e_machine ==EM_PPC64 ; }static void ins_ops__delete (struct ins_operands *ops)
@@ -877,7 +882,7 @@ static const struct ins_ops *__ins__find(const struct arch *arch, const char *nastruct ins *ins;const int nmemb = arch->nr_instructions; -if (arch__is (arch,"powerpc" )) { +if (arch__is_powerpc (arch)) {/* * For powerpc, identify the instruction ops * from the opcode using raw_insn.
@@ -1066,7 +1071,7 @@ struct disasm_line *disasm_line__new(struct annotate_args *args) goto out_delete;if (args->offset !=-1 ) { -if (arch__is (args->arch,"powerpc" )) { +if (arch__is_powerpc (args->arch)) {if (disasm_line__parse_powerpc (dl, args) <0 ) goto out_free_line; }else if (disasm_line__parse (dl->al.line, &dl->ins.name, &dl->ops.raw) <0 )
@@ -1700,7 +1705,7 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args)* and typeoff, disassemble to mnemonic notation is not required in * case of powerpc. */ -if (arch__is (args->arch,"powerpc" )) { +if (arch__is_powerpc (args->arch)) {extern const char *sort_order;if (sort_order && !strstr (sort_order,"sym" )) {
tools/perf/util/disasm.h +2 -1
@@ -106,7 +106,8 @@ struct annotate_args { };const struct arch *arch__find (const char *name); -bool arch__is (const struct arch *arch,const char *name); +bool arch__is_x86 (const struct arch *arch); +bool arch__is_powerpc (const struct arch *arch);const struct ins_ops *ins__find (const struct arch *arch,const char *name,struct disasm_line *dl);
tools/perf/util/llvm.c +1 -1
@@ -146,7 +146,7 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym,return errno;init_llvm (); -if (arch__is (args->arch,"x86" )) { +if (arch__is_x86 (args->arch)) {const char *triplet = is_64bit ?"x86_64-pc-linux" :"i686-pc-linux" ; disasm = LLVMCreateDisasm(triplet, &storage, /*tag_type=*/0,
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 8/12 perf disasm: Don't include C files from the arch directory
In reply to Ian RogersMove the arch instructions.c files into appropriately named files in annotate-arch in the util directory. Don't #include to compile the code, switch to building the files and fix up the #includes accordingly. Move powerpc specific disasm code out of disasm.c and into annotate-powerpc.c. Declarations and static removed as appropriate for the code to compile as separate compilation units. The e_machine and e_flags set up is moved to the disasm.c architectures array so that later patches can sort by them.
---
tools/perf/util/Build | 1 +
tools/perf/util/annotate-arch/Build | 11 +
.../annotate-arch/annotate-arc.c} | 5 +-
.../annotate-arch/annotate-arm.c} | 9 +-
.../annotate-arch/annotate-arm64.c} | 14 +-
.../annotate-arch/annotate-csky.c} | 11 +-
.../annotate-arch/annotate-loongarch.c} | 15 +-
.../annotate-arch/annotate-mips.c} | 6 +-
.../annotate-arch/annotate-powerpc.c} | 105 ++++++++-
.../annotate-arch/annotate-riscv64.c} | 6 +-
.../annotate-arch/annotate-s390.c} | 15 +-
.../annotate-arch/annotate-sparc.c} | 7 +-
.../annotate-arch/annotate-x86.c} | 85 +++++---
tools/perf/util/disasm.c | 199 ++++--------------
tools/perf/util/disasm.h | 38 ++++
15 files changed, 289 insertions(+), 238 deletions(-)
create mode 100644 tools/perf/util/annotate-arch/Build
rename tools/perf/{arch/arc/annotate/instructions.c => util/annotate-arch/annotate-arc.c} (53%)
rename tools/perf/{arch/arm/annotate/instructions.c => util/annotate-arch/annotate-arm.c} (90%)
rename tools/perf/{arch/arm64/annotate/instructions.c => util/annotate-arch/annotate-arm64.c} (90%)
rename tools/perf/{arch/csky/annotate/instructions.c => util/annotate-arch/annotate-csky.c} (83%)
rename tools/perf/{arch/loongarch/annotate/instructions.c => util/annotate-arch/annotate-loongarch.c} (93%)
rename tools/perf/{arch/mips/annotate/instructions.c => util/annotate-arch/annotate-mips.c} (94%)
rename tools/perf/{arch/powerpc/annotate/instructions.c => util/annotate-arch/annotate-powerpc.c} (76%)
rename tools/perf/{arch/riscv64/annotate/instructions.c => util/annotate-arch/annotate-riscv64.c} (91%)
rename tools/perf/{arch/s390/annotate/instructions.c => util/annotate-arch/annotate-s390.c} (91%)
rename tools/perf/{arch/sparc/annotate/instructions.c => util/annotate-arch/annotate-sparc.c} (96%)
rename tools/perf/{arch/x86/annotate/instructions.c => util/annotate-arch/annotate-x86.c} (97%)tools/perf/util/Build +1 -0
@@ -1,6 +1,7 @@ include $(srctree)/tools/scripts/Makefile.include include $(srctree)/tools/scripts/utilities.mak +perf-util-y += annotate-arch/ perf-util-y += arm64-frame-pointer-unwind-support.o perf-util-y += addr2line.o perf-util-y += addr_location.o
tools/perf/util/annotate-arch/Build new file +11 -0
@@ -0,0 +1,11 @@ +perf-util-y += annotate-arc.o +perf-util-y += annotate-arm.o +perf-util-y += annotate-arm64.o +perf-util-y += annotate-csky.o +perf-util-y += annotate-loongarch.o +perf-util-y += annotate-mips.o +perf-util-y += annotate-x86.o +perf-util-y += annotate-powerpc.o +perf-util-y += annotate-riscv64.o +perf-util-y += annotate-s390.o +perf-util-y += annotate-sparc.o
tools/perf/util/annotate-arch/annotate-arc.c renamed from tools/perf/arch/arc/annotate/instructions.c +2 -3
@@ -1,11 +1,10 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> +#include "../disasm.h" -static int arc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +int arc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) { arch->initialized = true; arch->objdump.comment_char =';' ; - arch->e_machine =EM_ARC ; - arch->e_flags =0 ;return 0 ; }
tools/perf/util/annotate-arch/annotate-arm.c renamed from tools/perf/arch/arm/annotate/instructions.c +4 -5
@@ -1,10 +1,11 @@// SPDX-License-Identifier: GPL-2.0 +#include <stdlib.h> #include <linux/compiler.h> #include <linux/zalloc.h> #include <errno.h> -#include <sys/types.h> #include <regex.h> -#include <stdlib.h> +#include "../annotate.h" +#include "../disasm.h" struct arm_annotate { regex_t call_insn,
@@ -28,7 +29,7 @@ static const struct ins_ops *arm__associate_instruction_ops(struct arch *arch, creturn ops; } -static int arm__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +int arm__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {struct arm_annotate *arm;int err;
@@ -54,8 +55,6 @@ static int arm__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = arm__associate_instruction_ops; arch->objdump.comment_char =';' ; arch->objdump.skip_functions_char ='+' ; - arch->e_machine =EM_ARM ; - arch->e_flags =0 ;return 0 ; out_free_call:
tools/perf/util/annotate-arch/annotate-arm64.c renamed from tools/perf/arch/arm64/annotate/instructions.c +6 -8
@@ -1,9 +1,12 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> #include <errno.h> -#include <sys/types.h> -#include <regex.h> #include <stdlib.h> +#include <string.h> +#include <linux/zalloc.h> +#include <regex.h> +#include "../annotate.h" +#include "../disasm.h" struct arm64_annotate { regex_t call_insn,
@@ -60,9 +63,6 @@ static int arm64_mov__parse(const struct arch *arch __maybe_unused,return -1 ; } -static int mov__scnprintf (const struct ins *ins,char *bf,size_t size, -struct ins_operands *ops,int max_ins_name); -static const struct ins_ops arm64_mov_ops = { .parse = arm64_mov__parse, .scnprintf = mov__scnprintf,
@@ -87,7 +87,7 @@ static const struct ins_ops *arm64__associate_instruction_ops(struct arch *arch,return ops; } -static int arm64__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +int arm64__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {struct arm64_annotate *arm;int err;
@@ -114,8 +114,6 @@ static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused) arch->associate_instruction_ops = arm64__associate_instruction_ops; arch->objdump.comment_char ='/' ; arch->objdump.skip_functions_char ='+' ; - arch->e_machine =EM_AARCH64 ; - arch->e_flags =0 ;return 0 ; out_free_call:
tools/perf/util/annotate-arch/annotate-csky.c renamed from tools/perf/arch/csky/annotate/instructions.c +3 -8
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. - +#include <string.h> #include <linux/compiler.h> +#include "../disasm.h" static const struct ins_ops *csky__associate_ins_ops (struct arch *arch,const char *name)
@@ -38,16 +39,10 @@ static const struct ins_ops *csky__associate_ins_ops(struct arch *arch,return ops; } -static int csky__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +int csky__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) { arch->initialized = true; arch->objdump.comment_char ='/' ; arch->associate_instruction_ops = csky__associate_ins_ops; - arch->e_machine =EM_CSKY ; -#if defined(__CSKYABIV2__) - arch->e_flags =EF_CSKY_ABIV2 ; -#else - arch->e_flags =EF_CSKY_ABIV1 ; -#endif return 0 ; }
tools/perf/util/annotate-arch/annotate-loongarch.c renamed from tools/perf/arch/loongarch/annotate/instructions.c +9 -6
@@ -4,11 +4,17 @@* * Copyright (C) 2020-2023 Loongson Technology Corporation Limited */ +#include <stdlib.h> +#include <string.h> +#include <linux/compiler.h> +#include "../disasm.h" +#include "../map.h" +#include "../maps.h" +#include "../symbol.h" static int loongarch_call__parse (const struct arch *arch,struct ins_operands *ops,struct map_symbol *ms,struct disasm_line *dl__maybe_unused ) - {char *c, *endptr, *tok, *name;struct map *map = ms->map;
@@ -51,7 +57,7 @@ static int loongarch_call__parse(const struct arch *arch, struct ins_operands *oreturn 0 ; } -static const struct ins_ops loongarch_call_ops = { +const struct ins_ops loongarch_call_ops = { .parse = loongarch_call__parse, .scnprintf = call__scnprintf, };
@@ -100,7 +106,7 @@ static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *oreturn 0 ; } -static const struct ins_ops loongarch_jump_ops = { +const struct ins_ops loongarch_jump_ops = { .parse = loongarch_jump__parse, .scnprintf = jump__scnprintf, };
@@ -130,15 +136,12 @@ const struct ins_ops *loongarch__associate_ins_ops(struct arch *arch, const charreturn ops; } -static int loongarch__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {if (!arch->initialized) { arch->associate_instruction_ops = loongarch__associate_ins_ops; arch->initialized = true; arch->objdump.comment_char ='#' ; - arch->e_machine =EM_LOONGARCH ; - arch->e_flags =0 ; }return 0 ;
tools/perf/util/annotate-arch/annotate-mips.c renamed from tools/perf/arch/mips/annotate/instructions.c +3 -3
@@ -1,4 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#include <string.h> +#include <linux/compiler.h> +#include "../disasm.h" static const struct ins_ops *mips__associate_ins_ops (struct arch *arch,const char *name)
@@ -33,15 +36,12 @@ const struct ins_ops *mips__associate_ins_ops(struct arch *arch, const char *namreturn ops; } -static int mips__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {if (!arch->initialized) { arch->associate_instruction_ops = mips__associate_ins_ops; arch->initialized = true; arch->objdump.comment_char ='#' ; - arch->e_machine =EM_MIPS ; - arch->e_flags =0 ; }return 0 ;
tools/perf/util/annotate-arch/annotate-powerpc.c renamed from tools/perf/arch/powerpc/annotate/instructions.c +97 -8
134 lines not on this page · raw message
tools/perf/util/annotate-arch/annotate-riscv64.c renamed from tools/perf/arch/riscv64/annotate/instructions.c +3 -3
@@ -1,4 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#include <string.h> +#include <linux/compiler.h> +#include "../disasm.h" static const struct ins_ops *riscv64__associate_ins_ops (struct arch *arch,const char *name)
@@ -21,15 +24,12 @@ const struct ins_ops *riscv64__associate_ins_ops(struct arch *arch, const char *return ops; } -static int riscv64__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {if (!arch->initialized) { arch->associate_instruction_ops = riscv64__associate_ins_ops; arch->initialized = true; arch->objdump.comment_char ='#' ; - arch->e_machine =EM_RISCV ; - arch->e_flags =0 ; }return 0 ;
tools/perf/util/annotate-arch/annotate-s390.c renamed from tools/perf/arch/s390/annotate/instructions.c +11 -4
@@ -1,5 +1,13 @@// SPDX-License-Identifier: GPL-2.0 +#include <string.h> #include <linux/compiler.h> +#include "../debug.h" +#include "../disasm.h" +#include "../map.h" +#include "../maps.h" +#include "../symbol.h" +#include "../annotate.h" +#include "../annotate-data.h" static int s390_call__parse(const struct arch *arch, struct ins_operands *ops, struct map_symbol *ms,
@@ -49,7 +57,7 @@ static int s390_call__parse(const struct arch *arch, struct ins_operands *ops,return 0 ; } -static const struct ins_ops s390_call_ops = { +const struct ins_ops s390_call_ops = { .parse = s390_call__parse, .scnprintf = call__scnprintf, };
@@ -159,7 +167,7 @@ static int s390__cpuid_parse(struct arch *arch, char *cpuid)return -1 ; } -static int s390__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +int s390__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {int err =0 ;
@@ -170,8 +178,7 @@ static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused)if (s390__cpuid_parse (arch, cpuid)) err =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; } - arch->e_machine =EM_S390 ; - arch->e_flags =0 ; + arch->objdump.comment_char ='#' ; }return err;
tools/perf/util/annotate-arch/annotate-sparc.c renamed from tools/perf/arch/sparc/annotate/instructions.c +4 -3
@@ -1,4 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#include <string.h> +#include <linux/compiler.h> +#include "../../util/disasm.h" static int is_branch_cond (const char *cond) {
@@ -157,14 +160,12 @@ static const struct ins_ops *sparc__associate_instruction_ops(struct arch *arch,return ops; } -static int sparc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +int sparc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) {if (!arch->initialized) { arch->initialized = true; arch->associate_instruction_ops = sparc__associate_instruction_ops; arch->objdump.comment_char ='#' ; - arch->e_machine =EM_SPARC ; - arch->e_flags =0 ; }return 0 ;
tools/perf/util/annotate-arch/annotate-x86.c renamed from tools/perf/arch/x86/annotate/instructions.c +54 -31
98 lines not on this page · raw message
tools/perf/util/disasm.c +43 -156
332 lines not on this page · raw message
tools/perf/util/disasm.h +38 -0
@@ -109,6 +109,28 @@ const struct arch *arch__find(const char *name);bool arch__is_x86 (const struct arch *arch);bool arch__is_powerpc (const struct arch *arch); +extern const struct ins_ops call_ops; +extern const struct ins_ops dec_ops; +extern const struct ins_ops jump_ops; +extern const struct ins_ops mov_ops; +extern const struct ins_ops nop_ops; +extern const struct ins_ops lock_ops; +extern const struct ins_ops ret_ops; + +int arch__associate_ins_ops (struct arch *arch,const char *name,const struct ins_ops *ops); + +int arc__annotate_init (struct arch *arch,char *cpuid); +int arm__annotate_init (struct arch *arch,char *cpuid); +int arm64__annotate_init (struct arch *arch,char *cpuid); +int csky__annotate_init (struct arch *arch,char *cpuid); +int loongarch__annotate_init (struct arch *arch,char *cpuid); +int mips__annotate_init (struct arch *arch,char *cpuid); +int powerpc__annotate_init (struct arch *arch,char *cpuid); +int riscv64__annotate_init (struct arch *arch,char *cpuid); +int s390__annotate_init (struct arch *arch,char *cpuid); +int sparc__annotate_init (struct arch *arch,char *cpuid); +int x86__annotate_init (struct arch *arch,char *cpuid); +const struct ins_ops *ins__find (const struct arch *arch,const char *name,struct disasm_line *dl);bool ins__is_call (const struct ins *ins);
@@ -117,12 +139,28 @@ bool ins__is_fused(const struct arch *arch, const char *ins1, const char *ins2);bool ins__is_ret (const struct ins *ins);bool ins__is_lock (const struct ins *ins); +extern const struct ins_ops s390_call_ops; +extern const struct ins_ops loongarch_call_ops; +extern const struct ins_ops loongarch_jump_ops; +const struct ins_ops *check_ppc_insn (struct disasm_line *dl); +struct disasm_line *disasm_line__new (struct annotate_args *args);void disasm_line__free (struct disasm_line *dl);int disasm_line__scnprintf (struct disasm_line *dl,char *bf,size_t size,bool raw,int max_ins_name); +int ins__raw_scnprintf (const struct ins *ins,char *bf,size_t size, +struct ins_operands *ops,int max_ins_name); +int ins__scnprintf (const struct ins *ins,char *bf,size_t size, +struct ins_operands *ops,int max_ins_name); +int call__scnprintf (const struct ins *ins,char *bf,size_t size, +struct ins_operands *ops,int max_ins_name); +int jump__scnprintf (const struct ins *ins,char *bf,size_t size, +struct ins_operands *ops,int max_ins_name); +int mov__scnprintf (const struct ins *ins,char *bf,size_t size, +struct ins_operands *ops,int max_ins_name); +int symbol__disassemble (struct symbol *sym,struct annotate_args *args);char *expand_tabs (char *line,char **storage,size_t *storage_len);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 9/12 perf disasm: Refactor ins__is_call/jump to avoid exposing arch ins_ops
In reply to Ian RogersAdd booleans indicating whether and ins_ops are call or jump and return it. This avoids exposing loongarch and s390 ins_ops for the sake of matching.
--- tools/perf/util/annotate-arch/annotate-loongarch.c | 6 ++++-- tools/perf/util/annotate-arch/annotate-s390.c | 3 ++- tools/perf/util/disasm.c | 6 ++++-- tools/perf/util/disasm.h | 5 ++--- 4 files changed, 12 insertions(+), 8 deletions(-)
tools/perf/util/annotate-arch/annotate-loongarch.c +4 -2
@@ -57,9 +57,10 @@ static int loongarch_call__parse(const struct arch *arch, struct ins_operands *oreturn 0 ; } -const struct ins_ops loongarch_call_ops = { +static const struct ins_ops loongarch_call_ops = { .parse = loongarch_call__parse, .scnprintf = call__scnprintf, + .is_call = true, }; static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *ops,
@@ -106,9 +107,10 @@ static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *oreturn 0 ; } -const struct ins_ops loongarch_jump_ops = { +static const struct ins_ops loongarch_jump_ops = { .parse = loongarch_jump__parse, .scnprintf = jump__scnprintf, + .is_jump = true, }; static
tools/perf/util/annotate-arch/annotate-s390.c +2 -1
@@ -57,9 +57,10 @@ static int s390_call__parse(const struct arch *arch, struct ins_operands *ops,return 0 ; } -const struct ins_ops s390_call_ops = { +static const struct ins_ops s390_call_ops = { .parse = s390_call__parse, .scnprintf = call__scnprintf, + .is_call = true, }; static int s390_mov__parse(const struct arch *arch __maybe_unused,
tools/perf/util/disasm.c +4 -2
@@ -315,11 +315,12 @@ int call__scnprintf(const struct ins *ins, char *bf, size_t size,const struct ins_ops call_ops = { .parse = call__parse, .scnprintf = call__scnprintf, + .is_call = true, };bool ins__is_call (const struct ins *ins) { -return ins->ops == &call_ops || ins->ops == &s390_call_ops || ins->ops == &loongarch_call_ops; +return ins->ops && ins->ops->is_call; }/*
@@ -469,11 +470,12 @@ const struct ins_ops jump_ops = { .free = jump__delete, .parse = jump__parse, .scnprintf = jump__scnprintf, + .is_jump = true, };bool ins__is_jump (const struct ins *ins) { -return ins->ops == &jump_ops || ins->ops == &loongarch_jump_ops; +return ins->ops && ins->ops->is_jump; }static int comment__symbol (char *raw,char *comment,u64 *addrp,char **namep)
tools/perf/util/disasm.h +2 -3
@@ -93,6 +93,8 @@ struct ins_ops { struct disasm_line *dl);int (*scnprintf)(const struct ins *ins,char *bf,size_t size,struct ins_operands *ops,int max_ins_name); +bool is_jump; +bool is_call; };struct annotate_args {
@@ -139,9 +141,6 @@ bool ins__is_fused(const struct arch *arch, const char *ins1, const char *ins2);bool ins__is_ret (const struct ins *ins);bool ins__is_lock (const struct ins *ins); -extern const struct ins_ops s390_call_ops; -extern const struct ins_ops loongarch_call_ops; -extern const struct ins_ops loongarch_jump_ops;const struct ins_ops *check_ppc_insn (struct disasm_line *dl);struct disasm_line *disasm_line__new (struct annotate_args *args);
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 10/12 perf map_symbol: Switch from holding maps to holding thread
In reply to Ian Rogersmaps may belong to >1 thread. In contexts like symbolization information from the thread may be useful, such as the ELF machine. As the maps can be gained from the thread switch from holding maps in struct map_symbol to holding the thread. Holding the maps in addr_location is also redundant, switch this to using thread__maps.
--- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/ui/browsers/hists.c | 3 ++- tools/perf/util/addr_location.c | 4 ---- tools/perf/util/addr_location.h | 1 - .../util/annotate-arch/annotate-loongarch.c | 5 +++-- tools/perf/util/annotate-arch/annotate-s390.c | 3 ++- tools/perf/util/callchain.c | 12 +++++++----- tools/perf/util/capstone.c | 6 ++++-- tools/perf/util/db-export.c | 1 - tools/perf/util/disasm.c | 7 ++++--- tools/perf/util/event.c | 2 -- tools/perf/util/hist.c | 18 +++++++++--------- tools/perf/util/machine.c | 13 +++++++------ tools/perf/util/map_symbol.c | 5 +++-- tools/perf/util/map_symbol.h | 3 ++- tools/perf/util/sort.c | 2 +- tools/perf/util/unwind-libdw.c | 2 +- tools/perf/util/unwind-libunwind-local.c | 2 +- 18 files changed, 47 insertions(+), 44 deletions(-)
tools/perf/ui/browsers/annotate.c +1 -1
@@ -601,7 +601,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,return true; } - target_ms.maps = ms->maps; + target_ms.thread = ms->thread; target_ms.map = ms->map; target_ms.sym = dl->ops.target.sym;annotation__unlock (notes);
tools/perf/ui/browsers/hists.c +2 -1
@@ -3189,7 +3189,8 @@ static int evsel__hists_browse(struct evsel *evsel, int nr_events, const char *hcase 'k' :if (browser->selection !=NULL )hists_browser__zoom_map (browser, -maps__machine (browser->selection->maps)->vmlinux_map); +maps__machine (thread__maps (browser->selection->thread) + )->vmlinux_map);continue ;case 'V' : verbose = (verbose +1 ) %4 ;
tools/perf/util/addr_location.c +0 -4
@@ -7,7 +7,6 @@void addr_location__init (struct addr_location *al) { al->thread =NULL ; - al->maps =NULL ; al->map =NULL ; al->sym =NULL ; al->srcline =NULL ;
@@ -30,16 +29,13 @@ void addr_location__exit(struct addr_location *al) {map__zput (al->map);thread__zput (al->thread); -maps__zput (al->maps); }void addr_location__copy (struct addr_location *dst,struct addr_location *src) {thread__put (dst->thread); -maps__put (dst->maps);map__put (dst->map); *dst = *src; dst->thread =thread__get (src->thread); - dst->maps =maps__get (src->maps); dst->map =map__get (src->map); }
tools/perf/util/addr_location.h +0 -1
@@ -11,7 +11,6 @@ struct symbol;struct addr_location {struct thread *thread; -struct maps *maps;struct map *map;struct symbol *sym;const char *srcline;
tools/perf/util/annotate-arch/annotate-loongarch.c +3 -2
@@ -11,6 +11,7 @@#include "../map.h" #include "../maps.h" #include "../symbol.h" +#include "../thread.h" static int loongarch_call__parse(const struct arch *arch, struct ins_operands *ops, struct map_symbol *ms,
@@ -49,7 +50,7 @@ static int loongarch_call__parse(const struct arch *arch, struct ins_operands *o .addr = map__objdump_2mem(map, ops->target.addr), }; -if (maps__find_ams (ms->maps, &target) ==0 && +if (maps__find_ams (thread__maps (ms->thread), &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
@@ -93,7 +94,7 @@ static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *o ops->target.outside = target.addr < start || target.addr > end; -if (maps__find_ams (ms->maps, &target) ==0 && +if (maps__find_ams (thread__maps (ms->thread), &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
tools/perf/util/annotate-arch/annotate-s390.c +2 -1
@@ -6,6 +6,7 @@#include "../map.h" #include "../maps.h" #include "../symbol.h" +#include "../thread.h" #include "../annotate.h" #include "../annotate-data.h"
@@ -49,7 +50,7 @@ static int s390_call__parse(const struct arch *arch, struct ins_operands *ops, .addr = map__objdump_2mem(map, ops->target.addr), }; -if (maps__find_ams (ms->maps, &target) ==0 && +if (maps__find_ams (thread__maps (ms->thread), &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
tools/perf/util/callchain.c +7 -5
@@ -31,6 +31,7 @@#include "callchain.h" #include "branch.h" #include "symbol.h" +#include "thread.h" #include "util.h" #include "../perf.h"
@@ -1042,7 +1043,7 @@ merge_chain_branch(struct callchain_cursor *cursor,list_for_each_entry_safe (list, next_list, &src->val, list) {struct map_symbol ms = { - .maps =maps__get (list->ms.maps), + .thread =thread__get (list->ms.thread), .map =map__get (list->ms.map), };callchain_cursor_append (cursor, list->ip, &ms, false,NULL ,0 ,0 ,0 , list->srcline);
@@ -1147,10 +1148,11 @@ int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sampint fill_callchain_info (struct addr_location *al,struct callchain_cursor_node *node,bool hide_unresolved) { -struct machine *machine = node->ms.maps ?maps__machine (node->ms.maps) :NULL ; +struct machine *machine =NULL ; + +if (node->ms.thread) + machine =maps__machine (thread__maps (node->ms.thread)); -maps__put (al->maps); - al->maps =maps__get (node->ms.maps);map__put (al->map); al->map =map__get (node->ms.map); al->sym = node->ms.sym;
@@ -1163,7 +1165,7 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *if (al->map ==NULL ) goto out; } -if (maps__equal (al->maps,machine__kernel_maps (machine))) { +if (maps__equal (thread__maps (al->thread),machine__kernel_maps (machine))) {if (machine__is_host (machine)) { al->cpumode =PERF_RECORD_MISC_KERNEL ; al->level ='k' ;
tools/perf/util/capstone.c +4 -2
@@ -268,7 +268,8 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, !strcmp(args->options->disassembler_style, "att")) disassembler_style = true; -if (capstone_init (maps__machine (args->ms->maps), &handle, is_64bit, disassembler_style) <0 ) +if (capstone_init (maps__machine (thread__maps (args->ms->thread)), &handle, is_64bit, + disassembler_style) <0 ) goto err; needs_cs_close = true;
@@ -382,7 +383,8 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused, !strcmp(args->options->disassembler_style, "att")) disassembler_style = true; -if (capstone_init (maps__machine (args->ms->maps), &handle, is_64bit, disassembler_style) <0 ) +if (capstone_init (maps__machine (thread__maps (args->ms->thread)), &handle, is_64bit, + disassembler_style) <0 ) goto err; needs_cs_close = true;
tools/perf/util/db-export.c +0 -1
@@ -254,7 +254,6 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,addr_location__init (&al); al.sym = node->ms.sym; al.map =map__get (node->ms.map); - al.maps =maps__get (thread__maps (thread)); al.addr = node->ip; al.thread =thread__get (thread);
tools/perf/util/disasm.c +4 -3
@@ -28,6 +28,7 @@#include "namespaces.h" #include "srcline.h" #include "symbol.h" +#include "thread.h" #include "util.h" static regex_t file_lineno;
@@ -277,7 +278,7 @@ static int call__parse(const struct arch *arch, struct ins_operands *ops, struct .addr = map__objdump_2mem(map, ops->target.addr), }; -if (maps__find_ams (ms->maps, &target) ==0 && +if (maps__find_ams (thread__maps (ms->thread), &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
@@ -411,7 +412,7 @@ static int jump__parse(const struct arch *arch, struct ins_operands *ops, struct* Actual navigation will come next, with further understanding of how * the symbol searching and disassembly should be done. */ -if (maps__find_ams (ms->maps, &target) ==0 && +if (maps__find_ams (thread__maps (ms->thread), &target) ==0 &&map__rip_2objdump (target.ms.map,map__map_ip (target.ms.map, target.addr)) == ops->target.addr) ops->target.sym = target.ms.sym;
@@ -1074,7 +1075,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, .ms = { .map = map__get(map), }, }; -if (!maps__find_ams (args->ms->maps, &target) && +if (!maps__find_ams (thread__maps (args->ms->thread), &target) && target.ms.sym->start == target.al_addr) dl->ops.target.sym = target.ms.sym;
tools/perf/util/event.c +0 -2
@@ -698,7 +698,6 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,struct machine *machine =maps__machine (maps);bool load_map = false; -maps__zput (al->maps);map__zput (al->map);thread__zput (al->thread); al->thread =thread__get (thread);
@@ -736,7 +735,6 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,return NULL ; } - al->maps =maps__get (maps); al->map =maps__find (maps, al->addr);if (al->map !=NULL ) {/*
tools/perf/util/hist.c +9 -9
@@ -251,7 +251,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)if (h->cgroup) {const char *cgrp_name ="unknown" ; -struct cgroup *cgrp =cgroup__find (maps__machine (h->ms.maps)->env, +struct cgroup *cgrp =cgroup__find (maps__machine (thread__maps (h->ms.thread))->env, h->cgroup);if (cgrp !=NULL ) cgrp_name = cgrp->name;
@@ -536,7 +536,7 @@ static int hist_entry__init(struct hist_entry *he,memset (&he->stat,0 ,sizeof (he->stat)); } - he->ms.maps =maps__get (he->ms.maps); + he->ms.thread =thread__get (he->ms.thread); he->ms.map =map__get (he->ms.map);if (he->branch_info) {
@@ -552,9 +552,9 @@ static int hist_entry__init(struct hist_entry *he,memcpy (he->branch_info, template->branch_info,sizeof (*he->branch_info)); - he->branch_info->from.ms.maps =maps__get (he->branch_info->from.ms.maps); + he->branch_info->from.ms.thread =thread__get (he->branch_info->from.ms.thread); he->branch_info->from.ms.map =map__get (he->branch_info->from.ms.map); - he->branch_info->to.ms.maps =maps__get (he->branch_info->to.ms.maps); + he->branch_info->to.ms.thread =thread__get (he->branch_info->to.ms.thread); he->branch_info->to.ms.map =map__get (he->branch_info->to.ms.map); }
@@ -810,7 +810,7 @@ __hists__add_entry(struct hists *hists, }, .cgroup = sample->cgroup, .ms = { - .maps = al->maps, + .thread = al->thread, .map = al->map, .sym = al->sym, },
@@ -890,7 +890,7 @@ struct hist_entry *hists__add_entry_block(struct hists *hists, .block_info = block_info, .hists = hists, .ms = { - .maps = al->maps, + .thread = al->thread, .map = al->map, .sym = al->sym, },
@@ -1020,8 +1020,8 @@ iter_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *al)if (iter->curr >= iter->total)return 0 ; -maps__put (al->maps); - al->maps =maps__get (bi[i].to.ms.maps); +thread__put (al->thread); + al->thread =thread__get (bi[i].to.ms.thread);map__put (al->map); al->map =map__get (bi[i].to.ms.map); al->sym = bi[i].to.ms.sym;
@@ -1232,7 +1232,7 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, .comm = thread__comm(al->thread), .ip = al->addr, .ms = { - .maps = al->maps, + .thread = al->thread, .map = al->map, .sym = al->sym, },
tools/perf/util/machine.c +7 -6
@@ -2016,7 +2016,7 @@ static void ip__resolve_ams(struct thread *thread, ams->addr = ip; ams->al_addr = al.addr; ams->al_level = al.level; - ams->ms.maps =maps__get (al.maps); + ams->ms.thread =thread__get (al.thread); ams->ms.sym = al.sym; ams->ms.map =map__get (al.map); ams->phys_addr =0 ;
@@ -2037,7 +2037,7 @@ static void ip__resolve_data(struct thread *thread, ams->addr = addr; ams->al_addr = al.addr; ams->al_level = al.level; - ams->ms.maps =maps__get (al.maps); + ams->ms.thread =thread__get (al.thread); ams->ms.sym = al.sym; ams->ms.map =map__get (al.map); ams->phys_addr = phys_addr;
@@ -2120,7 +2120,7 @@ static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms } ilist_ms = (struct map_symbol ) { - .maps =maps__get (ms->maps), + .thread =thread__get (ms->thread), .map =map__get (map), };list_for_each_entry (ilist, &inline_node->val, list) {
@@ -2220,7 +2220,7 @@ static int add_callchain_ip(struct thread *thread, iter_cycles = iter->cycles; } - ms.maps =maps__get (al.maps); + ms.thread =thread__get (al.thread); ms.map =map__get (al.map); ms.sym = al.sym;
@@ -2383,7 +2383,7 @@ static void save_lbr_cursor_node(struct thread *thread,map_symbol__exit (&lbr_stitch->prev_lbr_cursor[idx].ms);memcpy (&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,sizeof (struct callchain_cursor_node )); - lbr_stitch->prev_lbr_cursor[idx].ms.maps =maps__get (cursor->curr->ms.maps); + lbr_stitch->prev_lbr_cursor[idx].ms.thread =thread__get (cursor->curr->ms.thread); lbr_stitch->prev_lbr_cursor[idx].ms.map =map__get (cursor->curr->ms.map); lbr_stitch->prev_lbr_cursor[idx].valid = true;
@@ -2596,7 +2596,8 @@ static bool has_stitched_lbr(struct thread *thread,memcpy (&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],sizeof (struct callchain_cursor_node )); - stitch_node->cursor.ms.maps =maps__get (lbr_stitch->prev_lbr_cursor[i].ms.maps); + stitch_node->cursor.ms.thread = +thread__get (lbr_stitch->prev_lbr_cursor[i].ms.thread); stitch_node->cursor.ms.map =map__get (lbr_stitch->prev_lbr_cursor[i].ms.map);if (callee)
tools/perf/util/map_symbol.c +3 -2
@@ -2,10 +2,11 @@#include "map_symbol.h" #include "maps.h" #include "map.h" +#include "thread.h" void map_symbol__exit (struct map_symbol *ms) { -maps__zput (ms->maps); +thread__zput (ms->thread);map__zput (ms->map); }
@@ -16,7 +17,7 @@ void addr_map_symbol__exit(struct addr_map_symbol *ams)void map_symbol__copy (struct map_symbol *dst,struct map_symbol *src) { - dst->maps =maps__get (src->maps); + dst->thread =thread__get (src->thread); dst->map =map__get (src->map); dst->sym = src->sym; }
tools/perf/util/map_symbol.h +2 -1
@@ -4,12 +4,13 @@#include <linux/types.h> +struct thread ;struct maps ;struct map ;struct symbol ;struct map_symbol { -struct maps *maps; +struct thread *thread;struct map *map;struct symbol *sym; };
tools/perf/util/sort.c +1 -1
@@ -1016,7 +1016,7 @@ static int hist_entry__cgroup_snprintf(struct hist_entry *he,const char *cgrp_name ="N/A" ;if (he->cgroup) { -struct cgroup *cgrp =cgroup__find (maps__machine (he->ms.maps)->env, +struct cgroup *cgrp =cgroup__find (maps__machine (thread__maps (he->ms.thread))->env, he->cgroup);if (cgrp !=NULL ) cgrp_name = cgrp->name;
tools/perf/util/unwind-libdw.c +1 -1
@@ -161,7 +161,7 @@ static int entry(u64 ip, struct unwind_info *ui) } e->ip = ip; - e->ms.maps =maps__get (al.maps); + e->ms.thread =thread__get (al.thread); e->ms.map =map__get (al.map); e->ms.sym = al.sym;
tools/perf/util/unwind-libunwind-local.c +1 -1
@@ -666,7 +666,7 @@ static int entry(u64 ip, struct thread *thread, e.ms.sym =thread__find_symbol (thread,PERF_RECORD_MISC_USER , ip, &al); e.ip = ip; e.ms.map = al.map; - e.ms.maps = al.maps; + e.ms.thread =thread__get (al.thread); pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n", al.sym ? al.sym->name : "''",
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Ian Rogers
reviewerPATCH v3 11/12 perf disasm: Refactor arch__find and initialization of arch structs
In reply to Ian RogersSwitch arch__find to using an ELF machine number rather than a string. Rather than an array of fixed size arch structs turn the init functions into new functions indexed by the ELF machine they correspond to. This allows data to be stored with a struct arch with the container_of trick, so the priv variable can be removed. Switch to using the thread to find the arch rather than the evsel as the evsel only has limited notions of the running thread upon which disassembly is performed. Factor out the e_machine and e_flags into their own struct to make them easier to pass around.
--- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/util/annotate-arch/annotate-arc.c | 14 +- tools/perf/util/annotate-arch/annotate-arm.c | 39 ++--- .../perf/util/annotate-arch/annotate-arm64.c | 39 ++--- tools/perf/util/annotate-arch/annotate-csky.c | 14 +- .../util/annotate-arch/annotate-loongarch.c | 19 ++- tools/perf/util/annotate-arch/annotate-mips.c | 19 ++- .../util/annotate-arch/annotate-powerpc.c | 24 +-- .../util/annotate-arch/annotate-riscv64.c | 19 ++- tools/perf/util/annotate-arch/annotate-s390.c | 29 ++-- .../perf/util/annotate-arch/annotate-sparc.c | 19 ++- tools/perf/util/annotate-arch/annotate-x86.c | 24 +-- tools/perf/util/annotate.c | 46 +++--- tools/perf/util/annotate.h | 2 +- tools/perf/util/disasm.c | 153 ++++++++---------- tools/perf/util/disasm.h | 59 +++---- 16 files changed, 279 insertions(+), 242 deletions(-)
tools/perf/ui/browsers/annotate.c +1 -1
@@ -1198,7 +1198,7 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,ui__warning ("Annotation has no source code." ); } }else { - err =evsel__get_arch (evsel, &browser.arch); + err =thread__get_arch (ms->thread, &browser.arch);if (err) {annotate_browser__symbol_annotate_error (&browser, err);return -1 ;
tools/perf/util/annotate-arch/annotate-arc.c +11 -3
@@ -1,10 +1,18 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/compiler.h> +#include <linux/zalloc.h> #include "../disasm.h" -int arc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_arc (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { - arch->initialized = true; +struct arch *arch =zalloc (sizeof (*arch)); + +if (!arch) +return NULL ; + + arch->name ="arc" ; + arch->id = *id; arch->objdump.comment_char =';' ; -return 0 ; +return arch; }
tools/perf/util/annotate-arch/annotate-arm.c +21 -18
@@ -7,14 +7,15 @@#include "../annotate.h" #include "../disasm.h" -struct arm_annotate { -regex_t call_insn, - jump_insn; +struct arch_arm { +struct arch arch; +regex_t call_insn; +regex_t jump_insn; };static const struct ins_ops *arm__associate_instruction_ops (struct arch *arch,const char *name) { -struct arm_annotate *arm = arch->priv; + struct arch_arm *arm = container_of(arch, struct arch_arm, arch);const struct ins_ops *ops;regmatch_t match[2 ];
@@ -29,37 +30,39 @@ static const struct ins_ops *arm__associate_instruction_ops(struct arch *arch, creturn ops; } -int arm__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_arm (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -struct arm_annotate *arm;int err; +struct arch_arm *arm =zalloc (sizeof (*arm)); +struct arch *arch; -if (arch->initialized) -return 0 ; - - arm =zalloc (sizeof (*arm));if (!arm) -return ENOMEM ; +return NULL ; + + arch = &arm->arch; + arch->name ="arm" ; + arch->id = *id; + arch->objdump.comment_char =';' ; + arch->objdump.skip_functions_char ='+' ; + arch->associate_instruction_ops = arm__associate_instruction_ops;#define ARM_CONDS "(cc|cs|eq|ge|gt|hi|le|ls|lt|mi|ne|pl|vc|vs)" err =regcomp (&arm->call_insn,"^blx?" ARM_CONDS "?$" ,REG_EXTENDED );if (err) goto out_free_arm; + err =regcomp (&arm->jump_insn,"^bx?" ARM_CONDS "?$" ,REG_EXTENDED );if (err) goto out_free_call;#undef ARM_CONDS - arch->initialized = true; - arch->priv = arm; - arch->associate_instruction_ops = arm__associate_instruction_ops; - arch->objdump.comment_char =';' ; - arch->objdump.skip_functions_char ='+' ; -return 0 ; +return arch; out_free_call:regfree (&arm->call_insn); out_free_arm:free (arm); -return SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP ; + errno =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP ; +return NULL ; }
tools/perf/util/annotate-arch/annotate-arm64.c +21 -18
@@ -8,9 +8,10 @@#include "../annotate.h" #include "../disasm.h" -struct arm64_annotate { -regex_t call_insn, - jump_insn; +struct arch_arm64 { +struct arch arch; +regex_t call_insn; +regex_t jump_insn; }; static int arm64_mov__parse(const struct arch *arch __maybe_unused,
@@ -70,7 +71,7 @@ static const struct ins_ops arm64_mov_ops = {static const struct ins_ops *arm64__associate_instruction_ops (struct arch *arch,const char *name) { -struct arm64_annotate *arm = arch->priv; + struct arch_arm64 *arm = container_of(arch, struct arch_arm64, arch);const struct ins_ops *ops;regmatch_t match[2 ];
@@ -87,38 +88,40 @@ static const struct ins_ops *arm64__associate_instruction_ops(struct arch *arch,return ops; } -int arm64__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_arm64 (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -struct arm64_annotate *arm;int err; +struct arch_arm64 *arm =zalloc (sizeof (*arm)); +struct arch *arch; -if (arch->initialized) -return 0 ; - - arm =zalloc (sizeof (*arm));if (!arm) -return ENOMEM ; +return NULL ; + + arch = &arm->arch; + arch->name ="arm64" ; + arch->id = *id; + arch->objdump.comment_char ='/' ; + arch->objdump.skip_functions_char ='+' ; + arch->associate_instruction_ops = arm64__associate_instruction_ops;/* bl, blr */ err =regcomp (&arm->call_insn,"^blr?$" ,REG_EXTENDED );if (err) goto out_free_arm; +/* b, b.cond, br, cbz/cbnz, tbz/tbnz */ err =regcomp (&arm->jump_insn,"^[ct]?br?\\.?(cc|cs|eq|ge|gt|hi|hs|le|lo|ls|lt|mi|ne|pl|vc|vs)?n?z?$" ,REG_EXTENDED );if (err) goto out_free_call; - arch->initialized = true; - arch->priv = arm; - arch->associate_instruction_ops = arm64__associate_instruction_ops; - arch->objdump.comment_char ='/' ; - arch->objdump.skip_functions_char ='+' ; -return 0 ; +return arch; out_free_call:regfree (&arm->call_insn); out_free_arm:free (arm); -return SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP ; + errno =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP ; +return NULL ; }
tools/perf/util/annotate-arch/annotate-csky.c +11 -3
@@ -2,6 +2,7 @@// Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. #include <string.h> #include <linux/compiler.h> +#include <linux/zalloc.h> #include "../disasm.h" static const struct ins_ops *csky__associate_ins_ops(struct arch *arch,
@@ -39,10 +40,17 @@ static const struct ins_ops *csky__associate_ins_ops(struct arch *arch,return ops; } -int csky__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_csky (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { - arch->initialized = true; +struct arch *arch =zalloc (sizeof (*arch)); + +if (!arch) +return NULL ; + + arch->name ="csky" ; + arch->id = *id; arch->objdump.comment_char ='/' ; arch->associate_instruction_ops = csky__associate_ins_ops; -return 0 ; +return arch; }
tools/perf/util/annotate-arch/annotate-loongarch.c +12 -7
@@ -7,6 +7,7 @@#include <stdlib.h> #include <string.h> #include <linux/compiler.h> +#include <linux/zalloc.h> #include "../disasm.h" #include "../map.h" #include "../maps.h"
@@ -139,13 +140,17 @@ const struct ins_ops *loongarch__associate_ins_ops(struct arch *arch, const charreturn ops; } -int loongarch__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_loongarch (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -if (!arch->initialized) { - arch->associate_instruction_ops = loongarch__associate_ins_ops; - arch->initialized = true; - arch->objdump.comment_char ='#' ; - } +struct arch *arch =zalloc (sizeof (*arch)); -return 0 ; +if (!arch) +return NULL ; + + arch->name ="loongarch" ; + arch->id = *id; + arch->associate_instruction_ops = loongarch__associate_ins_ops; + arch->objdump.comment_char ='#' ; +return arch; }
tools/perf/util/annotate-arch/annotate-mips.c +12 -7
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <string.h> #include <linux/compiler.h> +#include <linux/zalloc.h> #include "../disasm.h" static
@@ -36,13 +37,17 @@ const struct ins_ops *mips__associate_ins_ops(struct arch *arch, const char *namreturn ops; } -int mips__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_mips (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -if (!arch->initialized) { - arch->associate_instruction_ops = mips__associate_ins_ops; - arch->initialized = true; - arch->objdump.comment_char ='#' ; - } +struct arch *arch =zalloc (sizeof (*arch)); -return 0 ; +if (!arch) +return NULL ; + + arch->name ="mips" ; + arch->id = *id; + arch->objdump.comment_char ='#' ; + arch->associate_instruction_ops = mips__associate_ins_ops; +return arch; }
tools/perf/util/annotate-arch/annotate-powerpc.c +14 -10
@@ -390,17 +390,21 @@ static void update_insn_state_powerpc(struct type_state *state, }#endif /* HAVE_LIBDW_SUPPORT */ -int powerpc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_powerpc (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -if (!arch->initialized) { - arch->initialized = true; - arch->associate_instruction_ops = powerpc__associate_instruction_ops; - arch->objdump.comment_char ='#' ; - annotate_opts.show_asm_raw = true; +struct arch *arch =zalloc (sizeof (*arch)); + +if (!arch) +return NULL ; + + arch->name ="powerpc" ; + arch->id = *id; + arch->objdump.comment_char ='#' ; + annotate_opts.show_asm_raw = true; + arch->associate_instruction_ops = powerpc__associate_instruction_ops;#ifdef HAVE_LIBDW_SUPPORT - arch->update_insn_state = update_insn_state_powerpc; + arch->update_insn_state = update_insn_state_powerpc;#endif - } - -return 0 ; +return arch; }
tools/perf/util/annotate-arch/annotate-riscv64.c +12 -7
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <string.h> #include <linux/compiler.h> +#include <linux/zalloc.h> #include "../disasm.h" static
@@ -24,13 +25,17 @@ const struct ins_ops *riscv64__associate_ins_ops(struct arch *arch, const char *return ops; } -int riscv64__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_riscv64 (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -if (!arch->initialized) { - arch->associate_instruction_ops = riscv64__associate_ins_ops; - arch->initialized = true; - arch->objdump.comment_char ='#' ; - } +struct arch *arch =zalloc (sizeof (*arch)); -return 0 ; +if (!arch) +return NULL ; + + arch->name ="riscv" ; + arch->id = *id; + arch->objdump.comment_char ='#' ; + arch->associate_instruction_ops = riscv64__associate_ins_ops; +return arch; }
tools/perf/util/annotate-arch/annotate-s390.c +16 -13
@@ -148,7 +148,7 @@ static const struct ins_ops *s390__associate_ins_ops(struct arch *arch, const chreturn ops; } -static int s390__cpuid_parse (struct arch *arch,char *cpuid) +static int s390__cpuid_parse (struct arch *arch,const char *cpuid) {unsigned int family;char model[16 ], model_c[16 ], cpumf_v[16 ], cpumf_a[16 ];
@@ -169,19 +169,22 @@ static int s390__cpuid_parse(struct arch *arch, char *cpuid)return -1 ; } -int s390__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_s390 (const struct e_machine_and_e_flags *id,const char *cpuid) { -int err =0 ; - -if (!arch->initialized) { - arch->initialized = true; - arch->associate_instruction_ops = s390__associate_ins_ops; -if (cpuid) { -if (s390__cpuid_parse (arch, cpuid)) - err =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; +struct arch *arch =zalloc (sizeof (*arch)); + +if (!arch) +return NULL ; + + arch->name ="s390" ; + arch->id = *id; + arch->associate_instruction_ops = s390__associate_ins_ops; +if (cpuid) { +if (s390__cpuid_parse (arch, cpuid)) { + errno =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; +return NULL ; } - arch->objdump.comment_char ='#' ; } - -return err; + arch->objdump.comment_char ='#' ; +return arch; }
tools/perf/util/annotate-arch/annotate-sparc.c +12 -7
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <string.h> #include <linux/compiler.h> +#include <linux/zalloc.h> #include "../../util/disasm.h" static int is_branch_cond (const char *cond)
@@ -160,13 +161,17 @@ static const struct ins_ops *sparc__associate_instruction_ops(struct arch *arch,return ops; } -int sparc__annotate_init (struct arch *arch,char *cpuid__maybe_unused ) +const struct arch *arch__new_sparc (const struct e_machine_and_e_flags *id, +const char *cpuid__maybe_unused ) { -if (!arch->initialized) { - arch->initialized = true; - arch->associate_instruction_ops = sparc__associate_instruction_ops; - arch->objdump.comment_char ='#' ; - } +struct arch *arch =zalloc (sizeof (*arch)); -return 0 ; +if (!arch) +return NULL ; + + arch->name ="sparc" ; + arch->id = *id; + arch->associate_instruction_ops = sparc__associate_instruction_ops; + arch->objdump.comment_char ='#' ; +return arch; }
tools/perf/util/annotate-arch/annotate-x86.c +12 -12
@@ -182,7 +182,7 @@ static bool intel__ins_is_fused(const struct arch *arch, const char *ins1,return false; } -static int x86__cpuid_parse (struct arch *arch,char *cpuid) +static int x86__cpuid_parse (struct arch *arch,const char *cpuid) {unsigned int family, model, stepping;int ret;
@@ -777,18 +777,21 @@ static void update_insn_state_x86(struct type_state *state, }#endif -int x86__annotate_init (struct arch *arch,char *cpuid) +const struct arch *arch__new_x86 (const struct e_machine_and_e_flags *id,const char *cpuid) { -int err =0 ; +struct arch *arch =zalloc (sizeof (*arch)); -if (arch->initialized) -return 0 ; +if (!arch) +return NULL ; + arch->name ="x86" ; + arch->id = *id;if (cpuid) { -if (x86__cpuid_parse (arch, cpuid)) - err =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; +if (x86__cpuid_parse (arch, cpuid)) { + errno =SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING ; +return NULL ; + } } - arch->instructions = x86__instructions; arch->nr_instructions =ARRAY_SIZE (x86__instructions);#ifndef NDEBUG
@@ -810,11 +813,8 @@ int x86__annotate_init(struct arch *arch, char *cpuid) arch->objdump.memory_ref_char ='(' ; arch->objdump.imm_char ='$' ; arch->insn_suffix ="bwlq" ; - arch->e_machine =EM_X86_64 ; - arch->e_flags =0 ; - arch->initialized = true;#ifdef HAVE_LIBDW_SUPPORT arch->update_insn_state = update_insn_state_x86;#endif -return err; +return arch; }
tools/perf/util/annotate.c +22 -24
97 lines not on this page · raw message
tools/perf/util/annotate.h +1 -1
@@ -586,5 +586,5 @@ int annotation_br_cntr_entry(char **str, int br_cntr_nr, u64 *br_cntr, int num_aggr, struct evsel *evsel);int annotation_br_cntr_abbr_list (char **str,struct evsel *evsel,bool header); -int evsel__get_arch (struct evsel *evsel,const struct arch **parch); +int thread__get_arch (struct thread *thread,const struct arch **parch);#endif /* __PERF_ANNOTATE_H */
tools/perf/util/disasm.c +71 -82
183 lines not on this page · raw message
tools/perf/util/disasm.h +30 -29
90 lines not on this page · raw message
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Arnaldo Carvalho de Melo
maintainerRe: [PATCH v3 11/12] perf disasm: Refactor arch__find and initialization of arch structs
Quoted 9 lines · Ian Rogers
Switch
arch__findto using an ELF machine number rather than a string. Rather than an array of fixed size arch structs turn the init functions into new functions indexed by the ELF machine they correspond to. This allows data to be stored with a struct arch with thecontainer_oftrick, so the priv variable can be removed. Switch to using the thread to find the arch rather than the evsel as the evsel only has limited notions of the running thread upon which disassembly is performed. Factor out thee_machineande_flagsinto their own struct to make them easier to pass around.
Added:
⬢ [acme@toolbx perf-tools-next]$ git diff
tools/perf/util/disasm.c +4 -0
@@ -1,5 +1,9 @@// SPDX-License-Identifier: GPL-2.0-only #include <ctype.h> +#include <elf.h> +#ifndef EF_CSKY_ABIMASK +#define EF_CSKY_ABIMASK 0XF0000000 +#endif #include <errno.h> #include <fcntl.h> #include <inttypes.h>
With:
[ Include elf.h for EM_CSKY and friends and also conditionally define EM_CSKY_ABIMASK for old distros ]
Ian Rogers
reviewerPATCH v3 12/12 perf disasm: Minor layout tweaks for struct arch
In reply to Ian RogersPack some holes to bring down the overall struct size from 96 to 88 bytes.
--- tools/perf/util/disasm.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/perf/util/disasm.h +4 -4
@@ -18,22 +18,22 @@ struct type_state;struct disasm_line ;struct e_machine_and_e_flags { -uint16_t e_machine;uint32_t e_flags; +uint16_t e_machine; };struct arch { -/** @id: ELF machine and flags associated with arch. */ -struct e_machine_and_e_flags id;/** @name: name such as "x86" or "powerpc". */ const char *name;const struct ins *instructions;size_t nr_instructions;size_t nr_instructions_allocated; -bool sorted_instructions;const char *insn_suffix;unsigned int model;unsigned int family; +/** @id: ELF machine and flags associated with arch. */ +struct e_machine_and_e_flags id; +bool sorted_instructions;struct {char comment_char;char skip_functions_char;
Signature · 1 line
2.52.0.457.g6b5491de43-goog
Quoted 86 lines · Ian Rogers
3 initial memory leak fix patches for perf annotate.
Move the
disasm.c#included arch files into a new util/annotate-arch directory. Make the code compile standalone. Try to better encapsulate architecture specific code within the files and with a arch__new_<arch> function that allows additional data to be associated with the struct arch using the standardcontainer_oftrick.Make the lookup of struct arch use the ELF machine gather from a thread rather than an evsel. For example, the evsel can't determine the difference between
EM_386andEM_X86_64so generally the latter has currently been used. This means the dwarf registers are off as register 1 is CX withEM_386and DX withEM_X86_64. To facilitate this changemap_symbolis refactored to use a struct thread rather than a struct maps, the maps being obtainable from the thread.To make in and out arguments clearer, for safety, etc. try to constify struct arch and its related structs.
v3: Fix arch initialization on arm, arm64, powerpc and sparc as spotted by Suchit
Karunakaranw.v2: Add a patch to fix a domain info memory leak that was blocking
leak sanitizer analysis. Fix moremap_symbolleaks or uses after reference count put (Suchit Karunakaranw <[email protected]>). Try to repro annotate test crash (James Clark) but suspect it was addressed in the other reference count fixes.
https://lore.kernel.org/lkml/[email protected]/v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (12):
perf header: Fix memory leaks inprocess_cpu_domain_infoperf annotate: Fix args leak ofmap_symbol
perf maps: Fix reference count leak inmaps__find_ams
perf disasm: Constify use of struct arch
perf disasm: Constify use of structins_op
perf disasm: Constify use of struct ins
perf disasm: Rework the stringarch__isto use the ELF machine perf disasm: Don't include C files from the arch directory perf disasm: Refactor ins__is_call/jump to avoid exposing archins_opsperfmap_symbol: Switch from holding maps to holding thread perf disasm: Refactorarch__findand initialization of arch structs perf disasm: Minor layout tweaks for struct archtools/perf/arch/arc/annotate/instructions.c | 11 - .../perf/arch/riscv64/annotate/instructions.c | 36 -- tools/perf/ui/browsers/annotate.c | 6 +- tools/perf/ui/browsers/hists.c | 3 +- tools/perf/util/Build | 1 + tools/perf/util/addr_location.c | 4 - tools/perf/util/addr_location.h | 1 - tools/perf/util/annotate-arch/Build | 11 + tools/perf/util/annotate-arch/annotate-arc.c | 18 + .../annotate-arch/annotate-arm.c} | 50 +- .../annotate-arch/annotate-arm64.c} | 59 +-- .../annotate-arch/annotate-csky.c} | 29 +- .../annotate-arch/annotate-loongarch.c} | 71 +-- .../annotate-arch/annotate-mips.c} | 29 +- .../annotate-arch/annotate-powerpc.c} | 127 +++++- .../util/annotate-arch/annotate-riscv64.c | 41 ++ .../annotate-arch/annotate-s390.c} | 70 +-- .../annotate-arch/annotate-sparc.c} | 28 +- .../annotate-arch/annotate-x86.c} | 89 ++-- tools/perf/util/annotate-data.c | 12 +- tools/perf/util/annotate-data.h | 2 +- tools/perf/util/annotate.c | 88 ++-- tools/perf/util/annotate.h | 10 +- tools/perf/util/callchain.c | 12 +- tools/perf/util/capstone.c | 18 +- tools/perf/util/db-export.c | 1 - tools/perf/util/disasm.c | 428 +++++++----------- tools/perf/util/disasm.h | 95 ++-- tools/perf/util/event.c | 2 - tools/perf/util/header.c | 17 +- tools/perf/util/hist.c | 18 +- tools/perf/util/llvm.c | 8 +- tools/perf/util/machine.c | 13 +- tools/perf/util/map_symbol.c | 5 +- tools/perf/util/map_symbol.h | 3 +- tools/perf/util/maps.c | 1 + tools/perf/util/sort.c | 2 +- tools/perf/util/unwind-libdw.c | 2 +- tools/perf/util/unwind-libunwind-local.c | 2 +- 39 files changed, 775 insertions(+), 648 deletions(-)
Quoted 15 lines
delete mode 100644
tools/perf/arch/arc/annotate/instructions.c
delete mode 100644tools/perf/arch/riscv64/annotate/instructions.c
create mode 100644tools/perf/util/annotate-arch/Build
create mode 100644tools/perf/util/annotate-arch/annotate-arc.c
renametools/perf/{arch/arm/annotate/instructions.c=>util/annotate-arch/annotate-arm.c} (59%) renametools/perf/{arch/arm64/annotate/instructions.c=>util/annotate-arch/annotate-arm64.c} (70%) renametools/perf/{arch/csky/annotate/instructions.c=>util/annotate-arch/annotate-csky.c} (67%) renametools/perf/{arch/loongarch/annotate/instructions.c=>util/annotate-arch/annotate-loongarch.c} (60%) renametools/perf/{arch/mips/annotate/instructions.c=>util/annotate-arch/annotate-mips.c} (59%) renametools/perf/{arch/powerpc/annotate/instructions.c=>util/annotate-arch/annotate-powerpc.c} (73%) create mode 100644tools/perf/util/annotate-arch/annotate-riscv64.c
renametools/perf/{arch/s390/annotate/instructions.c=>util/annotate-arch/annotate-s390.c} (66%) renametools/perf/{arch/sparc/annotate/instructions.c=>util/annotate-arch/annotate-sparc.c} (85%) renametools/perf/{arch/x86/annotate/instructions.c=>util/annotate-arch/annotate-x86.c} (93%)
Ian Rogers
reviewerQuoted 106 lines · James Clark
Quoted 86 lines · Ian Rogers
3 initial memory leak fix patches for perf annotate.
Move the
disasm.c#included arch files into a new util/annotate-arch directory. Make the code compile standalone. Try to better encapsulate architecture specific code within the files and with a arch__new_<arch> function that allows additional data to be associated with the struct arch using the standardcontainer_oftrick.Make the lookup of struct arch use the ELF machine gather from a thread rather than an evsel. For example, the evsel can't determine the difference between
EM_386andEM_X86_64so generally the latter has currently been used. This means the dwarf registers are off as register 1 is CX withEM_386and DX withEM_X86_64. To facilitate this changemap_symbolis refactored to use a struct thread rather than a struct maps, the maps being obtainable from the thread.To make in and out arguments clearer, for safety, etc. try to constify struct arch and its related structs.
v3: Fix arch initialization on arm, arm64, powerpc and sparc as spotted by Suchit
Karunakaranw.v2: Add a patch to fix a domain info memory leak that was blocking
leak sanitizer analysis. Fix moremap_symbolleaks or uses after reference count put (Suchit Karunakaranw <[email protected]>). Try to repro annotate test crash (James Clark) but suspect it was addressed in the other reference count fixes.
https://lore.kernel.org/lkml/[email protected]/v1: https://lore.kernel.org/lkml/[email protected]/
Ian Rogers (12):
perf header: Fix memory leaks inprocess_cpu_domain_infoperf annotate: Fix args leak ofmap_symbol
perf maps: Fix reference count leak inmaps__find_ams
perf disasm: Constify use of struct arch
perf disasm: Constify use of structins_op
perf disasm: Constify use of struct ins
perf disasm: Rework the stringarch__isto use the ELF machine perf disasm: Don't include C files from the arch directory perf disasm: Refactor ins__is_call/jump to avoid exposing archins_opsperfmap_symbol: Switch from holding maps to holding thread perf disasm: Refactorarch__findand initialization of arch structs perf disasm: Minor layout tweaks for struct archtools/perf/arch/arc/annotate/instructions.c | 11 - .../perf/arch/riscv64/annotate/instructions.c | 36 -- tools/perf/ui/browsers/annotate.c | 6 +- tools/perf/ui/browsers/hists.c | 3 +- tools/perf/util/Build | 1 + tools/perf/util/addr_location.c | 4 - tools/perf/util/addr_location.h | 1 - tools/perf/util/annotate-arch/Build | 11 + tools/perf/util/annotate-arch/annotate-arc.c | 18 + .../annotate-arch/annotate-arm.c} | 50 +- .../annotate-arch/annotate-arm64.c} | 59 +-- .../annotate-arch/annotate-csky.c} | 29 +- .../annotate-arch/annotate-loongarch.c} | 71 +-- .../annotate-arch/annotate-mips.c} | 29 +- .../annotate-arch/annotate-powerpc.c} | 127 +++++- .../util/annotate-arch/annotate-riscv64.c | 41 ++ .../annotate-arch/annotate-s390.c} | 70 +-- .../annotate-arch/annotate-sparc.c} | 28 +- .../annotate-arch/annotate-x86.c} | 89 ++-- tools/perf/util/annotate-data.c | 12 +- tools/perf/util/annotate-data.h | 2 +- tools/perf/util/annotate.c | 88 ++-- tools/perf/util/annotate.h | 10 +- tools/perf/util/callchain.c | 12 +- tools/perf/util/capstone.c | 18 +- tools/perf/util/db-export.c | 1 - tools/perf/util/disasm.c | 428 +++++++----------- tools/perf/util/disasm.h | 95 ++-- tools/perf/util/event.c | 2 - tools/perf/util/header.c | 17 +- tools/perf/util/hist.c | 18 +- tools/perf/util/llvm.c | 8 +- tools/perf/util/machine.c | 13 +- tools/perf/util/map_symbol.c | 5 +- tools/perf/util/map_symbol.h | 3 +- tools/perf/util/maps.c | 1 + tools/perf/util/sort.c | 2 +- tools/perf/util/unwind-libdw.c | 2 +- tools/perf/util/unwind-libunwind-local.c | 2 +- 39 files changed, 775 insertions(+), 648 deletions(-)Quoted 15 lines
delete mode 100644
tools/perf/arch/arc/annotate/instructions.c
delete mode 100644tools/perf/arch/riscv64/annotate/instructions.c
create mode 100644tools/perf/util/annotate-arch/Build
create mode 100644tools/perf/util/annotate-arch/annotate-arc.c
renametools/perf/{arch/arm/annotate/instructions.c=>util/annotate-arch/annotate-arm.c} (59%) renametools/perf/{arch/arm64/annotate/instructions.c=>util/annotate-arch/annotate-arm64.c} (70%) renametools/perf/{arch/csky/annotate/instructions.c=>util/annotate-arch/annotate-csky.c} (67%) renametools/perf/{arch/loongarch/annotate/instructions.c=>util/annotate-arch/annotate-loongarch.c} (60%) renametools/perf/{arch/mips/annotate/instructions.c=>util/annotate-arch/annotate-mips.c} (59%) renametools/perf/{arch/powerpc/annotate/instructions.c=>util/annotate-arch/annotate-powerpc.c} (73%) create mode 100644tools/perf/util/annotate-arch/annotate-riscv64.c
renametools/perf/{arch/s390/annotate/instructions.c=>util/annotate-arch/annotate-s390.c} (66%) renametools/perf/{arch/sparc/annotate/instructions.c=>util/annotate-arch/annotate-sparc.c} (85%) renametools/perf/{arch/x86/annotate/instructions.c=>util/annotate-arch/annotate-x86.c} (93%)
Quoted 1 line
Reviewed-by James Clark <[email protected]>
Thanks James!
Arnaldo, it'd be nice for this to land so I can look into addressing the missing e_flags issue - namely, we should optionally read the e_flags along with the e_machine so that we have a proper e_flags value to make csky work properly (not an issue on anything else). At the same time I think some of the e_machine should be made more robust like with:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/commit/tools/perf?h=perf-tools-next&id=e99d544c7f3691eb321c88fdbadf04b777c114c4
but here:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/thread.c?h=perf-tools-next#n452
the code should probably be shared.
Anyway, this series does enough without adding all that to it and waiting for more tags.
Thanks,
Ian
Arnaldo Carvalho de Melo
maintainerQuoted 7 lines · Ian Rogers
Quoted 3 lines · James Clark
On 22/01/2026 9:35 pm, Ian Rogers wrote:
Reviewed-by James Clark <[email protected]>Thanks James!
Quoted 12 lines
Arnaldo, it'd be nice for this to land so I can look into addressing the missing
e_flagsissue - namely, we should optionally read thee_flagsalong with thee_machineso that we have a propere_flagsvalue to make csky work properly (not an issue on anything else). At the same time I think some of thee_machineshould be made more robust like with:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/commit/tools/perf?h=perf-tools-next&id=e99d544c7f3691eb321c88fdbadf04b777c114c4
but here:
https://web.git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/thread.c?h=perf-tools-next#n452
the code should probably be shared.
Anyway, this series does enough without adding all that to it and waiting for more tags.
I just merged it and it is going on testing, I'll also check that fix for the inject callchain on hybrid since I noticed it failing here as well.
Thanks,
- Arnalod
This series was applied to riscv/linux.git (for-next) by Arnaldo Carvalho de Melo <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Arnaldo Carvalho de Melo <[email protected]>:
Quoted 9 lines · On Thu, 22 Jan 2026 13:35:04 -0800 you wrote:
3 initial memory leak fix patches for perf annotate.
Move the
disasm.c#included arch files into a new util/annotate-arch directory. Make the code compile standalone. Try to better encapsulate architecture specific code within the files and with a arch__new_<arch> function that allows additional data to be associated with the struct arch using the standardcontainer_oftrick.[...]
Here is the summary with links:
- [v3,01/12] perf header: Fix memory leaks in process_cpu_domain_info
https://git.kernel.org/riscv/c/d84f24c89886 - [v3,02/12] perf annotate: Fix args leak of map_symbol https://git.kernel.org/riscv/c/00419892bac2 - [v3,03/12] perf maps: Fix reference count leak in maps__find_ams https://git.kernel.org/riscv/c/6fdd2676db55 - [v3,04/12] perf disasm: Constify use of struct arch https://git.kernel.org/riscv/c/57d26593a92f - [v3,05/12] perf disasm: Constify use of struct ins_op https://git.kernel.org/riscv/c/1e3b91d6c53e - [v3,06/12] perf disasm: Constify use of struct ins https://git.kernel.org/riscv/c/2a1ca20d0b58 - [v3,07/12] perf disasm: Rework the string arch__is to use the ELF machine https://git.kernel.org/riscv/c/927308527310 - [v3,08/12] perf disasm: Don't include C files from the arch directory https://git.kernel.org/riscv/c/07b972ff09f4 - [v3,09/12] perf disasm: Refactor ins__is_call/jump to avoid exposing arch ins_ops https://git.kernel.org/riscv/c/5301cc698821 - [v3,10/12] perf map_symbol: Switch from holding maps to holding thread https://git.kernel.org/riscv/c/c4e3a00356ff - [v3,11/12] perf disasm: Refactor arch__find and initialization of arch structs (no matching commit) - [v3,12/12] perf disasm: Minor layout tweaks for struct arch https://git.kernel.org/riscv/c/dc329efc162a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html