From patchwork Tue Sep 27 13:14:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Ojeda X-Patchwork-Id: 12990589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 194CCC6FA92 for ; Tue, 27 Sep 2022 13:20:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232608AbiI0NUX (ORCPT ); Tue, 27 Sep 2022 09:20:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232626AbiI0NSq (ORCPT ); Tue, 27 Sep 2022 09:18:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCBD415E473; Tue, 27 Sep 2022 06:17:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 657F061988; Tue, 27 Sep 2022 13:17:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6AFE2C433D7; Tue, 27 Sep 2022 13:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664284630; bh=19EdJ/0y3i1GtpUk5jHOaF/ydgtBPX+gON+rAI0Q9N4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nCATbZBEjSdSSiYvzZKhXv7RNjQRITHtFsU0FYO64bdOCh5fL8RUIUN2gNfvMW4ks FntW28c+YZ5v4tVyVc3F8fEfx6CXFA1Qx/lVdGG3iwkzKuB06DRf4MDktTu/3BvFv8 fS5IOzIiKBEwR9LAZhmtY/YxW9tOyLO4RhZlWuZPCRSyj8/F8pcVlxSdy1ccHkzBv5 JBBtIyAzGlmNOpU6OtXS0w8XA5BBf2WbgKzgEULohK28EZkliI3LdLvStYBLFkkH3X aFpYTsBM8DqB6hKgrEBMXoQ/lAP0/XRsPi4vRoB3AxdAGFqHbbvNCJfI7uFXBnuzKR rQ26jJOAIm/RQ== From: Miguel Ojeda To: Linus Torvalds , Greg Kroah-Hartman Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, patches@lists.linux.dev, Jarkko Sakkinen , Miguel Ojeda , Kees Cook , Alex Gaynor , Wedson Almeida Filho Subject: [PATCH v10 17/27] scripts: decode_stacktrace: demangle Rust symbols Date: Tue, 27 Sep 2022 15:14:48 +0200 Message-Id: <20220927131518.30000-18-ojeda@kernel.org> In-Reply-To: <20220927131518.30000-1-ojeda@kernel.org> References: <20220927131518.30000-1-ojeda@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Recent versions of both Binutils (`c++filt`) and LLVM (`llvm-cxxfilt`) provide Rust v0 mangling support. Reviewed-by: Kees Cook Co-developed-by: Alex Gaynor Signed-off-by: Alex Gaynor Co-developed-by: Wedson Almeida Filho Signed-off-by: Wedson Almeida Filho Signed-off-by: Miguel Ojeda Reviewed-by: Greg Kroah-Hartman --- scripts/decode_stacktrace.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scripts/decode_stacktrace.sh b/scripts/decode_stacktrace.sh index 7075e26ab2c4..564c5632e1a2 100755 --- a/scripts/decode_stacktrace.sh +++ b/scripts/decode_stacktrace.sh @@ -8,6 +8,14 @@ usage() { echo " $0 -r | [|auto] []" } +# Try to find a Rust demangler +if type llvm-cxxfilt >/dev/null 2>&1 ; then + cppfilt=llvm-cxxfilt +elif type c++filt >/dev/null 2>&1 ; then + cppfilt=c++filt + cppfilt_opts=-i +fi + if [[ $1 == "-r" ]] ; then vmlinux="" basepath="auto" @@ -180,6 +188,12 @@ parse_symbol() { # In the case of inlines, move everything to same line code=${code//$'\n'/' '} + # Demangle if the name looks like a Rust symbol and if + # we got a Rust demangler + if [[ $name =~ ^_R && $cppfilt != "" ]] ; then + name=$("$cppfilt" "$cppfilt_opts" "$name") + fi + # Replace old address with pretty line numbers symbol="$segment$name ($code)" }