From nobody Fri Sep 5 18:08:02 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.201]) (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 5C9CD801 for ; Wed, 30 Apr 2025 00:41:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745973704; cv=none; b=KwjGmkahbaXpeWGY6BXY7H4Ty4Wf2OkRjH/s+yaUtyV5BVV1lQBUZXXFFkWFzJwoABiseCq++dharUSTks/b5yAiMwxXD2GjQX6DCgDrYk1V+SUJEpVufs6PiAxsoYXQvkS317MVYr7paHvSEuMkFdD4TptWbDKUXZkcMlu6Y2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745973704; c=relaxed/simple; bh=aQ8Ixb2ii7TM17c5CxHc/kZsrUa4Me1nM9JR+KWLbRA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gqqOmGWrEvYC4vwsSfP0UGtsfLnje2eHzZspnNWHNBfBNs2OiucZYzMFPUXJ/hlb/G9nZr6aeIq00HUok0A1cKPeiv1ov5a3IeqRmBEUEREkZpDW0l9VDLlzRvstzozKaqc0K7PNnANhDuX1x3RwJUw17D8PiJy5yWlRDwG1+Sg= 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=pmvxetvA; arc=none smtp.client-ip=209.85.215.201 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="pmvxetvA" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b16837f1874so3442457a12.2 for ; Tue, 29 Apr 2025 17:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745973702; x=1746578502; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=e1KMrryhTDqYQRcc+MhBf4Nju0O0E10cRTohQDGFkGY=; b=pmvxetvAX5sZV7/2/HiEwwwKtIl4NEgCdbbTwT9PYG1y72zDXeVY9cUSDGl5UycIxE uBb6dBzwblJhxkHppRcinXejNF97yEhE9sJQ/Xc19htP+OCXXkWY53T4mj6CzBSotSwj h5nFEOZxvr/XFrv8BAtvIgTWlAO0Fkz9OqPid+Xn9RQtBWG06WmeNxL+z1x795fLVU5l 4Kd2Js40qdyti4Pqjba+8oASCTL98Pqd8JWlAk6e6f3jGgi+p2I17H9Q1nELreo+OTQ2 /3Uj3ZbwT2GpUd0dO+dam4KnXrpDRpM/pcCtvm19hSyhiYqH8XVGNTHdBEBXebWu2vNI Rkmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745973702; x=1746578502; h=cc: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; bh=e1KMrryhTDqYQRcc+MhBf4Nju0O0E10cRTohQDGFkGY=; b=uAw3OnDjoTThvlc1bJeZAEVKULyS/IDe59bK8XD4v0bLe532bwPgiCycoWNvpgJkL3 ha08Xx33nv/tmZzuJZs/1TMmyn1g8BwXqjkb2Vl9mXwt2RNhwhx7lqrIFj1W6ggmoD3D +S6SfvCg2mcEugmD32HC0ZDNbV18SkzEqYqMAaeZop2wu8m/osvlIwBbZkDC0Z1mQg3T AqOj18G48My2DjTB0uQ0FhcTaM9MQfRSCpNx7en6gYcI5l7tSRPia3vUQg69BybNukqf ayj9/I4cJiD/tXAYxMuNvyUsTLcFvD7c7ocBKAbqVPp/z24vMscZUc2RytBaBLh3t3Yi xyXw== X-Forwarded-Encrypted: i=1; AJvYcCUginPHJz/G9jhXvzK7dkKvLqCQIvS3/wjIRZzn8GV211D7WszhV/NMukzDFVZUsfRjcunsRmgqlQ6R5oU=@vger.kernel.org X-Gm-Message-State: AOJu0YxnDWz4dT0lUjQFgeM09UMdyDvQKssf1hPYJeKNbXL6r+Km/ErP VPLvz3x3dXxj+NBc0TMui6tkvP+XKyxTSEgTAa4AZBNIFbWt19ZBDVkNtaghIT2Az1e12slip+o JgtyKGg== X-Google-Smtp-Source: AGHT+IH5AV8B/lmxOmO7bvKCtJ0Ps0gr6YLjC9VmSVrpHIqji0bGhb7vyMUNXXGmFCeguUAOJMfQk3WEI6qq X-Received: from pfbfn23.prod.google.com ([2002:a05:6a00:2fd7:b0:740:555:f7af]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:6f09:b0:1f5:70af:a32a with SMTP id adf61e73a8af0-20a88e1c278mr1607808637.32.1745973701640; Tue, 29 Apr 2025 17:41:41 -0700 (PDT) Date: Tue, 29 Apr 2025 17:41:24 -0700 In-Reply-To: <20250430004128.474388-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: <20250430004128.474388-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.901.g37484f566f-goog Message-ID: <20250430004128.474388-3-irogers@google.com> Subject: [PATCH v2 2/6] perf symbol-elf: Integrate rust-v0 demangling From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , James Clark , Howard Chu , Jiapeng Chong , Ravi Bangoria , "Masami Hiramatsu (Google)" , Stephen Brennan , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, rust-for-linux@vger.kernel.org, llvm@lists.linux.dev, Daniel Xu , Ariel Ben-Yehuda Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the demangle-rust-v0 APIs to see if symbol is Rust mangled and demangle if so. The API requires a pre-allocated output buffer, some estimation and retrying are added for this. Signed-off-by: Ian Rogers --- tools/perf/util/Build | 5 +++- tools/perf/util/symbol-elf.c | 47 ++++++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 4f7f072fa222..7910d908c814 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -241,9 +241,12 @@ perf-util-y +=3D cap.o perf-util-$(CONFIG_CXX_DEMANGLE) +=3D demangle-cxx.o perf-util-y +=3D demangle-ocaml.o perf-util-y +=3D demangle-java.o -perf-util-y +=3D demangle-rust.o +perf-util-y +=3D demangle-rust-v0.o perf-util-$(CONFIG_LIBLLVM) +=3D llvm-c-helpers.o =20 +CFLAGS_demangle-rust-v0.o +=3D -Wno-shadow -Wno-declaration-after-statemen= t \ + -Wno-switch-default -Wno-switch-enum -Wno-missing-field-initializers + ifdef CONFIG_JITDUMP perf-util-$(CONFIG_LIBELF) +=3D jitdump.o perf-util-$(CONFIG_LIBELF) +=3D genelf.o diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index fbf6d0f73af9..3fc87309746f 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -16,13 +16,14 @@ #include "demangle-cxx.h" #include "demangle-ocaml.h" #include "demangle-java.h" -#include "demangle-rust.h" +#include "demangle-rust-v0.h" #include "machine.h" #include "vdso.h" #include "debug.h" #include "util/copyfile.h" #include #include +#include #include #include #include @@ -308,6 +309,9 @@ char *cxx_demangle_sym(const char *str __maybe_unused, = bool params __maybe_unuse =20 static char *demangle_sym(struct dso *dso, int kmodule, const char *elf_na= me) { + struct demangle rust_demangle =3D { + .style =3D DemangleStyleUnknown, + }; char *demangled =3D NULL; =20 /* @@ -318,21 +322,38 @@ static char *demangle_sym(struct dso *dso, int kmodul= e, const char *elf_name) if (!want_demangle(dso__kernel(dso) || kmodule)) return demangled; =20 - demangled =3D cxx_demangle_sym(elf_name, verbose > 0, verbose > 0); - if (demangled =3D=3D NULL) { - demangled =3D ocaml_demangle_sym(elf_name); - if (demangled =3D=3D NULL) { - demangled =3D java_demangle_sym(elf_name, JAVA_DEMANGLE_NORET); + rust_demangle_demangle(elf_name, &rust_demangle); + if (rust_demangle_is_known(&rust_demangle)) { + /* A rust mangled name. */ + if (rust_demangle.mangled_len =3D=3D 0) + return demangled; + + for (size_t buf_len =3D roundup_pow_of_two(rust_demangle.mangled_len * 2= ); + buf_len < 1024 * 1024; buf_len +=3D 32) { + char *tmp =3D realloc(demangled, buf_len); + + if (!tmp) { + /* Failure to grow output buffer, return what is there. */ + return demangled; + } + demangled =3D tmp; + if (rust_demangle_display_demangle(&rust_demangle, demangled, buf_len, + /*alternate=3D*/true) =3D=3D OverflowOk) + return demangled; } + /* Buffer exceeded sensible bounds, return what is there. */ + return demangled; } - else if (rust_is_mangled(demangled)) - /* - * Input to Rust demangling is the BFD-demangled - * name which it Rust-demangles in place. - */ - rust_demangle_sym(demangled); =20 - return demangled; + demangled =3D cxx_demangle_sym(elf_name, verbose > 0, verbose > 0); + if (demangled) + return demangled; + + demangled =3D ocaml_demangle_sym(elf_name); + if (demangled) + return demangled; + + return java_demangle_sym(elf_name, JAVA_DEMANGLE_NORET); } =20 struct rel_info { --=20 2.49.0.901.g37484f566f-goog