From patchwork Mon Jul 24 17:45:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 125148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1980126vqg; Mon, 24 Jul 2023 11:34:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlHAVZd6ZCbE73ZrMvs9es5V9YTsQ4zET6z3jWlCWUkyp3q2Hg5jZfzvkUGz1wI0LY6Tpil8 X-Received: by 2002:a17:906:31da:b0:994:4f08:2bad with SMTP id f26-20020a17090631da00b009944f082badmr9488784ejf.69.1690223655813; Mon, 24 Jul 2023 11:34:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690223655; cv=none; d=google.com; s=arc-20160816; b=JallXtxUUqsOE4HzJ+fO2oJPRMHsq0SspQtc99RAZhoqb7IPO31DOIVTkOI6LiQXe0 Dn0w3J5/fVl1Axz2vQ2txLQHdKdpDZntpqdWEj0ZBD01pcuZ/cns3ml5eDS3quRmR5Bn xbU3pxHzcZphtGXYaf2iX4dmp4fLD9qmq4a+J7yEAOUiMurvc93xCQbW2x1BIJTcqR9a 3mituE/lX20iA+WHWbDSiZ++v4i2aDuqiOCVoKsjyUmytiAsjz5UHiQGoKykBj3StiB6 EaAAQJaPYIHU2OliTVy4jebiynyFara6KETN9IvvbHD7/YifOm9uwn9Vd+1QsCtqkzFa lh1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zrssEvxS+ld6v9SO/J8qoiZubJbMVHvX4b7POb87VbE=; fh=FSu9atl9DWIe1aov4mIRT4R72uuRBdCpyNQUle5ZVW8=; b=By06z359NagVQLyEuJruJ9XZfElXZj3/OW5NMhOmnr0WCeGtbo5TbYx76eadAtwL25 c75Fg19yt1p7Hd5x3LCpgSxsE7H8hSQCbW7+PsP9MI6QBXiSaBpMdl1GrjW5p6jcmsa0 jzgEjT7AzHrDI6Oay+ZifEqhgH0q0+OngRlg2nGT1PSICfnUppRxzCCU1fo4McIOTJOf i8kEeIscfpgIHRYhx2S0IeLaszs1ryZi3yiTh5W9OY531MMo+IA6mv1GhUEkT/kH0w98 QEQRzjPrKuXv6vi6CXshjfCmgWQRg8GCo7XWqowMggI6lgukPlKMn4jICEHglrOhE/s9 k75Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nT369RIa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kd20-20020a17090798d400b009886c420b37si6834114ejc.941.2023.07.24.11.33.52; Mon, 24 Jul 2023 11:34:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nT369RIa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231986AbjGXRt5 (ORCPT + 99 others); Mon, 24 Jul 2023 13:49:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231880AbjGXRta (ORCPT ); Mon, 24 Jul 2023 13:49:30 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 732DF4686 for ; Mon, 24 Jul 2023 10:46:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 529366132A for ; Mon, 24 Jul 2023 17:45:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 808FAC433C8; Mon, 24 Jul 2023 17:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690220723; bh=F0EIIGsmfIB+Y7QbLwduV6cHaLIhokS7WljeV8e+XkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nT369RIaytZKoua0dAoPD1E3ysYvjzoA7UIVRcXqwLuM2p29Xx48/D7VyYYKhumdy k7BNjmgz3bmm1pcPYlKPB8dnI1+ADa9nAw2A22dv8TrStw6hi2GMp7LjhPHQ7xKd77 wlWeQgvB+Cwv35BEJXNdXF6loAJBFGtCQRNHM1oVqyHn6b0cQZOfea5DX8jsJnJkG1 QH18n5Fpu3ILSCclHpkqgMTAeuIwTLVK0/4DLxverZTT9Rmaf3yLLvCrdsq2Xd9/Uc gwbEnL7i4xzLxdznfyc70BcTJiwRgJB6s6AYTtcnvDxIgjU88HFv74nYB5NbS/7pi7 7SiuRtg09vjLQ== From: Will Deacon To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, Will Deacon , Josh Poimboeuf , John Stultz Subject: [PATCH 1/2] scripts/faddr2line: Ignore non-function symbols in readelf output Date: Mon, 24 Jul 2023 18:45:16 +0100 Message-Id: <20230724174517.15736-2-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230724174517.15736-1-will@kernel.org> References: <20230724174517.15736-1-will@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772327959739025058 X-GMAIL-MSGID: 1772327959739025058 Non-function symbols emitted in the readelf output can confuse the 'faddr2line' symbol size calculation, resulting in the erroneous rejection of valid offsets. This is especially prevalent when building an arm64 kernel with CONFIG_CFI_CLANG=y, where most functions are prefixed with a 32-bit data value in a '$d.n' section. For example: 447538: ffff800080014b80 548 FUNC GLOBAL DEFAULT 2 do_one_initcall 104: ffff800080014c74 0 NOTYPE LOCAL DEFAULT 2 $x.73 106: ffff800080014d30 0 NOTYPE LOCAL DEFAULT 2 $x.75 111: ffff800080014da4 0 NOTYPE LOCAL DEFAULT 2 $d.78 112: ffff800080014da8 0 NOTYPE LOCAL DEFAULT 2 $x.79 36: ffff800080014de0 200 FUNC LOCAL DEFAULT 2 run_init_process Adding a warning to do_one_initcall() results in: | WARNING: CPU: 0 PID: 1 at init/main.c:1236 do_one_initcall+0xf4/0x260 Which 'faddr2line' refuses to accept: $ ./scripts/faddr2line vmlinux do_one_initcall+0xf4/0x260 skipping do_one_initcall address at 0xffff800080014c74 due to size mismatch (0x260 != 0x224) no match for do_one_initcall+0xf4/0x260 Filter out entries from readelf that are not "FUNC" type, so that the size of a symbol is calculated as a delta to the next function address. Cc: Josh Poimboeuf Cc: John Stultz Signed-off-by: Will Deacon --- scripts/faddr2line | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/faddr2line b/scripts/faddr2line index 0e73aca4f908..60368a1cdaed 100755 --- a/scripts/faddr2line +++ b/scripts/faddr2line @@ -179,7 +179,7 @@ __faddr2line() { found=2 break fi - done < <(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2) + done < <(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | ${AWK} -v sec=$sym_sec '$4 == "FUNC" && $7 == sec' | sort --key=2) if [[ $found = 0 ]]; then warn "can't find symbol: sym_name: $sym_name sym_sec: $sym_sec sym_addr: $sym_addr sym_elf_size: $sym_elf_size" From patchwork Mon Jul 24 17:45:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 125151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1980887vqg; Mon, 24 Jul 2023 11:35:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlGB/NqOfjto3SWihNIoBN6CrI6XaOV2vtwr/QXKqeeovW6iDIeTJ8XHruGTJQwoXJBZscxR X-Received: by 2002:a05:6358:2820:b0:135:6d9:2399 with SMTP id k32-20020a056358282000b0013506d92399mr9441797rwb.30.1690223738937; Mon, 24 Jul 2023 11:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690223738; cv=none; d=google.com; s=arc-20160816; b=daX/+LBIbN38D1vNHXGXGFe8LNkmtmCUajXnXDlSYzbF+fUvqAkmG+d2vX6GQwdnbc WkalT7yxurRIoPhx1EK9Ue/nj+n1aIFNmU+eyJCspeeGbB70Iwvmdn66+D2IXo0xGVyb IxhmMBkqOrg/4vjndke26i30S0yxb7KupWGFj3hC6WT7GYHMdhEAgDoR9m3mZQGfWfch BZMWykFsMroNETerHhrgkqRrrg/RjZqI34UPm7gqLHz9qqi1dPErr3CJQSDHpLqgIA6G ogs4bKHaxaqmbH0mPTeb2GIf0dmtGoBTfzFUSyU8IBp8C9rr6kUoa4uh5PJW4H9f+PI2 UEVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aWGQ6OEsQr6fM6/N6JGlbuDAQxRyVCSHX10efr7rxME=; fh=FSu9atl9DWIe1aov4mIRT4R72uuRBdCpyNQUle5ZVW8=; b=efEuEFUa/TW/MdPqvedXGw/qJNJZM73sqwILStrAVAnWWOXDjzVokVT7Segh2IUPnr FC3rdHZEQIgL8CgYRXKo3qFcEPYDo1K4BYC0NeprFHZu0mDDguGRvFrTiYXykbPW+Thc ySg2Ck+mvghh0FC+jx8kCIHwO77Tfky8hN/pElKL4WRQNOuEhjZ3jqPycoXSpP3tJudm umbmcYyecXuwYX2lq6TZccNfpzRo5N82KMuDPCvw3wQzeUIwbthijhF+VRzWWqBNRmLy SJoJpxaZph5qDoMqxOD7ynYic8TJhlQJ7/RjcZtaxwnNN+ueSs4T+AJZz4be/ChEUwTF c/lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="giw/2Q3x"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u11-20020a6540cb000000b005578c6a767esi9475899pgp.885.2023.07.24.11.35.03; Mon, 24 Jul 2023 11:35:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="giw/2Q3x"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231768AbjGXRtH (ORCPT + 99 others); Mon, 24 Jul 2023 13:49:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231869AbjGXRsc (ORCPT ); Mon, 24 Jul 2023 13:48:32 -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 2145D4203 for ; Mon, 24 Jul 2023 10:45:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CDE4F61312 for ; Mon, 24 Jul 2023 17:45:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04EDAC433C7; Mon, 24 Jul 2023 17:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690220725; bh=i/3ARKu2v/GvD5MJ/ESSUDjGzezlHuJEXEcQosWyGxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=giw/2Q3xI3BJd+qXlnT5waP43ZXAgYm5VhgjSj8yRAByRpbbHrtlZsqiolfmNQk0i 9HJLQz5NPiV08MPYrJ6x7nH2ect7N6NvRMGZghRrPOgaRLIrlqOZf5EJOYlc9RzX/4 5ngKvNYTRf4aUYODIPD7qPFn7Y4ZiMkWyCYXtnWpN3tqYtZtSn0epwmlsWWRxu5lAo kjX90gJ3/G07/dWqJg69QhS8+ZXaP3V7B4jfPrg/32i814sfzCN5TmHSsTTxhaqp/O obRFovv3/hPnlQlKKgkUK8vWusSRcFQ6PvhrSzwDXAMRjFCIhMGBKd7xf9v391UjHE d8CHYroZ1sJNg== From: Will Deacon To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, Will Deacon , Josh Poimboeuf , John Stultz Subject: [PATCH 2/2] scripts/faddr2line: Use LLVM addr2line and readelf if LLVM=1 Date: Mon, 24 Jul 2023 18:45:17 +0100 Message-Id: <20230724174517.15736-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230724174517.15736-1-will@kernel.org> References: <20230724174517.15736-1-will@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772328047297470467 X-GMAIL-MSGID: 1772328047297470467 GNU utilities cannot necessarily parse objects built by LLVM, which can result in confusing errors when using 'faddr2line': $ CROSS_COMPILE=aarch64-linux-gnu- ./scripts/faddr2line vmlinux do_one_initcall+0xf4/0x260 aarch64-linux-gnu-addr2line: vmlinux: unknown type [0x13] section `.relr.dyn' aarch64-linux-gnu-addr2line: DWARF error: invalid or unhandled FORM value: 0x25 do_one_initcall+0xf4/0x260: aarch64-linux-gnu-addr2line: vmlinux: unknown type [0x13] section `.relr.dyn' aarch64-linux-gnu-addr2line: DWARF error: invalid or unhandled FORM value: 0x25 $x.73 at main.c:? Although this can be worked around by setting CROSS_COMPILE to "llvm=-", it's cleaner to follow the same syntax as the top-level Makefile and accept LLVM=1 as an indication to use the llvm- tools. Cc: Josh Poimboeuf Cc: John Stultz Signed-off-by: Will Deacon --- scripts/faddr2line | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/faddr2line b/scripts/faddr2line index 60368a1cdaed..24845267efb2 100755 --- a/scripts/faddr2line +++ b/scripts/faddr2line @@ -58,8 +58,14 @@ die() { exit 1 } -READELF="${CROSS_COMPILE:-}readelf" -ADDR2LINE="${CROSS_COMPILE:-}addr2line" +if [ "${LLVM:-}" == "1" ]; then + UTIL_PREFIX=llvm- +else + UTIL_PREFIX=${CROSS_COMPILE:-} +fi + +READELF="${UTIL_PREFIX}readelf" +ADDR2LINE="${UTIL_PREFIX}addr2line" AWK="awk" GREP="grep"