From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9CF43DFC8A for ; Mon, 24 Aug 2026 06:28:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787552931; cv=none; b=Ouhf0NlHcCKlklUbjlkow1xmdmXM08PgdXfGpfELgmDIf8WZl6ymQSs3W8SObVY2h1Eh+ty93y2XdgLAk3DfWQOauQ5lpZAWyRuXMEycYzokFyJ54L4Va81dhupDVj+uuWoIM6ecyctaici2nRFddAAy+T2+mWbyNIai1OaJ0wU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787552931; c=relaxed/simple; bh=gMaNXf7xJjOQ+qdNmKmHhulbQS0EBessgU12SUxZg28=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=H4OfgcSDiAAr75aF+pm92GgY8VL23rr7vSg+rg5cvGnt5rDnpjBrGHa4HVaLdImp3JqXbV8VdImb3Erf50RxMk6bBYGEHGEXz1RYNJ20eazu/BjVkmGpUEc9A1GPgdf/uFKgTIQIgLIMO57A2DPLzUGSh+t8LYkFyOm+6XCpv9c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=r3xBMGvr; arc=none smtp.client-ip=209.85.216.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="r3xBMGvr" Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38e4758ab46so4887866a91.0 for ; Sun, 23 Aug 2026 23:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1787552929; x=1788157729; darn=vger.kernel.org; h=content-type:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=UgqPKMSInHAUx1W1Amw4siLEmTlfxJRfowC3pdCETa4=; b=r3xBMGvr1W/jgcPpAq5jLksL5JmaqcjnYHlKiauRg6g5ihMeDoWU0IUdQmek/R8tIL c/WhJE9dA8MOA2eJ7/XnLStfOJ08CJq2H4PNzEDyS7aue99cVCOMH+Z5BhNiTOrBmvOh at9pjYpbSe4JGLajH4Dhp8EQmYv41Dua+vBFKMOMDqIvWpTDn9YPZVGNKn/1+FhWhPJf 1RJ9vjMeIZPzhRdBOp9gBzJW1Ni9knPkEZ1ImABgX5K4oNxB8BIvqSZsgVTs5utrFNnP wKKUgaTmhWWyebc183jn25rdTWitLdb1ETPa0A4XQaJrnSF1jd8tJp1IYdub+NnQgoM/ 9zPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787552929; x=1788157729; h=content-type:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=UgqPKMSInHAUx1W1Amw4siLEmTlfxJRfowC3pdCETa4=; b=hYV8dgHe09EDXSJEX8J12cA8eOKK0HDgvUEE9cRiq5p4rO/o0CH5SLe9Go+XbA8C19 TNhCRhM4N+/QxypITwz4X8bhlu+Ejb2Rju6QrDLH1A+GhTxYIeiqyXD0Emg6YOaWR0JE NAL0anjCJoobaxi4/TbuELpvrAOhePIKnVQy+ojFRC1RAodXTj4yMnZDTrIvrnDaZu7S yvzq/AZOBw4YXld4sPfwge1RCkQEeVnKDU3aX/nKhVjKrOh8EsQ7hDPexpsHhbtk+mun pzRR6yq7JbuiySDslqI5tIDwWQ9zuPL6vV1044vgjlTzPP+zT6rNy6Z2InOobERt+H+t x21g== X-Forwarded-Encrypted: i=1; AHgh+Rq0wGLRfOmEmyh3j8SKKGOK2Nc06dvDbxk3wmyBJ2xraW1P/VFr4CQi6b1jJl+q0R1FWZhtJp3CJc4aCDQ=@vger.kernel.org X-Gm-Message-State: AFuF++nz5cXYWAd6C16IK/uJHJRYInG/Rq3bjA24zc5JY1U7F7kN/IfJ qLO6fSgsxByyvOof5qYCIdHZ4O71TtV6wXC3I+mhK5YFPMKSeBX9sKDMK7FoRCYcqyCZnYhw7CK EgsSsC6+0HA== X-Received: from dlbvv2.prod.google.com ([2002:a05:7022:5f02:b0:140:f3ca:6a02]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5646:b0:381:28e0:6259 with SMTP id 98e67ed59e1d1-395c36fb278mr45944849a91.9.1787552928935; Sun, 23 Aug 2026 23:28:48 -0700 (PDT) Date: Sun, 23 Aug 2026 23:28:40 -0700 In-Reply-To: <20260824062841.1529489-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260824062841.1529489-1-irogers@google.com> X-Mailer: git-send-email 2.55.0.766.g2966f0265a-goog Message-ID: <20260824062841.1529489-2-irogers@google.com> Subject: [PATCH v1 1/2] perf libdw: Pass dso_name explicitly to properly anchor split-debug builds From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Tanushree Shah , Michael Liang , Alessio Podda , Shimin Guo , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" When resolving source lines via get_srcline(), srcline_dso_name() explicitly checks for and returns the split-debug file path (dso__symsrc_filename, which is cached during dso__load()) rather than the default executable path (dso__long_name). Because libdw__addr2line defaulted to dso__long_name without accepting a passed dso_name, the Dwfl_Module was hardcoded to initialize against the stripped executable instead of the intended split debug file. By explicitly passing the successfully resolved dso_name down the call path from addr2line() to dso__libdw_dwfl(), libdw accurately anchors to the dynamically discovered split-debug file, fixing dwarf resolution for these binaries. Assisted-by: Antigravity:gemini-3.6-flash Signed-off-by: Ian Rogers --- tools/perf/arch/powerpc/util/skip-callchain-idx.c | 2 +- tools/perf/util/dso.h | 5 +++-- tools/perf/util/libdw.c | 10 +++++----- tools/perf/util/libdw.h | 5 +++-- tools/perf/util/srcline.c | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/perf/arch/powerpc/util/skip-callchain-idx.c b/tools/perf/arch/powerpc/util/skip-callchain-idx.c index e57f10798fa6..f7dd27faaec2 100644 --- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c +++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c @@ -152,7 +152,7 @@ static int check_return_addr(struct dso *dso, Dwarf_Addr mapped_pc) Dwarf_Addr end = mapped_pc; bool signalp; - dwfl = dso__libdw_dwfl(dso); + dwfl = dso__libdw_dwfl(dso, NULL); if (!dwfl) return -1; diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index 55c4aaa53c38..3271e1ecaa9e 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -380,9 +380,10 @@ static inline void dso__set_libdw(struct dso *dso, void *val) struct Dwfl; #ifdef HAVE_LIBDW_SUPPORT -struct Dwfl *dso__libdw_dwfl(struct dso *dso); +struct Dwfl *dso__libdw_dwfl(struct dso *dso, const char *dso_name); #else -static inline struct Dwfl *dso__libdw_dwfl(struct dso *dso __maybe_unused) +static inline struct Dwfl *dso__libdw_dwfl(struct dso *dso __maybe_unused, + const char *dso_name __maybe_unused) { return NULL; } diff --git a/tools/perf/util/libdw.c b/tools/perf/util/libdw.c index 4ca7e7e4fbe9..f53caee980b0 100644 --- a/tools/perf/util/libdw.c +++ b/tools/perf/util/libdw.c @@ -25,17 +25,17 @@ void dso__free_libdw(struct dso *dso) } } -struct Dwfl *dso__libdw_dwfl(struct dso *dso) +struct Dwfl *dso__libdw_dwfl(struct dso *dso, const char *dso_name) { Dwfl *dwfl = dso__libdw(dso); - const char *dso_name; Dwfl_Module *mod; int fd; if (dwfl) return dwfl; - dso_name = dso__long_name(dso); + if (!dso_name) + dso_name = dso__long_name(dso); /* * Initialize Dwfl session. * We need to open the DSO file to report it to libdw. @@ -163,11 +163,11 @@ static int libdw_a2l_cb(Dwarf_Die *die, void *_args) return DWARF_CB_ABORT; } -int libdw__addr2line(u64 addr, char **file, unsigned int *line_nr, +int libdw__addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line_nr, struct dso *dso, bool unwind_inlines, struct inline_node *node, struct symbol *sym) { - Dwfl *dwfl = dso__libdw_dwfl(dso); + Dwfl *dwfl = dso__libdw_dwfl(dso, dso_name); Dwfl_Module *mod; Dwfl_Line *dwline; Dwarf_Addr bias; diff --git a/tools/perf/util/libdw.h b/tools/perf/util/libdw.h index b12094737415..4bdd28d44e25 100644 --- a/tools/perf/util/libdw.h +++ b/tools/perf/util/libdw.h @@ -25,7 +25,7 @@ struct symbol; * * Returns 1 on success (found), 0 on failure (not found). */ -int libdw__addr2line(u64 addr, char **file, +int libdw__addr2line(const char *dso_name, u64 addr, char **file, unsigned int *line_nr, struct dso *dso, bool unwind_inlines, struct inline_node *node, struct symbol *sym); @@ -40,7 +40,8 @@ void dso__free_libdw(struct dso *dso); #else /* HAVE_LIBDW_SUPPORT */ -static inline int libdw__addr2line(u64 addr __maybe_unused, char **file __maybe_unused, +static inline int libdw__addr2line(const char *dso_name, u64 addr __maybe_unused, + char **file __maybe_unused, unsigned int *line_nr __maybe_unused, struct dso *dso __maybe_unused, bool unwind_inlines __maybe_unused, diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index b082178c279b..8e954f0c860a 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -155,7 +155,7 @@ static int addr2line(const char *dso_name, u64 addr, char **file, unsigned int * for (size_t i = 0; i < ARRAY_SIZE(symbol_conf.addr2line_style); i++) { switch (symbol_conf.addr2line_style[i]) { case A2L_STYLE_LIBDW: - ret = libdw__addr2line(addr, file, line_nr, dso, unwind_inlines, + ret = libdw__addr2line(dso_name, addr, file, line_nr, dso, unwind_inlines, node, sym); break; case A2L_STYLE_LLVM: -- 2.55.0.766.g2966f0265a-goog