perf annotate-data: Fix hangs on broken debug info, data type browser sample count, AMD mem record
Arnaldo Carvalho de Melo
maintainercover perf annotate-data: Fix hangs on broken debug info, data type browser sample count, AMD mem record
From: Arnaldo Carvalho de Melo <[email protected]>
Hi,
This originated in another patch series, 'perf tools: Annotate fixes, stdio progress indication, debuginfo-client in more places', and is being split off so that these fixes can be reviewed right away; the debuginfod download feature work from it will come later, separately, based on this series.
- 'perf report -s type' spins forever on the dwz compressed debug info of zlib-ng (libz.so.1): die_collect_vars() saves a type DIE offset that is relative to the file the DIE lives in, the dwz alt file for types shared by several CUs, and resolving it in the main file parses whatever is at that offset, here a typedef whose DW_AT_type refers to itself, making the typedef/qualifier chase spin (patch 3), with the chases bounded so that other kinds of broken debug info don't hang perf either (patches 1, 2 and 4);
- the data type browser's samples view (-n) prints a local count that is initialized to zero and never updated, so every member has no samples (patch 5);
- 'perf mem record' requests PERF_SAMPLE_CPU (patch 6) and uses the IBS swfilt filter when the kernel exposes it (patch 7), with the tables carrying the term kept in the arch/x86 code, where the knowledge that IBS needs it stays, as Ravi Bangoria suggested reviewing Namhyung Kim's v6 review remark on this patch (<[email protected]>, replying to <[email protected]>).
About PATCH 6, answering Namhyung Kim's v6 review question (<[email protected]>) about the --sample-cpu default: the data source field is about the memory hierarchy level of the access, it has no record of which CPU issued it, and while the TID is in every sample and in the CTF stream, a thread time-sliced on one CPU or moved between SMT siblings is not told apart by it from cross-core contention, so it is the CPU id that keys it, and it is what the false-sharing detector in pahole needs. The TID is recorded as well.
Requires elfutils 0.160 for dwarf_cu_getdwarf(), so the libdw feature test probes for it and Makefile.config says 0.160: older versions now disable dwarf support with that message instead of failing to link.
Best regards,
- Arnaldo
tools/build/feature/test-libdw.c | 13 ++- tools/perf/Documentation/perf-mem.txt | 4 + tools/perf/Makefile.config | 2 +- tools/perf/arch/x86/util/mem-events.c | 24 +++++ tools/perf/arch/x86/util/mem-events.h | 2 + tools/perf/arch/x86/util/pmu.c | 10 +- tools/perf/builtin-mem.c | 11 ++- tools/perf/tests/shell/test_data_symbol.sh | 6 +- tools/perf/ui/browsers/annotate-data.c | 2 +- tools/perf/util/annotate-data.c | 53 +++++++--- tools/perf/util/annotate-data.h | 3 + tools/perf/util/dwarf-aux.c | 150 ++++++++++++++++++++++++----- tools/perf/util/dwarf-aux.h | 17 ++++ tools/perf/util/mem-events.c | 11 ++- 14 files changed, 261 insertions(+), 47 deletions(-)
base-commit: 29f320d221c1c4c082c7eafb2251fedf8a4868ec --
Arnaldo Carvalho de Melo
maintainerPATCH 1/7 perf dwarf-aux: Bound the type chases for broken debug info
From: Arnaldo Carvalho de Melo <[email protected]>
A DIE that is not what it looks like, e.g. one parsed at an offset that is not the start of a DIE, can have a DW_AT_type that refers back to itself, making the typedef/qualifier chases in die_get_real_type() and die_get_pointer_type() spin forever, and the same for the type name recursion in die_get_typename_from_type(); 'perf report -s type' did exactly that on the dwz compressed debug info of zlib-ng (libz.so.1).
No sane chain of typedefs and qualifiers is 32 DIEs long, so give up on the type with a pr_debug instead of hanging.
--- tools/perf/util/dwarf-aux.c | 88 ++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 20 deletions(-)
tools/perf/util/dwarf-aux.c +68 -20
@@ -266,16 +266,29 @@ Dwarf_Die *die_get_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)return NULL ; } +/* +* A DIE that is not what it looks like, e.g. one parsed at an offset +* that is not the start of a DIE, can have a DW_AT_type that refers +* back to itself, making these chases spin forever: bound them and +* report, instead of hanging. +*/ +#define MAX_TYPE_CHASE 32 +/* Get a type die, but skip qualifiers */ Dwarf_Die *__die_get_real_type (Dwarf_Die *vr_die,Dwarf_Die *die_mem) { -int tag; +int tag, chase =0 ; do { vr_die = die_get_type(vr_die, die_mem); if (!vr_die) - break; + return NULL; tag = dwarf_tag(vr_die); + if (++chase > MAX_TYPE_CHASE) { + pr_debug("DWARF: qualifier chase limit reached at DIE 0x%lx\n", + (unsigned long)dwarf_dieoffset(vr_die)); + return NULL; + } } while (tag == DW_TAG_const_type || tag == DW_TAG_restrict_type || tag == DW_TAG_volatile_type ||
@@ -296,8 +309,15 @@ Dwarf_Die *__die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)*/ Dwarf_Die *die_get_real_type (Dwarf_Die *vr_die,Dwarf_Die *die_mem) { +int chase =0 ; +do { vr_die =__die_get_real_type (vr_die, die_mem); +if (++chase >MAX_TYPE_CHASE ) { +pr_debug ("DWARF: typedef chase limit reached at DIE 0x%lx\n" , + vr_die ? (unsigned long )dwarf_dieoffset (vr_die) :0 ); +return NULL ; + } }while (vr_die &&dwarf_tag (vr_die) == DW_TAG_typedef);return vr_die;
@@ -314,7 +334,7 @@ Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)*/ Dwarf_Die *die_get_pointer_type (Dwarf_Die *type_die,Dwarf_Die *die_mem) { -int tag; +int tag, chase =0 ; do { tag = dwarf_tag(type_die);
@@ -324,6 +344,11 @@ Dwarf_Die *die_get_pointer_type(Dwarf_Die *type_die, Dwarf_Die *die_mem) tag != DW_TAG_restrict_type && tag != DW_TAG_volatile_type && tag != DW_TAG_shared_type)return NULL ; +if (++chase >MAX_TYPE_CHASE ) { +pr_debug ("DWARF: pointer type chase limit reached at DIE 0x%lx\n" , + (unsigned long )dwarf_dieoffset (type_die)); +return NULL ; + } type_die =die_get_type (type_die, die_mem); }while (type_die);
@@ -1118,17 +1143,25 @@ Dwarf_Die *die_find_member(Dwarf_Die *st_die, const char *name, die_mem); } -/** -* die_get_typename_from_type - Get the name of given type DIE -* @type_die: a type DIE -* @buf: a strbuf for result type name -* -* Get the name of @type_die and stores it to @buf. Return 0 if succeeded. -* and Return -ENOENT if failed to find type name. -* Note that the result will stores typedef name if possible, and stores -* "*(function_type)" if the type is a function pointer. +/* +* The name follows DW_AT_type, so a self-referring DIE makes this +* recurse forever: bound it like the chases above. */ -int die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf) +static int __die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf, +int depth); + +static int __die_get_typename (Dwarf_Die *vr_die,struct strbuf *buf,int depth) +{ +Dwarf_Die type; + +if (__die_get_real_type (vr_die, &type) ==NULL ) +return -ENOENT ; + +return __die_get_typename_from_type (&type, buf, depth); +} + +static int __die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf, +int depth) {int tag, ret;const char *tmp ="" ;
@@ -1155,7 +1188,12 @@ int die_get_typename_from_type(Dwarf_Die *type_die, struct strbuf *buf)/* Write a base name */ return strbuf_addf (buf,"%s%s" , tmp, name ?:"" ); } - ret =die_get_typename (type_die, buf); +if (depth >=MAX_TYPE_CHASE ) { +pr_debug ("DWARF: type name recursion limit reached at DIE 0x%lx\n" , + (unsigned long )dwarf_dieoffset (type_die)); +return -ENOENT ; + } + ret =__die_get_typename (type_die, buf, depth +1 );if (ret <0 ) {/* void pointer has no type attribute */ if (tag == DW_TAG_pointer_type && ret == -ENOENT )
@@ -1166,6 +1204,21 @@ int die_get_typename_from_type(Dwarf_Die *type_die, struct strbuf *buf)return strbuf_addstr (buf, tmp); } +/** +* die_get_typename_from_type - Get the name of given type DIE +* @type_die: a type DIE +* @buf: a strbuf for result type name +* +* Get the name of @type_die and stores it to @buf. Return 0 if succeeded. +* and Return -ENOENT if failed to find type name. +* Note that the result will stores typedef name if possible, and stores +* "*(function_type)" if the type is a function pointer. +*/ +int die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf) +{ +return __die_get_typename_from_type (type_die, buf,0 ); +} +/** * die_get_typename - Get the name of given variable DIE * @vr_die: a variable DIE
@@ -1178,12 +1231,7 @@ int die_get_typename_from_type(Dwarf_Die *type_die, struct strbuf *buf)*/ int die_get_typename (Dwarf_Die *vr_die,struct strbuf *buf) { -Dwarf_Die type; - -if (__die_get_real_type (vr_die, &type) ==NULL ) -return -ENOENT ; - -return die_get_typename_from_type (&type, buf); +return __die_get_typename (vr_die, buf,0 ); }/**
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 2/7 perf dwarf-aux: Add die_same_file() and die_get_type_die()
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
dwarf_dieoffset() is relative to the file the DIE is in, so an offset saved by die_collect_vars()/die_collect_global_vars() is only meaningful in that file: add die_same_file(), comparing the Dwarf each DIE's CU belongs to, to record which file that is, and die_get_type_die() to resolve the offset in it, with the saved tag as a sanity check. Resolving the offset in the main file instead parses whatever is at it when it came from the dwz common file.
dwarf_cu_getdwarf() is new in elfutils 0.160, so the libdw feature test probes for it and Makefile.config says 0.160.
--- tools/build/feature/test-libdw.c | 13 ++++++- tools/perf/Makefile.config | 2 +- tools/perf/util/dwarf-aux.c | 62 ++++++++++++++++++++++++++++++-- tools/perf/util/dwarf-aux.h | 17 +++++++++ 4 files changed, 90 insertions(+), 4 deletions(-)
tools/build/feature/test-libdw.c +12 -1
@@ -49,8 +49,19 @@ int test_elfutils(void)return 0 ; } +/* +* dwarf_cu_getdwarf() needs elfutils 0.160: take its address only, so +* that older versions fail the probe instead of the link. +*/ +int test_libdw_cu_getdwarf (void ) +{ +void *sym = (void *)dwarf_cu_getdwarf; + +return sym ==NULL ; +} +int main (void ) {return test_libdw () +test_libdw_unwind () +test_libdw_getlocations () + -test_libdw_getcfi () +test_elfutils (); +test_libdw_getcfi () +test_libdw_cu_getdwarf () +test_elfutils (); }
tools/perf/Makefile.config +1 -1
@@ -470,7 +470,7 @@ else else ifneq ($(feature-libdw), 1) ifndef NO_LIBDW - $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.157, disables dwarf support. Please install new elfutils-devel/libdw-dev) + $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.160, disables dwarf support. Please install new elfutils-devel/libdw-dev) NO_LIBDW := 1 endif endif # Dwarf support
tools/perf/util/dwarf-aux.c +60 -2
98 lines not on this page · raw message
tools/perf/util/dwarf-aux.h +17 -0
@@ -152,6 +152,8 @@ int die_get_scopes(Dwarf_Die *cu_die, Dwarf_Addr pc, Dwarf_Die **scopes);struct die_var_type {struct die_var_type *next;u64 die_off; +int die_tag; +bool from_alt;/* die_off is relative to the alt (dwz) file */ u64 addr;u64 end;/* end address of location range */ int reg;
@@ -183,6 +185,21 @@ Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,/* Save all variables and parameters in this scope */ void die_collect_vars (Dwarf_Die *sc_die,struct die_var_type **var_types); +/* +* Get the type DIE saved by die_collect_vars()/die_collect_global_vars(). +* +* Those save the dwarf_dieoffset() of the type DIE, which is relative +* to the file it lives in, so @from_alt, recorded when the offset was +* saved, says which file to resolve it in; @die_tag is a sanity check. +* Resolving an alt file offset in the main file parses whatever is at +* it, which is what hung 'perf report -s type'. +*/ +Dwarf_Die *die_get_type_die (Dwarf *dbg,u64 die_off,int die_tag,bool from_alt, +Dwarf_Die *die_mem); + +/* Whether two DIEs live in the same debug file */ +bool die_same_file (Dwarf_Die *die_a,Dwarf_Die *die_b); +/* Save all global variables in this CU */ void die_collect_global_vars (Dwarf_Die *cu_die,struct die_var_type **var_types);
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 3/7 perf annotate-data: Resolve type DIEs in the debug file they came from
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
'perf report -s type' hangs, burning all of a CPU with no output, when resolving a hist entry on the dwz compressed debug info of libz.so.1 (zlib-ng): die_collect_vars() saves the dwarf_dieoffset() of the type DIE, which is relative to the file it lives in - the dwz alt file for the types shared by more than one CU - and update_var_state() resolves that offset in the main debug file, where it parses whatever is at that offset, here a typedef whose DW_AT_type refers to itself, making the type chase spin forever.
Record whether the type DIE came from the alt file and resolve the offset with die_get_type_die() in that file, with no fallback:
resolving an alt file offset in the main file is exactly the misparse above.
--- tools/perf/util/annotate-data.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
tools/perf/util/annotate-data.c +15 -6
@@ -645,6 +645,8 @@ struct global_var_entry {u64 start;u64 end;u64 die_offset; +int die_tag; +bool from_alt;/* die_offset is relative to the alt (dwz) file */ };static int global_var_cmp (const void *_key,const struct rb_node *node)
@@ -682,7 +684,7 @@ static struct global_var_entry *global_var__find(struct data_loc_info *dloc, u64 }static bool global_var__add (struct data_loc_info *dloc,u64 addr, -const char *name,Dwarf_Die *type_die) +const char *name,Dwarf_Die *type_die,bool from_alt) {struct dso *dso =map__dso (dloc->ms->map);struct global_var_entry *gvar;
@@ -704,6 +706,8 @@ static bool global_var__add(struct data_loc_info *dloc, u64 addr, gvar->start = addr; gvar->end = addr + size; gvar->die_offset =dwarf_dieoffset (type_die); + gvar->die_tag =dwarf_tag (type_die); + gvar->from_alt = from_alt;rb_add (&gvar->node,dso__global_vars (dso), global_var_less);return true;
@@ -778,12 +782,14 @@ static void global_var__collect(struct data_loc_info *dloc)if (pos->reg !=-1 )continue ; -if (!dwarf_offdie (dwarf, pos->die_off, &type_die)) +if (!die_get_type_die (dwarf, pos->die_off, pos->die_tag, + pos->from_alt, &type_die))continue ;get_global_var_info (dloc, pos->addr, &var_name, &var_offset); -global_var__add (dloc, pos->addr, var_name, &type_die); +global_var__add (dloc, pos->addr, var_name, &type_die, + pos->from_alt); }delete_var_types (var_types);
@@ -808,7 +814,8 @@ bool get_global_var_type(Dwarf_Die *cu_die, struct data_loc_info *dloc, gvar =global_var__find (dloc, var_addr);if (gvar) { -if (!dwarf_offdie (dloc->di->dbg, gvar->die_offset, type_die)) +if (!die_get_type_die (dloc->di->dbg, gvar->die_offset, + gvar->die_tag, gvar->from_alt, type_die))return false; *var_offset = var_addr - gvar->start;
@@ -838,7 +845,8 @@ bool get_global_var_type(Dwarf_Die *cu_die, struct data_loc_info *dloc, ok:/* The address should point to the start of the variable */ -global_var__add (dloc, var_addr - *var_offset, var_name, type_die); +global_var__add (dloc, var_addr - *var_offset, var_name, type_die, + !die_same_file (cu_die, type_die));return true; }
@@ -893,7 +901,8 @@ static void update_var_state(struct type_state *state, struct data_loc_info *dlocontinue ; }/* Get the type DIE using the offset */ -if (!dwarf_offdie (dloc->di->dbg, var->die_off, &mem_die)) +if (!die_get_type_die (dloc->di->dbg, var->die_off, + var->die_tag, var->from_alt, &mem_die))continue ;if (var->reg ==DWARF_REG_FB || var->reg == fbreg || var->reg == state->stack_reg) {
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 4/7 perf annotate-data: Bound the member nesting recursion
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
Members are added recursively, and the same kind of broken DIE can make a member's type point back at one of its own ancestors, recursing until the stack is gone; nothing usable comes out of nesting members 8 deep anyway, so stop there, marking the member as truncated (reported by the JSON exporter added in a later series) and giving up on member types that don't resolve.
--- tools/perf/util/annotate-data.c | 32 ++++++++++++++++++++++++++------ tools/perf/util/annotate-data.h | 3 +++ 2 files changed, 29 insertions(+), 6 deletions(-)
tools/perf/util/annotate-data.c +26 -6
@@ -221,6 +221,13 @@ static bool data_type_less(struct rb_node *node_a, const struct rb_node *node_b)return strcmp (a->self.type_name, b->self.type_name) <0 ; } +/* +* Members are added recursively; bound the nesting so that a broken +* type that points back at one of its own ancestors doesn't recurse +* until the stack is gone. +*/ +#define MAX_MEMBER_DEPTH 8 +/* Recursively add new members for struct/union */ static int __add_member_cb (Dwarf_Die *die,void *arg) {
@@ -235,6 +242,16 @@ static int __add_member_cb(Dwarf_Die *die, void *arg)if (dwarf_tag (die) != DW_TAG_member)return DIE_FIND_CB_SIBLING ; +if (__die_get_real_type (die, &member_type) ==NULL ) +return DIE_FIND_CB_SIBLING ; + +if (dwarf_tag (&member_type) == DW_TAG_typedef) { +if (die_get_real_type (&member_type, &die_mem) ==NULL ) +return DIE_FIND_CB_SIBLING ; + }else { + die_mem = member_type; + } + member =zalloc (sizeof (*member));if (member ==NULL )return DIE_FIND_CB_END ;
@@ -242,12 +259,6 @@ static int __add_member_cb(Dwarf_Die *die, void *arg)strbuf_init (&sb,32 );die_get_typename (die, &sb); -__die_get_real_type (die, &member_type); -if (dwarf_tag (&member_type) == DW_TAG_typedef) -die_get_real_type (&member_type, &die_mem); -else - die_mem = member_type; -if (dwarf_aggregate_size (&die_mem, &size) <0 ) size =0 ;
@@ -289,10 +300,19 @@ static int __add_member_cb(Dwarf_Die *die, void *arg) } member->size = size; member->offset = loc + parent->offset; + member->depth = parent->depth +1 ;INIT_LIST_HEAD (&member->children);list_add_tail (&member->node, &parent->children); tag =dwarf_tag (&die_mem); +if (member->depth >=MAX_MEMBER_DEPTH ) { +/* Reported by the JSON exporter so consumers can tell a truncated tree. */ + member->truncated = true; +pr_debug_dtp ("member nesting limit reached at %s\n" , + member->type_name ?:"(unknown type)" ); +return DIE_FIND_CB_SIBLING ; + } +switch (tag) {case DW_TAG_structure_type:case DW_TAG_union_type:
tools/perf/util/annotate-data.h +3 -0
@@ -57,6 +57,9 @@ struct annotated_member {char *var_name;int offset;int size; +unsigned int depth; +/* Children not expanded because the nesting limit was reached */ +bool truncated; };/**
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 5/7 perf annotate-data: Show the sample count in the data-type browser
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
The samples view (-n, annotate.show_nr_samples) prints a local nr_samples variable that is initialized to zero and never updated, so every member is listed as having no samples while the period and percent columns for the same entry are filled in. Print the histogram entry's own count instead.
--- tools/perf/ui/browsers/annotate-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/ui/browsers/annotate-data.c +1 -1
@@ -374,7 +374,7 @@ static void browser__write_overhead(struct ui_browser *uib,u64 period = hist->period;double percent = total->period ? (100.0 * period / total->period) :0 ;bool current =ui_browser__is_current_entry (uib, row); -int nr_samples =0 ; +int nr_samples = hist->nr_samples;ui_browser__set_percent_color (uib, percent, current);
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 6/7 perf mem record: Request PERF_SAMPLE_CPU by default
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
The data type profiling per-sample stream keys cross-CPU contention on sample->cpu; without PERF_SAMPLE_CPU that field is the (u32)-1 "no CPU info" sentinel, so same-instance accesses from different cores are indistinguishable from same-CPU traffic. 'perf mem record' already passes -d (addr) and -W (weight) explicitly to the record parser, add --sample-cpu as well and document it in perf-mem(1).
The rec_argv array only had room for nine arguments per PMU plus the user arguments, not counting the up to eight __cmd_record() adds itself, which a new argument would overflow on PMUs with separate load and store events; reserve space for the fixed arguments too.
--- tools/perf/Documentation/perf-mem.txt | 4 ++++ tools/perf/builtin-mem.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-mem.txt +4 -0
@@ -14,6 +14,10 @@ DESCRIPTION ----------- "perf mem record" runs a command and gathers memory operation data from it, into perf.data. Perf record options are accepted and are passed through. +It also requests the address (-d), the weight (-W, where supported) and the +CPU id (--sample-cpu) of every sampled access by default; the CPU id is what +lets per-sample analysis tell reads and writes to the same data from +different cores apart from same-CPU traffic. "perf mem report" displays the result. It invokes perf report with the right set of options to display a memory access profile. By default, loads
tools/perf/builtin-mem.c +9 -2
@@ -99,8 +99,8 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem, argc =parse_options (argc, argv, options, record_usage,PARSE_OPT_KEEP_UNKNOWN ); -/* Max number of arguments multiplied by number of PMUs that can support them. */ - rec_argc = argc +9 * (perf_pmu__mem_events_num_mem_pmus (pmu) +1 ); +/* Max number of arguments per PMU plus the fixed ones added below. */ + rec_argc = argc +8 +9 * (perf_pmu__mem_events_num_mem_pmus (pmu) +1 );if (mem->cpu_list) rec_argc +=2 ;
@@ -135,6 +135,13 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem, rec_argv[i++] ="-d" ; +/* +* The data type profiling per-sample stream keys cross-CPU contention +* on sample->cpu; without PERF_SAMPLE_CPU it is the (u32)-1 'no CPU +* info' sentinel. +*/ + rec_argv[i++] ="--sample-cpu" ; +if (mem->phys_addr) rec_argv[i++] ="--phys-data" ;
Signature · 1 line
2.53.0
Arnaldo Carvalho de Melo
maintainerPATCH 7/7 perf mem record: Use the IBS swfilt filter when available
In reply to Arnaldo Carvalho de MeloFrom: Arnaldo Carvalho de Melo <[email protected]>
IBS events with exclude_{user,kernel} bits, as used for per-thread recording when kernel samples are not allowed, are rejected by the kernel on hardware without the privilege filter, so per-thread 'perf mem record' fails on AMD:
$ perf mem record -o /dev/null -- true Error: Failure to open event 'ibs_op/ldlat=0/u' on PMU 'ibs_op' which will be removed. Invalid event (ibs_op/ldlat=0/u) in per-thread mode, enable system wide with '-a'.
Kernel v6.14 added swfilt, a software privilege filter exposed as the 'swfilt' format term, making those events usable per-thread:
$ perf record -e ibs_op/ldlat=0,swfilt=1/ -- true
Give the ibs_op memory events extra tables with the swfilt term in the event names, selected in perf_pmu__arch_init() when the PMU exposes the term, keeping the names that need system wide mode otherwise, with the knowledge that IBS needs this staying in the arch code: the generic mem-events table and name builder don't know about it. The variant is used even for records that end up without exclude bits: 'perf record' adds those bits itself when the first open fails, after the name was built, and that retry needs the term. With the term in the event name, the per-thread 'perf mem record' done by the 'data type profiling' shell test works on AMD kernels with swfilt, so the skip 29f320d2 added to it no longer triggers there, and the 'Test data symbol' shell test adjusts its event regex for the added term.
--- tools/perf/arch/x86/util/mem-events.c | 24 ++++++++++++++++++++++ tools/perf/arch/x86/util/mem-events.h | 2 ++ tools/perf/arch/x86/util/pmu.c | 10 +++++++-- tools/perf/tests/shell/test_data_symbol.sh | 6 ++++-- tools/perf/util/mem-events.c | 11 ++++++---- 5 files changed, 45 insertions(+), 8 deletions(-)
tools/perf/arch/x86/util/mem-events.c +24 -0
@@ -21,14 +21,38 @@ struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX] = { E(NULL, NULL, NULL, false, 0), }; +/* +* IBS events with exclude_{user,kernel} bits set, as used by perf to +* record per-thread when kernel samples are not allowed, are rejected +* by the kernel on hardware without the privilege filter unless the +* swfilt software filter is used, so there are extra sets of tables +* with the swfilt term in the event names, selected in +* perf_pmu__arch_init() when the PMU exposes the term. The term is not +* conditional on the event already having exclude bits: perf record +* adds those bits itself when the first open fails with EACCES on an +* unprivileged setup, after the name was built, and that retry only +* succeeds with the term in it. +*/ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX ] = {E (NULL ,NULL ,NULL , false,0 ),E (NULL ,NULL ,NULL , false,0 ),E ("mem-ldst" ,"%s//" ,NULL , false,0 ), }; +struct perf_mem_event perf_mem_events_amd_swfilt[PERF_MEM_EVENTS__MAX ] = { +E (NULL ,NULL ,NULL , false,0 ), +E (NULL ,NULL ,NULL , false,0 ), +E ("mem-ldst" ,"%s/swfilt=1/" ,NULL , false,0 ), +}; +struct perf_mem_event perf_mem_events_amd_ldlat[PERF_MEM_EVENTS__MAX ] = {E (NULL ,NULL ,NULL , false,0 ),E (NULL ,NULL ,NULL , false,0 ),E ("mem-ldst" ,"%s/ldlat=%u/" ,NULL , true,0 ), }; + +struct perf_mem_event perf_mem_events_amd_ldlat_swfilt[PERF_MEM_EVENTS__MAX ] = { +E (NULL ,NULL ,NULL , false,0 ), +E (NULL ,NULL ,NULL , false,0 ), +E ("mem-ldst" ,"%s/ldlat=%u,swfilt=1/" ,NULL , true,0 ), +};
tools/perf/arch/x86/util/mem-events.h +2 -0
@@ -6,6 +6,8 @@ extern struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX];extern struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX ];extern struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX ]; +extern struct perf_mem_event perf_mem_events_amd_swfilt[PERF_MEM_EVENTS__MAX ];extern struct perf_mem_event perf_mem_events_amd_ldlat[PERF_MEM_EVENTS__MAX ]; +extern struct perf_mem_event perf_mem_events_amd_ldlat_swfilt[PERF_MEM_EVENTS__MAX ];#endif /* _X86_MEM_EVENTS_H */
tools/perf/arch/x86/util/pmu.c +8 -2
@@ -333,6 +333,7 @@ static void uncore_cha_imc_adjust_cpumask_for_snc(struct perf_pmu *pmu, bool chavoid perf_pmu__arch_init (struct perf_pmu *pmu) {struct perf_pmu_caps *ldlat_cap; +bool swfilt_format;if (!strcmp (pmu->name,INTEL_PT_PMU_NAME )) { pmu->auxtrace = true;
@@ -348,7 +349,10 @@ void perf_pmu__arch_init(struct perf_pmu *pmu)if (strcmp (pmu->name,"ibs_op" ))return ; - pmu->mem_events = perf_mem_events_amd; + swfilt_format =perf_pmu__has_format (pmu,"swfilt" ); + pmu->mem_events = swfilt_format ? + perf_mem_events_amd_swfilt : + perf_mem_events_amd;if (!perf_pmu__caps_parse (pmu))return ;
@@ -358,7 +362,9 @@ void perf_pmu__arch_init(struct perf_pmu *pmu)return ; perf_mem_events__loads_ldlat =0 ; - pmu->mem_events = perf_mem_events_amd_ldlat; + pmu->mem_events = swfilt_format ? + perf_mem_events_amd_ldlat_swfilt : + perf_mem_events_amd_ldlat; }else {if (pmu->is_core) {if (perf_pmu__have_event (pmu,"mem-loads-aux" ))
tools/perf/tests/shell/test_data_symbol.sh +4 -2
@@ -65,15 +65,17 @@ if (($is_amd >= 1)); then # --ldlat on AMD: # o Zen4 and earlier uarch does not support ldlat # o Even on supported platforms, it's disabled (--ldlat=0) by default. + # o Kernels with the swfilt term add it even when ldlat is not + # supported, so only check ldlat when the term is present. ldlat=${BASH_REMATCH[1]} - if [[ -n $ldlat ]]; then + if [[ $ldlat == *ldlat=* ]]; then if ! [[ "$ldlat" =~ ldlat=0 ]]; then echo "ERROR: ldlat not initialized to 0?" exit 1 fi mem_events="$(perf mem record -v --ldlat=150 -e list 2>&1)" - if ! [[ "$mem_events" =~ ^mem-ldst.*ibs_op/ldlat=150/.*available ]]; then + if ! [[ "$mem_events" =~ ^mem-ldst.*ibs_op/ldlat=150[,/].*available ]]; then echo "ERROR: --ldlat not honored?" exit 1 fi
tools/perf/util/mem-events.c +7 -4
@@ -82,6 +82,7 @@ static const char *perf_pmu__mem_events_name(struct perf_pmu *pmu, int i, char *buf, size_t buf_size) {struct perf_mem_event *e; +const char *name;if (i >=PERF_MEM_EVENTS__MAX || !pmu)return NULL ;
@@ -90,24 +91,26 @@ static const char *perf_pmu__mem_events_name(struct perf_pmu *pmu, int i,if (!e || !e->name)return NULL ; + name = e->name; +if (i ==PERF_MEM_EVENTS__LOAD || i ==PERF_MEM_EVENTS__LOAD_STORE ) {if (e->ldlat) {if (!e->aux_event) {/* ARM and Most of Intel */ scnprintf (buf, buf_size, - e->name, pmu->name, + name, pmu->name, perf_mem_events__loads_ldlat); }else {/* Intel with mem-loads-aux event */ scnprintf (buf, buf_size, - e->name, pmu->name, pmu->name, + name, pmu->name, pmu->name, perf_mem_events__loads_ldlat); } }else {if (!e->aux_event) {/* AMD and POWER */ scnprintf (buf, buf_size, - e->name, pmu->name); + name, pmu->name); }else {return NULL ; }
@@ -117,7 +120,7 @@ static const char *perf_pmu__mem_events_name(struct perf_pmu *pmu, int i,if (i ==PERF_MEM_EVENTS__STORE ) {scnprintf (buf, buf_size, - e->name, pmu->name); + name, pmu->name);return buf; }
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCH 5/7] perf annotate-data: Show the sample count in the data-type browser
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 8 lines
From: Arnaldo Carvalho de Melo <[email protected]>
The samples view (-n, annotate.show_nr_samples) prints a local
nr_samplesvariable that is initialized to zero and never updated, so every member is listed as having no samples while the period and percent columns for the same entry are filled in. Print the histogram entry's own count instead.
Quoted 4 lines
Fixes d001c7a7f4736743 ("perf annotate-data: Add hist_entry__annotate_data_tui()")Acked-by Namhyung Kim <[email protected]>Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
[email protected]
AI reviewRe: [PATCH 4/7] perf annotate-data: Bound the member nesting recursion
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 11 lines
From: Arnaldo Carvalho de Melo <[email protected]>
Members are added recursively, and the same kind of broken DIE can make a member's type point back at one of its own ancestors, recursing until the stack is gone; nothing usable comes out of nesting members 8 deep anyway, so stop there, marking the member as truncated (reported by the JSON exporter added in a later series) and giving up on member types that don't resolve.
Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
[email protected]
AI reviewRe: [PATCH 2/7] perf dwarf-aux: Add die_same_file() and die_get_type_die()
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 10 lines
From: Arnaldo Carvalho de Melo <[email protected]>
dwarf_dieoffset()is relative to the file the DIE is in, so an offset saved by die_collect_vars()/die_collect_global_vars() is only meaningful in that file: adddie_same_file(), comparing the Dwarf each DIE's CU belongs to, to record which file that is, anddie_get_type_die()to resolve the offset in it, with the saved tag as a sanity check. Resolving the offset in the main file instead parses whatever is at it when it came from the dwz common file.
Quoted 5 lines
dwarf_cu_getdwarf()is new in elfutils 0.160, so the libdw feature test probes for it and Makefile.config says 0.160.Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
[email protected]
AI reviewRe: [PATCH 7/7] perf mem record: Use the IBS swfilt filter when available
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 15 lines
From: Arnaldo Carvalho de Melo <[email protected]>
IBS events with exclude_{user,kernel} bits, as used for per-thread recording when kernel samples are not allowed, are rejected by the kernel on hardware without the privilege filter, so per-thread 'perf mem record' fails on AMD:
$ perf mem record -o /dev/null -- true Error: Failure to open event 'ibs_op/ldlat=0/u' on PMU 'ibs_op' which will be removed. Invalid event (ibs_op/ldlat=0/u) in per-thread mode, enable system wide with '-a'.Kernel v6.14 added swfilt, a software privilege filter exposed as the 'swfilt' format term, making those events usable per-thread:
Quoted 6 lines
[ ... ]
Suggested-by Namhyung Kim <[email protected]>Suggested-by Ravi Bangoria <[email protected]>Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
[email protected]
AI reviewRe: [PATCH 6/7] perf mem record: Request PERF_SAMPLE_CPU by default
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 9 lines
From: Arnaldo Carvalho de Melo <[email protected]>
The data type profiling per-sample stream keys cross-CPU contention on
sample->cpu; withoutPERF_SAMPLE_CPUthat field is the (u32)-1 "no CPU info" sentinel, so same-instance accesses from different cores are indistinguishable from same-CPU traffic. 'perf mem record' already passes -d (addr) and -W (weight) explicitly to the record parser, add --sample-cpu as well and document it in perf-mem(1).
Quoted 7 lines
The
rec_argvarray only had room for nine arguments per PMU plus the user arguments, not counting the up to eight__cmd_record()adds itself, which a new argument would overflow on PMUs with separate load and store events; reserve space for the fixed arguments too.Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
[email protected]
AI reviewRe: [PATCH 3/7] perf annotate-data: Resolve type DIEs in the debug file they came from
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 16 lines
From: Arnaldo Carvalho de Melo <[email protected]>
'perf report -s type' hangs, burning all of a CPU with no output, when resolving a hist entry on the dwz compressed debug info of libz.so.1 (zlib-ng):
die_collect_vars()saves thedwarf_dieoffset()of the type DIE, which is relative to the file it lives in - the dwz alt file for the types shared by more than one CU - andupdate_var_state()resolves that offset in the main debug file, where it parses whatever is at that offset, here a typedef whoseDW_AT_typerefers to itself, making the type chase spin forever.Record whether the type DIE came from the alt file and resolve the offset with
die_get_type_die()in that file, with no fallback:
resolving an alt file offset in the main file is exactly the misparse above.
Quoted 4 lines
Fixes 06b2ce75386df04b ("perf annotate-data: Maintain variable type info")Fixes 55ee3d005d62279d ("perf annotate-data: Add a cache for global variable types")Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
[email protected]
AI reviewRe: [PATCH 1/7] perf dwarf-aux: Bound the type chases for broken debug info
In reply to Arnaldo Carvalho de MeloSashiko has reviewed this patch and found no issues. It looks great!
Quoted 9 lines
From: Arnaldo Carvalho de Melo <[email protected]>
A DIE that is not what it looks like, e.g. one parsed at an offset that is not the start of a DIE, can have a
DW_AT_typethat refers back to itself, making the typedef/qualifier chases indie_get_real_type()anddie_get_pointer_type()spin forever, and the same for the type name recursion indie_get_typename_from_type(); 'perf report -s type' did exactly that on the dwz compressed debug info of zlib-ng (libz.so.1).
Quoted 5 lines
No sane chain of typedefs and qualifiers is 32 DIEs long, so give up on the type with a
pr_debuginstead of hanging.Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Namhyung Kim
maintainerRe: [PATCH 1/7] perf dwarf-aux: Bound the type chases for broken debug info
In reply to Arnaldo Carvalho de Melo+Cc Masami
Quoted 11 lines · Arnaldo Carvalho de Melo
From: Arnaldo Carvalho de Melo <[email protected]>
A DIE that is not what it looks like, e.g. one parsed at an offset that is not the start of a DIE, can have a
DW_AT_typethat refers back to itself, making the typedef/qualifier chases indie_get_real_type()anddie_get_pointer_type()spin forever, and the same for the type name recursion indie_get_typename_from_type(); 'perf report -s type' did exactly that on the dwz compressed debug info of zlib-ng (libz.so.1).No sane chain of typedefs and qualifiers is 32 DIEs long, so give up on the type with a
pr_debuginstead of hanging.
I see it could have redundant chases, but maybe it's fine as they track different things.
Thanks,
Namhyung
Quoted 169 lines
Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/dwarf-aux.c | 88 ++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 20 deletions(-)tools/perf/util/dwarf-aux.c +68
-20@@ -266,16 +266,29 @@ Dwarf_Die *die_get_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)return NULL ; } +/* +* A DIE that is not what it looks like, e.g. one parsed at an offset +* that is not the start of a DIE, can have a DW_AT_type that refers +* back to itself, making these chases spin forever: bound them and +* report, instead of hanging. +*/ +#define MAX_TYPE_CHASE 32 +/* Get a type die, but skip qualifiers */ Dwarf_Die *__die_get_real_type (Dwarf_Die *vr_die,Dwarf_Die *die_mem) { -int tag; +int tag, chase =0 ; do { vr_die = die_get_type(vr_die, die_mem); if (!vr_die) - break; + return NULL; tag = dwarf_tag(vr_die); + if (++chase > MAX_TYPE_CHASE) { + pr_debug("DWARF: qualifier chase limit reached at DIE 0x%lx\n", + (unsigned long)dwarf_dieoffset(vr_die)); + return NULL; + } } while (tag == DW_TAG_const_type || tag == DW_TAG_restrict_type || tag == DW_TAG_volatile_type ||@@ -296,8 +309,15 @@ Dwarf_Die *__die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)*/ Dwarf_Die *die_get_real_type (Dwarf_Die *vr_die,Dwarf_Die *die_mem) { +int chase =0 ; +do { vr_die =__die_get_real_type (vr_die, die_mem); +if (++chase >MAX_TYPE_CHASE ) { +pr_debug ("DWARF: typedef chase limit reached at DIE 0x%lx\n" , + vr_die ? (unsigned long )dwarf_dieoffset (vr_die) :0 ); +return NULL ; + } }while (vr_die &&dwarf_tag (vr_die) == DW_TAG_typedef);return vr_die;@@ -314,7 +334,7 @@ Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem)*/ Dwarf_Die *die_get_pointer_type (Dwarf_Die *type_die,Dwarf_Die *die_mem) { -int tag; +int tag, chase =0 ; do { tag = dwarf_tag(type_die);@@ -324,6 +344,11 @@ Dwarf_Die *die_get_pointer_type(Dwarf_Die *type_die, Dwarf_Die *die_mem) tag != DW_TAG_restrict_type && tag != DW_TAG_volatile_type && tag != DW_TAG_shared_type)return NULL ; +if (++chase >MAX_TYPE_CHASE ) { +pr_debug ("DWARF: pointer type chase limit reached at DIE 0x%lx\n" , + (unsigned long )dwarf_dieoffset (type_die)); +return NULL ; + } type_die =die_get_type (type_die, die_mem); }while (type_die);@@ -1118,17 +1143,25 @@ Dwarf_Die *die_find_member(Dwarf_Die *st_die, const char *name, die_mem); } -/** -* die_get_typename_from_type - Get the name of given type DIE -* @type_die: a type DIE -* @buf: a strbuf for result type name -* -* Get the name of @type_die and stores it to @buf. Return 0 if succeeded. -* and Return -ENOENT if failed to find type name. -* Note that the result will stores typedef name if possible, and stores -* "*(function_type)" if the type is a function pointer. +/* +* The name follows DW_AT_type, so a self-referring DIE makes this +* recurse forever: bound it like the chases above. */ -int die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf) +static int __die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf, +int depth); + +static int __die_get_typename (Dwarf_Die *vr_die,struct strbuf *buf,int depth) +{ +Dwarf_Die type; + +if (__die_get_real_type (vr_die, &type) ==NULL ) +return -ENOENT ; + +return __die_get_typename_from_type (&type, buf, depth); +} + +static int __die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf, +int depth) {int tag, ret;const char *tmp ="" ;@@ -1155,7 +1188,12 @@ int die_get_typename_from_type(Dwarf_Die *type_die, struct strbuf *buf)/* Write a base name */ return strbuf_addf (buf,"%s%s" , tmp, name ?:"" ); } - ret =die_get_typename (type_die, buf); +if (depth >=MAX_TYPE_CHASE ) { +pr_debug ("DWARF: type name recursion limit reached at DIE 0x%lx\n" , + (unsigned long )dwarf_dieoffset (type_die)); +return -ENOENT ; + } + ret =__die_get_typename (type_die, buf, depth +1 );if (ret <0 ) {/* void pointer has no type attribute */ if (tag == DW_TAG_pointer_type && ret == -ENOENT )@@ -1166,6 +1204,21 @@ int die_get_typename_from_type(Dwarf_Die *type_die, struct strbuf *buf)return strbuf_addstr (buf, tmp); } +/** +* die_get_typename_from_type - Get the name of given type DIE +* @type_die: a type DIE +* @buf: a strbuf for result type name +* +* Get the name of @type_die and stores it to @buf. Return 0 if succeeded. +* and Return -ENOENT if failed to find type name. +* Note that the result will stores typedef name if possible, and stores +* "*(function_type)" if the type is a function pointer. +*/ +int die_get_typename_from_type (Dwarf_Die *type_die,struct strbuf *buf) +{ +return __die_get_typename_from_type (type_die, buf,0 ); +} +/** * die_get_typename - Get the name of given variable DIE * @vr_die: a variable DIE @@ -1178,12 +1231,7 @@ int die_get_typename_from_type(Dwarf_Die *type_die, struct strbuf *buf)*/ int die_get_typename (Dwarf_Die *vr_die,struct strbuf *buf) { -Dwarf_Die type; - -if (__die_get_real_type (vr_die, &type) ==NULL ) -return -ENOENT ; - -return die_get_typename_from_type (&type, buf); +return __die_get_typename (vr_die, buf,0 ); }/** Signature · 1 line
2.53.0
Namhyung Kim
maintainerRe: [PATCH 2/7] perf dwarf-aux: Add die_same_file() and die_get_type_die()
In reply to Arnaldo Carvalho de Melo+Cc Masami
Quoted 206 lines · Arnaldo Carvalho de Melo
From: Arnaldo Carvalho de Melo <[email protected]>
dwarf_dieoffset()is relative to the file the DIE is in, so an offset saved by die_collect_vars()/die_collect_global_vars() is only meaningful in that file: adddie_same_file(), comparing the Dwarf each DIE's CU belongs to, to record which file that is, anddie_get_type_die()to resolve the offset in it, with the saved tag as a sanity check. Resolving the offset in the main file instead parses whatever is at it when it came from the dwz common file.
dwarf_cu_getdwarf()is new in elfutils 0.160, so the libdw feature test probes for it and Makefile.config says 0.160.Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/build/feature/test-libdw.c | 13 ++++++- tools/perf/Makefile.config | 2 +- tools/perf/util/dwarf-aux.c | 62 ++++++++++++++++++++++++++++++-- tools/perf/util/dwarf-aux.h | 17 +++++++++ 4 files changed, 90 insertions(+), 4 deletions(-)tools/build/feature/test-libdw.c +12
-1@@ -49,8 +49,19 @@ int test_elfutils(void)return 0 ; } +/* +* dwarf_cu_getdwarf() needs elfutils 0.160: take its address only, so +* that older versions fail the probe instead of the link. +*/ +int test_libdw_cu_getdwarf (void ) +{ +void *sym = (void *)dwarf_cu_getdwarf; + +return sym ==NULL ; +} +int main (void ) {return test_libdw () +test_libdw_unwind () +test_libdw_getlocations () + -test_libdw_getcfi () +test_elfutils (); +test_libdw_getcfi () +test_libdw_cu_getdwarf () +test_elfutils (); }tools/perf/Makefile.config +1
-1@@ -470,7 +470,7 @@ else else ifneq ($(feature-libdw), 1) ifndef NO_LIBDW - $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.157, disables dwarf support. Please install new elfutils-devel/libdw-dev) + $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.160, disables dwarf support. Please install new elfutils-devel/libdw-dev) NO_LIBDW := 1 endif endif # Dwarf supporttools/perf/util/dwarf-aux.c +60
-2@@ -1680,6 +1680,16 @@ Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,return result; } +/* +* Whether two DIEs live in the same debug file, i.e. whether their +* offsets have to be resolved in the same file: dwarf_dieoffset() is +* relative to the file the DIE is in. +*/ +bool die_same_file (Dwarf_Die *die_a,Dwarf_Die *die_b) +{ +return dwarf_cu_getdwarf (die_a->cu) ==dwarf_cu_getdwarf (die_b->cu); +} +static int __die_collect_vars_cb (Dwarf_Die *die_mem,void *arg) {struct die_var_type **var_types = arg;@@ -1724,6 +1734,8 @@ static int __die_collect_vars_cb(Dwarf_Die *die_mem, void *arg) vt->is_reg_var_addr = true; vt->die_off =dwarf_dieoffset (&type_die); + vt->die_tag =dwarf_tag (&type_die); + vt->from_alt = !die_same_file (die_mem, &type_die); vt->addr = start; vt->end = end; vt->has_range = (end !=0 || start !=0 );@@ -1743,7 +1755,8 @@ static int __die_collect_vars_cb(Dwarf_Die *die_mem, void *arg)* * Save all variables and parameters in the @sc_die and save them to @var_types. * The @var_types is a singly-linked list containing type and location info. -* Actual type can be retrieved using dwarf_offdie() with 'die_off' later. +* Actual type can be retrieved using die_get_type_die() with 'die_off', +* 'die_tag' and 'from_alt' later. * * Callers should free @var_types. */ @@ -1789,6 +1802,8 @@ static int __die_collect_global_vars_cb(Dwarf_Die *die_mem, void *arg)return DIE_FIND_CB_END ; vt->die_off =dwarf_dieoffset (&type_die); + vt->die_tag =dwarf_tag (&type_die); + vt->from_alt = !die_same_file (die_mem, &type_die); vt->addr = ops->number; vt->end =0 ; vt->has_range = false;@@ -1800,6 +1815,48 @@ static int __die_collect_global_vars_cb(Dwarf_Die *die_mem, void *arg)return DIE_FIND_CB_SIBLING ; } +/** +* die_get_type_die - Get a type DIE saved by die_collect_vars() +* @dbg: the main debug info +* @die_off: offset of the type DIE, from dwarf_dieoffset() +* @die_tag: tag that DIE had when the offset was saved +* @from_alt: whether the type DIE is in the dwz alt file +* @die_mem: where to store the resulting DIE +* +* Resolve @die_off in the file it was recorded as belonging to: the +* offset is only meaningful there, and there is deliberately no +* fallback, as resolving an alt file offset in the main file parses +* whatever is at it. @die_tag is a sanity check. +*/ +Dwarf_Die *die_get_type_die (Dwarf *dbg,u64 die_off,int die_tag,bool from_alt, +Dwarf_Die *die_mem) +{ +Dwarf *target = dbg; +Dwarf_Die die; + +if (from_alt) { +/* +* No fallback to the main file: resolving an alt file offset in it +* does not fail, it parses whatever is there as a DIE. +*/ + target =dwarf_getalt (dbg); +if (target ==NULL ) { +pr_debug ("DWARF: no alt (dwz) debug file to resolve the type DIE at offset 0x%lx in\n" , + (unsigned long )die_off); +return NULL ; + } + } + +if (dwarf_offdie (target, die_off, &die) &&dwarf_tag (&die) == die_tag) { + *die_mem = die; +return die_mem; + } + +pr_debug ("DWARF: no DIE with tag %d at offset 0x%lx in the %s debug file\n" , + die_tag, (unsigned long )die_off, from_alt ?"alt" :"main" ); +return NULL ; +} +/** * die_collect_global_vars - Save all global variables * @cu_die: a CU DIE @@ -1807,7 +1864,8 @@ static int __die_collect_global_vars_cb(Dwarf_Die *die_mem, void *arg)* * Save all global variables in the @cu_die and save them to @var_types. * The @var_types is a singly-linked list containing type and location info. -* Actual type can be retrieved using dwarf_offdie() with 'die_off' later. +* Actual type can be retrieved using die_get_type_die() with 'die_off', +* 'die_tag' and 'from_alt' later. * * Callers should free @var_types. */ tools/perf/util/dwarf-aux.h +17
-0@@ -152,6 +152,8 @@ int die_get_scopes(Dwarf_Die *cu_die, Dwarf_Addr pc, Dwarf_Die **scopes);struct die_var_type {struct die_var_type *next;u64 die_off; +int die_tag; +bool from_alt;/* die_off is relative to the alt (dwz) file */ u64 addr;u64 end;/* end address of location range */ int reg;@@ -183,6 +185,21 @@ Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,/* Save all variables and parameters in this scope */ void die_collect_vars (Dwarf_Die *sc_die,struct die_var_type **var_types); +/* +* Get the type DIE saved by die_collect_vars()/die_collect_global_vars(). +* +* Those save the dwarf_dieoffset() of the type DIE, which is relative +* to the file it lives in, so @from_alt, recorded when the offset was +* saved, says which file to resolve it in; @die_tag is a sanity check. +* Resolving an alt file offset in the main file parses whatever is at +* it, which is what hung 'perf report -s type'. +*/ +Dwarf_Die *die_get_type_die (Dwarf *dbg,u64 die_off,int die_tag,bool from_alt, +Dwarf_Die *die_mem); + +/* Whether two DIEs live in the same debug file */ +bool die_same_file (Dwarf_Die *die_a,Dwarf_Die *die_b); +/* Save all global variables in this CU */ void die_collect_global_vars (Dwarf_Die *cu_die,struct die_var_type **var_types);Signature · 1 line
2.53.0
Namhyung Kim
maintainerRe: [PATCH 4/7] perf annotate-data: Bound the member nesting recursion
In reply to Arnaldo Carvalho de MeloQuoted 8 lines · Arnaldo Carvalho de Melo
From: Arnaldo Carvalho de Melo <[email protected]>
Members are added recursively, and the same kind of broken DIE can make a member's type point back at one of its own ancestors, recursing until the stack is gone; nothing usable comes out of nesting members 8 deep anyway, so stop there, marking the member as truncated (reported by the JSON exporter added in a later series) and giving up on member types that don't resolve.
I think 8 is too restrictive. It should be common to have 3 or 4 depth if you have nested struct or union members.
And some kernel primitives like spinlock also have nested members like
raw_spinlock_t
arch_spinlock_t
union
atomic_t
int
So it'd be easy to hit the limit when the nested members contain a spinlock.
Thanks,
Namhyung
Quoted 93 lines
Assisted-by LLMSigned-off-by Arnaldo Carvalho de Melo <[email protected]>--- tools/perf/util/annotate-data.c | 32 ++++++++++++++++++++++++++------ tools/perf/util/annotate-data.h | 3 +++ 2 files changed, 29 insertions(+), 6 deletions(-)tools/perf/util/annotate-data.c +26
-6@@ -221,6 +221,13 @@ static bool data_type_less(struct rb_node *node_a, const struct rb_node *node_b)return strcmp (a->self.type_name, b->self.type_name) <0 ; } +/* +* Members are added recursively; bound the nesting so that a broken +* type that points back at one of its own ancestors doesn't recurse +* until the stack is gone. +*/ +#define MAX_MEMBER_DEPTH 8 +/* Recursively add new members for struct/union */ static int __add_member_cb (Dwarf_Die *die,void *arg) {@@ -235,6 +242,16 @@ static int __add_member_cb(Dwarf_Die *die, void *arg)if (dwarf_tag (die) != DW_TAG_member)return DIE_FIND_CB_SIBLING ; +if (__die_get_real_type (die, &member_type) ==NULL ) +return DIE_FIND_CB_SIBLING ; + +if (dwarf_tag (&member_type) == DW_TAG_typedef) { +if (die_get_real_type (&member_type, &die_mem) ==NULL ) +return DIE_FIND_CB_SIBLING ; + }else { + die_mem = member_type; + } + member =zalloc (sizeof (*member));if (member ==NULL )return DIE_FIND_CB_END ;@@ -242,12 +259,6 @@ static int __add_member_cb(Dwarf_Die *die, void *arg)strbuf_init (&sb,32 );die_get_typename (die, &sb); -__die_get_real_type (die, &member_type); -if (dwarf_tag (&member_type) == DW_TAG_typedef) -die_get_real_type (&member_type, &die_mem); -else - die_mem = member_type; -if (dwarf_aggregate_size (&die_mem, &size) <0 ) size =0 ;@@ -289,10 +300,19 @@ static int __add_member_cb(Dwarf_Die *die, void *arg) } member->size = size; member->offset = loc + parent->offset; + member->depth = parent->depth +1 ;INIT_LIST_HEAD (&member->children);list_add_tail (&member->node, &parent->children); tag =dwarf_tag (&die_mem); +if (member->depth >=MAX_MEMBER_DEPTH ) { +/* Reported by the JSON exporter so consumers can tell a truncated tree. */ + member->truncated = true; +pr_debug_dtp ("member nesting limit reached at %s\n" , + member->type_name ?:"(unknown type)" ); +return DIE_FIND_CB_SIBLING ; + } +switch (tag) {case DW_TAG_structure_type:case DW_TAG_union_type:tools/perf/util/annotate-data.h +3
-0@@ -57,6 +57,9 @@ struct annotated_member {char *var_name;int offset;int size; +unsigned int depth; +/* Children not expanded because the nesting limit was reached */ +bool truncated; };/** Signature · 1 line
2.53.0