From nobody Tue Sep 29 07:48:13 2026 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 2C6CC31B803 for ; Tue, 11 Aug 2026 05:00:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786424456; cv=none; b=Y+F7ogzUxvBRe4/kD4vKX4R79//dbBvMsNvj8CNh6bQJJAL9+oq13cQ0mW0HNtbFO1Tj+58WPhTsIx7ABIw8wwLrsnUNdVMFwClUjihFQQFxeFtL4dl/YXuE3rL8Bx4KV2/I8YQnlqNAcEMlabE3GeWYHWx5CpMLNGSGTs24pAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786424456; c=relaxed/simple; bh=yuyBDXtIkxCZCrvgPb35PsZlLUmaE55ZmbM1gHuukS4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Vu/aGBfkjumKaT6ZNbZ8O/jNGfko3QLBkmkf2UuLEacvvcUkz8BzAEJf7bbUjSvmAFFht642+DawiG+kyfHzP+M6WAcncNdKAXJDYsIg1A4zpjXPn1sR4/WyhT3lp+9kF1/2AgdvmYQPoAhKUGldJ/hgEW4793tuIDCeaacCfn8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bzvJKUaF; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bzvJKUaF" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-38e42560ebcso2007095a91.1 for ; Mon, 10 Aug 2026 22:00:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786424454; x=1787029254; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=DmyneajZ/FvgDHMSIizhnr+cBuZtaX9gxd+v2rQ+Hv0=; b=bzvJKUaFJ2/x/FGa6k1j78KDPhWrFlRXuFxTe6yK0piO+JmNrHcAq+oh0Vf40OcJkw 3x1nPmkn6qG2Xo4zZZotOaOn46R/eCG7qacW7f0p62TuZwG/nfm4nxn1PzjUGPlCgL75 1PzdfA20x+XmHP09ttQEbU4pJNdXuOZZEFk62DoYWXHVBaXsAD3KTLz6Cb5nZw11JP8b ieKKhM+fVDHX0W5Ehk3r9ZrAZoa9idX2n6ZLYrOHv6rEW6PpjhjuZ/YVflXEWLzQwt9P kONpLtSVV4yaoexAo5+ybqTlrSzhwKy9prCrhJDRhWTBUz54DPidQkAp2e3Lflp/zzMB AHPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786424454; x=1787029254; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DmyneajZ/FvgDHMSIizhnr+cBuZtaX9gxd+v2rQ+Hv0=; b=Zy1UlES305VHtkA8od78yOBX9N/I98fKP1j7Z35F2pZAzZCoNCdmyxsdRNPYcZI3vu aQ0lJN2osw4DiZq5ZXr2w3dcN1HtwjDy8gunfi3peU9jSpIRgbH5KU4SGDHj5ga+B28S jrkM7JTSsH1xEVjiyt6/frYeOp4T90BAAueWuYpiL3WIDArTX+dXMRhY7lmY5CyX0RH7 3sFRqK/986P5fJW2MXf3Lpdg9RLu2aif8MLy6dHyuL9M76gZuCFT64IKXTqFFjodF98G 7frGN5cOnWLFxWPD4ttUZb+ghIP1JOwLmS8V8k0xuHjyCInm6eoEpt2/gZf5M0G/MPcH 32jQ== X-Forwarded-Encrypted: i=1; AHgh+Rouwn1174sCA95pz9A/B/eRnrFiVfzC0kGzXdi9gR1CBvUeSVwDmdeQJbfZD4s4TMXA/uRWHaiAD9ThauA=@vger.kernel.org X-Gm-Message-State: AOJu0YyGkNl32C1Zjhr6KcjWmyowsc6dzhZ+mJhNLfbpBIiGa7/IqrY0 5Avc8TxdjWZOH2DdFd/+80MXm8Vcsuw57qh7Q6ieDjJkh1ABHyg1Qbkj X-Gm-Gg: AR+sD12XSILipdZItM6v1aqd8r02ZI0u1vi35rAo1PdFYMkNHaOH3lk4tMzXqyiLQV2 2EYfvGA5lADQAHIx/9y86ZiKyGctNpVBv61U82Bt+H05aIw2O2nit0zWpYrS5BQ1uLwZnOcICRR Sw/mK4BNRWo2WiLVJjWRUhea8AAUEe0yHK6CYlzO03ERCE9JJEgCyCKCKxAsn92HT8CkLFnNX8e gojSus0uOyyO7KjwdpWXimvRJewS1J3EvUgfw0cc5sWtpj2U4YsnsAvHr++UEv73LzanzoIocOo UnS5CFqKK7W7USFBZ6gjZSL9eG1u1Ijti0eV/WAIMdodBSDMcLAxs3y2g9DM699a0iJkf0ZAlYo ZfNr2rwpBdJw7zUXqzQRLXEPZjp/4ZnD4sPtNFVonrZKz7FqBAoFxX3ciYFM7bupqirMVEhoHVU yo20kD1foEEqq0TZxRg1oeL4CaE8M59gBcuaLvVPhTpUUCF8yKWJ6EpR7PIUnzfF+y6wP9Ncpo X-Received: by 2002:a17:90b:2689:b0:37f:e1b6:4c7d with SMTP id 98e67ed59e1d1-392ec37c01cmr741842a91.6.1786424454506; Mon, 10 Aug 2026 22:00:54 -0700 (PDT) Received: from osman.mioffice.cn ([43.224.245.178]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-392ee3eab1esm147563a91.9.2026.08.10.22.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Aug 2026 22:00:54 -0700 (PDT) From: Zhan Xusheng X-Google-Original-From: Zhan Xusheng To: Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers Cc: Changbin Du , Peter Zijlstra , Ingo Molnar , Jiri Olsa , Adrian Hunter , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, zhanxusheng@xiaomi.com Subject: [PATCH] perf symbols: Don't apply the symfs layout to synthesised paths Date: Tue, 11 Aug 2026 13:00:46 +0800 Message-ID: <20260811050046.4019578-1-zhanxusheng@xiaomi.com> X-Mailer: git-send-email 2.43.0 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" The flat symfs layout was implemented inside __symbol__join_symfs() alone, which went from return path__join(bf, size, symbol_conf.symfs, path); to taking perf_basename(path) first. No caller was changed, so all of them got it. Most pass dso__long_name(), which is what the option is about, but some pass a path perf built itself: dso.c "/usr/lib/debug" -> "debug" dso.c "/usr/lib/debug/.build-id/" -> "" build-id.c "/usr/lib/debug/.build-id/" -> "" disasm.c -> last component perf_basename() yields "" for a path ending in '/'. So with --symfs DIR,flat the FEDORA, UBUNTU and MIXEDUP_UBUNTU debuginfo lookups land in /debug/, the two build-id ones in itself, and disasm.c flattens a path under perf's own build-id cache. Use path__join() at those sites, which is what the helper did for them before. A hierarchy layout is unaffected, being that same call. The OPENEMBEDDED site passes "", where perf_basename() is already a no-op; it is converted for uniformity. Every remaining __symbol__join_symfs() caller passes a path from the profiled system. Fixes: f182573e06ab ("perf tools: Add layout support for --symfs option") Signed-off-by: Zhan Xusheng --- tools/perf/util/build-id.c | 2 +- tools/perf/util/disasm.c | 4 +++- tools/perf/util/dso.c | 11 ++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index eb95ab90f974..0c89fe75a650 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -599,7 +599,7 @@ static char *build_id_cache__find_debug(const char *sbu= ild_id, dirname =3D dirbuf; } =20 - len =3D __symbol__join_symfs(debugfile, PATH_MAX, dirname); + len =3D path__join(debugfile, PATH_MAX, symbol_conf.symfs, dirname); snprintf(debugfile + len, PATH_MAX - len, "%.2s/%s.debug", sbuild_id, sbuild_id + 2); =20 diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 0a1a7e9cf3ef..decf9348d735 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -31,6 +31,7 @@ #include "map.h" #include "maps.h" #include "namespaces.h" +#include "path.h" #include "srcline.h" #include "symbol.h" #include "thread.h" @@ -1173,7 +1174,8 @@ static int dso__disassemble_filename(struct dso *dso,= char *filename, size_t fil =20 build_id_filename =3D dso__build_id_filename(dso, NULL, 0, false); if (build_id_filename) { - __symbol__join_symfs(filename, filename_size, build_id_filename); + path__join(filename, filename_size, symbol_conf.symfs, + build_id_filename); free(build_id_filename); } else { if (dso__has_build_id(dso)) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 2309196d8df3..314c9a0edf28 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -167,12 +167,12 @@ int dso__read_binary_type_filename(const struct dso *= dso, break; =20 case DSO_BINARY_TYPE__FEDORA_DEBUGINFO: - len =3D __symbol__join_symfs(filename, size, "/usr/lib/debug"); + len =3D path__join(filename, size, symbol_conf.symfs, "/usr/lib/debug"); snprintf(filename + len, size - len, "%s.debug", dso__long_name(dso)); break; =20 case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO: - len =3D __symbol__join_symfs(filename, size, "/usr/lib/debug"); + len =3D path__join(filename, size, symbol_conf.symfs, "/usr/lib/debug"); snprintf(filename + len, size - len, "%s", dso__long_name(dso)); break; =20 @@ -187,7 +187,7 @@ int dso__read_binary_type_filename(const struct dso *ds= o, ret =3D -1; break; } - len =3D __symbol__join_symfs(filename, size, "/usr/lib/debug"); + len =3D path__join(filename, size, symbol_conf.symfs, "/usr/lib/debug"); snprintf(filename + len, size - len, "%s", dso__long_name(dso) + 4); break; =20 @@ -200,7 +200,7 @@ int dso__read_binary_type_filename(const struct dso *ds= o, while (last_slash !=3D dso__long_name(dso) && *last_slash !=3D '/') last_slash--; =20 - len =3D __symbol__join_symfs(filename, size, ""); + len =3D path__join(filename, size, symbol_conf.symfs, ""); dir_size =3D last_slash - dso__long_name(dso) + 2; if (dir_size > (size - len)) { ret =3D -1; @@ -219,7 +219,8 @@ int dso__read_binary_type_filename(const struct dso *ds= o, } =20 build_id__snprintf(dso__bid(dso), build_id_hex, sizeof(build_id_hex)); - len =3D __symbol__join_symfs(filename, size, "/usr/lib/debug/.build-id/"= ); + len =3D path__join(filename, size, symbol_conf.symfs, + "/usr/lib/debug/.build-id/"); snprintf(filename + len, size - len, "%.2s/%s.debug", build_id_hex, build_id_hex + 2); break; --=20 2.43.0