From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29B462E0B5C; Sat, 19 Sep 2026 20:40:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850449; cv=none; b=F+7ZtC71c+ssk8SqpyLFNaM54cI32QImeHifhrYg5eh8Dcgi+SzNBPDl07dtjhwN0Z9CkoYN0aCobCJ6pjfr2LQkpRUuhs02pP2SqvwjKKJ2aqDlYQ+7lW9z13j4qmes1jpFInQxFkstghL4DwvsehSzZooK0vkttfUqE+vNV8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850449; c=relaxed/simple; bh=u/l1019tOO/XoAlgGYR/3QPOm7ASfUvmqHOxfTNqcyI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EFnO7KpNI2KCGP0tZHWzBkft+xPvdS+kCDEA6hY0m6xvtH2oEdT7waHrEFFydmpAt/wVsnW1N5Q3OIcPoHV7eZf4imiC8dCOlAfzrsWLr6TjczkX6vHBZfVVxdpUZ5xL0B7QCHedWNI2wApxnKLcS9lmqbp3eM1TDr8dmuGZvjc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jrXpy5Sx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jrXpy5Sx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44B6E1F00893; Sat, 19 Sep 2026 20:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850447; bh=DZau4VFdc8JLRYU/zsxSJdHkRPnwhv27DePH4WfF8tM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jrXpy5SxmjaLaf4gSUy/vQ1FwRuNrRaLwqmSHDvobSyBLZgW/TPu5EVk2E553AjkT bGYWbGuxfRcDxjxJiNvf4HFjyHX1Cada6qOTlfOhMJz5AsmTUSJir3Y5zPfS0K/u4R pgGye2791ZW7hOuQeG+TQUJzzqyyJge6IYdKj9FFfLBdq/jLH7D865ywqV7wfIvNGg KT2sKpcUZAJGPuhXqxU3REXS3j/XlGEA89Q3BCDnPSc7jZu4kQaFbS1Ozs6b3YKaym 3GMYavjwI01LQ08Ds3nloGZNuSmNVqrOYHwcm44rONYNOJd4VnnxqIfSOa9nAz3R/u NGycZWRBMpdgA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 1/7] perf dwarf-aux: Bound the type chases for broken debug info Date: Sat, 19 Sep 2026 17:40:21 -0300 Message-ID: <20260919204027.8504-2-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo 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. Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dwarf-aux.c | 88 ++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 20 deletions(-) diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index d7160f87ac7d7ab3..b5ffeea54446408d 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c @@ -266,16 +266,29 @@ Dwarf_Die *die_get_type(Dwarf_Die *vr_die, Dwarf_Die = *die_mem) return NULL; } =20 +/* + * 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 =3D 0; =20 do { vr_die =3D die_get_type(vr_die, die_mem); if (!vr_die) - break; + return NULL; tag =3D 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 =3D=3D DW_TAG_const_type || tag =3D=3D DW_TAG_restrict_type || tag =3D=3D DW_TAG_volatile_type || @@ -296,8 +309,15 @@ Dwarf_Die *__die_get_real_type(Dwarf_Die *vr_die, Dwar= f_Die *die_mem) */ Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_Die *die_mem) { + int chase =3D 0; + do { vr_die =3D __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) =3D=3D DW_TAG_typedef); =20 return vr_die; @@ -314,7 +334,7 @@ Dwarf_Die *die_get_real_type(Dwarf_Die *vr_die, Dwarf_D= ie *die_mem) */ Dwarf_Die *die_get_pointer_type(Dwarf_Die *type_die, Dwarf_Die *die_mem) { - int tag; + int tag, chase =3D 0; =20 do { tag =3D dwarf_tag(type_die); @@ -324,6 +344,11 @@ Dwarf_Die *die_get_pointer_type(Dwarf_Die *type_die, D= warf_Die *die_mem) tag !=3D DW_TAG_restrict_type && tag !=3D DW_TAG_volatile_type && tag !=3D 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 =3D die_get_type(type_die, die_mem); } while (type_die); =20 @@ -1118,17 +1143,25 @@ Dwarf_Die *die_find_member(Dwarf_Die *st_die, const= char *name, die_mem); } =20 -/** - * 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 d= epth) +{ + Dwarf_Die type; + + if (__die_get_real_type(vr_die, &type) =3D=3D 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 =3D ""; @@ -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 =3D die_get_typename(type_die, buf); + if (depth >=3D 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 =3D __die_get_typename(type_die, buf, depth + 1); if (ret < 0) { /* void pointer has no type attribute */ if (tag =3D=3D DW_TAG_pointer_type && ret =3D=3D -ENOENT) @@ -1166,6 +1204,21 @@ int die_get_typename_from_type(Dwarf_Die *type_die, = struct strbuf *buf) return strbuf_addstr(buf, tmp); } =20 +/** + * 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) =3D=3D NULL) - return -ENOENT; - - return die_get_typename_from_type(&type, buf); + return __die_get_typename(vr_die, buf, 0); } =20 /** --=20 2.53.0 From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B59B368D74; Sat, 19 Sep 2026 20:40:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850453; cv=none; b=BeP3m4ByfAT4XIVAVi+NlLyrOGPIKyS/MSEa4FhjuFoL/jrqyT6YWf1QOCIYI+pxjUi25doXAD1bRT6sXqNAr/nhQVMmgRJV5aq4WOXvp0Cy3uIHQ+mMmbFAdVCvf7NtJDV6AeRHgSqp8jzTAnP2zLgdGQptwEEEXdcutEuLjpo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850453; c=relaxed/simple; bh=jSIo2cQH4eRJsgYm7AwASGoLuduUQ3LI13aOXJClEto=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lRylTZkes2M7k5xaTU7mWxVrNPaZqyH4dP4onAnHznY2hZg7hhdLjbltvoQ9v5j3TuT5ZGcmyT9sROO9S7CM0wLtRoT+6qNS/lm8hjlfBeQ8fxFoTIvNU76uAfD9tlhdBv7J/y2d7/C9IRJIpsEcLndWswDypf0ZQa1AGjPn/KE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=heumUO9O; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="heumUO9O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 563BD1F000FF; Sat, 19 Sep 2026 20:40:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850451; bh=fveDyfm3Nkcs871mzBLgTxASv86CqYPhvvnqx/vjk38=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=heumUO9O9TJl0+cW6qzOnAZO+GRK5QEYdLf5pvWUjnEByeB8MR4x+vDHo8gY6R6FG jFbJRMil5oyARhwkKexFlfvOxmu+SKl0nDukFejEg+ysp2mzYO2qHxJSM4/5P24/sf h1aLvfQB223HOZd5Wp1pgh9zOqZ+UTDeQUq3skL4DDVvzdjJb7YMIIucTZHBHGzzf4 UJJv207sRfp/DbVuiF9lylyRFADK7rBYSt+dx0O9fya5En7KjvUHWiydHqGNGukpkG 63OLU7a65SIIwCPSV61tjizsTw1DfNyRNzsnFAvCYmjrULjB0j8dMyQxqOmYttLwJm t1xr2QyYtmBfQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 2/7] perf dwarf-aux: Add die_same_file() and die_get_type_die() Date: Sat, 19 Sep 2026 17:40:22 -0300 Message-ID: <20260919204027.8504-3-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo 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. Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- 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(-) diff --git a/tools/build/feature/test-libdw.c b/tools/build/feature/test-li= bdw.c index aabd63ca76b4d7e6..0ebe7bb4adf9d0bc 100644 --- a/tools/build/feature/test-libdw.c +++ b/tools/build/feature/test-libdw.c @@ -49,8 +49,19 @@ int test_elfutils(void) return 0; } =20 +/* + * 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 =3D (void *)dwarf_cu_getdwarf; + + return sym =3D=3D 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(); } diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 4ee7393a39f91d85..0585d71e3182c6dd 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -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 old= er than 0.157, disables dwarf support. Please install new elfutils-devel/li= bdw-dev) + $(warning No libdw.h found or old libdw.h found or elfutils is old= er than 0.160, disables dwarf support. Please install new elfutils-devel/li= bdw-dev) NO_LIBDW :=3D 1 endif endif # Dwarf support diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index b5ffeea54446408d..de14d18a9d2f87d8 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c @@ -1680,6 +1680,16 @@ Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_d= ie, Dwarf_Addr addr, return result; } =20 +/* + * 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) =3D=3D dwarf_cu_getdwarf(die_b->cu); +} + static int __die_collect_vars_cb(Dwarf_Die *die_mem, void *arg) { struct die_var_type **var_types =3D arg; @@ -1724,6 +1734,8 @@ static int __die_collect_vars_cb(Dwarf_Die *die_mem, = void *arg) vt->is_reg_var_addr =3D true; =20 vt->die_off =3D dwarf_dieoffset(&type_die); + vt->die_tag =3D dwarf_tag(&type_die); + vt->from_alt =3D !die_same_file(die_mem, &type_die); vt->addr =3D start; vt->end =3D end; vt->has_range =3D (end !=3D 0 || start !=3D 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 inf= o. - * 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 *di= e_mem, void *arg) return DIE_FIND_CB_END; =20 vt->die_off =3D dwarf_dieoffset(&type_die); + vt->die_tag =3D dwarf_tag(&type_die); + vt->from_alt =3D !die_same_file(die_mem, &type_die); vt->addr =3D ops->number; vt->end =3D 0; vt->has_range =3D false; @@ -1800,6 +1815,48 @@ static int __die_collect_global_vars_cb(Dwarf_Die *d= ie_mem, void *arg) return DIE_FIND_CB_SIBLING; } =20 +/** + * 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 fro= m_alt, + Dwarf_Die *die_mem) +{ + Dwarf *target =3D 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 =3D dwarf_getalt(dbg); + if (target =3D=3D NULL) { + pr_debug("DWARF: no alt (dwz) debug file to resolve the type DIE at off= set 0x%lx in\n", + (unsigned long)die_off); + return NULL; + } + } + + if (dwarf_offdie(target, die_off, &die) && dwarf_tag(&die) =3D=3D die_tag= ) { + *die_mem =3D 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 *di= e_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 inf= o. - * 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. */ diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h index 161f0bf980b6ee6a..299ffddab0358baa 100644 --- a/tools/perf/util/dwarf-aux.h +++ b/tools/perf/util/dwarf-aux.h @@ -152,6 +152,8 @@ int die_get_scopes(Dwarf_Die *cu_die, Dwarf_Addr pc, Dw= arf_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); =20 +/* + * 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 fro= m_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); =20 --=20 2.53.0 From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 788C12E0B5C; Sat, 19 Sep 2026 20:40:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850457; cv=none; b=FKeypbfoRXfpMh269VKKN6A+2U0D8CTDrMpo2I/hf50QRGAvmmwGd8ZfJuJT7N8xKEC4DyA3yfY+J8xcgP7ux+3d+UHk2rSCFXhG2jLmiKW3c/QZbumsZP+5YRhmviCfq6FG9BZ5ASD57J5BTfHfWMKFBuIzHVAwnQWkCPKsn9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850457; c=relaxed/simple; bh=jdqlWZ8Uw3eCXfH2zwaSOTBWozGXvQl89lOuEJLWemQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NXFsr2zOL/lVxQd5HfudGJG6W8Ijaw2iHNVLS4dZL9cRtXibD9HPG8pB0EKtZsnf8/jJB1ac1Yx0Zfvzp+w82wy8SsXP3ITiB3hYNvyckMuiUMGKh2i4pgNLdKTkCly4dl30IXqXkn8JFqziPNJQJzHDx+eqXwns+oe1kzNMqE4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O/RkrYsa; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O/RkrYsa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B9FC1F00893; Sat, 19 Sep 2026 20:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850455; bh=RAKzrrpReCOvLem2gwUxjMaJMp10YTpRJYGulbVatRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O/RkrYsaIm5YRu2Oj1yLAU6xq8cgmTdySIea1KHdv4u+/RxOeQoVWR+St1ZCoerUn Rjtf99BO/QxKj92f9YSAoC7V4FEUSg+K33rUQXGUJ5rEwTuP/SMOSQC64vs8VQNZGB 246Kq4wpt6yUMwdSDqclIWMoA0tDXWJIZYjsMX4IIBUczY3HQlT2BieqQq1uFZPWpB v8ggYQrbVd++uoz68L49VV8pkwprYNt9itrXnx5qKSrlONFDI9RJxXlgS+8jWzThdw gk0k2EA+ckI5VDLNOm70vaHNA5YnXWKoxzSlCSCH0Ih6JbCz8E4mNrjm/KSMvlgqsD HbB/JtmzL7RfA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 3/7] perf annotate-data: Resolve type DIEs in the debug file they came from Date: Sat, 19 Sep 2026 17:40:23 -0300 Message-ID: <20260919204027.8504-4-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo '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. Fixes: 06b2ce75386df04b ("perf annotate-data: Maintain variable type info") Fixes: 55ee3d005d62279d ("perf annotate-data: Add a cache for global variab= le types") Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate-data.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-dat= a.c index aff60a630fd05b01..2ad6d012e069c522 100644 --- a/tools/perf/util/annotate-data.c +++ b/tools/perf/util/annotate-data.c @@ -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 */ }; =20 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 } =20 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 =3D 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 =3D addr; gvar->end =3D addr + size; gvar->die_offset =3D dwarf_dieoffset(type_die); + gvar->die_tag =3D dwarf_tag(type_die); + gvar->from_alt =3D from_alt; =20 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 !=3D -1) continue; =20 - 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; =20 get_global_var_info(dloc, pos->addr, &var_name, &var_offset); =20 - global_var__add(dloc, pos->addr, var_name, &type_die); + global_var__add(dloc, pos->addr, var_name, &type_die, + pos->from_alt); } =20 delete_var_types(var_types); @@ -808,7 +814,8 @@ bool get_global_var_type(Dwarf_Die *cu_die, struct data= _loc_info *dloc, =20 gvar =3D 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; =20 *var_offset =3D var_addr - gvar->start; @@ -838,7 +845,8 @@ bool get_global_var_type(Dwarf_Die *cu_die, struct data= _loc_info *dloc, =20 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; } =20 @@ -893,7 +901,8 @@ static void update_var_state(struct type_state *state, = struct data_loc_info *dlo continue; } /* 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; =20 if (var->reg =3D=3D DWARF_REG_FB || var->reg =3D=3D fbreg || var->reg = =3D=3D state->stack_reg) { --=20 2.53.0 From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B03B237E5DC; Sat, 19 Sep 2026 20:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850462; cv=none; b=gLw7GEC8PkWSswGOCF9CueWv8Mwsxz/hw/63qebju4sR42gIwg6jujlMkZ0q0USWovcZm9JDJ5G0VCpBiimN/oqB2niZEqzmf9ZyzhXYjWoG3yEgDn9rfwSs/kkpgXqjPUC4nTNFCuz6vxUCSNws9ziDPpjI4N9CZbV7Qp/DPXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850462; c=relaxed/simple; bh=cdsMhhDLo2jM8tA4bY0FQYn4R/1nfLlAMM5GLmTr6E4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=clSy14vedHM39zrVYTIvshElXnjpQnedycoFkjB80ksEDusVj9/5NG9iRw9z0DF069prJN+aC8qlYugwP7WOs94vbFjVN7G25Wahe9/3MbXVNPWCx+vSbF7V63McxxXEs6FZhoV7SvHaRA2V6AQZw/bYoRIBv8yfk0qHDn/3sjw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FsBD9laj; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FsBD9laj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69B361F000FF; Sat, 19 Sep 2026 20:40:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850461; bh=lT1wCPAuEIFo7R+PjuyFlgnttrVDkpYDnKA/trn2IFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FsBD9lajtANXWCwC7TPG+fH/W5bnjWnmezBNVo3znPZgwBiDvK5UYq+sm/nVaoNtb Lc7594WywBNHdEAj2RUga+2WXfAuvZJ8Rv4ivLAZ3F+5LfHO1ByiQqkWhE4yAhNRHb 7qSIj0/g3Z8M5PXY/+IJHAfCX6jCxxSTU10CWOEFiptLjFWrKl+9g9TYxtbxlNCtJj c6bSgNG3YLdX6hm+TnPkZTkrcIRYIVFMBEneD/YFbmuaMxy/hjtgJlYmwQjBEatu+n UhbB+kNjjLXWrOeUt1yL35J74eacEdQ7UxgRt4Mf2u1cobkrfW0dixrU/ibIhAfedj bSvqby1uEkrVQ== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 4/7] perf annotate-data: Bound the member nesting recursion Date: Sat, 19 Sep 2026 17:40:24 -0300 Message-ID: <20260919204027.8504-5-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo 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: LLM Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate-data.c | 32 ++++++++++++++++++++++++++------ tools/perf/util/annotate-data.h | 3 +++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-dat= a.c index 2ad6d012e069c522..c67bb6005e23c516 100644 --- a/tools/perf/util/annotate-data.c +++ b/tools/perf/util/annotate-data.c @@ -221,6 +221,13 @@ static bool data_type_less(struct rb_node *node_a, con= st struct rb_node *node_b) return strcmp(a->self.type_name, b->self.type_name) < 0; } =20 +/* + * 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) !=3D DW_TAG_member) return DIE_FIND_CB_SIBLING; =20 + if (__die_get_real_type(die, &member_type) =3D=3D NULL) + return DIE_FIND_CB_SIBLING; + + if (dwarf_tag(&member_type) =3D=3D DW_TAG_typedef) { + if (die_get_real_type(&member_type, &die_mem) =3D=3D NULL) + return DIE_FIND_CB_SIBLING; + } else { + die_mem =3D member_type; + } + member =3D zalloc(sizeof(*member)); if (member =3D=3D 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); =20 - __die_get_real_type(die, &member_type); - if (dwarf_tag(&member_type) =3D=3D DW_TAG_typedef) - die_get_real_type(&member_type, &die_mem); - else - die_mem =3D member_type; - if (dwarf_aggregate_size(&die_mem, &size) < 0) size =3D 0; =20 @@ -289,10 +300,19 @@ static int __add_member_cb(Dwarf_Die *die, void *arg) } member->size =3D size; member->offset =3D loc + parent->offset; + member->depth =3D parent->depth + 1; INIT_LIST_HEAD(&member->children); list_add_tail(&member->node, &parent->children); =20 tag =3D dwarf_tag(&die_mem); + if (member->depth >=3D MAX_MEMBER_DEPTH) { + /* Reported by the JSON exporter so consumers can tell a truncated tree.= */ + member->truncated =3D 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: diff --git a/tools/perf/util/annotate-data.h b/tools/perf/util/annotate-dat= a.h index ca2096a9ee62cbfe..cc576232f55b5fb0 100644 --- a/tools/perf/util/annotate-data.h +++ b/tools/perf/util/annotate-data.h @@ -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; }; =20 /** --=20 2.53.0 From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE4862E0B5C; Sat, 19 Sep 2026 20:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850466; cv=none; b=Lusdwu1FneuWLlRP4BDBIkbUNMoPtODg91hNHh5v9YEr/OMzVg8nJm57GqYxKL4P9Bflt/vwrr6zQEDecS73OvQFPdxt7iwiEiA+cJ3UQGOsOfy8/lILR2uDsTEeV3o1dLZmKHPPLZiK2GiOzZmzg6pcMrmPd0zOIgebXBhekIE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850466; c=relaxed/simple; bh=3cDhoN7P/1XTUwvA8WkOrFA9S1haHivtyk6o/1zsDr4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZBeoCIL493fIs3KwkENvqTpkldw0cZREjKj9R/t7om2y6EpkxETx1fHh4jaUpcjCF/J4oE2aRjxc0UqdAudKedAOhq+0qein7KxXbbqc9kugYzSuJphNIaSOJMJudlJ5oLBRs6aJM5OMC1unY8UpCcTyaufyDYBx8Bbj5XxmyEQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bcn5r6Mt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Bcn5r6Mt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D50F81F00893; Sat, 19 Sep 2026 20:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850465; bh=ut/tiruf2HnofkU7Adqr3g/phrfuZNzP9oxtyKMjlx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Bcn5r6Mtr1/JYWm2aHtPyM7kGYmPam5JK06rtW4LM4BFWXZ7l4dokQpCJnL6r+9Hu kM7c40Ed9tSSH0Burry8U58Tz12UYnzJ2qcnsj8MYIGopgjHsndg6SVRVmIk1m9akE F2vjAX/BnFqqBWQ3bdRV+dW6WV2cVflzEAHBf0aHiZDxlJWkf6Va8VeWn1Dj9nywiL Nl271nLL7su33f9edx9WXO72ZzvLPPTlA6Nf7IuhG0I2BIQUI0Of6xnsY8JF2ISG32 MiMvwRVJkf/ccAEMgTeep8dAn5MK/VNzNXRsQA1Mu8HSEiM4I/H0EthpUxX/ZARPmF oC8x44Ub4OW8g== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 5/7] perf annotate-data: Show the sample count in the data-type browser Date: Sat, 19 Sep 2026 17:40:25 -0300 Message-ID: <20260919204027.8504-6-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo 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. Fixes: d001c7a7f4736743 ("perf annotate-data: Add hist_entry__annotate_data= _tui()") Acked-by: Namhyung Kim Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/annotate-data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/ui/browsers/annotate-data.c b/tools/perf/ui/browser= s/annotate-data.c index c6e07a9b64089ab5..a15608f6ee53335f 100644 --- a/tools/perf/ui/browsers/annotate-data.c +++ b/tools/perf/ui/browsers/annotate-data.c @@ -374,7 +374,7 @@ static void browser__write_overhead(struct ui_browser *= uib, u64 period =3D hist->period; double percent =3D total->period ? (100.0 * period / total->period) : 0; bool current =3D ui_browser__is_current_entry(uib, row); - int nr_samples =3D 0; + int nr_samples =3D hist->nr_samples; =20 ui_browser__set_percent_color(uib, percent, current); =20 --=20 2.53.0 From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F32552E0B5C; Sat, 19 Sep 2026 20:41:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850471; cv=none; b=CgTu/I5nxr6gw1Jv8Gg03iMBTB2wxFQCrMsznPX/xl2tKgKpBK4wSTwKC5M+BY3CuwD9I05TznRmW+211TMbCtQqp7p7sahqU+ksJIkSa3lovh5FsAoYo75FOAnLj09F0RgxfhYGvpuQHj08v4ZxLX+ZZixTPmBb6xjXBEMnAHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850471; c=relaxed/simple; bh=MGTXjif7xTswKs0E+znM0wCKYAnwpLrgIKOtWM0szIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LalIBAIl16OCWdhbCDHiq/wNYR8aNQPQ530qDqJ1+CrBJvdTPKMWms3mkaiJZryz24TT/fa28SPWE+LPv1h59y+pHO8JZzayPsGLa1Mh5QKXHA4KBQdpnqXKGHSPDKxb8/B3VTftwWQ/CPG7DBNil+ixUovvRHVQ7rHqkT1/ZbE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SHTTZZF6; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SHTTZZF6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E91111F000FF; Sat, 19 Sep 2026 20:41:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850469; bh=BncCxjTiKQVF3SwqHJrsuzqMd2UO7T1iZGDHgAE23rY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SHTTZZF6alGZ45oWmpcwo/8UFjTlCvKo4ad75bP8Rh5/eLULb7SLIps1JFm6X1VNK SggjTrd1CxrjvqxFJOj7oiEGb7rPBbrbZ4wJ59WVjFF0EvPk/xxV47l71J4TFGAWWr vRlZ9YEVNnxVcgWLwqyvb9PKXSetSfn4s1BcEJY7LJGZyuOVICY9myGUDVZtY/6/bS VBQlfKxFm2redONz1uRCb0ihTV9pACAlcLeViXWIlhge3WWuEnt0ASNvfaI2wbM3oW 0b+UF7He0st/p5DRnpRMaGgvdS/tcB3TrQpvQwtC6kMi4kz9tCRYZxOUPVSeD17YvP dvlvjcXErGllA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 6/7] perf mem record: Request PERF_SAMPLE_CPU by default Date: Sat, 19 Sep 2026 17:40:26 -0300 Message-ID: <20260919204027.8504-7-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo 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. Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-mem.txt | 4 ++++ tools/perf/builtin-mem.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/perf/Documentation/perf-mem.txt b/tools/perf/Documentati= on/perf-mem.txt index 4d164836d0943119..fe51c5e3333dc4a0 100644 --- a/tools/perf/Documentation/perf-mem.txt +++ b/tools/perf/Documentation/perf-mem.txt @@ -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 t= hrough. +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 wh= at +lets per-sample analysis tell reads and writes to the same data from +different cores apart from same-CPU traffic. =20 "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 diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index 6101a26b3a781e69..f25592bc52728655 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -99,8 +99,8 @@ static int __cmd_record(int argc, const char **argv, stru= ct perf_mem *mem, argc =3D parse_options(argc, argv, options, record_usage, PARSE_OPT_KEEP_UNKNOWN); =20 - /* Max number of arguments multiplied by number of PMUs that can support = them. */ - rec_argc =3D 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 =3D argc + 8 + 9 * (perf_pmu__mem_events_num_mem_pmus(pmu) + 1); =20 if (mem->cpu_list) rec_argc +=3D 2; @@ -135,6 +135,13 @@ static int __cmd_record(int argc, const char **argv, s= truct perf_mem *mem, =20 rec_argv[i++] =3D "-d"; =20 + /* + * 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++] =3D "--sample-cpu"; + if (mem->phys_addr) rec_argv[i++] =3D "--phys-data"; =20 --=20 2.53.0 From nobody Thu Sep 24 21:46:48 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F4E72E0B5C; Sat, 19 Sep 2026 20:41:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850475; cv=none; b=HvpzKi3ziQ0fFN0FOs9R1o39AOhdWxlcIgSibnHm7GJZMfuRAXZIXPfqYtXXx9OLeRjZuNNSFvwR3i7iBRJ/A2tH4C/oLEpwvxOLRJY2rDp4YMxKKB9mhuvCKKV4hMvQ5CKmW17lE2B41WZ2x4bmHVXaG7c4zYklDKbOXwzVwNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789850475; c=relaxed/simple; bh=NX5IbQBC9tvW32ED0IkNvx5/a3Fl6E4GFGAoGst6Clw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=arU4n3E4g48Y2IVKhaFS86XHBXgLh3I14Ln7skws87UsHaReBM8pwYX4NDnYCPNJzQhBpJWZOIFnMjYiHwM9JuSElGD3hQoppTJj+CyscE4SjHPzItIcgbqRRxEj8Up/wcydNR/0z485HfuqSENupEAiB28Emf3J5m2GShc5zy8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iOzxflG1; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iOzxflG1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2A931F00899; Sat, 19 Sep 2026 20:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789850474; bh=MHL0Zm9FExTTcnRuFH4KvXCWMqeeqIFgEGVtpkRNCVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iOzxflG1QP4GXe4iA1fJPjSumtF73V0MQ8eMI+uLknBI07xmSPJSRqIH3BzUHDDJA xl7mveZm/4XEqMUzsKXhxJZiEM+3rCRFiihTxJ0j7TDGnHU+gpl7HTbyWrmAphEqlj DuvAlWUyHO4Qoi4etRJhwEqeu+iK0/pbdbPZs9yEgcKABVmO3OwlsXFeXP7dj5qDka np03f3khR6F0XmuuwvAaFlgiIdy3Kj93LobEhLvyZPeNyPMpUU44zUr/nHAi7PHZUU Welmy38ZUHvsCLzfMQ06NZez+GTHRgQe3gsQW3rcz7VElpvYDVjTYJPNZPK/uaJCUp RQR5XmyQJUScw== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Ravi Bangoria Subject: [PATCH 7/7] perf mem record: Use the IBS swfilt filter when available Date: Sat, 19 Sep 2026 17:40:27 -0300 Message-ID: <20260919204027.8504-8-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260919204027.8504-1-acme@kernel.org> References: <20260919204027.8504-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Arnaldo Carvalho de Melo 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=3D0/u' on PMU 'ibs_op' which will be = removed. Invalid event (ibs_op/ldlat=3D0/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=3D0,swfilt=3D1/ -- 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. Suggested-by: Namhyung Kim Suggested-by: Ravi Bangoria Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- 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(-) diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/ut= il/mem-events.c index b38f519020ff8c6f..2052750cd707c7e5 100644 --- a/tools/perf/arch/x86/util/mem-events.c +++ b/tools/perf/arch/x86/util/mem-events.c @@ -21,14 +21,38 @@ struct perf_mem_event perf_mem_events_intel_aux[PERF_ME= M_EVENTS__MAX] =3D { E(NULL, NULL, NULL, false, 0), }; =20 +/* + * 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] =3D { E(NULL, NULL, NULL, false, 0), E(NULL, NULL, NULL, false, 0), E("mem-ldst", "%s//", NULL, false, 0), }; =20 +struct perf_mem_event perf_mem_events_amd_swfilt[PERF_MEM_EVENTS__MAX] =3D= { + E(NULL, NULL, NULL, false, 0), + E(NULL, NULL, NULL, false, 0), + E("mem-ldst", "%s/swfilt=3D1/", NULL, false, 0), +}; + struct perf_mem_event perf_mem_events_amd_ldlat[PERF_MEM_EVENTS__MAX] =3D { E(NULL, NULL, NULL, false, 0), E(NULL, NULL, NULL, false, 0), E("mem-ldst", "%s/ldlat=3D%u/", NULL, true, 0), }; + +struct perf_mem_event perf_mem_events_amd_ldlat_swfilt[PERF_MEM_EVENTS__MA= X] =3D { + E(NULL, NULL, NULL, false, 0), + E(NULL, NULL, NULL, false, 0), + E("mem-ldst", "%s/ldlat=3D%u,swfilt=3D1/", NULL, true, 0), +}; diff --git a/tools/perf/arch/x86/util/mem-events.h b/tools/perf/arch/x86/ut= il/mem-events.h index 11e09a256f5bb084..f707de38037017c1 100644 --- a/tools/perf/arch/x86/util/mem-events.h +++ b/tools/perf/arch/x86/util/mem-events.h @@ -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__MA= X]; =20 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__M= AX]; extern struct perf_mem_event perf_mem_events_amd_ldlat[PERF_MEM_EVENTS__MA= X]; +extern struct perf_mem_event perf_mem_events_amd_ldlat_swfilt[PERF_MEM_EVE= NTS__MAX]; =20 #endif /* _X86_MEM_EVENTS_H */ diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index 2c24ef3140da5e9b..fd4491fda117e51a 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -333,6 +333,7 @@ static void uncore_cha_imc_adjust_cpumask_for_snc(struc= t perf_pmu *pmu, bool cha void perf_pmu__arch_init(struct perf_pmu *pmu) { struct perf_pmu_caps *ldlat_cap; + bool swfilt_format; =20 if (!strcmp(pmu->name, INTEL_PT_PMU_NAME)) { pmu->auxtrace =3D true; @@ -348,7 +349,10 @@ void perf_pmu__arch_init(struct perf_pmu *pmu) if (strcmp(pmu->name, "ibs_op")) return; =20 - pmu->mem_events =3D perf_mem_events_amd; + swfilt_format =3D perf_pmu__has_format(pmu, "swfilt"); + pmu->mem_events =3D swfilt_format ? + perf_mem_events_amd_swfilt : + perf_mem_events_amd; =20 if (!perf_pmu__caps_parse(pmu)) return; @@ -358,7 +362,9 @@ void perf_pmu__arch_init(struct perf_pmu *pmu) return; =20 perf_mem_events__loads_ldlat =3D 0; - pmu->mem_events =3D perf_mem_events_amd_ldlat; + pmu->mem_events =3D 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")) diff --git a/tools/perf/tests/shell/test_data_symbol.sh b/tools/perf/tests/= shell/test_data_symbol.sh index d61b5659a46d9a77..52c837fddb639595 100755 --- a/tools/perf/tests/shell/test_data_symbol.sh +++ b/tools/perf/tests/shell/test_data_symbol.sh @@ -65,15 +65,17 @@ if (($is_amd >=3D 1)); then # --ldlat on AMD: # o Zen4 and earlier uarch does not support ldlat # o Even on supported platforms, it's disabled (--ldlat=3D0) 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=3D${BASH_REMATCH[1]} - if [[ -n $ldlat ]]; then + if [[ $ldlat =3D=3D *ldlat=3D* ]]; then if ! [[ "$ldlat" =3D~ ldlat=3D0 ]]; then echo "ERROR: ldlat not initialized to 0?" exit 1 fi =20 mem_events=3D"$(perf mem record -v --ldlat=3D150 -e list 2>&1)" - if ! [[ "$mem_events" =3D~ ^mem-ldst.*ibs_op/ldlat=3D150/.*available ]];= then + if ! [[ "$mem_events" =3D~ ^mem-ldst.*ibs_op/ldlat=3D150[,/].*available = ]]; then echo "ERROR: --ldlat not honored?" exit 1 fi diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 0b49fce251fcc184..0b07011939d7d7c3 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -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; =20 if (i >=3D PERF_MEM_EVENTS__MAX || !pmu) return NULL; @@ -90,24 +91,26 @@ static const char *perf_pmu__mem_events_name(struct per= f_pmu *pmu, int i, if (!e || !e->name) return NULL; =20 + name =3D e->name; + if (i =3D=3D PERF_MEM_EVENTS__LOAD || i =3D=3D PERF_MEM_EVENTS__LOAD_STOR= E) { 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 per= f_pmu *pmu, int i, =20 if (i =3D=3D PERF_MEM_EVENTS__STORE) { scnprintf(buf, buf_size, - e->name, pmu->name); + name, pmu->name); return buf; } =20 --=20 2.53.0