From nobody Sun Sep 14 07:33:39 2025 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 B6D38C61D9D for ; Tue, 24 Jan 2023 21:15:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234742AbjAXVPI (ORCPT ); Tue, 24 Jan 2023 16:15:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231987AbjAXVPF (ORCPT ); Tue, 24 Jan 2023 16:15:05 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52FBD45225; Tue, 24 Jan 2023 13:15:04 -0800 (PST) Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OKuaw3018687; Tue, 24 Jan 2023 21:14:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=1OLMPfywqWiuxO9AxppMUi0bW4XREoi2eA0/fAjtbuA=; b=fmeX/7+wLyjsKmrZxPr/DJbyplMDtw6FtUROgzD2Y15wjrbZPAl2LMk961IAizwiPu76 izIzVxZ+Lv9ZwB/RMPoNd9RTtjjJ3VXG4J3wj9KQoG9EisCLk0+5jKa5QqcKWpDXICQ7 ExiflG+AH1bj7/TTfuPuIE7vSXRq1w/qqruS77TxajhFx9BMiaj98nMOffsjKaiJ8p7I WO+TBJmyZAg0ScFK14lL/zVSJL6lt7HnlgdlaVg6Oe7Oc0fWeA3W1EcRVCmAOZ37HsXr PMSN00Y1kDfHufowRMRf0/xUDbmfBtP79Rsee+XoNiKv0YTSoc7rKBP7FwiT2cAgXi2M EQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n883c6jtj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:36 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30OKfjbQ021074; Tue, 24 Jan 2023 21:14:36 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86gcbej0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MMDGISx/MNcwPLwpTAC9anFnGdKLFRHeYaxNkUpr/SP8P1yiEXtr5ipivpIU9le9YnhNGVz8++ghkWTZD/9n+cmQjP3ci1RAgY6AL9996NoMcGXE5a7Kt3P3rwZ8fYtT90jNMkMr/v3PkX2O2G6R4wAH227XGfeWsJAFLXorqIzrT2Fm1HSG/6Tj6DbZo6Sr3M12HzyjLZfq3YUVhY4GbEM3iIi64GNtRuidaxgchJ5H4Cfk7+2UTzcO8zGBW387Chap1zTQLiM3L4MfGSqLe4UCUgLwMiwQaFOlm00WjPPvxeNttQClqCxZWvJMJUrEAgKh5yJOVZRlfhT2DA/EFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1OLMPfywqWiuxO9AxppMUi0bW4XREoi2eA0/fAjtbuA=; b=YZ20SLiWTGPxJ+H0L7/Z5F7rTQAVVubBz6whi+dMKahSci8dAT7QhwxprpsFsgLV8TzYDVW8eyuBkwHAbUuCkurv3k9er8sXFcvuN1dSdrrQwZfKpgG3rrbpTNDF3LlxBSQhw0x0e9eGiLXI/tMTgqEF9MnkslI5WtZq6dari3NxdNR+JTVa9XHOnfA2yTA17WcPhRTcrHzd91DihSvxAOz3ZgUY+g6nqtBxLg/T38CiewnyvImOKvZf95mB7Ig2jpZ/G3uhlqQ2wtYDTw7fFZf7ZgXg1gGoRYEpTAlu68J5wU+dC2CAT5Qjylflou6Vua++ETmJe7K/mRiy5H0DIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1OLMPfywqWiuxO9AxppMUi0bW4XREoi2eA0/fAjtbuA=; b=DNk+lhpx2UHdCMgQhyKvPO+vupgFiC9+fsZ5dk+oNl+whKy9MdgrU/jN2ZyvopwtCSh0rpO/0ngrBWZVsGC209qHKoOXZAUfy8ePXK0vCQrfIpIO8+3g0UTLqw6sig1F/HcidX/E43Ir7L9ZJTWEIL3OfQj/+jBEmFSYmI+EaKI= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB6836.namprd10.prod.outlook.com (2603:10b6:610:14f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Tue, 24 Jan 2023 21:14:34 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.014; Tue, 24 Jan 2023 21:14:34 +0000 From: Tom Saeger To: Naresh Kamboju Cc: John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Greg Kroah-Hartman , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.4 fix build id for arm64 1/6] x86, vmlinux.lds: Add RUNTIME_DISCARD_EXIT to generic DISCARDS Date: Tue, 24 Jan 2023 14:14:18 -0700 Message-Id: <92564d1254985c3983353204bf56fa6c5f507d33.1674588616.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0108.namprd05.prod.outlook.com (2603:10b6:8:56::27) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH3PR10MB6836:EE_ X-MS-Office365-Filtering-Correlation-Id: 759b3e3e-bacc-445a-d051-08dafe4ffdab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L2frSY4ZXW50MKo0zEsFaNO1axlpY46+RU1MyKeWgadwEQZSw02lBosava7bOKv/cNpZPR3RHNSORVYpBfMnGS0tazqA0D7fBXMvtwbvPIvgTcdNSmKsJzvcclsabt6fKXigx3XbpuMAPxqL8qroIQ6UZ8aA0U4rap7IMaUGNwg29YsYlsKJg8VrV4ET/gKN5zU5GegE4sB+FdzYaAg4BIknhx+ydZpwDqVmzOfRLcFY7ORzeeH9wCB46VGUaAj8uYeBucFcG7qdhgUfOpp49P2z6W3wSZfghJtioqp+MR/jG4Kdq9Was+ke8IK1wZ1Snp+Er01OSewNPwy1vfgur4EADxdMrHlX2KTy5rTDmxYtzqETBidjT4n8h46wI0VYnk9fXwsTHUJoP5dnGQeO7jynet74l2E2J4Kn6ogGfQ8NmugXVfZP5TMclEJLSPRRsWQ0z+sfPJ5hUn+CoBmZJggLbCrvMHGvs+5gXiTbc+7ezIyYlXaqW1AKlHucEv6aMAk0pjrLG6RNwnC6SNWwHtNHgEjYyJtO/J/kpkZUjwQ2qM2InPwjePSBe0AXJFiE0q2/xuqF53lTX3vGscYi2xAekpISk9ECmTqJIsVOdgkhk21PXstZmQ6k2AVBc0Vrig6U6TXUFdi91oGCr98Z+9miy20rxk0r7dlrlEjgrgv4R5Tq7HCbf0q2KSSnxLJaeqoilnhNoJh3YB6I6yF3nkfHzOat7bwOTAAXB6OLi1c= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(376002)(346002)(39860400002)(451199018)(86362001)(36756003)(478600001)(6916009)(54906003)(316002)(2906002)(5660300002)(6666004)(6486002)(7416002)(66556008)(66946007)(4326008)(8676002)(66476007)(41300700001)(8936002)(966005)(44832011)(6506007)(38100700002)(186003)(2616005)(6512007)(83380400001)(41533002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ltmGQoO74FZd4Wq0+GEmTP/+h6Sg+JS6uB8KSh+UK2F5Vqb8HYoFClOVEj60?= =?us-ascii?Q?mYD4jDAakgR1uL8ZE4rdE0qQ4MYqDz1qrbM+Cp0T7c3SgIClSQhYZBeUP+ZP?= =?us-ascii?Q?Qv/ljF9gKxYbILwfBcbqb4zmTGPMdKTIuWlyofHFt6aRzAFqcrWShKEkFBGj?= =?us-ascii?Q?s/1gJvwCHPXooMF7Q3CKe2uyBCKMBQ+in6VZ00i5L3xrdYUHw6sbmpSIUodp?= =?us-ascii?Q?HT2A+YCqO8J0yCKZsrNXQdNZZRL8HmIOzcfQRGHN70eFKLYxNagbb5p/nTsl?= =?us-ascii?Q?wdFczcuvhyPAIauTPOXcHNRI0gQ5HiSQJyHAm919CweylHvI2CoBEnR3wvzG?= =?us-ascii?Q?e/QUzxWym0MUfqB9f8pX5y9KD+4kR1YIG9WbSmAo5T2s/KSZhcYt/voUgOBa?= =?us-ascii?Q?KHKHXVcbq5jnJtUrffr9FXdVjdhT9Gc5+OlC7ucBQXDMVVzp5nlfzAEd2p/g?= =?us-ascii?Q?lUN+cNZoQcEODdCweP1GfA/MylGERNe0orie4IG8ng7IsmQpFmnydAWGo3ld?= =?us-ascii?Q?bJypNVomIwCRgJVSM6w3HTI1KjnAoAklj1/upXPbPMImwQ8z/0HUFbX+TqOm?= =?us-ascii?Q?n2tfN1Jn415pTLVmxK483B36IYbrpwvhdtIF+P8VEuy2EcJMqWHb8JQxDpKz?= =?us-ascii?Q?JYabcQ30BTLb/Tw1c9hzBYDD+OzSDOt5ZP6pSTXiFzbvDgK8GnLHzzhsb8w8?= =?us-ascii?Q?++RcL/TQnVmnXI/owDu+SP93jTPyMc6i+x8dQuU1tpYOpIBkEDb5w8DvMyXc?= =?us-ascii?Q?CAI8SJcpXXMyjv7PhGmf66I73XNbqneGkNkUDoIC9XUGpkYu0oKw7jWF+Yn/?= =?us-ascii?Q?FoM2c9lreF3GEMLK+RtlOP7gPanUhjvKK4UgK/lnpkhHLWOJJSAiaqwxAM5L?= =?us-ascii?Q?TWJXqDVIBnA6dB1B62xj9x2QKo8IaSuySJeVxHMtxK6J1ou04tGaQPm8fGQZ?= =?us-ascii?Q?se4Vgant0T4ZVnOYTvp52a+GbOZPML5fP5p0CtlhmZ94tttdSx1uc4ker5OX?= =?us-ascii?Q?Mbr7VaGYQBcBq1qO1ZPWmJRLfjXWJuTy4pnByIu/envCui58/A1HQRTrCqwm?= =?us-ascii?Q?3DzXl2UycMZ2S9j9nveQRY2GZuKD0215ANoBr/Kto7qgq44ErU68jFtjQp0g?= =?us-ascii?Q?DrCFwQQDz2VVVzSbhuHGu1hPnfm5f7Qux7JAVexfwcf8h5On8o+13aN2UbgN?= =?us-ascii?Q?NMbzSbkN2+jdnWxF0x6tiIxJYRN9LDoI9ygu2pnFM2v4RhVqPYSuQptqRn4W?= =?us-ascii?Q?nSxBB1ejv0bD+Pcx221YFXwEMcBHi768juXvsOmlYejr4vbOWpXv18fbdapH?= =?us-ascii?Q?p/SAmrn0ItMMt89Fx4ph1/G8kzu4gp7brTRHFbxvW9ur4s1ANn4R9xFqwif5?= =?us-ascii?Q?CerlIzk0KzV+1KYHrRlXcJlzYPek7dWTnDGSBR4YFj8T/Cr/d/sAXA28PPNf?= =?us-ascii?Q?2VsVjY8RpPuR1ZAaBz63Dp40ZrDptl23eObNS1Km5yMCg9wmD9tJ/ToZa5ym?= =?us-ascii?Q?+D/DqGjni0MncrXdiErJimkpn2bohUJnGyE27oBsnmXMRtLnBXDbjnWLGis7?= =?us-ascii?Q?qvX76PqTpGPHHBOv+o43+vmjuJV62zl5+B8zXzr4it5NE1x6oqw1zpx5l4ad?= =?us-ascii?Q?kdNaBLsH1oPMVHyCHseDJMg=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?HRC/dElJzwv2ONdi9qo0rR/GF2NNh8BMeTTsqiCGG9u3xghJHN7QI9s70Qc0?= =?us-ascii?Q?odlAINbhEy5OPkXFe1FF5DCEnVw3Wp73xpCoexLQMeHzqXuuHJ34+mZ6gcZ6?= =?us-ascii?Q?UuNampKu2fnq1BZS/Dy+QsklYeV4CkJyMLRl3AbCgaJviyI5kQuoTrpEye3g?= =?us-ascii?Q?d0kYjWaSEcIZ/A59+Cfvd9Zdxhz6lebxv3GvmU73BAbQrZ+qX7+9vQOW3Ihb?= =?us-ascii?Q?R4QGHzByGa5/+Jfr6fuxxI6/2vpty5d6W+8vYS7oUUfsQGG1JVL+AxBJj1qO?= =?us-ascii?Q?L0kcL6Xf4eNdIwiYy87/5zu7cH21scI2dPK3T71pvRYsGtt9dmMk9IGBzfTy?= =?us-ascii?Q?6uSoSQ6ZwP0yoZZQEeNqvM6JlF/io5Pgon9zk04si/YMBPuW2kXswC54iv0+?= =?us-ascii?Q?lWlYGd+RiCAn8AvtW2txngeAlFK2sOK7HGszCXrO9Y8M4fDcpiTmVOfhoolN?= =?us-ascii?Q?5fZGdQQZLuLIE5w/oJqQnW3IFUMgdW41E0aiqutcLBtnKsG4aOWZdxrXJg3n?= =?us-ascii?Q?/K7GD3edzzbgXr4SZR0f+aQuMjoewzQVnImLjtMObch+V0Va00P165kWd2Na?= =?us-ascii?Q?/ck83Bz6RVfMsQpiY8C8EC/70wM8/sMnBhCZfDPiTW4OJe1eejch/58jMApW?= =?us-ascii?Q?yjwcMY2vKdCv5UkJ2kRbRMQYTMEcHQdTIVg73hOUncKE+gJKkcQ5k1RM+Nur?= =?us-ascii?Q?JQKf2zIY5YMsl03J8H2zIwwcB/GtVe4hCbuflrbW6543U4aLW+s1qLIa5rYC?= =?us-ascii?Q?In/r0hRBNacifKaZ8cxVTlw4uFsqSsTIuHEboedAVbYFNx4VaFl9bpecLNFE?= =?us-ascii?Q?oGzL5OKN3LxMqRnqImFulQxZ7v2JSgRi1iXGtCNTLu+lA6m8uPbxghBWxzLp?= =?us-ascii?Q?wOXHJHYEqyIV4axYRFjJn3uun5atJo4EHPLE+NEnzXLkoPd/WY9c1zx6ARY/?= =?us-ascii?Q?9TsjaIjXPBkhw6ISDmI14dsD3qbT09WYZYaEAP4I6UScc1oy9WfmmQ6yp1c4?= =?us-ascii?Q?vJI1B6MKrd9ZvKGSvqCbsF3jJg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 759b3e3e-bacc-445a-d051-08dafe4ffdab X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:33.9832 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4qS+4TsAlFhAOuPa8FWJYmFfccr4GXpnK94fA5Xc/gizfMBXOR8yi/mi7fGYZuiaiVPD5N0NpuXfWcFqe/0eUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-24_15,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240196 X-Proofpoint-ORIG-GUID: fMpqxxL_l8kMviJgYv1gOUo3XuE9ukxn X-Proofpoint-GUID: fMpqxxL_l8kMviJgYv1gOUo3XuE9ukxn Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "H.J. Lu" commit 84d5f77fc2ee4e010c2c037750e32f06e55224b0 upstream. In the x86 kernel, .exit.text and .exit.data sections are discarded at runtime, not by the linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS and define it in the x86 kernel linker script to keep them. The sections are added before the DISCARD directive so document here only the situation explicitly as this change doesn't have any effect on the generated kernel. Also, other architectures like ARM64 will use it too so generalize the approach with the RUNTIME_DISCARD_EXIT define. [ bp: Massage and extend commit message. ] Signed-off-by: H.J. Lu Signed-off-by: Borislav Petkov Reviewed-by: Kees Cook Link: https://lkml.kernel.org/r/20200326193021.255002-1-hjl.tools@gmail.com Signed-off-by: Tom Saeger --- arch/x86/kernel/vmlinux.lds.S | 1 + include/asm-generic/vmlinux.lds.h | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 1afe211d7a7c..0ae3cd9a25ea 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -21,6 +21,7 @@ #define LOAD_OFFSET __START_KERNEL_map #endif =20 +#define RUNTIME_DISCARD_EXIT #include #include #include diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinu= x.lds.h index c3bcac22c389..2d45d98773e2 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -900,10 +900,17 @@ * section definitions so that such archs put those in earlier section * definitions. */ +#ifdef RUNTIME_DISCARD_EXIT +#define EXIT_DISCARDS +#else +#define EXIT_DISCARDS \ + EXIT_TEXT \ + EXIT_DATA +#endif + #define DISCARDS \ /DISCARD/ : { \ - EXIT_TEXT \ - EXIT_DATA \ + EXIT_DISCARDS \ EXIT_CALL \ *(.discard) \ *(.discard.*) \ --=20 2.39.1 From nobody Sun Sep 14 07:33:39 2025 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 CF3A2C54EED for ; Tue, 24 Jan 2023 21:15:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234839AbjAXVPV (ORCPT ); Tue, 24 Jan 2023 16:15:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234700AbjAXVPN (ORCPT ); Tue, 24 Jan 2023 16:15:13 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45B7F51436; Tue, 24 Jan 2023 13:15:10 -0800 (PST) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OKxbRV000593; Tue, 24 Jan 2023 21:14:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=5OQStQmNMkhkKHeRg+xPFJTie+R1hX8NmkrTOikIuhw=; b=dVWgyOpemwKA6yQ6j1LQ2vffsw7JoWupA8PLyJ6KhLgCVMBIS6ESWvG20wSL30ZiQUh0 fxGtkygcvC7/1ZjAv6og22IaGqc0eipUKVQ3E3JPk/bA7fBrNIE4qWJF4CB9zT7+rnj5 clXkkZpUl7Ic2U3WSY8pC14ELzPex3BYBZKbMsUvSVq8V/czu7pLCs55rKrgMva+gXhD oB1+PaqNysJv+GVyyJbmC8OE9HtQMUWsut3nbTcH6iDX4ZWpmyqxc4VQoB/l1QDFeYA5 TMnkjbz93RiT90RAQQneGabevCBhwX8zbUccMvqKkXthXH/0ixr9KFg2r4mgqayNkTnn QQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86ybeg2y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:40 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30OKBXRm030217; Tue, 24 Jan 2023 21:14:39 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g5ubwt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AcB/RcQxaeJqFtnQyqF7uCz1H1Dha5lPdwehBmLfBJhPqtI9B9ceRyje1fpnj5WMv9B9ViMTY4nVp1thtguYKxFKtu14Aqds8pKD8lIWFDfpmXYks9fk2sbjKYTI14HsV0Q+J7Sh0AgarIiGOTAiGYo/lWjKMILhq+/+/Gly8u9CJJdcLZ89yRFgy/SgQmasAAzQxy8/2DASYsotwV1EeqOWsRL7A/rXfwerV7MdA3cnkyb8Cn5BAKn9ECkFhpb+suY+tFuU76ktf7yGEkNBwvS4kP4+k3ZO4SfppLaODh3ds84s9p+0acedrHylIkNqMjgfM93GdL1DOS84lj9tcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5OQStQmNMkhkKHeRg+xPFJTie+R1hX8NmkrTOikIuhw=; b=kqb2x38pA5zkhs7PGdwN8YUxnRXatTi6GdSW1tNGYdUJsIlkZKAnGzFVVlX2XmEawUN26KJt+Eel21l2RDVuVWprmKewMe/m+TsaZSwHNxS4X84bRDugS5O6gWtTSSRDYpUyNsDDv2Bwl8lSsuvlxamT6HiVPbZQaO1g0EOWbAIWSNbSXwcmOew4nFTEcl3zxRFz52yOI6vhtVaTkv75iOMfu7IQlSoOzL7yrK74mKqUFsLSj4kIXzVJ540vH327sHsGiBandgoKahLgF8xC9Qfdo9XJto5WgJceuJLY+Rdlt0E/nPO/V1eJuKLkM6kpsnPnxcFEn8jbIU1Qki43YA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5OQStQmNMkhkKHeRg+xPFJTie+R1hX8NmkrTOikIuhw=; b=NOgqgLWc1CkPQ4tcz5tYbTNqVCsxf5gFXU7t9ecfZMHQUgmgU/4sxlVoVA69xQOIA/1sf7eGH0nkrb3WEmudPfr6qs4qTdmdHMDUzaoQ7Afe984I3Lxq+KTONBLx3lQOB+2Lff3jkxQOdyR4ZJRO3sWFjAjqEPvyLHpYfOK8WuI= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB6836.namprd10.prod.outlook.com (2603:10b6:610:14f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Tue, 24 Jan 2023 21:14:37 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.014; Tue, 24 Jan 2023 21:14:37 +0000 From: Tom Saeger To: Naresh Kamboju Cc: John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Greg Kroah-Hartman , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.4 fix build id for arm64 2/6] arch: fix broken BuildID for arm64 and riscv Date: Tue, 24 Jan 2023 14:14:19 -0700 Message-Id: <33319e16cbdf3b817ff150a9d1e072f349398ff3.1674588616.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR11CA0068.namprd11.prod.outlook.com (2603:10b6:5:14c::45) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH3PR10MB6836:EE_ X-MS-Office365-Filtering-Correlation-Id: 0484a83a-6ba1-4cc0-0011-08dafe4fff8b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f6Vxb58DOnlWlMVJb7qT8GZQxpNqZRbjM5Rvde3c1ZKqwUEHg4rPiiSevaye5Bb+wvPlICrn31gxbeEmEqrE8YzGhTu77FY9h7tyyXjntSFb3DEGFIigtXvp0YCP9vgFQneT7so7KLHy0YKO4sopEj5k/7Cd/6IPKmnqXojHkbvS3dHJmDP64tfSs1EKktq92oSR0Z5kO/kul/pGv8wBT1lbrUueNS4gPclM3sACH0l1KqbGapMIaCFpHkXHXCqWR3ZHnL2n2Oha8qwTbO7jtGcBrjqjhcT6pmwJzQmLY4k5mDCXJZZu6AvcPg05nsWrS5JIQmqW8qs2uW8ibg7XtZqmepL+tGQmicl4scfFsVMbdvpdOLAUxmCdyRIpZQ7EoM+2J8HNYEK4dEavOy3RbkqcrwGqxce9stkAFg++LkEP39JmG3uL+fheUTlUyr7eERM/2gPU4iqVgmBowgLPO4IsOuo8NZEIZ8qpaXG1zhGhIuN/BdtKeCeCgpu/tWfVc7n9F2wY0rrgu8jvLve297bi2kLbqScJrkVDq8yE7UjnIuZRjCalND2G8qsreXsiHZb5oxO74v1uAbjUOeL0uPehSfQ7glw5SzKz0VuAAzbiFw6cbByN5vFfw+h6lfj4EFygwRgfvw/RtS0TGPrPgf7ugTbl6P+NgeFPgLfZ1Br6t9q9YgserfrICW34Sj6t X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(376002)(346002)(39860400002)(451199018)(86362001)(36756003)(478600001)(6916009)(54906003)(316002)(2906002)(5660300002)(6666004)(6486002)(7416002)(66556008)(66946007)(4326008)(8676002)(66476007)(41300700001)(8936002)(966005)(44832011)(6506007)(38100700002)(186003)(2616005)(6512007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gHBAdMqDyrsjp+iESYSk9NWWsriX+pgjgYM77UNXfTj/DRW8sBrbY9si7Ej+?= =?us-ascii?Q?b2gs3w8RQS3JSC1jXebsgrZlEmS9PMnFsTcfQRdh9/nq0x8x7Mnb91tcEM6L?= =?us-ascii?Q?uAmZLFIMfJy+3MjFHpoARRg/jL9Dva8yzsCiEAqlXdYdvSC+AwBcSCciQGjW?= =?us-ascii?Q?VBP6nOOppm5XOWWRJqaGnmBBmIuUWA/rtc7OmXEjlRuHKJG9TGH8NJCtbC5d?= =?us-ascii?Q?bnSBlX703XO+6J2UqONeLVLLwBWdoFrMtf2eTlfpULi9FlvsQYcnuvhKrbze?= =?us-ascii?Q?B0xElL836QvXrdtqLOzpDHQr8JPpOz0Z6SRPDow9ujsUwB2cHmddruIO7Hdg?= =?us-ascii?Q?KS1Hka/Ez1Pv1NTJNDA69bx9Mxn5n0UZsd0VwADXnSo3ohwLSMk7YCxKN0qC?= =?us-ascii?Q?vWY69D6LhqayVS03RwQR+U37ExjkIqh7SZ3SV1uPtrwX3qeDpD18jNSAGc3W?= =?us-ascii?Q?gmSVfGtn6B71+yZ5slgaiqQYOhyZGMTk6S3wkOiDeCw+ED0vLUWIBIC7IoIM?= =?us-ascii?Q?H5G43tpmrUEinoAd63skzUd7YCaXkFrlQMJajUhWifadT58/aY/JCxfiTwyT?= =?us-ascii?Q?b4QpN0sFtg3MqCg5bq7NzdhLov04feUIXau5wdp+XMpZnEs4b83nm/OXxnbn?= =?us-ascii?Q?YJMy+7RAEbT9m9a0pwaOgmCoqWk9GEruG0DXkM2MLZw/quzykAqLeLofVo1V?= =?us-ascii?Q?A4pW8OAMv0mDpVfsDf5Zk6qLVe44gzQrioxkGADUonX8rTnYhYriyg+5lbr3?= =?us-ascii?Q?gOdrM1/mPI3uxYxbf5D8pzOz47JziOMNXxvmS/d4e0j63fhtEO5wdM8ywTN9?= =?us-ascii?Q?fTpfqEZuDP2D2AFmUPoyPCbaDsjUWFM1pTgeW738NaaFIHiuG06CkXIFYEaq?= =?us-ascii?Q?pRRTE6RTKoIQrphLgONOHYrfC1ZXQJANByt4fkAZ1Wardro6+hM03WhQFwEK?= =?us-ascii?Q?6WpdlV6igLeLY17X2T37P4RpmdvffJdFq6PgDpxJ3P5xEC7KnJe+HaIFSDrM?= =?us-ascii?Q?qp84BRt3a4IlI/DNr+KVh6SbXAMEt+PLi9cxHObPaI3rsXNyei2aSwS3WIex?= =?us-ascii?Q?/YFHa2mOcOoto2CAENddMEvL8xmugh2R2MYbnYfL9ic2f+Su3SlopZI7jAQd?= =?us-ascii?Q?2G4FAh82ym3bZsiUxAK2p8XmX69+wORYu1lNvLEKG1Jt2iWqGlqAJSZLIYLP?= =?us-ascii?Q?c7lgSfULERKx+xJnigYfh2mounvyWJnOP/afIWiHPehIHYB2TyDitWuTFvAf?= =?us-ascii?Q?JS5FQ8vZIcWLkSBskUAeM5n9xdbgbD27zEsmzl2axMi1577MWu9gINhEskQD?= =?us-ascii?Q?JWC4UTMhcMYN35NiFkqDTuriYl9A53QGi/qSmk3TTtPMEL3s+5+0kK3+ICpp?= =?us-ascii?Q?UGXxX1oCuMS0BntAXmUAjb/AvpyVCxQXFukmhhZBtamJszHQBp7PHcrcuK3B?= =?us-ascii?Q?N4cn4y5jiudXg9+wQYUjk5mYAnj0RvTPX6MWJ5BF4ok7Y7dCUe251IteCjan?= =?us-ascii?Q?jsEIsYZYlqMhVFuXxOWxIpk/RK9gSGnoPXGXAgIHdJzTJiSxQSsT+LkttxWC?= =?us-ascii?Q?DacfrHbFdQTqDsUs23ILAuE3EHCx/BXM7Sae1CV57ilgWCMfwSaAJKcTo8zX?= =?us-ascii?Q?arNDTMxNAguP2XjCNkY9w1Y=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?a+UMN/Fq1DGAwMk0Di4nFBJFC+eF+cQ9/ZinsOFTCFBYEDqvz4ow1fmOSTVh?= =?us-ascii?Q?+/MLhQdtETs/rC33p1UiP70zQzHkhdlhfTknbEZABvb3d+KazfR66NU/mSx4?= =?us-ascii?Q?zj0ESeqXo5C8O2ABaMaQOdJEmrcfDFmZvOZ1CSAiO/v/oR7UK/sYv8tEvZU7?= =?us-ascii?Q?OlJBOZhe0hNknWsbqgfuXKDaEaaslKiuFrw1E0gV3UYFoWpn+KjitD5Mfx9g?= =?us-ascii?Q?a+ItXvNyBNK1sCy+/JjUXKC3cmTeDARC1BCVCigtcUQmPLhryO2UO7niNJY9?= =?us-ascii?Q?BA+3WV0hYW+8vS2Pg8KZ0tfON8UZszPFIvMDSeGcoarlAmqNcScbswhAwEsn?= =?us-ascii?Q?dIviXVXyOrsDdmgu9Z0RBifqwERpGEc8bRwNsYc7Q3/1b9syOWt2QgC9q/M/?= =?us-ascii?Q?aQ/iOzAWeS9q0kaP6Mutdm11FzEyjaBgog6e37b7pXMfyrPaXNCDpi/FSfb3?= =?us-ascii?Q?QemDhqNBkQY220skeCcvw94VbSEj6H/GGVPsoUyjU39zO82/iK3ybO3vtBYC?= =?us-ascii?Q?vRqvxuZ8LiMc/LbL2+oP9ZDWWLzuST4eE7ou/l0K4sbT7e2oXSdWyTXq+FSZ?= =?us-ascii?Q?mz6SDyQETRXLh1H8hYKdxXj7vay6GxKLPSkkHOCpRKZnNQIqGKxFZ6mQDFGP?= =?us-ascii?Q?Lgnhh0EUXr3tlqWCmQduN3COfSUlwcAvTmih87VzFTjV9cv9lXpVKHXC3HdK?= =?us-ascii?Q?aVdQHiwTtlgh+J0mWGHU5x9x8BB5PEotW2YUs3jrUrl+47iuZijqOpkgTGcX?= =?us-ascii?Q?9sgKhVzf7bZG0+Y4Uiqxa3OX4oWPKsYkwChDMglCPzWdTJbZbaoLxOaU4Uec?= =?us-ascii?Q?EvJErHEEKK/EUvi2ng5AwrEToY4fATbS89gcj3TLBrLYBI6HHB0iKUy5g+MG?= =?us-ascii?Q?DYo1cx0eLEeDD0BGtz+zf++DJzSRRHbFVeVBaoyUTMFuvLYdgOb7IIM/ust+?= =?us-ascii?Q?rWd7Csy6SNFK2Wdh2dgKNEevpxDMFZQC4M/RKgqt04bF2FTxBUCKC5JSvOc6?= =?us-ascii?Q?JqaKlr7ZkB48bsdriHhoemx9wA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0484a83a-6ba1-4cc0-0011-08dafe4fff8b X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:37.1548 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Jgpze5sKjTm97FVsy6vpbOddTP7BKQAK5SO0B98vDH+IT1REAm7EyuO5z9yCMrlMKfht8uJMxbwNdvfQaMzvfQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-24_15,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240196 X-Proofpoint-GUID: EFf5L0lm8jj1DvSoE28W-AqzVNRr_u9s X-Proofpoint-ORIG-GUID: EFf5L0lm8jj1DvSoE28W-AqzVNRr_u9s Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Masahiro Yamada commit 99cb0d917ffa1ab628bb67364ca9b162c07699b1 upstream. 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. 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. Link: https://lore.kernel.org/lkml/CAABkxwuQoz1CTbyb57n0ZX65eSYiTonFCU8-LCQ= c=3D74D=3DxE=3DrA@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 Acked-by: Palmer Dabbelt Signed-off-by: Tom Saeger --- include/asm-generic/vmlinux.lds.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinu= x.lds.h index 2d45d98773e2..a68535f36d13 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -825,7 +825,12 @@ #define TRACEDATA #endif =20 +/* + * Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler. + * Otherwise, the type of .notes section would become PROGBITS instead of = NOTES. + */ #define NOTES \ + /DISCARD/ : { *(.note.GNU-stack) } \ .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ __start_notes =3D .; \ KEEP(*(.note.*)) \ --=20 2.39.1 From nobody Sun Sep 14 07:33:39 2025 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 F0B31C54E94 for ; Tue, 24 Jan 2023 21:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234775AbjAXVPY (ORCPT ); Tue, 24 Jan 2023 16:15:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234779AbjAXVPS (ORCPT ); Tue, 24 Jan 2023 16:15:18 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3061D4A1D6; Tue, 24 Jan 2023 13:15:13 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OKtQv7022131; Tue, 24 Jan 2023 21:14:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=/aTAwXo6n7HzhGN5ZS55fdG3GL/N1fNd+zuXprNzf1g=; b=WrH7ZYhiCgkUf95wk0fYqpMfHbeZxexv9lJEPDezbqa0tV/Z8eVZohHBzo4d/St1lTBo 3oT8vqQw0ol3T7gTz9RFhA52uRZTyizSwGe8Rk6XwQ3LmiHx8VX/j6R9+JY+/q6DGWk/ /265MR23mR1rvHKGmW4zdRsoPZVDOij4JDJ/3uY6M1rixCEGK52UkAi3/mFuSZ5LRr9z /7IrWK1ewGTpzR2jX7l9Q+W23+cAiF5VSLVPTRK2cghNh/q4x6qUQa/7bGalF4F0QE8G 90f0z5lRC+C20yAkrtVm8jENo8sVhkN8Bs62la/lU7odAkmh3u5o8FSOPzPyHJ652Fil XQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n87xa6f5n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:43 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30OKjnK2021312; Tue, 24 Jan 2023 21:14:42 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g5hdfv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Or7yHi87EFGq/VoeWl/qOI7qj3e9ran29jG3HrOvaRijDbnhNgA8rbIIf8MUZaO4T8Sy9X8XB1lbGXak1ggL0BXaYEUWLONdPtPCJpNKGqo+nPkxWbdGPAZkCQ9ZJHaNKx/3AVDczFk1rl/T1ZA7VjpkLGNdfNVvO0evYoBIpAVTM5ldPDR6VZxPak2Lbkj9Cv02Rw0YU6fHaW36jvCArAKEn7kmm5q+9AhZhhj66sc57ChqMWztdzhV2KYPQxbc019Sr5dzx8DNkFNrVCkwlMrLcpcmJEjx3ccvpKVRXHpzOQuQQrcNvW0mSBMWAlqwv3E0Wv98phjPqzK8PK2M9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/aTAwXo6n7HzhGN5ZS55fdG3GL/N1fNd+zuXprNzf1g=; b=aP9grAZDILprCJBQRDVPcJD9FhEkajdLSzdT9T3kM4S355XPgIIpCDne2qQHA9XRmgehwD6G5w5YLEogCgKXNKJV4I3W82bHryeMxG4sZXfLy6fw9A09s1L2vAgLV+Mn3NSWmRo3GMEXIFhJ9QWQRyHRaVhdpKek4PSV3r1E6jdiVSbSxp7NOHh9o0aSsoqkC5ePU4PY8H6pEI8jfbIAYlmugAnW6F+ILjxP9qwUjgK3n531yoU7NJcqCIYScTGuxpSN+6YHo0ByJan6wYEzcysBp2XdT80Ay2lUaCvMK/v30YqDXRludgzgw4Own3o1kS4nWfe1w+QFYdUyC2OvVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/aTAwXo6n7HzhGN5ZS55fdG3GL/N1fNd+zuXprNzf1g=; b=m9AAlMhR9oHmqnzRepnrOssedWUny+IrZwUm8Z16yLCYXBoZHGuFtjg99dzqxrLhQBIvAPuMIoXOVUz68JaFFRic7sGz+Ldjz2I18qjZC97CTHooZYU9K67zL/+1q6NqMCuzyrONz24rFhRvXppdI1ZOpyz5qDiYPgUnKQemprA= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB6836.namprd10.prod.outlook.com (2603:10b6:610:14f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Tue, 24 Jan 2023 21:14:40 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.014; Tue, 24 Jan 2023 21:14:40 +0000 From: Tom Saeger To: Naresh Kamboju Cc: John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Greg Kroah-Hartman , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.4 fix build id for arm64 3/6] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT Date: Tue, 24 Jan 2023 14:14:20 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR02CA0109.namprd02.prod.outlook.com (2603:10b6:5:1b4::11) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH3PR10MB6836:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e2923c9-e943-48ac-9225-08dafe50016c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MKOQMCAyqVPyl98xqpWYsCPaCl3Ku+aNjpf802BQYwfzIydFt3uwJH9kuBu1zqSsTpunfagGkDXXUu8MOXQUHpqrYXYQA3jz/ZGG6LJyHwnihVV8k1CjuF4DnvBFVm0cBL+oqSx/aOmBSoU0YanP3dtGYYNq/82Nb1wc2J+PIw5Ok5/lCwin9/B9qE4pFteuT+WNWYb5rTOtL1Yyr0IiYVyXYxLL6TdCnLJvGGP2HUXIHwf/nqUgX37pxumd60ABJkJK+C7nayD+nRRbSS/WEv7bDNZTv6G08kb5UJD3L+fky0x5R9KJDRLhlstdDnBmsRTSXwFnTfTrJsXkHrjeN1ESJ2IzSKXc3dD9sttPrwEGxXwQZ1dfY/tP/IcxiUL2bmy3Nkg5eIuhgdoBpRhwIeDDwEUx+Zmv42OV+eA0fEopL//IN0YbMP5+obBC7dS75cPbmz00uyTHKNolWwpeEFoTNlpD2ffBcisVM9ARkZ4Yc2R3O2D0V7rvft5yTNCZeAkBmP4ajgI9D+CArLKZsZPd1kTK9lKE1z+/C+T85qNnYYN119MArkSUd7ccAtRhKyH0Px6o+rMvCn9CmesV/pGWRmdKVKLdWuAB+KZ/WwNpfBm9qmMbo9nFLju0gylVrs+yfJsMleA6CkHtPKPqa5hZj/MV+Rfdfvjam+iZu+bbNagX0sVGSEsCTRCNKU7IbMJ0lJjYnjXh5YPmGYM2Iw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(376002)(346002)(39860400002)(451199018)(86362001)(36756003)(478600001)(6916009)(54906003)(316002)(2906002)(5660300002)(6666004)(6486002)(7416002)(66556008)(66946007)(4326008)(8676002)(66476007)(41300700001)(8936002)(966005)(44832011)(6506007)(38100700002)(186003)(2616005)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Cj8rE0RL8yivAcSPdH4PDk690JNtg4frRbQ8IW5e9e+rUmO3zmVs0Ny+B7Dk?= =?us-ascii?Q?8jheKfkUPs71ujoGfAe+VuUy4dILE7S0DYi5fkO/CYfRZ2lE+mnflhagwhCR?= =?us-ascii?Q?7dRHDk+RWyuqtyvBErA5azE6F0oyP4LwPHqrtujRLwxBmk3jGam+mxIsK1Ua?= =?us-ascii?Q?m+CNVih44OdeRXeigrGZIhyHuH73Ay7v/oloNk8dqMvSreD+TV1vBhUUW0mK?= =?us-ascii?Q?eUOQdSG82MCQxjEZI4mya6btYdB05qghD9+OdbHDUWGCdkWBspgN+foHmcx4?= =?us-ascii?Q?HZKyvTwRsAppRceNb9G8pxRMLbGiH3KJ2xfs3c2/TAx+0ZCDs48yZVsc85Tu?= =?us-ascii?Q?jr8SJlNNuSpDBr4Rw040FjYjRdFCm5/hyEYjZ4eBgvR9jgTB+U6whaTce7iG?= =?us-ascii?Q?I9KpYhQT4i9GY/xh7FOpPk/nPj2taDeQr2u8yHPViO0LG8Zp9CL8FSUibXbV?= =?us-ascii?Q?HsWNA8644iQ64UMFe2MMx8AwYFGuEJyBmcIvD/lqw259vW9Y7MBXipll6kc/?= =?us-ascii?Q?XcT9tgjTuCOGzDu9bTKRGr6/UWuauQ67uVwckbNl3Z/6MHyC/e98yq5Y8a6m?= =?us-ascii?Q?DrypIk2oPDlbw8QkWMUHnoDpbiFSXPhbPZL2QS1m4k58NR7AcGTClMUtSQdg?= =?us-ascii?Q?BQteJlQVhVhTUi29fTa1JmWnkmqt9Z6+kYEwERHr6TMvtxWngrF72fEcOEoR?= =?us-ascii?Q?MY5xESUvHr4Rt9QsabjZ9FRWnb0VXsNrh0cOyh/8ixZFs7dEunMDXBqZ3o/T?= =?us-ascii?Q?TncBLNP274uMH6D1BvS38+ScnQnm8cffMByQMlrtISF+PsYJJzlgtKnATbR/?= =?us-ascii?Q?CfPHr2+WAzs27nTJ7hVQQ4qOZ8x8NLNr9lKw6Jg//AN2aZ9UNUKjxXKb51id?= =?us-ascii?Q?SAOSDBarcGmDvDzmDgp1LLXyqU08iumcpTLzZIEXxALHO9n48xrlQZLM8396?= =?us-ascii?Q?VGMQilx4CkIk4IMOTuhZT0CcXN9Kdvw6E5ceBLWcFO2TJBkagL6V5LcTMdyg?= =?us-ascii?Q?f0KCR3LfDqWRFCqFN+KahU2YGMxDfMsxL8TS4rakpcS6EVbJErY8YIeq439L?= =?us-ascii?Q?KXCo/W1Zw/yHphRvEeZv/MY/H+q4sWXdWx7jVsW4TOXm46yZnOdmGLUEQso8?= =?us-ascii?Q?bwKFVuQArw4Bqg2k8BEolqRzQ9Jb5RaOfCzLC75Ur0lE188rtBFcDqTyuEmh?= =?us-ascii?Q?Lsu0sYclMjmhz43Dey/2te6uNdb0Y6cTM2hYx+3tMOCCZmyS+jNN0v8+zT8b?= =?us-ascii?Q?Iy485KapYZRyHkyKYMPemboLCfnYPJz5zm0X4j+uN2cO6EoR7+zOVbbylASQ?= =?us-ascii?Q?h0YpHtix0Ex+jcomiQ4VHTdigwOm6OdyKWZxCdHMxsNEEJFByG4OV0TrDrY3?= =?us-ascii?Q?jTeV6zucUwZJ52nG8OLFMXC9KuMFsTEu9CObo2/uVCVxvAIKbHXdawZOYGPO?= =?us-ascii?Q?69asW4Tp4YPv5Lc+DJ+awfhUOM4Y4l8yXnMEqHVwvxZSozlv9XJQWzAnRV03?= =?us-ascii?Q?5A1B1rsBCAgrAGisT1A62EqszpJPRwF4zJIVgCU0+O5Y/kXbI4oxie662bAb?= =?us-ascii?Q?BUGBbR0xbSCU66AXF/98aqab31NDFaMjaAgok+2dyenZiupt7DGisgzKY9nL?= =?us-ascii?Q?6IFfcU9HVvsOukyOy98zzKU=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?pAONDU5Iu1Y6FPlNoqWoOj//ia67UWloQ6itiDArKqq4qHDSTKt3M5CAWcYo?= =?us-ascii?Q?3J3Pes8siocikLRw6FbCNChJJZKuN98UghArZBQt1/5b7Gj42grD0d6lS6Ml?= =?us-ascii?Q?Hg67hj/EM4T8VPSOljH0aMIiq0m1/IRtcCOucYTtEOMYJjytXPb4MoYA2CWA?= =?us-ascii?Q?FeLbNpoeYSaB8JrIhsdLn7iEBa/1bUsZ4wGdPP8BdUvnyVGaiCpximgHKSvW?= =?us-ascii?Q?bgJUc014a2oZ8Eqjrxb2GjlQ+5FiViW/sTR0TNwQni298wnoSQmFrKMzUPuQ?= =?us-ascii?Q?bLbZsUfsMqwFaBV0/sitblFRZmKb9vkLzLiD5FJJRkZskRUI+31tDR6vk/cZ?= =?us-ascii?Q?SaHz1564ftRK9OQxKHps4cqSFudr+dswj45Zji42e0w2odoB/eTWqpsBchPa?= =?us-ascii?Q?tttdS+29A69PPDsoQB5nuiOz+Ed+CO/n9VreKFhqGPhkjKfNv9gvJrgi+BVW?= =?us-ascii?Q?oOI8KLZQO0mcn3G1jrgCopOabhOFJRapRHlruH3TDaMSPP4QpHuXHZ5vhHQL?= =?us-ascii?Q?/o+Upuo2l/DhzQJvkzM2Qj+h4Ipr+rDel5NtqzCzTjI/aSpoxsx1hy1ueFP1?= =?us-ascii?Q?LS9btqiRKO1B4K+DPhXWil0m3ClA605a0pemAraPvMWrkOCuAggCILUrKOSk?= =?us-ascii?Q?wQHQFGK7Bk05nDzMD5OcD/B4z8XzwV44MOsp8DU/CJituWE2zR+C1yNgycsf?= =?us-ascii?Q?kzq+kUWuRGrVXtAxyPuTo1f59lghPslupAGmL2Ljv1NRasZcRd6dCJ2l1s12?= =?us-ascii?Q?8VB1dRmAxCcMTy1b7UzvixxwCjPIKIqwKSWhhGK6GOAGXJ0riejPmrbEakr1?= =?us-ascii?Q?2dKLis2sGjkv4+2rPSdYbsMhsKPt7uFadjJPJ8DHuqRuOGl/2cNy5EpahIXa?= =?us-ascii?Q?r0Tga4lxaeJoep3EFQpJTfreupxxaOKu8HrRoMXuOr++vEdOEPS1ff9pWUr2?= =?us-ascii?Q?hyv7SrncEAnJlEtw+WWwlo913waLDto16mNiARFdqggq5YXeGmZ4Y3oZfPI4?= =?us-ascii?Q?AzOk/ZVAqbEUaJi/AYk6FITw6w=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e2923c9-e943-48ac-9225-08dafe50016c X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:40.2796 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IcmSC4L0T6UUISW0YkjAZWG48m5pd8givE/kti0TuLz6AYMRm+CYROZVg4tKs+1p9jv2mhtbYMVG3oQqFvjPww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-24_15,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240196 X-Proofpoint-GUID: rVdXXOuv84kIDJ9pZpqyMjU11HYRpCCe X-Proofpoint-ORIG-GUID: rVdXXOuv84kIDJ9pZpqyMjU11HYRpCCe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Michael Ellerman commit 4b9880dbf3bdba3a7c56445137c3d0e30aaa0a40 upstream. 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: def= ined 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 Link: https://lore.kernel.org/r/20230105132349.384666-1-mpe@ellerman.id.au Signed-off-by: Tom Saeger --- 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/vmlinu= x.lds.S index 3ea360cad337..4d5e1662a0ba 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -6,6 +6,7 @@ #endif =20 #define BSS_FIRST_SECTIONS *(.bss.prominit) +#define RUNTIME_DISCARD_EXIT =20 #include #include --=20 2.39.1 From nobody Sun Sep 14 07:33:39 2025 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 6AB75C54E94 for ; Tue, 24 Jan 2023 21:15:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234852AbjAXVP1 (ORCPT ); Tue, 24 Jan 2023 16:15:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234770AbjAXVPS (ORCPT ); Tue, 24 Jan 2023 16:15:18 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E70EA518CC; Tue, 24 Jan 2023 13:15:13 -0800 (PST) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OKtPO1006194; Tue, 24 Jan 2023 21:14:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=m0k0ASqY/0zUNpAQPw5wE4hs/76lnhfInYn0B1ZoOBU=; b=KvPBEII7ic/pDGuoZdBf2IVss8zt/MSHmhoF+EVUugdDoCihZ4jqMnrz1Dudw6Fmv5Rr 316JirXXbjvt8YPaIQ+wRom821HLffS39oCSNpCCEFR+pbij7HSP2eX7rycI0Ot9i1wb WFN6OG96bObc4JKxfMeYOY5H9DnayVcrZVB0+K/lQOST7xqoe29ifGVQQ9bMVub3N7Xu 790TAsdCG7bGU8y/MkHvjhpa32KSLFFtuwXboA/snAS7KdhjhgVbN9wUaExET1U+C0ei 6YTdOvmfN2UI/W39iwJ+nk5+9lprgrjNjv8PzUVm+FSTgbLyHlDGYb/qm6SwI5CuH2Pa Iw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n87nt6hqh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:46 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30OKNa20029346; Tue, 24 Jan 2023 21:14:46 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86gbu7mm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NsOI5pCAdQ2r3CWnaFtjmZorpbJ0EWzPWNs5E3hctugsW2jg4PhpdtKxqCjG/buGxmSH1tGdW6bPo8XyLRME4vPcPzCIzBfw5/PssyB2WKiYxCZTl/U+1Fugy2X0RCKqB/n/pRbFtwj6rV5iKX1nUBK0k7UhK+8PZpxEu+KEt4ztAsjg+QrGiyuXB9F79cBPOHT2/vIZMu2DDKGJQKrA7RDUajUo/MyVjCUB8nM73mjjWbKEEpySN/P4YEMrD9vnv8ZDyxopdeuMbODvU/pUW5eT+/qNzd98f/+L1Nn6gZJGeN7JHkHQ0n8waq0kVG5sDmSvDMBqO6V1JnMq1WTJtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=m0k0ASqY/0zUNpAQPw5wE4hs/76lnhfInYn0B1ZoOBU=; b=VdbhyE9SxdSsgWNH64QsT4WC0F7FHjdIjhOPrYRklQ/PMvVHpKpruNF409n/1HvotsRkIw+Bj7AwGI/k2r/jN5tb95Hy6d6gqOiY6uQIm7bz77AeZI0RPXeJFTSAKVl38F5JcENwx39oP7nerNP/x4DlDNrUPaUEBHu/gbxxDoZyuFGD/xSaOoQBc7qMNxlY0KhqJZ7cjQtunhonjEJvlSCYfmyMvOzfKuaIjdxl8kee2guijk5WKYU5J8vua7KmXuCI2oSM3Znqd8a958jJFsjwS3e8s6FcjNteU4kgNMPPP9eD4qHtqsNnSTCs53auTwnwUz3crqNwfk78r3tbag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m0k0ASqY/0zUNpAQPw5wE4hs/76lnhfInYn0B1ZoOBU=; b=PoS7lDP10G1Y/9++CMSZDv1Qs+3rnviL5w4wCJ49S27+Lkz06HgP2cWdxUD1BADR95jZ2z67xy3imQnh8ysgBFTZkUW1zPUH9S53BVAqNDcZfQManFvahtgPn3KaBsBD6X29Cmu72f/GzEHw9/v4mE1zB7w8iWjH0yL44ltZlj8= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB6836.namprd10.prod.outlook.com (2603:10b6:610:14f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Tue, 24 Jan 2023 21:14:44 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.014; Tue, 24 Jan 2023 21:14:44 +0000 From: Tom Saeger To: Naresh Kamboju Cc: John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Greg Kroah-Hartman , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.4 fix build id for arm64 4/6] powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Date: Tue, 24 Jan 2023 14:14:21 -0700 Message-Id: <53a8183997789febfbe4e86920b470bc4e59c1f7.1674588616.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DM6PR02CA0138.namprd02.prod.outlook.com (2603:10b6:5:1b4::40) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH3PR10MB6836:EE_ X-MS-Office365-Filtering-Correlation-Id: 455c7c69-2bd4-4c17-09b5-08dafe5003b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5E/xxh43n6eJs9rlJbfiwA1hUa6DJ83D5uro9qhZblrdR3s/Ymf+dADwjIyUzbGYkVU8yHcAc4XlhmlWSe/uhIHw0+B3eFl403qIFdJBHuHKEI4MS/Vp1HhVcDzE/cDXecGs44ZI0gJMndujM0wG0X5df6EHaZ5Vtw2DrFrmGQdPB27h9hfSJxCeip6sKHZlZTG5u+1BO+l+/FlpHC6m7/8XMDJPW9IDmsC4R8MfPzB6/GFHjXfz/Uq7ngJBW3Q718n+S+uCv2MHNl0UTqIocLcMqsbcwXVWG1QdVr7osD8oiIzT6ei5ThnEPM1hBUxmsJFAcThMEh9GHU9RlJi3cLhNAngoRyw8F3Uz30DlMnph3/04V2Xc37BTvr5IkbXgnH1d4Zoiyv6T8SFJchmZG3CTfGqG9Om7Y8eM5A34wXpEsesQQbQ4ty9c2lAPSPIoA9oUEtqyRyqvflNQ1ucxNdZ1k+7pex0ktJZKptOy5yKIhA1L6fB43Qezzen4bCDDG919CvbuAS01a6LWD4KpnIFiBDtNCtygApp15xmVy3nZtd8AfCGweGz4TN0FiXXx07rb23PUKEbozNGPGSMn33q6sXnurRNVV/0FxTfyPL/nFR/7nMBLjIRUBnNLt2a9Gm70xI4ygGzeHlhYfBHZlLtPpoPH/Qhgf/qebl5DzFoxUFL420FkyGiPBh1nkmfNjhIqYHvy+t+InEQvfeHR+HNbI7ORHsQAwKEBQfrCXw4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(376002)(346002)(39860400002)(451199018)(86362001)(36756003)(478600001)(6916009)(54906003)(316002)(2906002)(5660300002)(6666004)(6486002)(7416002)(66556008)(66946007)(4326008)(8676002)(66476007)(41300700001)(8936002)(966005)(44832011)(6506007)(38100700002)(186003)(2616005)(6512007)(83380400001)(142923001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eqvSinUXZ2R67ufw7srvdUY8453Z0FKPL1WgA9sy4iPcYu1BY9bMOIeZiOuy?= =?us-ascii?Q?rTDBUrXxJ8lnPYyQczvVA+VNwcP7WcStHDF/XOqzSyRP00nWmguyV4d5RR+N?= =?us-ascii?Q?x5EQ7ro/TAqACR/OtvmFgKtyvBiO7t/tI1bbD4JXEPj2PGFfVJNK1AO/Q8gz?= =?us-ascii?Q?rIUsT9Dgmu7dtQ6yovEF097EF8JxADnfMSwCTY2SfEwhFaT2n/OmtpZMRQY1?= =?us-ascii?Q?06CzMRkkG8gMW1+n+7khVY+4A6BqGhKlZf9Wj0lypvaSmoQyoEQVSCWq7fjH?= =?us-ascii?Q?i5R9VtBiHCT/Xp5BF695IVz9SA9py5WPbxlTwkGJqmNeiBwsyTP5eKVNMNLx?= =?us-ascii?Q?6RYolrPwwduMTvw3zaiOhqyBIkYZAA9i4aQ5vtjjgC3qK9fukluwT2zkWTFc?= =?us-ascii?Q?eYV5MUrSEhrn5Kyd3IPaljqA2ok3z9/+SYn9PydLmh0etbXyOOtAWe1Qmbah?= =?us-ascii?Q?zATe9kL7J1JYblVh0yl7UftWyzUqkrsc2ZPbIx9ZP7950EHtRGq4qjA3RnAk?= =?us-ascii?Q?L7Cd7GMejGLYdXLCPA6BVMLZSyIWCJ0CKDQ01Gsa2LLVeQSzVfimx32H43VW?= =?us-ascii?Q?Sd2eMitOUix2n6F3AuwwGTHqxNe1GaCfGlyFqdxnVFV/6lEw/l3Q+e8IL1jx?= =?us-ascii?Q?LZjb2mcLsiiy2NzHRpVzGir5FlPeS3cKJ03/ErLL4rjO1wfQ/ACUgNoSlCOi?= =?us-ascii?Q?TwSI0WNvNsKWeJWLcIUqFP5nIeppD2WdqEt+72KHIYSQIanjdQ/l4WMUdB6Z?= =?us-ascii?Q?u7MhPU02MJGI91MTLNCud82xGsBwy1j5EwlaBO2zxLv5R+vzH/eq8sBVYkZT?= =?us-ascii?Q?PaOD1nUE7YkgLzgmvmP6bPthzG3nrzRatlLctK7FGEhsGa1SJ09+yArL5x4i?= =?us-ascii?Q?VDXqF+AMnFthUjxl7G9VLPRODL2qopeltueA6jWYqPUDHbmUctaGVc+aGcAo?= =?us-ascii?Q?ZuH/ZUaXmTnvJD1mjqAo2qRCAIDMLT7ILDY/AfzbkWesth2hRt60fxXUZOQV?= =?us-ascii?Q?lbuJTnM6/40gfSd2LT5a/QKYIhPV8VAWMbwzZ9hntudSWtZ2FNRq54srTjmT?= =?us-ascii?Q?eKkIH9YTD/0CXWDo1x7Bcz9iRTaO3OfWRXbOrQyhNcNtEMi1Sde932EDDKcN?= =?us-ascii?Q?Dfj31FAkd5PeCH7rCMUKGc2AREj9NgX6fqll5HWzH5RH4qaSde34QVVvGFIO?= =?us-ascii?Q?yzNNVGLw4n++JkktNCkayfgp1Y+y8gvQRlMNQObcvwxG2jIalOeCRKRtXOCO?= =?us-ascii?Q?+Db0cC7BuC8tjsVKJwrAVVMrA0cJtBJxA0GqiulJBpzD7s+0uKa0OPuHkkse?= =?us-ascii?Q?F8fUem8wYarUcQNTmaBkohhHoQerwoEK+ubX43HMR7rKLE/OufntRRjMDqaR?= =?us-ascii?Q?1hvYs9GOmZClwba3XkEO43eFA5OmkF1QGSMJ4q1thn6TSFqomoAXXiZUuHht?= =?us-ascii?Q?+Q9zvTTi32SAbaSI5cko1gbtjVAOGQnGYsTU9XO+07QP8krl9xwRTq4oqmQk?= =?us-ascii?Q?WgCA+J8mOwVUTRvVDPlXwgU7515Sj26TX0Y7n2fTqdM5yzSOVwNY0d/e90je?= =?us-ascii?Q?Az3EJ1E2QYEg95GpQLnSJPodk1aCHUjoVpGTJcdWSEtbPUjc1ZWM27YeMfUO?= =?us-ascii?Q?tc7d6kSr+i6y5gGY9uIu1DM=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JDQHZHDhV5VQO5J4fX4MF7C76yFopXX4J/E9AO8QluJuBdtxdsfULgRB47u3?= =?us-ascii?Q?6aMmvw+erl2KikT+pB17MEBXFFrnu9K85zckPtqxq1TYC1Xe3EL3nrcM6FIB?= =?us-ascii?Q?OqkcjGb6bAIPFBe+io4rsd9RKy8vSRq4TuviB6m1fcTAx/Z0UQizzdhM4/81?= =?us-ascii?Q?n4FJRx2CYBf4AZ9KVwSl9hbOb6W6z4S/yBMFG6652uFJg1hYtBLvsXAVc6Q+?= =?us-ascii?Q?Vcu7gSHhv27JG/7s0DLRAUaeb4GzV66LglYJ+DB8zIIS9HZVndW+7L+V4BoW?= =?us-ascii?Q?tb0PW0hUCncnAIIYy8OYqaueP9K5OmOthKlyfv3okQAasMcKwJG+oriLWK9g?= =?us-ascii?Q?F1hEgkdZ/5FD6mVwec5nSXaW/j5Pt7sbUfJTAKfmc/7/z+8iSBN81A1d32xM?= =?us-ascii?Q?rIQ7A06B3TdAxpv38a6Py8+QnJsrs+Vta34yqv+hSDGaFlZinkk2FWVodRDp?= =?us-ascii?Q?34V3Nv1njlr1N0a27a/SDXGeaLIhp5hDT28HOkB/c8YsLBPpePYVtCr3esyw?= =?us-ascii?Q?GLiwcSWQy90KnNlqJESZFDzC/bgtomr54ZoYwl5boyALTnlock+S61So4Sl8?= =?us-ascii?Q?s0+JOlAxuIW29J0wJ4afuUCHVNCk/elmi0QDdf9rUauXFp8ybhoEey4yBmO0?= =?us-ascii?Q?CTwh5Kfs9C7srVUikG7bbmBszcOqHp87nshgl8ttxofHH3AunHSdgbJg2TPw?= =?us-ascii?Q?6Oc6JuYlcuEpr2aOXDy+/Y3Ql8L+jn4St8gNeZfYQNYX0BmfNa63VCRV1jZl?= =?us-ascii?Q?h6YXeowX6oO493hdqIwZhMnetKkhjYgntKsrGVH+uy8qerHGLXA0WZXD5e4M?= =?us-ascii?Q?136c8noalvr5OIKVWAWOeCKHkyC92Bk00+pzq1Pnb6lfxUnTkr9VJ5lS/PIt?= =?us-ascii?Q?SFcungb+CAmMr67tMRRAp8jprsC7ubF1HHeToT7+v9mVykiUAwuBPBHJOqS/?= =?us-ascii?Q?Q4TgHasZlMeIgrIxbuyetGMr2Falmb18/gU9KBtdtsuwwEH+eiVr1yoJLFWH?= =?us-ascii?Q?oEtTAAQQ1/LCscbo45b9PgeV8w=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 455c7c69-2bd4-4c17-09b5-08dafe5003b7 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:44.2481 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GS0JoSXxrLM9yhO6g3wn/arysguthKwHAxvCfH1RKgo/027QUYWRj3Y3f1IMDXVgms3LJTZN5cnQPDSc/SCBlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-24_15,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 suspectscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240196 X-Proofpoint-ORIG-GUID: 0QvMZEbV6gwcYBbeZXeIjtbB4MDst0U_ X-Proofpoint-GUID: 0QvMZEbV6gwcYBbeZXeIjtbB4MDst0U_ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Michael Ellerman commit 07b050f9290ee012a407a0f64151db902a1520f5 upstream. 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 Link: https://lore.kernel.org/r/20230105132349.384666-2-mpe@ellerman.id.au Signed-off-by: Tom Saeger --- 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/vmlinu= x.lds.S index 4d5e1662a0ba..46dfb3701c6e 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -395,9 +395,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 } } --=20 2.39.1 From nobody Sun Sep 14 07:33:39 2025 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 4EDA4C54E94 for ; Tue, 24 Jan 2023 21:15:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234897AbjAXVPp (ORCPT ); Tue, 24 Jan 2023 16:15:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234712AbjAXVP1 (ORCPT ); Tue, 24 Jan 2023 16:15:27 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5729251C42; Tue, 24 Jan 2023 13:15:20 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OKx4Cg024819; Tue, 24 Jan 2023 21:14:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=P7RF08IFjPr8u101M+R3oBptWf9YNOkkALVPZ9ZHtPo=; b=GDKMbWVmZ4aSmpwGQtGrNDpT+waZZf5M6gcDkQvXtkjBmKJ0oAJF7kNVMo6ACreCxtQq hYm9YtAmJCFuXtbCa+d1SCJiI4gfZNlGKk024ucX4RNXZH83H2fwqIIdeg09WjuwPd7V jJupu5rkUchOLR9+Td6dnXBoPwpG+LLyD+P+djxjy6PNrjrIEamVB9NjR/TQdaBVnVlD VHT7u/kFiylfxbS+ucsFRzgZLsWwyR3IMhe+I7kQJUROzmJ4ESq91Z7OtiHcD3kzahcp FsawfhwCwuike84zYJy3zIikgDvsOFQMIDFj4Z3nS3fdKZIl3Pfmr0dlngvXJF28moPg /A== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86n0xhnf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:50 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30OKXUJT025295; Tue, 24 Jan 2023 21:14:50 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g51ekf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XPQtKlik97tzBsTCN3M5lvcKdJK+7EfVjgv8L+GD75CjPy8OqgycPxAmBFmNintTChVE66UsvufMk1zym+SmFmoWSIY1jhIAjJjk0rTc+nLHrMB45JYoyNWKzCcinRBVBdLedbmS5pKTrhW3ZrpVXKmFNy2gHC9du/ObDEiHUncONaph9JVFiuhXK0ZS92+ezc44hQUWto3og2NoDnmFq91/6mDQ5RHhw8guauUfaLM8ZwRHYCoMck3c+tg+dSbFRmasyuTGhOjpf9uwe2pUztKxjTrIq49YAUkQ0UY1L5uJeeZg8EAGAH2uSSjHKHo91Sy9jYxDWGiI8MfSwCxhNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P7RF08IFjPr8u101M+R3oBptWf9YNOkkALVPZ9ZHtPo=; b=G2uc/G2g5Zb4iW40o0+lm/6DU9RDwXTdDPt+TEFVec3lWIpFkfcibdtpNer/J/Pp/etRJPEYLOh0cKcGSQap6Y6Ts+MP9pJvOeaC5hun4dNjNsjhY/ezwSzXh9e0TouZRbQswE9fZr/I+wKr9A2DlTnBHGiev4RWmNQ1PpUKzhKcCyo4n1AWPStFxKWABBdeJmws1ofWLQckRr98cgTVOiXCK1qy4Q/z3qOxhg3EdNYLMQb1lNskj4er/glNcPukCJg5yA6d5f8v8FV9Fde4NpVS/hlNAK8hqp2UoQzf7qrYN1+cQUYw3VWWsbqI1sbbYSnluAUx8Iq0Yzn1uLssdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P7RF08IFjPr8u101M+R3oBptWf9YNOkkALVPZ9ZHtPo=; b=GGaYoFrFtTuNaMm6f/SG7rXGJpdGH65e6ZToqVgWW2C9/qThVetevz86VeFrRQtASezmYazlPcpJMicJDhszdA5YWB+n1XX/gMp+2xma5C6Asa2RbIL6FMFhh6jSG4M5ak9AW7TSJyO4YqF6IEx3IyX22QbKQRbz8XitT2Z9rNM= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB6836.namprd10.prod.outlook.com (2603:10b6:610:14f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Tue, 24 Jan 2023 21:14:47 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.014; Tue, 24 Jan 2023 21:14:47 +0000 From: Tom Saeger To: Naresh Kamboju Cc: John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Greg Kroah-Hartman , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.4 fix build id for arm64 5/6] s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36 Date: Tue, 24 Jan 2023 14:14:22 -0700 Message-Id: <02aed8d0fad05a87a02c226d8e9f55792e41c47b.1674588616.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0103.namprd05.prod.outlook.com (2603:10b6:8:56::18) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH3PR10MB6836:EE_ X-MS-Office365-Filtering-Correlation-Id: f8c0a92b-6321-4220-e5a9-08dafe5005e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j4GuSK3gsSdmrlceuFIIhSl2lRVhx2qaqkW3pGTO2ZUcCoB5/A8Z7dDUZl3cdONqdIh8yyL5Bb6s85AuhYHdsLZE4/Gq5Dgn599g1S1n2VYvFMmUG3vkJGB6SR2x+wKKEcbOycapavgtQUtdyfgL15Y+wdymaU4+Ad5wz3UsSA1P/Bc+X4MLs5OoVzrqde2LnIUP0wUAGDXEs7Tw1ixQwPFNElzRxnbnK8g7epNMH3PbEItV37t4XsVCH9yMYJfKwfyUHQJciUlBiaMwemgDGMe/XpG6CFstyWUjYOJcsSuoXtEcCoO4HL+7FVjVQV6SOxCsrdZSV+CXOu5ofHAY2mWgr3PB6L4jirlavAt/fv+jkRViJohvDRl+CwtXrn6wvEkik3XSIi9NTqqN6g16DiOErcvXLT9Onqkyp2h2T6bTcb4FyFFdtP/4s++tROoc7ErU9wOC6VCk6axY7OvgOV+26RN45U3Qkp/ug29oFY4RY3f2txHBlIrTYaxjU3LcxcTLeKS4hkRQareTh2CUiZxTfqGsgi8sguUwbqYqiR/MhueMzIhySy6fJtIyPsI/BwRwFHvzQVn4XZ8B9LOSBt3G3RICvuAUSTqcDoPaoFY2Pq/vviHCNbkcWRSnFROvtNRVWlB2aWbG1v215OJyNxL5HOCe8R9fJQ9uhSLZ+GM2KVgAL4/zDS/BY1OY/3z/orhzBQtWmqG+65ylcdwQ9g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(376002)(346002)(39860400002)(451199018)(66899018)(86362001)(36756003)(478600001)(6916009)(54906003)(316002)(2906002)(5660300002)(6666004)(6486002)(7416002)(66556008)(66946007)(4326008)(8676002)(66476007)(41300700001)(8936002)(966005)(44832011)(6506007)(38100700002)(186003)(2616005)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9muwmtxJ1sklos87YcF+C4yYGHC0NMSJ3/Cou/QG+tNgMsF6eyKHtJ/G/uKE?= =?us-ascii?Q?7gX6+//BrJsum0dVRqe9hJkNtAynOTGkRu/QwEo0OEdKrNt1Jmd3JAxE96Ww?= =?us-ascii?Q?DANz2rtMiJoMBlkJ+ejfp8+qZMlo9Zg1q/FxSuFS5M7bEQ4mSaTsiXy4W2tn?= =?us-ascii?Q?MV8yzRwehKqlFoyUUMOAlvvPegJaGbqXgloSxTmFNxjxcCB/uBF2YO7uhFfW?= =?us-ascii?Q?OiAcMw5Smj8TDdcwhZ/KP+QdpFGzAy2CX1xQKmW8wT8vNvvrSgoYQu8YrfWM?= =?us-ascii?Q?yNMwxUqLJN9FI4DGNEa0dU1mQ/40gtVFJKcT4AHIstthjwF3t8ObMLG51VFs?= =?us-ascii?Q?CiK8qLYgwCgkXOQWdJnUxsuhG6SXNd5GdnoH567za2KL1JJhaBaMfSiSKLqS?= =?us-ascii?Q?RDi0cjscKOhduEiItBcuXMGmZ2ISJxEIwZf3kQeknahIcmwwcdmM30AX/btl?= =?us-ascii?Q?9/jFJ+58BSRX0po7RAqJ1CbrqmY3/t/3mgrwu7RaXMtL53WMrgYiA252Yi5F?= =?us-ascii?Q?w6s6tlC/3bIQFPPEBwbOohSxU+xufGRKA9NCDG5WAZsvCWtljL7Ubrc6PtkH?= =?us-ascii?Q?e/wABxWs98XyEOEcllg9ES98qp8Ghqt9nwlPpUmANXIeYArwORYYsICCXjkI?= =?us-ascii?Q?a7hR+kBjqp8GmWt3IpHr1/1WTmkO8tFY27ljEkfqhW6KgKigXrag6K7eUQCy?= =?us-ascii?Q?mDTGvRp2jsSb8pTMgzzEN3cghe9L6/DiYTkxLTHFCTUTfM+GtJ74mCP/Adfo?= =?us-ascii?Q?IhnJ3eos17v3XP/VL/KLfHPZ9DaEnWWvtlwjcs3WfAJxd2tFbXZMTFkOoaBf?= =?us-ascii?Q?P3cx7ImvCiMZXYe0JrCgtkDuwyJzU8ZWrq4apJqtnFLLJs7nyb812WBkrUWV?= =?us-ascii?Q?lHCd5h8Rqygo8g+O8nXjaZM7nWd52cqHOYLDkDjvY8qj65X4a9B7yqhlYw/a?= =?us-ascii?Q?3xhxttb2McG15xqtgjTrqej0BkjOn7Pqx4ZeyIuunz0gK9dUNYYg3wPAViNZ?= =?us-ascii?Q?JMrMdOGJYPmDvZKQazut5vDiBpLQg97ZNTSxl2bEkdeu0VnuH2abYzyVTiz7?= =?us-ascii?Q?l2jXWfG/OskvmxB2qoKadikykFHTWQpnJ+7DEX03VR/waSn4vnd+fO7hQTle?= =?us-ascii?Q?o4dsMIRudRFnaDFgkH0Gv+VC3NpskFLqvLLbI+iytjlsrMRiPEDHk53hCmr2?= =?us-ascii?Q?l9h8Ydjeo4VCiZxfMBn85XtfWwyCkSx/E4BtSr6OxpsiwwexH/sLUN0cYVct?= =?us-ascii?Q?NQmB5tO0BK+TM37OIC/sRRvRQ+jnIVtaz5epYTRw4rMipsAS/a5YRDeMCooH?= =?us-ascii?Q?x2jJ/ecsuajODbs/HNPEBrvtV8bIyW+dvmtJM6rtpKHjsDxTzFrOWScYBIMq?= =?us-ascii?Q?7rVdNNKlPAhRtGb2vsMJfy076vXKtGiOOXUh0Nyx1HRyCQ/4jWJqpgpPzo1d?= =?us-ascii?Q?KaB4V2GL37UsaWJUkd/DRUyypzB7QF0a9TtqE34m17Qk68g6YPc7TRVgLFKy?= =?us-ascii?Q?tTJJxlCs1gHHlAhL5wMKEe2xr+N6wruY02F6YoH9OtqydoEeg8hx9Zlq48pi?= =?us-ascii?Q?/aBqfIVnCtcG4SoCSIJsFBcFrbwqjoUNGEKR6ODs6eX3REVPbUqkxUVagi8Q?= =?us-ascii?Q?v46XzAsl4GgPo/vVIK5RjTY=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?pgJU/ql0PDTe+eYiqdXDs8Z24IYSuMejtq9ba4nU0r8yKCf/J1gzoe9Up8rG?= =?us-ascii?Q?qECL+eEBPXvZI47zcAdZebAS5CiF33n2PCpOi1Y2mJYXa4kT836YeUj/wgmE?= =?us-ascii?Q?MCTXqy3PuMZzENu9ean4qezoAbVRpwYLquBtW/QjQe6Fw6AtPNF/yzT+RnS7?= =?us-ascii?Q?NFfYP+gQbLtp+8pGGc7p51OqOuRLhOmpYuDmq9c6mh9LVeNxANVE5K75b45n?= =?us-ascii?Q?iD42P8ITQkY7+VQ5PmQ1+rGeT4NwcfLgvz7MYcTVgum8gsM7ac1GJLyTa1Qw?= =?us-ascii?Q?huST+mJYZwnGJ068lzglH/0HEwmhMqaIuQdiurPW8UYLnHBkMprDcsKcgmlT?= =?us-ascii?Q?4krc39Nixh+ytGSHYz7cp+v1NWWLSmmQlaxjTZpzG5BI3rEqy3esG68AhMKe?= =?us-ascii?Q?S/X6MOFEvxavy+rzt8AaAm3t/nY+2Rvl8dCXXv1f/Xm5mnzrvLekiev+lkPP?= =?us-ascii?Q?MciI7er/nTCNh57fMgs4oXwXYlzyrb+h7AabagkwVkM0pE26KjrGJwVKOGCL?= =?us-ascii?Q?YY1g6v2m8OadTb/ibnUH/jybs6kwkDItNRg7IYum8YukxXcbgHlxo7I+oVKb?= =?us-ascii?Q?YBIXtkKhhhrstMBve3hvvF99aVeYEjPh00bGNu2c0ouWO3IVFc//f7vZHxx9?= =?us-ascii?Q?JZBoCHOexDlsGS2pDIAWrjZk7MxyFElDBhMYDYZ8UyIK/cKjP9SrONPa+Fbx?= =?us-ascii?Q?jf2seAmzocPUTIuSGlCmsBnLjHRoUZAhGzxust+tQ3JnWp1phhH2gCD/N/pt?= =?us-ascii?Q?rIlVN3KNIHXBGKAq1lI1Av4sYvJyH/SWIVcONwiTQpOM3k6RLVJIlKm3lyUJ?= =?us-ascii?Q?KoUPLLmahJ5TbS2PF2JncpNHKI6f093+KS6MOm0CfC9SphRFuBCnxf9lPo7a?= =?us-ascii?Q?E3Hty9/drgz1vjwB67UMnUGiJqyldWZuKExDTOjPZ6yahpFTAi5CSD+TsNmG?= =?us-ascii?Q?nqQkUULkgIlp6ZfyaqO5pI9Epva6TLL1npmdYhDJH29AVDEZZ4QDy10ovumX?= =?us-ascii?Q?um8S2krenRPptWUYykdNvEnKKw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8c0a92b-6321-4220-e5a9-08dafe5005e4 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:47.8103 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: r5HnoQPziUDrjSbcPzhjnRffiK2QZA+mDhAtSGG7ln2wNELUTXZsus782ckkiGn4IfeM2IP1XgV/v7FcareQvA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-24_15,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 malwarescore=0 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240196 X-Proofpoint-GUID: BPviMx7RtMB6SsvqEZRNslQUF-Yno3nq X-Proofpoint-ORIG-GUID: BPviMx7RtMB6SsvqEZRNslQUF-Yno3nq Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Masahiro Yamada commit a494398bde273143c2352dd373cad8211f7d94b2 upstream. Nathan Chancellor reports that the s390 vmlinux fails to link with GNU ld < 2.36 since commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv"). It happens for defconfig, or more specifically for CONFIG_EXPOLINE=3Dy. $ s390x-linux-gnu-ld --version | head -n1 GNU ld (GNU Binutils for Debian) 2.35.2 $ make -s ARCH=3Ds390 CROSS_COMPILE=3Ds390x-linux-gnu- allnoconfig $ ./scripts/config -e CONFIG_EXPOLINE $ make -s ARCH=3Ds390 CROSS_COMPILE=3Ds390x-linux-gnu- olddefconfig $ make -s ARCH=3Ds390 CROSS_COMPILE=3Ds390x-linux-gnu- `.exit.text' referenced in section `.s390_return_reg' of drivers/base/dd.= o: defined in discarded section `.exit.text' of drivers/base/dd.o make[1]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1 make: *** [Makefile:1252: vmlinux] Error 2 arch/s390/kernel/vmlinux.lds.S wants to keep EXIT_TEXT: .exit.text : { EXIT_TEXT } But, at the same time, EXIT_TEXT is thrown away by DISCARD because s390 does not define RUNTIME_DISCARD_EXIT. I still do not understand why the latter wins after 99cb0d917ffa, but defining RUNTIME_DISCARD_EXIT seems correct because the comment line in arch/s390/kernel/vmlinux.lds.S says: /* * .exit.text is discarded at runtime, not link time, * to deal with references from __bug_table */ Nathan also found that binutils commit 21401fc7bf67 ("Duplicate output sections in scripts") cured this issue, so we cannot reproduce it with binutils 2.36+, but it is better to not rely on it. Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") Link: https://lore.kernel.org/all/Y7Jal56f6UBh1abE@dev-arch.thelio-3990X/ Reported-by: Nathan Chancellor Signed-off-by: Masahiro Yamada Link: https://lore.kernel.org/r/20230105031306.1455409-1-masahiroy@kernel.o= rg Signed-off-by: Heiko Carstens Signed-off-by: Tom Saeger --- arch/s390/kernel/vmlinux.lds.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 4df41695caec..a471bd480397 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -15,6 +15,8 @@ /* Handle ro_after_init data on our own. */ #define RO_AFTER_INIT_DATA =20 +#define RUNTIME_DISCARD_EXIT + #include #include =20 --=20 2.39.1 From nobody Sun Sep 14 07:33:39 2025 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 16730C54EED for ; Tue, 24 Jan 2023 21:16:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234862AbjAXVP6 (ORCPT ); Tue, 24 Jan 2023 16:15:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234799AbjAXVPf (ORCPT ); Tue, 24 Jan 2023 16:15:35 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED9CC51411; Tue, 24 Jan 2023 13:15:21 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30OKx4XV024824; Tue, 24 Jan 2023 21:14:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=hH24EBzOXS5wKwU3SClAqDOGMpEKsnD1DNzELvg7b+8=; b=bCOQQHPk3pTRp87XBaeo+JQ3Dn5kZ7ZkzqLd0pO/bQKFLVP0cx59HxW+KTgBp2eo9r/b D+B8JhqO51OfhoHFYficXd4EQqRkuFZbeR/hHj/EcJBO8vpcRx9OlPtB9a06r6LBYpxb Gz0lx5oT0G+I1ekRApYYUydw2RFgnz6XQTj+/loan5vFkvauQ9xJbjdDezyOV6fli0r3 6IWPHMneQFPKQCuMcHTySVnKrbyxav2RbF1eK+gu7bf/htpdyeIbkxv83twyLCF4kyKD uElnqTEKtjKD8rvsnNuIOg3/e4+zZVcg32kFAxAd2Jy/0UsJl/fhBr2TWgbUUQwUvFBR DA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86n0xhnp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:54 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30OKnVGE021263; Tue, 24 Jan 2023 21:14:53 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g5hdp2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 24 Jan 2023 21:14:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KasW22sHpCk87GgIalIcRqT1jt2Jn5wUypkCQyO+Qv3MX66SxYpcvoMJMEMuC0mhQq13uLSwuNAtqXrD+K9ryL+N5NmA85NMyWsYnC7oFm/z2csPN8V3izJYITW1EL9IbuUEgjFxbaeQQmJcZjc4SB3rD3vGmi9fI5LisgwdxlvEMnvYyfjGzP0hlSq/mL2D6ouPJ31t8WfCfsbKvoW//SXSScMe+ERL4xTA91nZA/w9KUQBmpKzgkLBksNozb9S8XDh/oVfIiNtqkOmSB16pY5KE9EE/IMF0YH5/pqNy0GQSrpo9VMy9BWScJ4QheUKbq0N6Cf6y7G/ZteB5r7elw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hH24EBzOXS5wKwU3SClAqDOGMpEKsnD1DNzELvg7b+8=; b=VTSGzy9lVAAOvWn5KqNyMwA+veohBGgWEB2CgejtzjS0M9NeWkcX2Z1Yxd06sVlD5TpF86LWzwJC+OX5tdZKnxBP6dn+5eLFGE2wgz8P6Zm0P0jogl2/hsKAczl1gDeQYijj5XILKcOYhB90yhYV8+a/LuqD52+Bx+qdSuj62vDSFe/OZiFw33xpdrXRoYVFbSTps594HGKAwzcw9Qv46/uquyrwPVYhRWIs55YkPbQL7QeH+x4a2BHVzbqw45FAaYSXzEIJxNadbG/UJrgqdeY8xuS0R0wtoyYiMEOsKk0Nz8D7k7vGEmM6xBNJ6tkGOUF0AOZ7ueOxQO5CDzRufA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hH24EBzOXS5wKwU3SClAqDOGMpEKsnD1DNzELvg7b+8=; b=st8I1o65ELkUiP8SzrvY8UnWPbTMuvzelePM7pFwCxQ1ABw6TRBojUydgix7Qp7J/AzRAqPfpzIJHwzQlY3gx6V8TEFKJkIpAEbrrIr9zHAyUp/TX8f4c9k6q9Ep0UUWvltR6HxhZXy4H1eZ9KePBoYmIP7N/WKTZH4Nw217KG4= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB6836.namprd10.prod.outlook.com (2603:10b6:610:14f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.17; Tue, 24 Jan 2023 21:14:51 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.014; Tue, 24 Jan 2023 21:14:51 +0000 From: Tom Saeger To: Naresh Kamboju Cc: John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Greg Kroah-Hartman , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.4 fix build id for arm64 6/6] sh: define RUNTIME_DISCARD_EXIT Date: Tue, 24 Jan 2023 14:14:23 -0700 Message-Id: <7301d95edaf5bd0926bc93a67cb0cc1256549c95.1674588616.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SN4PR0501CA0030.namprd05.prod.outlook.com (2603:10b6:803:40::43) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH3PR10MB6836:EE_ X-MS-Office365-Filtering-Correlation-Id: 2120322a-3f64-44c7-50c1-08dafe5007bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FyMH2DQ4y95kuhiMfeFLxZqZzatQVG+DAoT/dsEIeyfsCFay35/0MmOf+dFJIaNa4mppq9nxDMlikXrsB/laYMJ/oqG6KMLc7ex8dtCi8HDS0FiVHwvNJUyKYcaiFmU0uWeF+NgeBbIVZsdwiQNgIaasDbf7e1ienqpZgypbUDnjfw3i0Rz0VwA2WtrABpCQ6V5JoJnzV4QOOGjTHnb5N9pMXm4kEqylMGk3z+UaUaL1m7Brhp4ZmU9GSOxmp387Ko1+jAGIPHP1o3UNlsamO3IY1HjvPjT1qz1K0sQ9msNN1Gsy0Ju1LP+/gH4bJuVrO3GdeW6V+4qKL0z43nDTipHOe7hkOpYc06/b6FHwqN/T2mAYGMVwp3kwJTqC0a2qlTQcLNEXEKOw4gK2KbUsghfQKSAC9trgv45lFP+kn2Hpq2JA38h/pmg8Us/GSehLnZotqzou1eqMosLvPiNRH/fjMFG3Ph4WPRaGo3HgOgKpre9U0N7VGbx/vXVX3hDjQgeW0327xpvwuJaQfCoKiTlXY84n3tKDFY1Sw2CecCdDy0pJ4UTpGFtaM3CyNE6Do1hp1gd+vh1kjCzeE11BPwlvh6amnWCmsBUXdbcwOTLZi5PgJCnedtmL1goskTkKa/UhCVcwRoyL6odSEIBDr0bO9F4tjaYMTjZrXaNd8K8knfF4tjwzUnTYWOAqiR+UqXuhzzQGms0a7AmCejtkkA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(396003)(136003)(376002)(346002)(39860400002)(451199018)(66899018)(86362001)(36756003)(478600001)(6916009)(54906003)(316002)(2906002)(5660300002)(6666004)(6486002)(7416002)(66556008)(66946007)(4326008)(8676002)(66476007)(41300700001)(8936002)(966005)(44832011)(6506007)(38100700002)(186003)(2616005)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i2+MnUq9CX0L434diA3Szq3FqIydOuBIYFIUx8wr81ub799kQy8pl57e0M1H?= =?us-ascii?Q?OAku/VHFqCg/rvKFTtgzStT+py+uoLsizPf8F4JmrR04YJQF6zb90yjNkN1b?= =?us-ascii?Q?Am+cnsK4RjzLfDDXXLKbJI8pEUzOe4Rxh2s71Xn/1iut8SNFbecIswWDYY8v?= =?us-ascii?Q?mPhJjpwXwShnZecZPntJsu01Mb1HWvrmNtBzDJlF01q3sq3LMwEnu2MX5MNr?= =?us-ascii?Q?TS34zppv4BLbaJ8XlXeP0gqEQdMXWbnTHdVyhUg5uOzbz1NFTayTwl/NpmWt?= =?us-ascii?Q?mwXme4HnL5KNVubwY00Gd1M7XGCnRdO70ucBdTzRGp+NmyGPBMRAWTCvzdcz?= =?us-ascii?Q?KIAzYZlJXiFoIThMWLzASYWEuhX9aIeMESeiCSXmSuAgvCUQQTDz92fCh9cP?= =?us-ascii?Q?17omrXsCcANkir39E0Gwh5Hu4DWyAsFQjYZBgAfFbCsG5PBFDm+Ty5FCDwNV?= =?us-ascii?Q?zD1z3LV0kbieUAPjGeCkWbTiFHO/OeGkTVlZ2atBfNZXdDwOVhI+4XewrucT?= =?us-ascii?Q?s5/kvelJTM+P2fwj2SjY4ngeOJeDdoW236h0Of/xZ6j2QXMgAjVGx/mxVBt+?= =?us-ascii?Q?3r/JTlRaxdmq8oynAGi3xt1HE446XdHSf9oqX5XX+Sun5scUVggihMonrn0W?= =?us-ascii?Q?PIOYNtzzzqrLO/Hj6kdwSUb2T6v3hxEMsVvUiIV0Y1lS4Rwy2kpFEfFQTJeX?= =?us-ascii?Q?JQMJazb/oN05vwapyD7gNgPUHmedEo+dYoSyzt0sKXq0cXNDMjHlQI29Zvsp?= =?us-ascii?Q?y2OItR4RuTV/n5yCHlH1/TXzw5kFPdYS3vSxCTvcHGiO3qtoi1EoGqJWqabX?= =?us-ascii?Q?Et6+jZClG97M3rmDU3u2VbokMUx3dQg6YY1cV04n+0rgedzi5vP7PaALMVQd?= =?us-ascii?Q?xoaffohMUibGD2JBYsukrphP/pQJfeWftWtY5wWO94O10PT0P2eYXEphrCX2?= =?us-ascii?Q?Pg96dJnzZVTbGuvVgXJGtQGLwQ3RX28+N0yJr9pySXz2yjDCsx9IEICDCXRw?= =?us-ascii?Q?X6SnXcjAggwAsUJFNfNNiTP0u9TuAnF+rhLqUu2yDDWXTHFJQG66FFdthMuo?= =?us-ascii?Q?Lt/cMbUPEjDX5B9qEozYavpm0/L3A8UJaQ9m39I01A/PEkFaRivAkAk/cEAg?= =?us-ascii?Q?2aSZniiunw0DnzDO5MroglPMvQGnAzqbW6YKPPsOj9qHmfSOyndqLHm+Y2tl?= =?us-ascii?Q?qgDSokayHyomehpBb6GDeq3+nCokaYIhrWfv7UVAXFDJT0COxb5KiKbZC8w1?= =?us-ascii?Q?8G6jFWOz/AHW635csS87YSeVLW/B7xBxGKpY1RtH5egyo4AueZuKlxZQ0ThL?= =?us-ascii?Q?cSYQFtgPo8zV4CmDB4c/fr1FoZCYk5LUhggOhSkIeIUCwu+SV9cgUrkzn/KG?= =?us-ascii?Q?ZqpQntvSYp1huLRCY+iKv1eZ6d3DwxcCOC+bG2rpSVoknSl3RhxcocnF4coD?= =?us-ascii?Q?RFJvtc6QsxFTLnLXAMW9bD3NwaDMeS+Zy0Z2rSvbBgQi9tHuNC+XSt2/2NkT?= =?us-ascii?Q?cfKYxGZQ1BIb5OTTGZjNXUPO2O21b3oMDKVrHvI4dD//lAHncg6P8/QO0i9O?= =?us-ascii?Q?gzSJO4sIysZ+bAPvUFGv+PQeGTAAMztHPdANn+EtfRMfIdB2ZXw3u3LKSV5Y?= =?us-ascii?Q?2tZNJNBC2FdLBYQNdmvOyrM=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?s4F1jMSSS2/hYokZ82kKICQG50cghHPkaRTn7lRcQkHHwAkqAYLOkaS0r9uQ?= =?us-ascii?Q?hUB/4gmcIOl2WEmai26J2G2r0eatQTvFSUNfDHTL2XKNshrSFXXad5VPAbWJ?= =?us-ascii?Q?wrf2QzOmkNHY46hSHvOo2tkcgCCgu3YhsB8D7subxuYBLvfXzlX2Mwk7qhES?= =?us-ascii?Q?KvLD+aqHKo6kr3lLkdkuvZE2vCNAERvR5TNx7v4FuwgI3HJQE4sT461nMuC4?= =?us-ascii?Q?0rFvYLD+KSGw4H0bAL4vlkxbg82KHLnxoxMY1sBacJrCugsHh6wCRUu4d6IU?= =?us-ascii?Q?LVvlvui+16ibCoF1vC7FSjIe6CUBYD1HepwHkXKvuu5LXTaKlENSwU8yspEz?= =?us-ascii?Q?wKmDqj1x76rsnZ13RKOBTgrw+Zu24OypNNiMeywfQnuRh5t2BKMXrFn9I50H?= =?us-ascii?Q?zw/+dDcGkOQmkACb4Ovawr85J5YbEKB/cPziWdrPd3yfhatNASIhVjxkif4S?= =?us-ascii?Q?TrEtShzCaRfjvwFaoOg31GvobSOk57qh4b0P1aPD1EdS8Jd54XJ8Fi/PKWKu?= =?us-ascii?Q?GpnQsk68f6h5UMeqOUtmjA/zQKl4uPp6BR1ae/BcNlPVaOPvmzGhW+HhxVlx?= =?us-ascii?Q?6a2T+AoAbCdBEx9bBiQaYIWu/UdNc2jBGxz0Capf2nDDtBSlUC83dgo2UVCd?= =?us-ascii?Q?lxDzxuCg0Fff1jGVd595fRJnNThEmFwDNBDulCEgxezbaX1MpCCdAsHBp46A?= =?us-ascii?Q?ALGvfvxzkwz9HdILgeVgRqENefk6lXIHjq3bB0lOpi1ukhyYOjNE5flHq7FG?= =?us-ascii?Q?On1drJEgTsoYwc/gRuKpd/ePENxfQcNJNxkJhwOp8majzqVv0dZ5IS4cIesK?= =?us-ascii?Q?/MaGNgDv4j+RAl0km4Dj5rwyUSRdd/HRVy/yL131QgefJSTgRDXe0eJ0wCmy?= =?us-ascii?Q?RxKj+gNW3tRMDEjsDNnndSFPbRmbP+wFzYZqvTlbzkWN/6j3tmvNfjD6/Jsa?= =?us-ascii?Q?AKRlERS7GtO7pB309BrS1/GXKfs3ZlGAhesXyCv42oe4RWvxFUyDAVxyuJ23?= =?us-ascii?Q?YNz+EcapEcnobhQ1dlaj1z9TdQ=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2120322a-3f64-44c7-50c1-08dafe5007bf X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2023 21:14:50.8882 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HEpIE6dVZdaX76C8ffLlAsxAU9W+T98CcpYFAW2LbPfq4udVO/rSm3bXzXypr7J3X3ohxKqIaJUIApHsmkdWGQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6836 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-24_15,2023-01-24_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301240196 X-Proofpoint-GUID: WSRik6ZVs73JlTRWXfbpFdqI4Ou5GcNK X-Proofpoint-ORIG-GUID: WSRik6ZVs73JlTRWXfbpFdqI4Ou5GcNK Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" sh vmlinux fails to link with GNU ld < 2.40 (likely < 2.36) since commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv"). This is similar to fixes for powerpc and s390: commit 4b9880dbf3bd ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT"). commit a494398bde27 ("s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36"). $ sh4-linux-gnu-ld --version | head -n1 GNU ld (GNU Binutils for Debian) 2.35.2 $ make ARCH=3Dsh CROSS_COMPILE=3Dsh4-linux-gnu- microdev_defconfig $ make ARCH=3Dsh CROSS_COMPILE=3Dsh4-linux-gnu- `.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 `__bug_table' of drivers/char/hw_random/core.o: defined in discarded section `.exit.text' of drivers/char/hw_random/core.o make[2]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1 make[1]: *** [Makefile:1252: vmlinux] Error 2 arch/sh/kernel/vmlinux.lds.S keeps EXIT_TEXT: /* * .exit.text is discarded at runtime, not link time, to deal with * references from __bug_table */ .exit.text : AT(ADDR(.exit.text)) { EXIT_TEXT } However, EXIT_TEXT is thrown away by DISCARD(include/asm-generic/vmlinux.lds.h) because sh does not define RUNTIME_DISCARD_EXIT. GNU ld 2.40 does not have this issue and builds fine. This corresponds with Masahiro's comments in a494398bde27: "Nathan [Chancellor] also found that binutils commit 21401fc7bf67 ("Duplicate output sections in scripts") cured this issue, so we cannot reproduce it with binutils 2.36+, but it is better to not rely on it." Fixes: 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv") Link: https://lore.kernel.org/all/Y7Jal56f6UBh1abE@dev-arch.thelio-3990X/ Link: https://lore.kernel.org/all/20230123194218.47ssfzhrpnv3xfez@oracle.co= m/ Signed-off-by: Tom Saeger --- arch/sh/kernel/vmlinux.lds.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index 77a59d8c6b4d..ec3bae172b20 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S @@ -10,6 +10,7 @@ OUTPUT_ARCH(sh:sh5) #define LOAD_OFFSET 0 OUTPUT_ARCH(sh) #endif +#define RUNTIME_DISCARD_EXIT =20 #include #include --=20 2.39.1