From patchwork Sat Dec 24 19:27:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 36441 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp272445wrt; Sat, 24 Dec 2022 11:31:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXuCPW2Kukv7/Unn6mB6HlcIurhHs4/x1QgWsx8d4FlDW9TNEi74HkEoSkgDXhhpb+VLVgok X-Received: by 2002:a05:6a20:6f59:b0:a4:8725:fdcd with SMTP id gu25-20020a056a206f5900b000a48725fdcdmr13802826pzb.15.1671910262621; Sat, 24 Dec 2022 11:31:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671910262; cv=none; d=google.com; s=arc-20160816; b=lM4zn7DlSCLryjMdx23DE1TXiNWT/F1w8rn3GIDS9HlINaekWqEQvhqnV4o2mGcu4h inIzkCgi1gmiX6hdwPXsA38wVFHtVkLpaCv4MnZ+qjejGRalYaK5W3OoWlarTabvo23M 9Thz7FSlyL8Lrq1y3ZUakSpnEbcs/ik/g1Nvf9Dt6Lj5+qwoOERFS7ArsOi9WehcS/qq lZBwehBsn4Oz7GEmSnGHxU4f+1kDoWbznMdVVFWTSmiP+1uo9CsLZJixmgQfp25SFiLv 3N5zNelL51kJC3mJ2Ma+ZIWrizdy9EQL6dbEA4HYnZTLMeM/AQUkONWkQwYdwWmdXiWJ zH7A== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=IX/nQu0mKtFFYmJ5Rvz+J89r1jcmS6i1Kk+78EcU4SE=; b=RuW8tamccC4cNF/B1Q3oNS2EaXA98ayPWEz7xybOUg4D75Z4yK8WQAHDCjqGipN8cb ongmaKN97Ef+IrfvPXO4CXt20enI2uNPg7wWg8H59lYJX84EhThNFntLWTxcKq9QPyCY KCzBQEY+2Rc/pSxLFh646Dy1tosjHz3RvE26U7PtRFudfWj2o3Wb0blo8TOABMHD4s3R Xs1vsMdNA3yhDinfF6sfeDhwPudYl9/4skDzlbQmRQuZyZzVwrVRdssTUirtIwz8cGdH n0aaVOXxKOrRBE3go6ADdywLqAypX04ILWgydvYyQ4kdkugAwVaLpyMjwuq42ZsrdCIn 7Lbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z5QB2B9W; 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 q16-20020a637510000000b004630aa449c2si6969219pgc.242.2022.12.24.11.30.50; Sat, 24 Dec 2022 11:31:02 -0800 (PST) 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=Z5QB2B9W; 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 S230152AbiLXT2U (ORCPT + 99 others); Sat, 24 Dec 2022 14:28:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229499AbiLXT2Q (ORCPT ); Sat, 24 Dec 2022 14:28:16 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CBA6114B; Sat, 24 Dec 2022 11:28:15 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 158D7B801BC; Sat, 24 Dec 2022 19:28:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74A0CC433EF; Sat, 24 Dec 2022 19:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671910092; bh=UQnfmGWpjZxvdevhblki0v7ZzFcxxRalPcpyLzVn6JI=; h=From:To:Cc:Subject:Date:From; b=Z5QB2B9WNLl5VOrzUNo0txpZ6VIJYGVDHCH+nwR9luPwWds2mSlHGNBIJO7lozNhO rdFdovyAsB8iRmKcwBjULiwQCbK3avqS0A6tQc7lu4SPb0m0ThZmLLMTjhPQylrGcA BbNoZh4CnJ9T6EKJEAENiUfDk8GfMBn6rJWde6vjhr7FWCwAeOw5dQ804F4M/ZDkXR 65k9Y0tgUoGpzCSK+LlqI2CLA4kXFmBWcPEfmKWnT6hIZxpd77+lxGYLDzIhXW5LYG nsxJWyNmGQmKvPj12ADF7gzCtbrkH2gHdznoidrqiuOo+Bc0OnHF48JPsAJa2dgbwR rs5qlsrB9UaRw== From: Masahiro Yamada To: linux-arch@vger.kernel.org, linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Thorsten Leemhuis , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, Masahiro Yamada , Dennis Gilmore , Albert Ou , Arnd Bergmann , Jisheng Zhang , Nicolas Schier , Palmer Dabbelt , Paul Walmsley Subject: [PATCH] arch: fix broken BuildID for arm64 and riscv Date: Sun, 25 Dec 2022 04:27:51 +0900 Message-Id: <20221224192751.810363-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 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 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753124975422046605?= X-GMAIL-MSGID: =?utf-8?q?1753124975422046605?= Dennis Gilmore reports that the BuildID is missing in the arm64 vmlinux since commit 994b7ac1697b ("arm64: remove special treatment for the link order of head.o"). The issue is that the type of .notes section, which contains the BuildID, changed from NOTES to PROGBITS. Ard Biesheuvel figured out that whichever object gets linked first gets to decide the type of a section, and the PROGBITS type is the result of the compiler emitting .note.GNU-stack as PROGBITS rather than NOTE. While Ard provided a fix for arm64, I want to fix this globally because the same issue is happening on riscv since commit 2348e6bf4421 ("riscv: remove special treatment for the link order of head.o"). This problem will happen in general for other architectures if they start to drop unneeded entries from scripts/head-object-list.txt. Discard .note.GNU-stack in include/asm-generic/vmlinux.lds.h. riscv needs to change its linker script so that DISCARDS comes before the .notes section. Link: https://lore.kernel.org/lkml/CAABkxwuQoz1CTbyb57n0ZX65eSYiTonFCU8-LCQc=74D=xE=rA@mail.gmail.com/ Fixes: 994b7ac1697b ("arm64: remove special treatment for the link order of head.o") Fixes: 2348e6bf4421 ("riscv: remove special treatment for the link order of head.o") Reported-by: Dennis Gilmore Suggested-by: Ard Biesheuvel Signed-off-by: Masahiro Yamada --- arch/riscv/kernel/vmlinux.lds.S | 4 ++-- include/asm-generic/vmlinux.lds.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/vmlinux.lds.S b/arch/riscv/kernel/vmlinux.lds.S index 4e6c88aa4d87..1865a258e560 100644 --- a/arch/riscv/kernel/vmlinux.lds.S +++ b/arch/riscv/kernel/vmlinux.lds.S @@ -31,6 +31,8 @@ PECOFF_FILE_ALIGNMENT = 0x200; SECTIONS { + DISCARDS + /* Beginning of code and text segment */ . = LOAD_OFFSET; _start = .; @@ -141,7 +143,5 @@ SECTIONS STABS_DEBUG DWARF_DEBUG ELF_DETAILS - - DISCARDS } #endif /* CONFIG_XIP_KERNEL */ diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index a94219e9916f..2993b790fe98 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -1007,6 +1007,7 @@ *(.modinfo) \ /* ld.bfd warns about .gnu.version* even when not emitted */ \ *(.gnu.version*) \ + *(.note.GNU-stack) /* emitted as PROGBITS */ #define DISCARDS \ /DISCARD/ : { \