From patchwork Thu Jan 5 13:23:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 39541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp299404wrt; Thu, 5 Jan 2023 05:26:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXud9QV3/2F6ah7LFkAZXdJKyUl3vpV10LG9v2l6tbCdUD0yZfjnSuCJGXWM6TlUYl8lrOVq X-Received: by 2002:a05:6402:291e:b0:485:7d78:7bca with SMTP id ee30-20020a056402291e00b004857d787bcamr30499117edb.27.1672925181914; Thu, 05 Jan 2023 05:26:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672925181; cv=none; d=google.com; s=arc-20160816; b=dCVlhBiiJBx5GKvpJunI43xmO1Ep8DKSwx1id8M79OhOlBAg5OBziOp5Uwo2oAStq3 5KpiOkKtua4HW3PZnU1vXp4CTMazO3lCMAWyKEiWjaY54Be0vN4auh/WOHSTEDTuSdHd xcfcWDOtcjbISFfFan8oGfo8BZ5mAbmMdJ21wCwG8WDg42t6bhTBzzEgp6IAfchH6HDN rfBPU1uAD5BQouNd5UADqdMx7feCyHU8selIkBp9jGl0Mh87uG73KSktCCcUS/7usF7q hVNYKZOoOQRnhSfO+Ua8+wZfVALyDEdWF8AYiOoXJBktlSklh02Y6Dutl/qaP6G7NnkR yA2g== 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=kXnkF0b/OaOC5Nxi/u3bSyBpk6+JvzMFBPMrXrjtg/Y=; b=ZfjoDSFMVlb/EulXTN1QNwIY//em5RlEYK0g4jyz+h3/6cRAC0ZnskDgUA5J28Iz6k dq06/NbYhu4cDa0h5WHD/NO8xB0SbkCNoYY4FxQtV8IcLeXocyCA1dK0dMHJXD9SCrab yNz7ZKvozrBl4p5Zehg7tK6m+pQx2H75yHKVC2M6Pe6C+xkiKwdyQORFoB2r/65mLjv6 rJGLGKwhqDhTc3R51hX/tPCIqzvdxiJf711/Wt4P+0Pi26AfFpqlnB6ZzRp1oN+egvgi NmfkSHjoClc8+2L/lDr6ZotMtgM01ki/JLggzRg5jTA3czkRqCUMsY9G97sjSAaaZr9S QxsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=JpMYYfH2; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w24-20020aa7d298000000b004852eff77a2si23716562edq.604.2023.01.05.05.25.57; Thu, 05 Jan 2023 05:26:21 -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=@ellerman.id.au header.s=201909 header.b=JpMYYfH2; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233407AbjAENY2 (ORCPT + 99 others); Thu, 5 Jan 2023 08:24:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232012AbjAENYS (ORCPT ); Thu, 5 Jan 2023 08:24:18 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49CA5392C4; Thu, 5 Jan 2023 05:24:16 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NnnHZ0LZYz4xFv; Fri, 6 Jan 2023 00:24:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1672925051; bh=kXnkF0b/OaOC5Nxi/u3bSyBpk6+JvzMFBPMrXrjtg/Y=; h=From:To:Cc:Subject:Date:From; b=JpMYYfH2FCrnCTfmelT45DFH0gd2VP33Kgl71fHMREtAS9q0VH2osMQNv3zucxG1H TqZsHEHL49sW2gJDZ0Ai/nQRFQZoIo7Yq7GU9XxGHza1s33SGTZLhPrb/x7Jibp1Wi Sdaj7JIZdSE6+RvzyssDKYUaRrZvrUI49nm2MuSh7Y2XTnQiRUbc3drSCBa+0974Qo LLXfNYkXx5usjlSk8JaN+FTZZZOP1vd09olfmjU9Rihl7SsHlyY3kUVg56Upqw5sj6 7ZGu5K7Zagh5rVJJWxaCRyVgxyIttibIvIJB7kBMIMveYRd7Y3dJJ7urgaxZgJX3G8 26AXbPyrkSoyQ== From: Michael Ellerman To: Cc: , , , , ardb@kernel.org, Subject: [PATCH 1/3] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT Date: Fri, 6 Jan 2023 00:23:47 +1100 Message-Id: <20230105132349.384666-1-mpe@ellerman.id.au> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, 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?1754189195065287370?= X-GMAIL-MSGID: =?utf-8?q?1754189195065287370?= The powerpc linker script explicitly includes .exit.text, because otherwise the link fails due to references from __bug_table and __ex_table. The code is freed (discarded) at runtime along with .init.text and data. That has worked in the past despite powerpc not defining RUNTIME_DISCARD_EXIT because DISCARDS appears late in the powerpc linker script (line 410), and the explicit inclusion of .exit.text earlier (line 280) supersedes the discard. However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") introduced an earlier use of DISCARD as part of the RO_DATA macro (line 136). With binutils < 2.36 that causes the DISCARD directives later in the script to be applied earlier [1], causing .exit.text to actually be discarded at link time, leading to build errors: '.exit.text' referenced in section '__bug_table' of crypto/algboss.o: defined in discarded section '.exit.text' of crypto/algboss.o '.exit.text' referenced in section '__ex_table' of drivers/nvdimm/core.o: defined in discarded section '.exit.text' of drivers/nvdimm/core.o Fix it by defining RUNTIME_DISCARD_EXIT, which causes the generic DISCARDS macro to not include .exit.text at all. 1: https://lore.kernel.org/lkml/87fscp2v7k.fsf@igel.home/ Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/vmlinux.lds.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 8c3862b4c259..c5ea7d03d539 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -8,6 +8,7 @@ #define BSS_FIRST_SECTIONS *(.bss.prominit) #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 0 +#define RUNTIME_DISCARD_EXIT #define SOFT_MASK_TABLE(align) \ . = ALIGN(align); \ From patchwork Thu Jan 5 13:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 39539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp298897wrt; Thu, 5 Jan 2023 05:24:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsd21N71ISVtCY75YRkEl+9CqB0z1k/xI/ydEAYMYvsnNdSKmkOrSWkiZUxTYhRxV6/+Etx X-Received: by 2002:a17:906:850c:b0:7c0:f44d:984 with SMTP id i12-20020a170906850c00b007c0f44d0984mr58865081ejx.74.1672925092887; Thu, 05 Jan 2023 05:24:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672925092; cv=none; d=google.com; s=arc-20160816; b=lTn3HQSOc5sE7RWrZfEE+foBv19rsDPkMyfYBql35bDV5AnTo2PJgGGyStlsnNaEeX j8F7VUcOzpy/1K8SxraBfQ+6iFvKQMZPICCAGAAMC6j6aKU7EPDc2FCetdGwoq5/JB2U biH4rH4u9M2ylmg/WLqvDaPT0VC9hS8BjxQGUw3ORo9g6LgSkue/TxHYN6zmdn7xLX1q jRx/kcjQQtYzSdhWcQKkr+9P/5bQwa12uol+Ak4OJSr6fatiShq62mjFoQY9jjhxOd+Z G+vebZuPRotV7GG5rfOUaPXzJ7btk5QVKQOBBnnwL2/50NmoJTFVQP/yDtOCi1bQXCQa fiyQ== 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=QTsUQ1sYWKmE6XhlhLQnxBN+PbVBVcCR/OFSB37SXXk=; b=lmkIJD4WTq63/C0h283fmkLUp98ptzN8+ZYC/6zkBh4s+hjVgEWgaMOACnlxNrtmjh rU+ABAUhn/L68hlBLF5uv78mYT4GufmB37lRNJP2JG5VGlUPRHQvK/QRzXpDSlMHjyDQ ErxrXfLFpBIRl3VX0numS0E1LDGTuIyUfFPA4bSJdXIfMGDqM00d/w1CioBGD1HTojj9 1eQ7NydevNN/gSGP21f5dJR3DwDZ7YAhVC/Qs6EnLRmudbHsNFgVjI3ktV2f38GkofOC +XE8xHImGJguT0GzjfM/1P1omehfakDChfv9Hqn53noAsYirVfCr+nziA0qh7bdsOrua jTAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=WwSDQTP0; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k19-20020a1709061c1300b007c17452499asi25747906ejg.951.2023.01.05.05.24.29; Thu, 05 Jan 2023 05:24:52 -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=@ellerman.id.au header.s=201909 header.b=WwSDQTP0; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232854AbjAENYU (ORCPT + 99 others); Thu, 5 Jan 2023 08:24:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231927AbjAENYR (ORCPT ); Thu, 5 Jan 2023 08:24:17 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D49162003; Thu, 5 Jan 2023 05:24:15 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NnnHb3ZNQz4xwl; Fri, 6 Jan 2023 00:24:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1672925051; bh=QTsUQ1sYWKmE6XhlhLQnxBN+PbVBVcCR/OFSB37SXXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WwSDQTP0O+RGc33AQz0bKGVZ720wPJAqF3y3BD82q9g+6UpcEYilbbDc/1Qwlzs3s z/o8mweLhXRCC3Allh/ld8NDQA1eMbdCrAzDgsqJDhTRAdEDxlSO4eEuSAGKtaBkaa nEClg+3ffaCE2j8FMP2VLdDUNog+WakODNizO0wM512Y1dZXgXaSkBetLefKvxyJgP tYCT72k4gQ11D5HxKp+iCi9LzOdPPGdfit1onVGKe7qP4X8AxQekj7lZ0YYOVGYK51 UmR8N+0Yf88NvUJp6eKlxD8TJaSyX4Xo9ErJSn12aGnI3LtKhzsZLI+tCvMm+fqGck /WLZZk3urYKEw== From: Michael Ellerman To: Cc: , , , , ardb@kernel.org, Subject: [PATCH 2/3] powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Date: Fri, 6 Jan 2023 00:23:48 +1100 Message-Id: <20230105132349.384666-2-mpe@ellerman.id.au> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105132349.384666-1-mpe@ellerman.id.au> References: <20230105132349.384666-1-mpe@ellerman.id.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,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?1754189101808081198?= X-GMAIL-MSGID: =?utf-8?q?1754189101808081198?= Relocatable kernels must not discard relocations, they need to be processed at runtime. As such they are included for CONFIG_RELOCATABLE builds in the powerpc linker script (line 340). However they are also unconditionally discarded later in the script (line 414). Previously that worked because the earlier inclusion superseded the discard. However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") introduced an earlier use of DISCARD as part of the RO_DATA macro (line 137). With binutils < 2.36 that causes the DISCARD directives later in the script to be applied earlier, causing .rela* to actually be discarded at link time, leading to build warnings and a kernel that doesn't boot: ld: warning: discarding dynamic section .rela.init.rodata Fix it by conditionally discarding .rela* only when CONFIG_RELOCATABLE is disabled. Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/vmlinux.lds.S | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index c5ea7d03d539..a4c6efadc90c 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -411,9 +411,12 @@ SECTIONS DISCARDS /DISCARD/ : { *(*.EMB.apuinfo) - *(.glink .iplt .plt .rela* .comment) + *(.glink .iplt .plt .comment) *(.gnu.version*) *(.gnu.attributes) *(.eh_frame) +#ifndef CONFIG_RELOCATABLE + *(.rela*) +#endif } } From patchwork Thu Jan 5 13:23:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 39540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp299370wrt; Thu, 5 Jan 2023 05:26:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfudhYTviUCBCrN72s2ASMmmH9tAbfeWaivV0qSD/JgA/q2U6BhWhUfnwnUDiHQelvT6Od X-Received: by 2002:a17:906:d052:b0:7be:e26a:6104 with SMTP id bo18-20020a170906d05200b007bee26a6104mr45798988ejb.52.1672925174030; Thu, 05 Jan 2023 05:26:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672925174; cv=none; d=google.com; s=arc-20160816; b=fALDz148Fswx5xBbpqZRNYmr+NpdmC2bvZco5hAxo80ayYX53cQ+SNIwzNXPYBQeq7 jKjdnHFIoxXrOYXoYzvVq7EzIzMsAap4sUXBcjh44UkoqtKct8kuCt5Y46Zrya7Dscpw OZOPzNH/1YdDuSomCeHIOkrRVS8Rn5G8+M3qQANzLIofKsuTlGgvcwTDWX2Vebw9eNDR cMX2NshhhtXvn4dLez9siygS1nqr3MavHttde+dzuF65MFtxPFEjlq64A7DaXgQV0SLb h+g3GUmcZmf5KdHWs42mAsaTWuLgh27M5pvMexedq8PL9R2LbIOdM3hbZzv0nXbkaYDH cWIw== 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=OSrLexRH0yAsb5qST90MoTX51vfdeiMji+XTnquxx4E=; b=wKRJD3C5jGoOAbILv8J71U4YXqbWf8pzrfqTXTVQeK7uc6IKE+TIUWYbaadxW7laSR 8/hgHNqwhUaMJBkfG15CBtH488IAjQpEvEIlUYhAH4xkaQtOFt0Ig5tLh5gQtlVs8gTu pGKmc2JD0Vt86BxZZpZkbzxoqUXmasuPTMKJ6HMczCdZMbh8VYqVW+s6Opx0fiyp8tAo 9JQ9X4O/jWQqXopybgHKPs9zkL+L0vr7i1ES5drqoXXyg8f0opAp+Qi5IikDzLwdc9AQ vmb29I1Ls2SEoGqi3MPL6uMSnAdPr5qmFA4SSHrcqpSzVsuxeaGIzX3c4IQpPxkMl1kT Gyiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ellerman.id.au header.s=201909 header.b=VcSOFdnf; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id js4-20020a17090797c400b007c106ff40ddsi35965249ejc.631.2023.01.05.05.25.50; Thu, 05 Jan 2023 05:26:14 -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=@ellerman.id.au header.s=201909 header.b=VcSOFdnf; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233250AbjAENYY (ORCPT + 99 others); Thu, 5 Jan 2023 08:24:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231303AbjAENYR (ORCPT ); Thu, 5 Jan 2023 08:24:17 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5195E0EB; Thu, 5 Jan 2023 05:24:15 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NnnHc0FDqz4y0B; Fri, 6 Jan 2023 00:24:12 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ellerman.id.au; s=201909; t=1672925052; bh=OSrLexRH0yAsb5qST90MoTX51vfdeiMji+XTnquxx4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VcSOFdnfJkqg973Yj8od+KLuNgioMrbMpfYqEmAbOzD9d9Oe3WTzxXzx0gJJZuALw 9ABoRfTgnZKTpsNjtk62xNu+80BKfXOl/0ACARfQLR326UjPiA/CHJ5+1k9jtdLnwi ZOIE+LyejRC2XvTqF39E2vsgIfijxviU2y3aanMsaNceXVo1k9LAUWDIx8tv98NvoW /2V2YR/Rk67IkSGdD4deik6oDJBXVl3ok3nIq5FuSFoAcVgYqs5cFSaJaugXAD0UMd 4/LuMfDSMwhW2QCJyAmqlKLFCjWIr4aNfYbCaMK/m/lifGd2tjR4DdZRr1b4kHVFtz hgJ0f0Etdbwiw== From: Michael Ellerman To: Cc: , , , , ardb@kernel.org, Subject: [PATCH 3/3] powerpc/vmlinux.lds: Don't discard .comment Date: Fri, 6 Jan 2023 00:23:49 +1100 Message-Id: <20230105132349.384666-3-mpe@ellerman.id.au> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105132349.384666-1-mpe@ellerman.id.au> References: <20230105132349.384666-1-mpe@ellerman.id.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,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?1754189187231027804?= X-GMAIL-MSGID: =?utf-8?q?1754189187231027804?= Although the powerpc linker script mentions .comment in the DISCARD section, that has never actually caused it to be discarded, because the earlier ELF_DETAILS macro (previously STABS_DEBUG) explicitly includes .comment. However commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") introduced an earlier use of DISCARD as part of the RO_DATA macro. With binutils < 2.36 that causes the DISCARD directives later in the script to be applied earlier, causing .comment to actually be discarded. It's confusing to explicitly include and discard .comment, and even more so if the behaviour depends on the toolchain version. So don't discard .comment in order to maintain the existing behaviour in all cases. Fixes: 83a092cf95f2 ("powerpc: Link warning for orphan sections") Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/vmlinux.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index a4c6efadc90c..958e77a24f85 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -411,7 +411,7 @@ SECTIONS DISCARDS /DISCARD/ : { *(*.EMB.apuinfo) - *(.glink .iplt .plt .comment) + *(.glink .iplt .plt) *(.gnu.version*) *(.gnu.attributes) *(.eh_frame)