From patchwork Fri Jan 27 20:40:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119388 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 725FBC61DA4 for ; Fri, 27 Jan 2023 20:42:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233271AbjA0Ul7 (ORCPT ); Fri, 27 Jan 2023 15:41:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232746AbjA0Ulq (ORCPT ); Fri, 27 Jan 2023 15:41:46 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF8607E6A8; Fri, 27 Jan 2023 12:41:17 -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 30RETMaQ001589; Fri, 27 Jan 2023 20:40:23 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=ICGy+aFUPgIKkWoxiB5uCpdn79qzigNUQy70xbk2kIY=; b=S1HLcyOQiEDyAEbBAiNmsPOS2/bpMgb5za6hNo6X8vv1cjlcOBrDHz+/AXZKmTewxlic GmUYunLguSnVVj0dOH9y+ktn7rcdnRLaZxVbM/LKYK6HZQDRqjSkN5txVZXmdFV76N+i ArQxzHTRfU93JGce4r4K9v9pujHlpnKXtRx8yO3uGJJmvYlSbL30LSyWs8dCbDBAfa8J BuFy5H9BOj8HPXtRzNM570K4BP2KTKBOFnUl4GJsl6yDQUOkyXNJRSCUvUCZ+rSLDYzR 5g3Mxw1KmwoDgZzxIutRowfYlXDKAjJfnCrQHHgGByqyxzvhrYYklbQ20fCRuGei3zul AQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86n15uaj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:23 +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 30RKAAPF018184; Fri, 27 Jan 2023 20:40:22 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2174.outbound.protection.outlook.com [104.47.55.174]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86gg2rmh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F+QxjSe/CrWLe03RUtOBRr2VSeerlST0hWvKz1F6oaUigSlltRgh2DfvkCXGS0DPoKST5eM7F0GtQyJDpGsPolobcjCB6kSMEjKshuwk/dlroc+yWLHKwIqu7/Ei7shBtIFptvrpvaXsvyJaskrErROYJuFdjtcVWGgN8g0Cug/NnKpYH1IyqdRqluQS5B7YWHmmEKBp0KclKL3kleAwp0dB+Su5PFmhV3w9gvpOdoCgYoZa/Q9+qHm95aqtXFJO80zAobR8q0HBR4aNshVdvff+pdxNsGlJWFAUM5DsdF3rxkD1iU+IOPCTTXL+ciHk7yYa1CvAxzjS7pYsrP5PgA== 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=ICGy+aFUPgIKkWoxiB5uCpdn79qzigNUQy70xbk2kIY=; b=CrHUpQ8zRgy+IbyxUODeUMyauvip2Lc0l5Er2QjvFC0DgcMzCtKOuu4W0kaZOizp0ySFU27hJV620zvHjbnnUHpFxjgv55iBixzXqsOPIXTeBEkU5e7i5dtXVFoSp4i2RaFyazC5aLmt6aEaccc9kyVVsxjY6JO4YUOMsjKrMA/A7b3RVPS0F8svNOm21oIyiQ+2LIJWIZwE3KFtSEuiQEWD1rbkwdzDcpWMOFhyPf0aepuDPu9bvbAVw8AxfyptAuWZyH3VyRuYnD62TzrjEfD6cEXPm6DjSpSHpRaXvWAHq4CclSKIjSVfj5xG0NztKSU2pNdCGCkAUnTdL40bIA== 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=ICGy+aFUPgIKkWoxiB5uCpdn79qzigNUQy70xbk2kIY=; b=oJXSqPzQRrgTVhlhbW50tQuog55NeusAoCoegSsd2j/8OeLLPFzQxFm3E/4k7ukWvEsA8/aQw/Ih6/v6Mlq5T5Kg0/VT5gavTnkwRisTGjH1kszDn1e8gZ/QfF/RN9l2kIfNQMYmqcp8f5rYrja91CsBakIo5YEZDOZKGdVkMbw= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by SJ0PR10MB4605.namprd10.prod.outlook.com (2603:10b6:a03:2d9::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Fri, 27 Jan 2023 20:40:20 +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.022; Fri, 27 Jan 2023 20:40:20 +0000 From: Tom Saeger To: Greg Kroah-Hartman Cc: Naresh Kamboju , John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.15 fix build id for arm64 1/5] arch: fix broken BuildID for arm64 and riscv Date: Fri, 27 Jan 2023 13:40:07 -0700 Message-Id: <16ff34ba4cf621f03d0ab4f5ec2c0a8a6ab5afd8.1674851705.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: BY5PR03CA0030.namprd03.prod.outlook.com (2603:10b6:a03:1e0::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_|SJ0PR10MB4605:EE_ X-MS-Office365-Filtering-Correlation-Id: 09f99a8f-eb08-42c0-2584-08db00a6b4e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ShuJdLtJplgq3R0sV8ItPlr0ITBzhSfqICMYUHURG8cL6yOUNuvju/KgVZHcgw17RB3GHXCmKOuRZaie6xqj2AwF6MqQbuSDVC5YjK4NOuxBCuqBBaJvvypSLyCDkzpvCe4hGoBPVi6Cm6zf2eOQMbwTBJ5Wn5IS9vNy66UNu2C7unUSbUCSamRb0JYHzx3g/pERv3SZWNkEJiFZVGE4i/6dPRCpuwC2GqOjBiPh97FL8yJz87LstkXRaccSbXHqwsHWAVo7PWaUemPk9Watyq202we4/vBSyqe83x6LfQGbzT1pVMXx1mO/zxZMUF3OPsxJ4M1Ji7b0c951Y8EJuDU6XwoojN4EM8A5bKKEDz/o/VvL0/n6hkJ4uyOXfFin4WAV8BQ1R6FOlsedQ1grwS+YnlgZk6mXeEC69fgtjvk2+vJkYokYPFXsRcSlYMU0Hq8aOtd0iawUn6f3M0u80ecG/0UAujD4apneXjentWrGLJZIHY+6CGDEROuqLXJc5eFGR+WKYF26tMwDxyp1jB2XZKDNMZP1qqVzTLaaiBCbgrVfo+WRJRe/tNs8j33KrnGfrhqFkcCf3tLzJGSAnY+ZQZ2YmOjapOKEv2VdUVDbJf5z+T1L52lF+7+8Vgl0DAIstB8LQXji7qXOxqF1PQNPgC6MQOU57CG6FWWl48hjnEC8wIGbShsiI07xW/29 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)(136003)(376002)(366004)(39860400002)(396003)(346002)(451199018)(2906002)(8936002)(7416002)(5660300002)(44832011)(41300700001)(6916009)(4326008)(8676002)(316002)(6666004)(54906003)(6506007)(6486002)(966005)(478600001)(83380400001)(6512007)(2616005)(186003)(66946007)(66476007)(66556008)(86362001)(38100700002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QZVSVBacx8ki7obQxazZSctvsUKObqTadCmYrGGmJdTtcX77YYCbzXn6FSabdfKgOeyV6742n8w4cOwBGYYscj0N/Lr51JvQkTMq/Q11eFudcPfsXdWFWPhBXyAsQ/HaQ4abQTAUKM9px5i0nuT5IjqZJ2wI3dE9mVtjEsGEeaMqR37fpLE42Hk12WhJd4VS4AD1H7/2SAkUiN+CjESAgo8S70IibAjHSfuroU0XRZ5iAWi3HhAUztuoJUjMB8EiTBanAoZWDFYz1yh95lmXFfjfiImoXZOFj4OwLpHc7Eqr2mllJsxk2ZzzeDL1AHuqQ4RVU/ngzu24gQ8u/UxlMQdV+yl3wR1NUH/2MubvVms3Wle/z5Kr8i/Dlq0kNSq1mUcLnhJe4LXxcU+kVtBebQweuz6QrO1de4VtjIvgHPCD7FDjJysIyLMIR5ZySDqzW1QQY4ueAX/BHOXuNkRBUQ/gbAXlvpro0wWQAjDIGKOtHTr4I5/xbtD45du3/JSV1HL1kzmgxl+V3ua8x3mHHMFlp0uF5zJQ15TcbCIyYUOZJJ98ItlbKso6e18EaDzSGHsuU9Cy74zWs3Y2Fu8WaEJ6nnbN3/jpm38VN9MFL1hW3SJZvtyhEbilVHFndgvquPEvIT2f4tl1LV9NI4TslhcNYk5wLXnxvHit9dG+ByDE9OTBcUGn0OqKk0xOZgiHLb1bATDQpycMg8hB7uXac4k62x+sk+EqMl0jRgzfXTn7J+hJG7qkE1Shqvd3AmLRgDqlveYCy8WsVZCpF1zNC4Kxl6S9q9kasusfGq+9q8TgXpy0umVE9R/sdoDasJlzTamWFcDXdPcZDbCT2dV1LtuD+TBGXD9RzzUbkjc5ijkaTy0OBET7IuUmz7AsU9JXmKwZTj4iUeFDass0moDT9ilt98XsZGGtuUUuwhGNj0wwBuorXLzeFd1r+AB1TTHv85mlGMAFc3JIPaeGVbWHGueuuU7BY0PL/jR9m5eNqlsKGsPv5h05ku+uwZEr7O33I5LBCKYNudKKSKDuMlgAMnUTDWJ/C7BifME2zMgyqaN/vLVSjkx4sPVMbBB3J8+134ftnd2H/TqhDiaHbWAwox3NVVqkQju8R2gDws675HSLUy8U7bewuCs9LA5IYT+Oz9cgcx6uiqCqnz5U/hfMuFUqKsQaHiZvjLVHoJwT9Slz6k9Adw2Dfa+ve8BsIZYhtLnwyWRt/wFCN+xF1ogmEurSu314QBI6/3Qj2q+1GknDNEuIPumINmTezYcxNNOawk6IWnjTTm2F9JbyaJSTxy+PbeJrwd2cjxqEfIygogS6dOZWgLOXOz2xp8NtnMF9D04cq2uwRx8UHdpHqoxvG8fm/BLoWeq/iNJ7+6wKdh/uOH+3XaA613Z3s55v8A4drB9avDpqll3ZnNwxc66YuTuB13sBvKnvqXE+cZY/6YiwXvu3qscnJ4ggnB8S1xoxhEUsWh9xyXYKM7p9IRmO2RGTWYUZD4AgfphNb18wALkdx4ntjnBuluZCEvI+GyEg6ZS1k9KJ2/u07aHb1lQCeaX3gaFeOJh6A5fOE9VLXQt3zNyPDnSbB5riWbGzeUr9bSK3PzmhEbZ/nD0AIzrriVYkD9dFSV/w9bJgQMyWFF8= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: q44uAj4QcZ8yn87+fja9qwluIH5Ywx9pSwDdznaNLExfEworosUdcPCdWDGsmPluqvOZBoCi+J80dDWK4ZhOxjSjgqBd0pXJnpjhAZbn9+d/LE3ApLYJlUMIf93pRTv04rfL9QVK+mjT4QvwLRoUbiNltFijETMIlY+yMEAvCAUnV/8QZyIN0xTPDZvNTErpx8qCP81BWbk3AWhvgCLcRQEoGP9UxkjueUSKJxILKfk1YzMoyoga8QKvTF0qLJkouwxZaPlZXkRWIREGZ/Tkfa6MAp3mWF677bixhU5oqGDtxnCv3MVbZo4QR9uPazOI+binH+kFSDbgjUoHJJPKdq1GVsPnq2qDWoQgysmh69JHcEu4/t34IZ3xf/SrpJO0Jj99RgF1LT04PiKB+6Eu9TazQdFERftFEfIQrt/dFto3daEvOxDTRHdq6a65W1BtkEy/T7lqBfc1Z6pfktfsJKrxXAbyTWX7zqcXGqnNbeBVVAgrQRG1D1/QNTpPl/UFaKoJnDVVMrq21ZUNxta4OXhdZAdwyAcC/bOMKHu82ARR06okkMt1GJv4HPSHyfrb3nN4p+YrEpLlfA2/1Yhtk8wPnFEwFpozFjWJdZsIz7LqOoY8m0X8kla5Eb/Y0jUR+yiTHQ8GWF6a2D38p/GWg+J9GAICpGQcIWdc61htlAGd6gmmytstoLyWvIVj630VA7XWhgyrB0gMmlbAyGaN7TzVhu9Mt61fn/MTDcEWP3kLDRfs02kznFcUQDq3G/DhKlPMMNBFDmn3j6lN90Jr1GuEwiZ2Q1ZGyNzdf0+VCPuK95YGzJhZMs9XI/rL2w8RvaDFWSq/LA1iIX5zCcf5ykcX0BnNtXCXCvYSKXxtTYs3s13oksNQj9Pn7SOckHyqgOFcHmSwQXfR+hs70hCKcdQI1hMfHy8OFMVzs0seQIack2K+Oi/Yc3FgyxvrzPmPAvg7pxFofKTFptzBfrGXvCzvWLkR0XJd6hhaaBGoG7VarATZElzFkCPfpVhejbpxJ7giwF3ov35ik2Av309wjRGJJItDzJoiZj6/vOBUfdGYpg0vyAmOverMJjIy5KM6N1EUw/UQnBTkKhEkysjRYQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09f99a8f-eb08-42c0-2584-08db00a6b4e2 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 20:40:20.4066 (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: IRxzeM/4tWMkuNAtwGW5juoIkKxg1SoWfz/Hso9LdUKGnKGrmOFdNMbujPLAjOhD6YL2u+7X01fl+rOD8PsBaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4605 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-27_13,2023-01-27_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-2301270190 X-Proofpoint-GUID: vYgmbGUY1cQ6BRIxJ4721fltJHS32ecD X-Proofpoint-ORIG-GUID: vYgmbGUY1cQ6BRIxJ4721fltJHS32ecD Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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-LCQc=74D=xE=rA@mail.gmail.com/ Fixes: 994b7ac1697b ("arm64: remove special treatment for the link order of head.o") Fixes: 2348e6bf4421 ("riscv: remove special treatment for the link order of head.o") Reported-by: Dennis Gilmore Suggested-by: Ard Biesheuvel Signed-off-by: Masahiro Yamada 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/vmlinux.lds.h index e28792ca25a1..8471717c5085 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -903,7 +903,12 @@ #define PRINTK_INDEX #endif +/* + * 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 = .; \ KEEP(*(.note.*)) \ From patchwork Fri Jan 27 20:40:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119387 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 0DA45C54EAA for ; Fri, 27 Jan 2023 20:41:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232772AbjA0Uls (ORCPT ); Fri, 27 Jan 2023 15:41:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232740AbjA0Ulq (ORCPT ); Fri, 27 Jan 2023 15:41:46 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C6D27E078; Fri, 27 Jan 2023 12:41:17 -0800 (PST) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30RESgXU010166; Fri, 27 Jan 2023 20:40:27 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=4fG2HcBY5c7gqrqLnizjFcjPbGKkhPZsaABLI4qibhM=; b=App72n6/3DgnBcarRJ4WE+GeFrVz5J/RMOtXKyFWGkB8+umtcfCAvw41RlvCZ4TueZ63 hblV4pJgbucAN/0UTG8Xh7exj8aSkMQG+UJjld2D6pDzmqqvBVbC9xQ13hrCSau53EQI MuWMyWcfP6L3PTIM83A6Wy7LEYpnitp6n739RBmLuwtJCdy1ncy8Eu5reL7H/siF+VRe CklDqZv2M8epllW4Rq6m9jhP98u4ycPNk+q+66eLOykr+c059BHCl1pvFoWViycU3kPe 7zdNRV+qF6Cd/Ysj/NBuHmkcQW1Ce7tE/XjN60nyeROWVGyoTEDIvQJ3swKZ41SKrHN2 JQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86fcnsd4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:26 +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 30RK8jKN005033; Fri, 27 Jan 2023 20:40:26 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2106.outbound.protection.outlook.com [104.47.58.106]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86ggjemc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kAIl+y3ph/52t9fCuNQWbgQbeA2XJ7J9h7kpywQgnHazusHKKkLDLozfcyfE3WtgfVsEpuDd7QlodLVpu4fAJMlOpjARsUUi0cEEZXevpGx+ayu++an+XOIRxMgY/+Wf+ZA6/fXkuhC9SgD5vZmR+EyxijJ0qcYloj/uMfB+vg23rb3BkrwZ4SX0QnF1M80tl4fTa/g8v/EcDEbH/EdMJx7OY6Tvr+o5UXKrMX4uPBdkAU1/IcQJnWXjuiEou/WvvJjUb0YY8rGxNKZfRGkZnai56xrgcIwBSYwurbgylqmmjWn/jHWd6TaiB1XMC+IakGeaaHogsNNXroFP9+1ZAw== 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=4fG2HcBY5c7gqrqLnizjFcjPbGKkhPZsaABLI4qibhM=; b=nnStUNu54VT9QncmELcDVtOdxz7TlME2Px7LL8BaJta+8+baet2mkfFOSUQexURStI3xVbiVrznzUu3Mo8YFrQgv/dRJUsZmUaTh4JMa8HKfLpkXldh3YELB/XGH5DafJdwsP7tVu7DZZQSg6T5ft1kOdmackHw3Yd3skg4Zq1de0cW+RsJ99m7eFV5F53VJjv6vf6kKeszTjd/asXgUMR2qMGuOhXc9Gu7Wmp3tW7d8OsppQg7z6OWzRj+S4zeNRiYxym5Rd5YQ06WxRuhG3d1Hm55RDP86ByETRPYGV0PWdQq4w4ccROsoGs8Ufz84w5HRN90yXkc274JjRGQ46w== 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=4fG2HcBY5c7gqrqLnizjFcjPbGKkhPZsaABLI4qibhM=; b=XGVnDoVhSWQhZTG6nJA392qd2ngvFY4VSIoUijN2uzc5dWx7N7g+uq3J/9/vuSFtn7FFLUsmqmrFCf350D99mFESijmnwSaYkpXptzjM3rlrS/pN1Qd8dqDXNq1GFhXU/GrOL+8FCIB1n1taUO+2Ghe8tzp2RkeZzgKXnA5fbaU= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH0PR10MB5019.namprd10.prod.outlook.com (2603:10b6:610:c8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.13; Fri, 27 Jan 2023 20:40:24 +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.022; Fri, 27 Jan 2023 20:40:24 +0000 From: Tom Saeger To: Greg Kroah-Hartman Cc: Naresh Kamboju , John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.15 fix build id for arm64 2/5] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT Date: Fri, 27 Jan 2023 13:40:08 -0700 Message-Id: <53aa41078473a9e5475cb4607e5a8c890658dfd0.1674851705.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SJ0PR03CA0151.namprd03.prod.outlook.com (2603:10b6:a03:338::6) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH0PR10MB5019:EE_ X-MS-Office365-Filtering-Correlation-Id: af555a53-89d2-4906-a121-08db00a6b6ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GajgoM83I7I0l92woubvPvTLtfQpLC6JZWDVTXJxjgFieQk62VKY1ENFbqc8klvjlKAZjk/ypiSuunManPeFvjOJ4M8vH2uSprpWi6cemqicpq1bwKGoHtA3sZdiaPP0b7ZS/5uFckhmQcqDQ6AT0T1m3xjswJjHiBCfjCYwG6L5G9X8kpXtDqSK+ColRkX0iSfk1kQBD8SOHpZFHH+09eLSUWauVfmagsYllKjN6stGxRz6qgojDHh0RKIvh4z5EHPh072ghQwElpn6vE5M5JPBMwhOaI0f62uiM9KBc7tqNo34Pk+tIjLYZs+9cfPyOAWZnZfzis0FFvVGIsHpo6vtBnnXk+PRcsENO05GTUhLV1mgAGQ5ibkcMMMW0s9GLL3CAGuxmXmobaDI2C2TmPEu2aM9f8p/E8e0ekcPsSRH7IDrB34Ufyu2ayN/GM0VUQ3FR8TcJuEAzz14m3xPjPwBNPsXdQeY5Rk5HKEA/H2uriHth4jVaPClY04CG6nNf6GV9d0ZYsY5Ga3elKhYpCdgw39XoyWlwgpKhzSV+b7KrAHsuyiQGa4E6AlIw7k5m84xHZ1FTfjF4ivl3Zz7VWibQRszut4vUI/bBwsSR2zpKAtywkd9yXlYHoK53upVWAH1VfUVYVuevbhRXJWUDsNhnmc9oiuVdK6fq4Al0FVB+/oYH7uNgF2T1NHXFIC/hbVN/UQJCwQdCrq9Dbf0OQ== 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)(376002)(366004)(136003)(346002)(396003)(39860400002)(451199018)(44832011)(2906002)(7416002)(5660300002)(8936002)(38100700002)(41300700001)(86362001)(6666004)(966005)(6486002)(478600001)(36756003)(54906003)(316002)(66476007)(2616005)(66556008)(8676002)(4326008)(66946007)(6916009)(6506007)(186003)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 21l4bO9HfLvdtao4YROIjr5tsax3u93RL6/WRiv8jpr/8OAbVb2evEys3kvhm02xukw5Kp+DMZT2V88cmLoRsGcPNjZYIcumf0Eqk3t8bHpjDKWoAjAf6eTwENWt73KnJ4hcGPG8Pq3H5v55G3f6x9u/dZcj/KQJMtL89xAdJHyjMTLB/Stlxk6akJUjHjoEBkJzzdZm5ZsPd5WbkWvObM2TKWvsT/DNG2FQzd1lfMzWXC4OQ6KWAQazi4gkzkcIwLWmxbaImQVvibNPRbQjOj9VAUyunN4ognhD5N/o7qyK4UrM4zm14iy8eEWqmq56G5FradqLgr/a7G6qytGAud8wKX2Z9uwbmiQ9/op64hIMi+ANTTvfnXLPFLSbQVwS2HQL93ZGjVBCgx6PAAZQjWyhoyvQ4W4aEu8+QgmSeRqSt2GO0GvqgSjNvyrLzaOE0Si5Tedj6JfMeaKGCgKnGJZks7NUy7suP5xwa99MI/dYU0Uu7yDqAtj7rmDlVTrXuevJ+0qNjgNm22lM/t1gMTvrPpsbELb0BYUnHtRsNFtBvw9e97yZJBuTy0JjQpLcs+/lZ61CQfWE5ZZ6yDnz1HHuPLHF70uhUf54FKBNwD3fLvBUuZz/GueKWPvgsDMms0zaKHJYGadsgSp81WNaFBb+llqbKWW+5hdIioIAF10PI3GZZysYZZZLGLXo6dFBbFKFxJAsUXf47Qgbzw8n+8R9fyAtnMqdN4HMy1+wwbRFKiWXhW6mey8fwM6o1XG92PcqlBm0oC45n4RPQzCdkm9PhdqMgLbNYT/1mKQQFifNj3BtX14BHLvlEsd6MRZUuiLL3qnz84SdLzph8x4fQUnZnh+JupnaK1qbEdqPEt4nHEX7BdOYeUNGr6FtHchzTF8ZAAFFAKRF38zT3LpTs01QNYeDqh/LShtjX93RUfSnprxz46/Zmuw7w89P8imrJtTtkyCPnqIBgckbb8XxWElVRdE+hkJTWpsNGBy7Wd8LK40QBUCpGsG0JufSXJTDuqgz4eOGXXSGJpnT8Li7WCvgUOOiIIA+vJdTICBZGLXePS/1FPDfMifKw3cMTxOXXVrQ8/OYl2FUD6ak7NcS6BCDkrhxwNYxIrXqP/45XaMh6ZQUEqeh+gNRJ2bRECRTl2Tw0eAhfbZZdtpEXTatloZ4dg1KtmjQr80zdte2KCZENlo3FKO0Ehp7/pgrlVF9VSCLT62qg6q5FOYP1OjXHGOyFIzvIDggJLiBImD7s2/3H5GhBppFv3tN7Aox1MEOtgX9LpjNpYHf8DHVAE/m93cVHdv6m4mUTRrDTerQt+SbPe7YNplq/MLFR9qY1z0slep1AeuxSjXyzR3oOaC0aJThsducT1H6AMQVE1uzPsN/1TUfNSAAibFHcZ8XP00eltC51B6QYdTpfkJ/1jsfuvWUbtd4RjZNyfar2E56OntQexd6U+13qBCdtEAMpWLjjjzsjr+bIQd5NOqZqtwQJ/NeB07QIwAluUDy4IRRBuns7IpH4iRnEMF7clEYuWE1FPGQ/TH7w4WCS5ZduUtNMS///0P8iL195A18UJSXQ9HY3AuC/EyijWiXR4bPbD8F2DHYEtJ6X5lmvy3psas9J9X+mk4tcb2rPy38dVyTN0k= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 63PQ7HKeNX/2VfIbf9H/6nmZjtTxvNg6cjUkgO8cyHoTVPyq7iHVfHZWZPNRPbml8dDrLjAcIHb+kkUyi3487qC+PShUp7CdkwBb8IOkKUboEXagiElAurh8zY9ZwoXQMc2EfdsOMhb/ssug2alXLeLJeQHWmbQHAU9bTiT2cWEWrW5r337OQQhP9W15L3ATgj3Imwfe1H0Zc9ivSui+qzJairwY1ijUiZmdXbhBu0d/v6tCZgSNDNDkYwEtzzJhnjCsvQRyH1fdpokXM+42FTEL3KjZnNI9J+jlkINH2Tew5RPqvpacEjczHz7eQn789rF7ppowZRCqFxrEq8KcoaogPsmPzrwhm2FflCIsjbvx0hlkfMiaQvQEMIxrmLDhw4M+7XT0W18fDg4zfPyZ6+ZAzHB2lP/H+rso40Ftn3aJkRU238VuYlWzguf5CV+Yo09BXbEOhT0pKD9sYYZw1py33mxcmojmxpa0tJlFyQb0gxy1DpLnCpYpIR2UflGLgFksAk9VQE68dhmoZ0r0IHJHrEj8KL6lsEnxUHwoyrOQeLuxtXKOp2NG2C0lhTNjXDnW04FP01wGLu/jEZjnJoqPhqFz9S1LXS9peZwwzFgDYbRWhO8nORNqSEzoSCsGTnj1t8NJoAKZo73NLrFlcCzims+iQVef+ndWo955YNbLMIapQdRKLfDD1zZLcXqCurjIIkqEaizyGZ48YG+x27RW/lbI+GWyKxw2snJwtKvAdktmAntLeM7s73G3A8XlrKHdDCB/hprSA6SD9HzBc8J73jHQ5m9TZw+HnsrgiQC+hmn6VwYLv0vVt64I+HD7AUXKVzPVIDmenl4vLlXfEV+CciXT+VrgG8mnpFLFx9dV2m13pk8feLM+rB/W6HmYGFV921GYoUXr/V9oChaItLAAKU6yd4I1fsFqsJEXsJAYDkzPr6mkC6L6L1d/StgO42DeKobHbFxbuqV7CrxEG4hN3HfJ7v1AKaoR/fRY4ytpkYev7trAvbMDTvLjH2mFscoA36x7z8Mg4Mnbrp69Asx9Trs2dMrjzb+kNpIL22CUtRZWxwhUi3m1CmkHsQ8SxzJ51Ae6bt3C7y73Q3AlUw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: af555a53-89d2-4906-a121-08db00a6b6ee X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 20:40:23.8751 (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: 16XXKK9AjoR4NWrHSad7yXu8zitvnrod/bRlhG2p4xz658P/gGvsvh4/50E2UhAP7cMKhTWe+yqxybMrC927kQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5019 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-27_13,2023-01-27_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-2301270190 X-Proofpoint-GUID: 9At66RkmU9ubrHUHTFUtyftKoXh9agF- X-Proofpoint-ORIG-GUID: 9At66RkmU9ubrHUHTFUtyftKoXh9agF- Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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: 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 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/vmlinux.lds.S index 1a63e37f336a..2cfb1b52d123 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -24,6 +24,7 @@ KEEP(*(__restart_table)) \ __stop___restart_table = .; \ } +#define RUNTIME_DISCARD_EXIT #include #include From patchwork Fri Jan 27 20:40:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119389 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 4EA3EC38142 for ; Fri, 27 Jan 2023 20:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233509AbjA0UmE (ORCPT ); Fri, 27 Jan 2023 15:42:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229737AbjA0Ul7 (ORCPT ); Fri, 27 Jan 2023 15:41:59 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED36F7DBC1; Fri, 27 Jan 2023 12:41:28 -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 30RESdEX015335; Fri, 27 Jan 2023 20:40:30 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=cYJee/xls/lCay/kHB+RuxWv0HqYfjh5QMHJ+MCMjYs=; b=uuc1031MKmaaB+/+Mf72zYtP1EeQhtbeGq8obcuerFgJF4yUm7CRkYXfBFuQpc6Yez35 lIFamWKktQXo8+/oAXPTBSweJXBmqwfidMF+0dPJRZLjsS84TPRhcOjl0k2apO6OuZ1n T60Scwkqh8A0TNk8w3ihbZUWclWUDl1ygu988B1btDLtqkHYS75A7lrFsePX5Oe2YGKN gKBWzShMAxTylforJVbpLO8ucKrDmJEEEM7jmpGxw0D3qp0fCKl4rNCNiA3Nrt+8u6w5 kPUNosEBeSYKkZ6SKFIzxS1qUExf6oQbvfvmoWHRjEKyvbm/OJMyF3QnVFkBaOz0WnIe 2A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86ybnr1b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:29 +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 30RK6HIT038095; Fri, 27 Jan 2023 20:40:29 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g9pr02-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oSH7X+ODw9U42R6N/7tpLMdihmMkLbqik3yJSnHp7lDLCnbJ3Efz5UB6JNErJnNPri3JRcJbkfC03h0G37HX8lIjG+o0x5VylYxUOk7z1A/k2+mwnCJ4RiUxAM7ghY4WkXGrk+D712wuUWRRbvrvn7MNxD+qW9AtiRWmOzkMC8Gr5j2CEvshFJ0I9cjAx0bhOsjQSWzHhJk5M+17T3KFePadfW1ZSCoIXZ+9WZM942Laut3tWKlym+4+yj36gc/vYk/tAskHUX5rCPzUb4IqIRurhO+5raABmgaLZXtxql7DD34TYC7VO5YpRiO6ghrFcZbEOxCxcumt9baW+ACbQA== 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=cYJee/xls/lCay/kHB+RuxWv0HqYfjh5QMHJ+MCMjYs=; b=hnHZWx6ZoBZTNkbHwS6/NwAvurO4FLFh08O9UiDkAOgUB+8DD4rdrvn3QEiozN2BWkMPVnJ8gR33TJHf2rXRbVBSJ/0dcVa86njvR7RctHRWd3P7OdxD5wcfvTlVPFmAbdZgjGWA1xO+ED8AuYK1ZL18UKSSl4l/XOFSfl/yiegGPZdHRSbCbCYbgQm0erUhkXycvFAH8pdzNKyp/NGunHH/QoNzc8qp7jOENh1l8CXqmg6iB/6fGttX41m0UWcdtJpmqwZ2O1eSJYblKZy7bJ0VnjCeEC96GdugsW3X7G+ltujzp1kew5S6conavyVu1y/a4HUrndA1gP0AYesh0w== 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=cYJee/xls/lCay/kHB+RuxWv0HqYfjh5QMHJ+MCMjYs=; b=yDFvw2YnZJ76tsM8YFMbuBZB3JtMVs5MTyTGFagBJr6HKSN6icYnGwKeiaAm/PeZadEV6qKt2wzKx6s5p6vTQx1Rx5vhG/4wnMRlsiOhUDENSYBT93BGdKCKae4hv+F6/JLHN6sFKugnvo810vhUr4cmhWxxoGrDuL0DaV+Hw9Q= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH0PR10MB5019.namprd10.prod.outlook.com (2603:10b6:610:c8::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.13; Fri, 27 Jan 2023 20:40:27 +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.022; Fri, 27 Jan 2023 20:40:26 +0000 From: Tom Saeger To: Greg Kroah-Hartman Cc: Naresh Kamboju , John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.15 fix build id for arm64 3/5] powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Date: Fri, 27 Jan 2023 13:40:09 -0700 Message-Id: <85e425f77ec54a89db740f8e22e763e401eec4f1.1674851705.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: BYAPR07CA0016.namprd07.prod.outlook.com (2603:10b6:a02:bc::29) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CH0PR10MB5019:EE_ X-MS-Office365-Filtering-Correlation-Id: c391b969-ce3a-4ff9-7076-08db00a6b8ac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mPctN6PQ3swNKT5iuPPm8L9JOKD8Zd9rKhlFg4V53RdQC3vkNv3Q/KjeaA3DVM/F+ULrJXejf2ixcgd0kInDMq26Y/PqDlQoj9hLGyH8je9m03Z2jk4qIxAY10CD/7OCIsPt3CPzcruYNT21j4+at5POWh0mwCsyNqVX3Vning2ii85lvdw48q2w6VMAoK/DIDw1f7OKksNnQZQpKxcZ2Kqd9T1R1+rYlX0YAtzZ3Un+fn5zn7EENwTmLvcgyWupDlt3pCFiGXqefjY+msD1qtQdnIiL7lzbbMg70hz45fv8w2lEM47CxjX5t7n9qcuGxbAE6pU/AJjfE0AgJCr88vv9w9+LmAOp674yeRu1GS0qzlGjtZAs0RSY/FMcRznOKpLapRBJAGi3DL2b2m6PvtxfEzyJxU5f1L9OHy1MY6uihBKJGamoMYpVKvCXABm9UHllCqGC7XmBNqptjZSv80U98ddWdiq+AMuaZPRcd7/U/VgUh2cULKea8GTdHmgtA8xomfvu49oDnx1HviQA0LEnBD3IAzMpGs62d1M38yOIy2BVTPClfRsoVd1T8wD3GSu+iyKblMNIQeZ7PdgSe174yhmwS8g1GVbPoBJE8UXBfPPdTsPM5fEInd+Evjv4T33ZVYfPeMzx4hX+l5l6sIZJbDNqbq+6jLCXpuWUlJNN9/r6VZrb45GY64N0yvWw8UWbM9ufWAnbureNUiFmbuZrftB8EwNRXQYW27vmj4k= 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)(376002)(366004)(136003)(346002)(396003)(39860400002)(451199018)(44832011)(2906002)(7416002)(5660300002)(8936002)(38100700002)(41300700001)(86362001)(6666004)(966005)(6486002)(478600001)(83380400001)(36756003)(54906003)(316002)(66476007)(2616005)(66556008)(8676002)(4326008)(66946007)(6916009)(6506007)(186003)(6512007)(142923001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C9P0B2KyPsza7HzFat0unMVFMekQQ+ZghMv0HjIf4n3+Pg8EwqOWw9ibJLyPgBNjP0FJvntv3A0ObFn94N/nbJ5mBLy7aS7wHLaoDT/50LJSim6ZV47jCzahGYbOjWL6/ReWvGvmAYPvMCivMg/h332qlPgYVv7NMxPaYvbf2CtLjwjuPoCbttj6x3pqklU4yYf4DSBE/VMdxifFjo8dJTBu8iUqyYwVoetYTjNen6tSmpJEXM/nvdVbqDwtdRzrAh9f1Cbxqj6grVWzBFqOH5FsHEG3uGMm2o1pslrIpe888MggIfccmbZGu3jR35yqtKF7Vvm+gVc0wx3qHtb+U+Mx+o3lDhJ0Sw9N7rzusAdWNoI6RA44GiENv6ODbfbmAA5fz4z6dxRbkYR0K01yhK01e1Lefajch1Xmaps0HfZZc71r/jY+xOsJjiKdXba9RtV5vp6H51wCY5x+ZscZuj7JhrZ5z0SApjCMa41fNOjyDO9Xmv5StJGB0oopgkVQ78xIIbPpV0osuS79ofKPfk+mzeGck8ldULsL+VlZ3amX4McebbW3pWkLe6b2kuFqAzguFXHF9HrIfxvj3xUdZ2KAKCKntu60bfNCy2xZ+YCBCJU6pF06oJfTixJuSRCP4BPXoEA0xIyMMCirloMOn09bdKlW7F0v8K9CC9y93hxT4YfaOSkTGDLn00b5qUHOwhpTsobn9nnyyucetIzegUkVYoL5Ee1yhWHhS4u8FxBpN2MQwadVxdv+RRYqKSm92Z0qQvPa3xBshlaXJ/ImlMDCdMFCPDOYy5HX4i4QulMjpLWCCaR/YV73t06GjKRtwgnm2WtjcAJsgKbJ/HQ7AX324yJ39qgxtyw+q/FBQcCi46Sr80og/4DG5Dpv4Hf4SvdMA8l5SFAPPLAOzZQ783+44TQ6dOfLZSQUvwcn9M0Vstx/vGNqxziYLqKW44jPmfZmZkcexkWXQ/2qBOVqYtcNebzqBe/jroiZmRE+5/bS0Yc9DicXtVRnEJjhK+8b+ag0uukeXiY0Dvu2xKQJ9+mb21i4ZdopvUEYNpqKsdw6AMqeCdQfHYmba1HGLxVyI41yKGMDu6dNGMCT5MDFXlaHRdjMB6yBKM7Y8ytcjpiQpUn0kHMW22FZsFD0lqe+5PV9Hw/ARMMaOtS8Ej2rL8inNokM1aMywa0hHzmIyw1XBHLBydVqtM17ovyr/PAbpn8pDVAwolCU01rowCHExp3zydGmXsg1YC39ZRYv+4/5OzJENu6Q40kbUGtzRXM5bJedVElQQFctVOZF0frxSi6FYDmikIUUAB4Wl5O2rjOWTgWHibZyO41AYvDG9stCkh92i717ubvq+QEDbTwtXS2tmzZZc7tg6g3YUaGiPMtDNXC2QyjLwwKwgUJM3DPyLuVC4BQFnt79hEQ/cgnrQmiEF3XE3SiqqIdxJXHmQB1S9uWftwle3srbRiIpg5gsNEZUNz4F3Ju0rIlocxf/O6GNa7BYbz7AnGhU+UwCyyUgPzHXK1gMquKh+WiYtvATAGYI52FPq1WfC8VWVtdBA0YJpuO8bD1FyBiafR9y97t0z7BRm6AbKQyCU+lthEyx8PRXq7eXOMyXvUIDfKjowbufA+nHTAzJ1Gs8n12TW3o= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2wMhZPJcZPKv15UoTPtFpEnXHtv4WvOQ+nRe9+Fe3YGNlU9m3aIs8BZUPPIVwIKXkq8GqjUrnVwRMC2Ol1iy3B/N+imIO74mlEfqBJbcNmaZjXM83s64a/Hg88ECL0o1vROfKxEbR+8hyyfemmDTh83XTyTxo74VPVsFEaTQ2cHE68mTnFpVLCNcpj3JFzG8walEZGkarftrcYUA0DI+IRIKIPGu0sXnaCkf9mnK89FSoUuQb4J5IFfBFKQW7SBH9l580qPsK0YhmslQLmnU6bnbwhDB5Wtci3IPyoeZSuNlThOCRUcz4n5dvtLDshT/4Idc+Ifq1lpueHGQEeJPdHLA4hPoAhYIWRovv9l7SNJByYiHVwfByvla4oVo1+RP/95Ff7MxCoIIrPjw4BIdsg0DazPLZckmY3RQGiQHeAXvpKXo236HiT68hx5gTF6iPQJh9DT61BIjsaL0/fRHHyn/84ChKsRNfBJjq7d7FEDjw+rXxHWilhuef4SVE+mqnvi+xoGXx1eZFRgcSh64lclDxnnr3inqsMTOR0hzALVLrat7bxZi36WHBmVtEESV5TEOJrKCvAKPnIP/PWlMltwideNdmW1tpJc+G4KZag8W+hMxIKnrwqs9J4srgX3OUdsBXGVro9J3Vy/VJO0lM04PMi6jS4KUPGxdan1KvKVg3xSoj7GmDkec4PoWDG7Fk60pzDC2dUO2JLGax44Cx7Fsu0yePM2xxn5HpqYaFYV0TgNIkRr0/Z9u1eX/wMTuqMDviEtXXpihxqd0YpuDPvsS50R3Za2nmVpPSqggiJ+DmDghav6O0zDUfnFw6G89Thrtrx59SH5c6NiH1LXo8ufrs3sLvTSd7GoEL7DGErbIVdgIErvRm2fKsWd8oE3b5tYiL8YK+YZ922UJVOVJPhwV4Fu587KhwzRioJh02WJIYVugb35zY5CTalseiMab82Z6UjbSgJo4c/zRKxihewcC/sIIqmTB3TO/OvIDuWmOKFW7zBvS55iB0xkDO6ZDLZLYdCoI3YafnRl1AtPCIJwbC5TKV1zychdyyWIsU151n7PUjjgH9hRQz7ybVDwa2FrAorcen2XhgqZMALj0OA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c391b969-ce3a-4ff9-7076-08db00a6b8ac X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 20:40:26.8124 (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: U7pMP9oclyLaSiiv7/ehoQ1vj6+jACyj9rOZyitXGksXW69R+a9gaEqz9fOLePhqS/vjAMDgm+CbZALcwR+nCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5019 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-27_13,2023-01-27_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-2301270190 X-Proofpoint-GUID: jAxoqUftqFYLmuwFsIrGvTH6k7cpVh8U X-Proofpoint-ORIG-GUID: jAxoqUftqFYLmuwFsIrGvTH6k7cpVh8U Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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/vmlinux.lds.S index 2cfb1b52d123..e1252bff67d8 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -400,9 +400,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 Fri Jan 27 20:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119390 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 DA4E1C61DA4 for ; Fri, 27 Jan 2023 20:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232845AbjA0UmK (ORCPT ); Fri, 27 Jan 2023 15:42:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233380AbjA0UmA (ORCPT ); Fri, 27 Jan 2023 15:42:00 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2F037E684; Fri, 27 Jan 2023 12:41:29 -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 30RESXKO004156; Fri, 27 Jan 2023 20:40:33 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=/ScKNlq04bACu9a67pQ0P3CjFeCGILL1fNZe+wVV9dI=; b=QLMnyiVT6Xbh7Y73yDH0yLIo8eylBjyf63q7cBFlwQvCE3C3ZvpX4L/mWBl0FIwOE2uI +54UFH8l7nWkR0uF9BN92koOcFco5OEuwKeAnEkHuazwHsPwFR596jA6ljBLXkOgLY3u LitzCbJ/ruje3Ns7ncUNQLvDvqLYVl2BWl/a3EdNdCSGg0RYN3iT8owY5jijzB1Lsckt 1xT8xO89K7t1G95VBaRsiO39WlWt0T7TlrZtXpTzpLYarbpNpy392qyr4JyUyWayDN1g MaixsPFlqXwNnkXLH+0DQXEORadLkAxFS0+IAVooNpLgU1/rtT+OpIGdNA9xJStpj/Ge fA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncfd190vh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:33 +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 30RKBs1I004986; Fri, 27 Jan 2023 20:40:32 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86ggjeqh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y+Wqjv+0riwi731m02q4k/vlDUqMsaoER68vJuOCzt3N+2FP3erYY1ZY7XUVVQxDJiSCQzkhw54gbxy90KHuYwElnFon/WN7W5NJs40BguazuqbKkGQsk8a2ZFouhUCeiPEh33v/bCvwuXqxXCMQr64j2NKwLKEOzcUD//iQ+OgEiqQbp4JoIuLrSy94fegHjKkjwjmEPVhucqqHyhkjEQuXWlhucF3pVQxS+od1RMLpdD/XbrQ5uKTzI+ne8ZAQhorCJbMHj8bDPZfDu5R9QhlfYIrNSWnoXu668AnIKt4akrLk6J+Il3xkpYQC1bTjms8RuQkElXVDSO4tZfhz7g== 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=/ScKNlq04bACu9a67pQ0P3CjFeCGILL1fNZe+wVV9dI=; b=EpFMomI0dtqYvx31EenFEIx9sBnPEwgS8amGeSigh3AfYJAmj6ZzPh4S8F4XFZF2EqFJXoiU8MczPsYCyYbPs7PUrgV+Vp39tdwg7LCgURgl0oCefutcJtsJ1PvZcgQ//Fx4VzQFiiAxcr65ghQLMeoNz+dgnlMqqrzm9XG9/8ztH6a/L+rnInj90aT4oC/J/zI1uWStuNxJSJsPrl79amA+sBG/ePeuaSD9NesYy9ZyZgaexxOyX6mEkmJTYZ2fulpH7lmHrQKcOTFo4y8sukhgAr68EpiDuem5zuqlrMmNIhTD3ACI3oF89bC1so8/cECIKqeQVC4mcacS9VX4NQ== 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=/ScKNlq04bACu9a67pQ0P3CjFeCGILL1fNZe+wVV9dI=; b=bX4mqJ8JZBbClZv5QKVcNodc95Oaz9ItksOMg+1Q6OGwoE1T7ZlBYM1+XtM+91ZntWIlqR5VwzotvfAUWzn3wAd3eg1INHN1fhy2IJmyyNiPwtwldbjUYlZcqGntwp7fCV7RtusnGymXVqGIasauDOmTyIOQ2s4yTAEhUk7Chlw= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB7459.namprd10.prod.outlook.com (2603:10b6:610:160::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.10; Fri, 27 Jan 2023 20:40:30 +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.022; Fri, 27 Jan 2023 20:40:30 +0000 From: Tom Saeger To: Greg Kroah-Hartman Cc: Naresh Kamboju , John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.15 fix build id for arm64 4/5] s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36 Date: Fri, 27 Jan 2023 13:40:10 -0700 Message-Id: <178abde2262b22100aac5de018e92a6dc9d5bce6.1674851705.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SJ0PR03CA0163.namprd03.prod.outlook.com (2603:10b6:a03:338::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_|CH3PR10MB7459:EE_ X-MS-Office365-Filtering-Correlation-Id: 80453183-c155-4cff-16f6-08db00a6ba82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZTl9NzkGUYWAWfW3IOJZNogZNQhfx9xVqPKlAvQt22v5Tc+M1ffeZM3S8Ptje1YMxVBy9wOG7HaSLcfklikyMobzJxJfykIOXKs2740dcQ6RMYuSy3QeK8o+UExWO+oCsVRB6b76s4ZRQYtZCsCdAbfz1fdz1gUA+2PR+xN8YqlNtndV4CFTrB2fo2Fr2yNWPaUfB1cigBHulPQTp6T/rlLHbjUpxEvBkUIZcbM1uY1PnFDPZ66PhIlQmj/dlGzdJNGicPd3wlkoMTJKN3vjJSnDIKwcyIiA175ziO54X6iQudfPDGcwvEJaJYoGZAG/OKoSkWLl/A8510oimHDyj3ePygjbnwxdY6iXZd3iuPNLmZnv5//oVWrL38dUvWHbbkoWCw5gH6hpySwaJasNJWBS5c+6WZiOuVZ4Ro4yT6Rcep9xQlW2vmbmhu1bJo2o+fQFD1yP04lGYbyzxbuchGUQLK3CUFse5Q+Zp+5FrpX6VMtnAEPsoe5uLyBDjNcsOtcdoPoZOQcPyJGhjJdwPFZZx+TkqHrywpeUuF9dJfEAg0jMGQ1jKQV7Tz9REIfPa18uJQYCippJ4VnUasb1atV5VNz25wwpySE+KbuzkxY6mvE3AjtoXDxcLK3CN8JHJI04BRC8EArb7sjle3LsQA/gEak11brv2OvT+xdM2bvae3f4QAyBg4rTwdyLAEeqOH1R6a2EAavuVc/AFTjGPw== 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)(346002)(39860400002)(136003)(366004)(396003)(376002)(451199018)(36756003)(44832011)(2906002)(54906003)(6666004)(6486002)(478600001)(966005)(8936002)(6512007)(6506007)(316002)(2616005)(186003)(38100700002)(7416002)(5660300002)(86362001)(4326008)(66946007)(66476007)(8676002)(66556008)(6916009)(41300700001)(66899018);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ihD7Sk27bRjEphqziys2YR7cKjgLze5HKcYYe7eumlNK4XTj/fZH2nuUObDGYcWsp+xSHrb0JDQnJu+/F71eAC90IAccaxj9ACyKCmzHloosqzV/BwQ+007J6GrjjV0ewuVSxKhNalCMW8pAUIhN4a+sCJIL9EwRkuKn5M7ImjWaOkwr9uhsEixVerNXKZc4eoMY2wiUwnVqtXJ1u73FGBZSHS0jxh+/xqyc0sRqbYLoHPfOLmb516gI2E7qYbnfKhMK6Q3TUCox11f2gDP/J/3V61Q1pPePRQr5ewMzZZlU1mvvfqMVFXn8Lmskl9NMENHoSqYj+iiqkaAbtUUyamM/IBwbaXSJVfW0LTtmwzRxgshq+MwZHOyC1geRGyrnrc6uaseVL48p9XYfwT1a8ixAaohGh4UuhvzrjCub/MFl+yzgrY4/SVpvHIXaZxi6DtPHBYL5iKhSyc16Oqmz05WcvGK0a9igbvsTK5ruuZpzx5hXaebmb1NHm2gXrYq2kN/Pp4WPNmnBl1r0SC15WPlE5SStzAYHj+uDUGJ3PJgaWRxKJodGcwyhoWr8X2m4GdLWvG0St8b//9DEYNs/xznfUiqYZhqlLis5WgIQ7AzwDSeoDZDsfwyjVMsVJfSUbSZmkQwk/UPUvHLPjOmnUmq40WYj4+B/Cunuo5j+Jpo5QOYRNPrLxRPA+cglphD5gj5fq+Qpwr7KgqGWgBSN5sMu2nDqz5rJ4J5QB1h7uGo7oW3pTedhDcJFVpRqPoeH/eHRgGoyYF/t5T7sdeCLE9sMvpX/rzX7Y1kRCFhzik02Po5QFNcrRg33g4epN3jhWPswYsbfcEeTWEw8OQvN7YCJKIgb5Kr3h7ht+qpxlhz9WMHKLBC7zeERdU/My5L7r773odGIquZDzKk9rYZMQ7Z9Gr67ZS9HOF5LRJ1ifDInU3Z7prk2lTTrsctyzt8S4ZmSN8fUgno+AIqpmgfqbVQ9HgaWgr8ceIFQRtUh/rWn+WLQVWtid8ZLluEzCGMOvjZNAgOFO35u1vteo/PPWxU7v/KmMH3sgso8LGSHYmEk0hD5g8OXonIKqMLMmOdTHe2sUr1C3b4C/hhLnsPaZ3T9N0ig7f6YxsoeAyW6teEYnxp+VI9Bj6mBKCFxyKddFWWqEk/J8FMptGk0v4AnwsX5fTGZlKSlEPnAq8yIGqXIw+NmNKafnc9h9Nug1PQouyU88vMgLaVhdAe0+gNBi/zXanq/pBSdHYtxmlx5aEpkqFaFAhOvgT71tQw9Z1QzilMkOgP7+l1SahErUFMxFgmIAG8X3wYER5Up3Z8GePOA+IQIQu31YCClg3iDgVDcnKDQJeDxxhwKiYulsyxl6P8X4xmcJ30biUZ5gWTYRXuZ7JTYdXBlZCLwC2hy5W5KuWd+G3iC5LCW6xsw4mYLRfG2lsCbql9E5xRGtNekg226S92LKnYs37hk1bo2SwQCbHpoQpx/11adLIYn04mSP0gFjxCRcpZKdYABKJ5ZnrNgRJ9oY3ewEah4q16O2V2GaJWrajlDHvZkEhMp9fVpQaY8SpGHf/PyqdN7vYaa5lZRkL/r+Id8O2bVFMGF5NaQFIX0dPmjKFizoy4EDVp713yPMgrrqTXqUHGgvWreOLE= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xVU8w83qXbU5M9dokscxK2JH5bSeiATdDj7BU6ybz4iKdtHYHVjwR8LwcENYEMoA1v1vcZTA4MRne+PeLogmMl14A3Wf72jh5pJ4sJzF+2IadUArGdOvoxtALe1HzPPhqwTFnkChzbhapTkSpimX9zMwOC0GJzoskkxcjXKvh4lYWouhPh6nt8u7CGQzxlwaD3gJVKBIPly5cDdBqMOuEpPnwf1dP3Q5XR9AzMAAcupSrY4ZgFmiSGpt6K1dzuSrnZjOc2v5TuoZbFJ6u6GmkJOup9U+zqJ1FC8dKdipSDRNXcb2q+EelQD+nbyic523kiHT9KyHneE0CFEp4YMY4XNgAByUw+ThfRpsZ10S2E533xyAgn6Shqgf9RONeCyPZcHtUFkgyLgY5hH5UvDykgE/FdQZmWfpVm5FYaRdUUwIsl+eItTxSJtvewFHkoQXDOezyE37vJOpNnxEjHmvBRTb73XdUuAbE3yloNr+h3AZgboyym5ZGZe3vs8BVOxNneejsQiCkhnj80GLqBnzUbj3JEr0Id6n0y2Wpx7txrjKpbq7dJ2QJbfhDfXJKBhdLtvZfPkJG3WrhPSHpOpIm+mxp0jBrD6NdVhkOowKZ0dnh5gvlP8GyAnLCyNS6oHU34+uBV/FmY0VBZTgdl+UI/3YBjZsonNdbl6hqcwRFIhANxARnTgQgRPz6ypt4j03bJK+pECudZnYdezUUoGbpbmeWzlPwQQmRoRdxzA7EBmZwcDMOM4hOSAa7pelqt85nMqMIpjt6RkLDMv6X2haQzXglv/Fg76R4ilFX+F0PBEpGGnXoeOHjtQx60XAP7lTX3oWMVpZM5aQWQq+etqKN2sG30wvTU+bY8ZVgGKWKrKZ4V3peG332AKM/bjCnCzOXY1gpEZtsPz3O36ajoC/oadPmPNMAzkd3aZQbF5OJN4KD1JjA/cd9nF8ebVPyzKvCwAhkRb/dNX5u/dvx2QsygTLDAA0m9HcvL1hEYfGgRBt1GO5tfxF3/+c4yxtndQOBe3O5Xkk3iSVxOOiFhXUdPDHJ0OGUhau7mb5+FaT8VCwF3J9Z1D3Gy1x36mG4sopzEgKZh9hWnVR0xDMznWvOQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80453183-c155-4cff-16f6-08db00a6ba82 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 20:40:29.8747 (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: awxF1l1rojWfDbefa5xHk3/4Tkkkdtmh5K0bNriJSBbuP0tAGun64o7msi02QZiCCPpljcyqeRkUELf3YKIPXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7459 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-27_13,2023-01-27_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-2301270190 X-Proofpoint-ORIG-GUID: NaILmeKXaWiDE97CURorLlDwZUJxmHQM X-Proofpoint-GUID: NaILmeKXaWiDE97CURorLlDwZUJxmHQM Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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=y. $ s390x-linux-gnu-ld --version | head -n1 GNU ld (GNU Binutils for Debian) 2.35.2 $ make -s ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- allnoconfig $ ./scripts/config -e CONFIG_EXPOLINE $ make -s ARCH=s390 CROSS_COMPILE=s390x-linux-gnu- olddefconfig $ make -s ARCH=s390 CROSS_COMPILE=s390x-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.org 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 b508ccad4856..7582d5fa4cc1 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -17,6 +17,8 @@ /* Handle ro_after_init data on our own. */ #define RO_AFTER_INIT_DATA +#define RUNTIME_DISCARD_EXIT + #define EMITS_PT_NOTE #include From patchwork Fri Jan 27 20:40:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119391 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 B042DC38142 for ; Fri, 27 Jan 2023 20:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233512AbjA0Uma (ORCPT ); Fri, 27 Jan 2023 15:42:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233662AbjA0UmP (ORCPT ); Fri, 27 Jan 2023 15:42:15 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06FAD7E057; Fri, 27 Jan 2023 12:41:41 -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 30RESdgh015334; Fri, 27 Jan 2023 20:40: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=liGK6Cfe7R3hLz9yjT29KaP2fem8h5ZkQP1LS4op+YU=; b=ErOQ9zRN8d7hfZZcExpxmb1WoISrg8+ubjegON400f4inBbJFdp9klpmOn8KnTo13D0i 1A65MuHB3Y3+E1adpHvZeKXL9CYtPqZd52F4b7UpSSEooLjHJu4LmzS7e+6HruHCzajO +zTMjIn+TG+x4ing8YvT+kjCpuqv6XmxpJWo09iYJDdxcGWae4B7F+/p2736J64jXvN3 8qXzVwnrnA2ySrrBXctZ2e7RPH8A40KOM2dCdfxDLQkCEajOt04tXyaGCNnezuaT+b25 lXE7EA4ptGI4H9/k1amuHT6rnQeEaT0HW3QqxKba9xeOfEz6Ay9gw0iGpCcEdyGtDqwi 3A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86ybnr1j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:36 +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 30RKF0Z1023959; Fri, 27 Jan 2023 20:40:35 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86ga2t27-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:40:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kOcoxBSQc38kKpiUYE1we/MDFlg3oS7cJHm5s8qj4XLFc6HgfaRjr21z31bEDJLxLsnwFzptjzylvO0j23T1nR4hPUwoBr/kaT+46d3GJbLD/QBbVx5a8ljE0KUEj4Dgr9//6O714+/uTAwxX7eGJJUeS4STMhSkxqvazFNse3+vgGGluTCrxMobOZrcGxkm7ZRq4W7poYUDzM6fnrT6wJ0yriEoqeaFm7Llgf+7qRzjHxuxIcSwTQSqhvdfm3xvd0sFDNi5yUKSsr7KKtTTV7c5Qozl4Gl1LaiZNrJ4fDNBxSqZj+3gdwqTEIlofTbRc29uT+/2JPRydoJOMzKelw== 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=liGK6Cfe7R3hLz9yjT29KaP2fem8h5ZkQP1LS4op+YU=; b=aO45Mk67lnQPQytFNjXHgxI/UcUvPZRCz9b956d1uLL6PXVwX1/rYPNFFHd3LdabO0cVmT+9P1fZIF8kV+PV/SsaCo+vebkBNbo6blN43mD/F8PZD8sxocydH26NgygnWzGlQqgQFjmeWOqWN1+sTa+eBpwKT5ORwMi3fZDXBrNkc2uyGQ6mOaC2NtRiWiSX+mYQO2fGYHQu8sDC+J9kSPo2jyNi/LY9cojB+gvQZPuYpJYU28AOluhcn6MyGwHAuuXGi8R5qVuAeemrp06wr9vCGQ1Z/NMQeAb5+thsD6etFzCo044ixChKVaiWAeYJmyyXjbZvV75TFwfCinuu6Q== 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=liGK6Cfe7R3hLz9yjT29KaP2fem8h5ZkQP1LS4op+YU=; b=kstOfY6dfHNEnu1+uEpscaKJu9OGzUT4zeBiGjjDz0QEc8A72CMz6uPfYf5djNMiRh3xTgVt/y0+3jNytyCY4Qra/qX/XSaLHesWBcx7ycbngN6Zzb+aOsBR5c4XykgInXhMXugT4ERPjI/wciJsWcgFOGbbOE4YXAm3xXG32aA= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CH3PR10MB7459.namprd10.prod.outlook.com (2603:10b6:610:160::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.10; Fri, 27 Jan 2023 20:40:33 +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.022; Fri, 27 Jan 2023 20:40:33 +0000 From: Tom Saeger To: Greg Kroah-Hartman Cc: Naresh Kamboju , John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 5.15 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT Date: Fri, 27 Jan 2023 13:40:11 -0700 Message-Id: <4ce08524259cc3f1a0eff588aeb5ce6b7105630c.1674851705.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SJ0PR03CA0133.namprd03.prod.outlook.com (2603:10b6:a03:33c::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_|CH3PR10MB7459:EE_ X-MS-Office365-Filtering-Correlation-Id: 8027853c-addd-4f7a-343b-08db00a6bc4e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZATkecuSFfUYCSkI/Ocxt962awQBtv0bEHlfjztacLWa7RcovOo76fYgGOoWhyv7vwo24cZqrnh0gCGHngfa9AxkdTXAcRQGCumW0XupuD4nBl0GhuiNeGClUER30ymD8J22hfj4OUccbfM6/gzKux6JjnpFy8amu6OBmz+p6ikEGrAp+GewXqmFtytEDR677i+MU9b8NQFIv8axxL1L0TTLV6xYVgfWQLFNUDtatLjQ6OT03J8Df7vuPqpcrgmlBV1Xq9pIj0qwSZjNoPKNeThQMEXFnYjHw5CsnQxOw6Rh4BuWwp1YuBEskkMUMWYyX7/X4AsmgnhVNK6ZvTEWzker2ER6AL0jtIME9Qm3md0WQc4rlHoWWtC/qvQvrtHsiChCys0qDJbjLj3kQTOX9h29qDKSbiVfas5Bb2PvozaUvhYMfoUuW7IONqtb2aNuIaDEd1xjd3EGht3qQjgOQKWj1nocb5ipS5fmihgmQ7gI66nq1Ek7U7uiD3VF6JUbbWd52lkBHqdME01bkIwWjfBZt5Z84h5UyqKWpE8vNOe0J52GvQnW79VzfCy6EWbgO2LC4B3tqBOk0Wd+HbKbr1ZrCkVfip0kLg/PQR+t107CkzpS49LD+7zjQsJCnCI5/VsirDFKKCy/DGYq5F8w/ZNoOZkqmbAbSIhGVS0w32mbTD0XNQ31QIn6WqepeJZp5QG4OkPCBDYNZOK5rBnI4w== 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)(346002)(39860400002)(136003)(366004)(396003)(376002)(451199018)(36756003)(44832011)(2906002)(54906003)(6666004)(6486002)(478600001)(966005)(8936002)(6512007)(6506007)(316002)(2616005)(186003)(38100700002)(7416002)(5660300002)(86362001)(4326008)(66946007)(66476007)(8676002)(66556008)(6916009)(41300700001)(66899018);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jP/gY6lFI7vn4Q90srVjlTE/9QzZ12urOvlXLfg8aqZQxj8d4OLqNTzGqNd5Zy8iHypb2O+8lV+aL3xFkopiLGa9Ksw6Bpgbw22fuB7O4fas7gLRSiE7/pBw+clYlZ4P/dx+bVPdHdDPsR0Ia0/ZqzNd9LHsG/DLlrOJq+EBena1KdVrLlYpEdI5igLixyXXBdEzkJ8e7hSW+iUudXsuWIHvHYP49YtVUNWMQHq4jtWm7tCUvKh33mgGW+EZWzu1AAxgWR5fG/IYnS8uqNVh1KObR1ttdySJ4RSogZXkdXPiw2Y6wmjCjXShyVtL0RkNDv/WYfPyqH5X/RFBnkHz10GjkTwpxHz3nzZpMwgxMixucM8dMjTEfknI1mjL9TnVehGMvU1kw1jiQHb/vURpM74U8WOzdyhXxXApO160TW9qmsXk1pAEuV9jDZx04L0K1hluMa17XG8Y2spvZkKKGxFU4an6QL/+vsu15oP/7xmJrzU0lIl56PJqhMPHhCzfOMmtvUbO3yxSXKynbegO8cRWC4eS1A1DwMPpy0VRFvLII83ViIarxFFExpV9nmpRRy7RthYK16XS1IWOITRuRmYo74o2LaqeUeL5URX4Pc3dhrE9NB+nqJD9msS46/tnpTrvrRszZ2xSpiipXD0akMDCIwe8Siq8jqA7vNmXj3MW6+oWqQhdLx2ELWsqg1tzi02Z5Pg/Ha8jCft2miXNbxC2idpp6yejCMGsHr7NQdDcm0Cfo8ut79qNywuQ7522HQ5ZZsJOjfsOAESYuMnTYXL+vMzB2BAijUnzOHvKQcefqjz6QOB99hzUcLDqpaEAP+iWzlYO0PX/1wNdtSUMio2jNlzltq8KcqvpTO8umCeZqPnYXhXEkMiUx7leI1rHldZz2UyR0xruxniPPkvP5pQ7eGfKi7a8kOGQWmD4nUiYFSQkLMjFK4Bd4s0ok+mq01lV3/WCaeKMUQfRYayJ6cPPo3WHR9jgGGTgJzxHVXKIyKSN+a215FOGf2014ZwUR8wm1WpMcuzxYtmFxgo6y3JGFcu7HIpG4gcYJVPixqmQ3W08pnulWh3i3p8tXQRCMnGtZASA9cjYn9RoU42sRnBAttP2/ON21Gl/yC00IQ9kX2x333eieDncSXaI9Dd8Oc9h8KDDp25+Qlji9UsfSqIt92ibm1cCPGCsJNT+Mlo7FMScEjiiqs2CgUDxMvHrbH0RtxkBn6wv9fm1UrUafIu9ztVJYFC+It/zIMNbWxvDFpiTDp0W2VPAStpXVNaAb3lALhmYHOyBI0DhGE8dccrjf3dKISSG7fuswTgpLPyPPZN+MEMZMTl7Qb5aU906s0lxB6VLee4kyzYo9vrOuHiHI+1HgK93zHSDjOXPVQaT26wi5RHMl+X9/ooEALtI1zmKztUQGHdLzmKz6ExcoD+2N0trcZ9q0uB2QsmzMbiUQk2tn/ENzBc3lv0JgioAIgEe0mAeA853ubTx0Zen/hyY9okrZ2bDNOR0ago3fTM+W5Kyy1nIsfe+y9t8zxi5rBm/VOx1aGpy39X+QRAqmDufJ3Yn8aZqWGn7RHXBnu9/b0/QsxjJeEKGeoT6ECV7oJA1CBQkY2K512fQfTuIy4FpBmWC3hTJhizhLg0e0Gc= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 8dCGPcR6fE5Vr9fnkntK3PdEff5XVKF8BeHiSnNVaxVqSdvdDS9I/Y/wCY0NY1yptyUAjOfHZOaIzj2TYsuEr1HJG2IAyUuMULqB2qFgKYu+A+59mLYFgOmR/Ks+j5hf3h4gYnkeZ/pP0Jkam43g48mXsMWsVzdxHil8BvSNp/ZUndN2MkumMzVV7J5V2IrYnAcl8LMRrU4oKiBXde9NBeOPl46NIdm+A2d/vni3yBg9+wZTx9Eqxgo7FBO04oPrdAN+mhjiwWmuT8an1kNZ0FQ5bGkyynKTnnsyrrNE6xKEb3r4K8OSm05tQ+3yiChVpo07Oz7jDQXvXmTjWT6Y2tzv4ZWPZnWdM9slvFWobjhWczwirLVplP/K6VKcx0ac4L4m7Emkwb4SZA++0fc55FvTKxN2Jh6zM2C0FdddVHmJa7kEjNzssuy7b6Sqo725orbBZXb8dgVK/Vm3uhvdHkbXr6C2e7dx/NGZz7sLBrJ0GIrx1IqZ6vHay1J6Z7TucULetUVP/c+OEUNvdvIfgeHCvBy+biDF801ylIqSjqW0dIaLqiQgWagr4dt8ecDsGfb4amxXedaThEt4na22gBdNunu3LBWF9Gsmq0AbxmCRkMmFDA1DPKkAHfZiRipuRhGN3sMbDGOm0wibbUuBUPoGVBd0fu0+SzxIDohpLTohE8Q1SMVq3DkIi9XTvQd0lCjrHoXP8B0tBBEoQncy0QMjyJHZblm1JoQxxsblBfoUO5T2HZVvHMoyODqMOkb5gTGzWRNZ2qw0qZfdozavg8m4KgJ4slMUJuhO97/uTjTjPhpxrLpoW8gbspwSP64Olk0SOu0IRo8lTWSGyxtuxkOD84g27mIbLflWeWgRevX/qbeIoV5dXq0rQtXALSIcnxBev7E5RA4hyOweldzUo4oQz+A6ew119m8E9rVFdeMWfuakzzxWhXz8DCdIlxUoEo+RuuGNMNmHEhAUg1++M1vSofl6SMeErXrllePG698+hr81HOApKuUmQkfdl6p2tK/cIq22tipFw6KqZeO3tvc+slS7AdUPAygr+Dy1LTwcnhdn99k2A64MjgengB9Lr8H9530296R+7qmod5uXcg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8027853c-addd-4f7a-343b-08db00a6bc4e X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2023 20:40:32.8901 (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: XZnEfEfaUuc/qzzY4iZH/ENxuYvNuwX+17brD02SLJkseuntcxRorQWr2vhN5dXMbAxK41GEFDTk+orfCUbm6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7459 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-27_13,2023-01-27_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-2301270190 X-Proofpoint-GUID: GE7wxkUCBFyTRi-k1DANxRl9w-uA6Mfl X-Proofpoint-ORIG-GUID: GE7wxkUCBFyTRi-k1DANxRl9w-uA6Mfl Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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=sh CROSS_COMPILE=sh4-linux-gnu- microdev_defconfig $ make ARCH=sh CROSS_COMPILE=sh4-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.com/ Signed-off-by: Tom Saeger --- arch/sh/kernel/vmlinux.lds.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index 3161b9ccd2a5..791c06b9a54a 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S @@ -4,6 +4,8 @@ * Written by Niibe Yutaka and Paul Mundt */ OUTPUT_ARCH(sh) +#define RUNTIME_DISCARD_EXIT + #include #include #include