From patchwork Fri Jan 27 20:39:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119383 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 57A59C61DA4 for ; Fri, 27 Jan 2023 20:40:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232300AbjA0UkP (ORCPT ); Fri, 27 Jan 2023 15:40:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232119AbjA0UkM (ORCPT ); Fri, 27 Jan 2023 15:40:12 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94ACE7D9BD; Fri, 27 Jan 2023 12:40:09 -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 30RESXcN004169; Fri, 27 Jan 2023 20:39: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=kmO23abRBgPtmDBpNQ9blSPHAPqqjxkVBwxqHKNafA4=; b=ggXCIQ6Xf9bw92nOD/+ioEX4Ql4cv6uY+jT1ve0kIHTAZQqohFwbVhi712oCzuUmdnU+ PptumBneQAkrB4X7nYQVgQ8WziyV38++/QXGOZk9gYkjYhHrBbViG7yd7Gyri2ZlSFeN 3WanXoybA2NFx/if+7G42y2S+x06vy+5m9yCTiRNDW9SrCdrwta8RCoro5gsZhP5U7iH uKTphTNOBuYheY+gPX/ct3EHc3xKBuGvm36KCfXn9TIOjykBr1B/SWKpzUwc9fhx+EQB ap20ryPFZGwxIzWYXJRrqe9lOFVtRliY4XEyGVS6XispPeiJqGmH9Jpqe2+yeiVCy8Fm Sw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncfd190u1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:39 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30RKFmcf029892; Fri, 27 Jan 2023 20:39:38 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g9p69y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n10Xxu7wVNoBAuTwrppgPVKtTMwV7jvPd3tjC7SC+gNzkh7s5adtKntUmLNEarM2z1nxFKG92cnGdA/dGfG6wzR1aHjmn2KwopOcNsD93IrBk5zFrWMZx+l714RTQ5Ts4FGq2EFVABXCMBn61lZbGVz7XlXpvI+rwdTPNqcASDdjy22SAoylZOpYTcgusaXp9Vu/aKs2ZFxVClUQvTtCsL+TFOh06Ptemet3F8dzArxy5NNtJVKlAfQybWalPwhHUM0mVmPtrlYR5uCBSW4Q8dffoLs7/XCGOMzLOpKrVk8IUjQlydITIAQHfZDQyc1WW2Pju9BDC+PmVi/Flu01sQ== 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=kmO23abRBgPtmDBpNQ9blSPHAPqqjxkVBwxqHKNafA4=; b=AF928OibfTDMfCi08qBwbEwMYlGeQaSxwTo9HXiTQOIdjhyq0P43OA3cj9VhG9F+AslPfcCAtF6h+9tiaJu915m2dtxJXD8ULjUyKxU9u7rCyf3MoU+2QetqVYtHTXFJ8At1tp2DINCbNInuweh5wNj3oJYnDZjrp7GKTqbgfOR8W7GfHuJ5vmwWMrLEGSmD3LDatUQ0ulEI7O0IQTIezeJVvxnyWLm1UR3zmtfjtDuPpvvY27hO73CKPwDoUogQeMBZBSUANmD4M9FW3aBmkap1NL0Yk1UOvCcV4lIJm+k3da8wHhekev2f0TGe5PC6GK9gV3zDH4mcovfZlyuxWA== 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=kmO23abRBgPtmDBpNQ9blSPHAPqqjxkVBwxqHKNafA4=; b=xs21i586xrAQxEFaLWUJgpyUDXqdUEWqRMoxu2wDthdzXdSXX/6/KzqCjJka6DAr2xxXGepa1FcmyucqjM3XI2odASGhn+H6fZ48n2DRN/Yfsjo2EA725sE/z0IoqroFicGyIdnodxVIDio64P0QKpsE/2q26q92hjEH4yUd+jA= 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:39:36 +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:39:36 +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.10 fix build id for arm64 1/5] arch: fix broken BuildID for arm64 and riscv Date: Fri, 27 Jan 2023 13:39:23 -0700 Message-Id: <6608d565dbeace275597dd22787b3c6161d7e501.1674850666.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: BYAPR11CA0039.namprd11.prod.outlook.com (2603:10b6:a03:80::16) 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: 4e28caa7-b681-40e5-87b7-08db00a69acc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wG57AVUJGnm2bSAAh5M4HkESHDL7u5aVePU+JSx63/D8HbfeT8wOs7GB7DmViX4f7wvNw07OsZJMt6TyNIXb1moBsgMfC1DcXF4BRZTcfMc14ur62lyYL6SRMAGmQqwxWLMop3Q/TnfL6vMGWDoP5tWCT2A+v9tRCn3KIv3Uv5FOtfVH72Rhiz/sOA79if4Ge6W1QAMtiCpbV0SMx7n3AQvBTw2Li23kOpSdq8hcJMwYSmBlsJ08+hhaaAvTHxFS0xBc0smAHgvvzmX9vD1ltTxpHzzc1b54a++lk6f6tlaO4aKu0vZYZzZv8I4H+arIrw7uxvgHuGxp2XjGZsE61HUGNbsuEgHlUdqr9lA9evqsZroYpfvJoNLMlN9un8XF8pyz0uuX9Q7oJQmZNb63KrmZrJFnn7l6e1AmVDrRQ8BV691TntdzfsZwv3jnaBYrh3RdPsdKEFpmMe1Dr2zuVpNN9/e1IAs1u9od9eJdYdrmQGQl2U8CIDExw+10u/cgTHK99brVWbB/giX5E1TPbeRnq0VEtBdnukA5F0m/QgpulDuCL+g/ZTm+U26Z2EDYAUpMR3BljKV30SDIBNC6dcjonGjnrCplcNgyL2isDqWAjQxbkIEc8mhoEPXVs4BmgSZCmcLV/nmfS3UXm0CLcwkuvPKPNawEELYL+8XBJX4MzU49fCFMIBaHqdWf/+Bx 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: tZArC0m6RE/tl01eZZQ31anuNqBHtqV5NbKuP6GIKcpppQViXxlEIA3wS9q8AnRNXmjXMF8NJ5x2KVgnDTmqrWILFZBAlVpAYmj9VSKREcWQzq4ls6ROF8yU4++Tfyh1c3W/fKHDs/gCm7Y9+55tF/I668h4UpASuqT5YA0XxR0KYPIrl7qlcmsVBTTpwaLysHzRDDPQrxjy4TgoYGRm+s7HCAJof81Xqmz79WlV6B5Mfe7+DiVmSV5aOyhC7UsNEgJrQ/BpglVqqHg+LNxvLONuONkNnD58BtX+cGz56vdRYMg/t/mPt78ZG57kMc/ZoXjCJ0mLocSDkDXaDrrOOMK3yCJOyp8BlzBRFw2wFWYkyaGJiIqAFhnCmDGg3ha/aV5pZ+Bm3oZv3JCJdCOEgfBO71hCMi7NdBMy+g3PoRWzey2j8qFuEt2RyouqhCR/7PMbQCpuKWnofcL8uglITOaXUBIObGLRGXocfVRJc7LAvR7qJVhNyfU2/YyrhxxRb5yk8X/jxQPFBdr7PS6dpKpGIZvPj6BoHIGMeriEbWk9HA1eRIlyQg+qozHfhmkfGNhgI4K13s69tkZYASaYE5KPwnRaR9OcqYOFqCWMXQ4Kv0o6jjkXfylbr+hPCTPrN3syO52MFScjwGI+wdD5R1hzvZq0vE2o57+TxQNINVtl0XwH8oZ5sDFRXxW7eA6qA9zWUFCKWAcQq03QJ8jCunTostU6wgBRNv/FRy00B+w1Q9o+5wqIIBbVMzN/LFdcVMDS8xZZXnkgN3Nd+wCh6MY53FIBDvcO3ErJDy6wvGtAB2uHg7CaO4CFDcM/zKmArSLIpSA1ZR9p+wrD/seCrD9Pr7MRUX7VjghpBponTjBd3fM66W1eRp+aQPUq6BjM7j8Tj3F5pgS9VHO2BltNS9H0sCMkvY+1+odprYFVJU2xZ+EcmSDf8GQZ5Lh7y8gHNTXgl4A9CXKfluBvVmdPYxCorxAOH3nDESuzVA6oZQbVuiGtYX3dRAVGVrIR2OvpotJhqcIgclmHSakNI3+mUq0qtibg/nM8RpHdhOiySW4IJEUU21USpVr92d/qE7aC0t8TBqNsDkpfCWouVTPeKureJcOtBEQLHsg5m/leYb/0LYYYFsG0jfpML0HbPQqMUmjM5l0KiHk+TeDl5Ps2jl9WVU4dsBbxh61/M7nQcrB7ooecXQg8bruvphYl3+AGCkf6pwJDt3LUHFbP1z/D3apS2os0sN01hfuNkjrMvV1+iz+Btu5IZBVpccSJCd4286mimIkgeXRHwfpdo0ryXTMiX/iezArkxv2U1Gy2qWVcaZji0aDNTRp+y/E87fYBuJG6h84CThxoK2qSC6r705VMYnCNjnZXZxVAWmcXpK+mkYKhoDlxVyCak5V60ZeagB8SlzARmojNFB7NQ5f29v2QkQ3g99hU2H9Ua6EG2Js63HQRopCqQt+ue5rdpQqT1XdBjx0Uem14KnEWWsvHHB0Cp0fIHQn3gEDt86CHv14HRMGJxu/vnrTi9+iWhNgsthYwssyBC2KT7IUBU4QgmioIsbRhH0LzfFRS/S1bMkm/P9Ex76VGQPJ4ozu133VSsQcxOL7so7ynOhkF6rWDPKalpml6MD/SBte30NUF2LY= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: nwBaRurJr5qyW/5tqNkCMRkxyZRSuZzFJ4Q24AVcSk+IUyB8+bTe3ljAbwOVv6zdKQnvswTqHUpKXcuGlAPFSPu7td8l97MXyP6fx8u6LaydG22a72EDk9rnWANBWLfwG5yT66CJy+G8RtrtI3Cde40+lrq1RkhI02lWl8vSmLoxcPByf1qcLitYwJHWYwHFSr7oVaTpK7Mby9CuR08Aw3/SL+rWF003ET+fZfnqyC3Wd/GajwS8Amct07wr76XwcWGnBi7C2k4sRXTqqTqJUKf/g6NS4Tj+UF6l+wXMFnV7SXGTA+sxO/aWoillqr7+aQ9wnh9c3i+ntj/QT3zQfm6vEQ9QcG/IJirT5bKp8adGKGqeO3gZHrpZYfBpqL5XLOdkw2wogJxncDTb3AEQ92eNDDtzdm1sU6ZEb/FoZ9Y+pOEfgX31nBX+q0cjMcH79g3DpVAoh9Zy99+YNPlJKoziD61VxWabiSJUjBidbOAHJgmv0W17RRyiyDeDjjD8kXygI6jHUayJM8KYFSRTOMy+ZIoAOiH7C6QuQ7t5Hu+bGGo3+3Zk6/lcfxtawt2fs8ZNIrMdXzBZiYqLWXlOC08Fd5dgb5Kjrfl5sphpJJ78SDWbUuuB8VypkHnDX0dYg/Fkw/zKCP/SSR1lAZ1Gt9OBt5H4fqOHHgQ0OAHTtFjTvPbrYPT9EIQf9sGmbkFbQm+vY9OVpRerBS+lmSzaIHZUpGjDe7EITZnTcNCe0izWQ/IZ/k9avPTHKDxOIfnlywTs2D+luQIGfnbJ6luuW8/qraaqPM8fVHnspdgVHfiWhFvmZMjU7f8DIYZeNQQfG653ScRPkwo1VdfRUkWEGEWTUfM4H7dhpj+0mzD9elQsg2isvWamgseu2OFseA7IhEh4IgO7LqhDl2cb+cB2UGhhjq6P72WbAJuXTR4JN04BxOYX5VgYX/oHyDWyxkXXwOw77xPGNR9gbCjHg6FWewj6ObdkHoUSq52tYOICw3T83cJCh9dADi99ddDBe/2xgVeX0nuvfVzgY/jx2yPMqoGOpbhw+gh1e64zfpwO8ze1l3WAQWoN7PAA7L4a5UfTitZpaGVncfVES0GnndFK8w== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e28caa7-b681-40e5-87b7-08db00a69acc 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:39:36.7067 (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: XVjZ1xHTKmuwCq8xdhXzkXj/nu0Qg1S3dDAeIp3uNzaYRt/A/SDFTYckcpgs0R014qfH/gSLUM6W8NSpQgQRhw== 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 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301270190 X-Proofpoint-ORIG-GUID: xeOm5KqRA2mQGXYYAyKlqTNjON4yhOEO X-Proofpoint-GUID: xeOm5KqRA2mQGXYYAyKlqTNjON4yhOEO 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 d233f9e4b9c6..44103f9487c9 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -906,7 +906,12 @@ #define TRACEDATA #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:39:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119382 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 07E5EC636BD for ; Fri, 27 Jan 2023 20:40:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232461AbjA0UkQ (ORCPT ); Fri, 27 Jan 2023 15:40:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232064AbjA0UkM (ORCPT ); Fri, 27 Jan 2023 15:40:12 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94B727DBC1; Fri, 27 Jan 2023 12:40:09 -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 30RESj7v022855; Fri, 27 Jan 2023 20:39:42 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=WBBeZ1vkrerG75hvnJo9bC/qCY7gF8XZ7qq80akbQT8=; b=CaPfL9zci57b9hNlaFf6dug8D3ACbwubH55mpbHOrzhzbCuvlY19g5rJAehJHsN6dmV1 b+UJONCqa3L1oJcuCiEWx9OP8nX4oYVgqx3qtOYAyCD0ST+fSaP+Q/Md1/VbfAGdcGcn h+2xzyQOFQJakO/QbZplJhj4Bj9xJ+aV6rfMBD0nxu3hC+8ghkuD8Na17nomqnQkj1k4 qMF1a5a4GhpQGS5REamSheWXcMK9zc6ZzmlVQVoQSGc1CdT8uFnDs8/ChW4V3lt8aLJm rIGyFHSBP4EwdYhLUfV621E2ioSjwbkPl/Khd7WDTi0ctCRUOUP9nGmD4dKe8qv1LlrK HA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n87ntdq9m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:42 +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 30RKDuQZ024025; Fri, 27 Jan 2023 20:39:41 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2170.outbound.protection.outlook.com [104.47.59.170]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86ga2rpm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bcys/xgEW4J6lKG1uj7nrm8Ge2hTflKvIfzcahsr4FPZ7kevjSSopfWQE1x4Ni1b3xWLy0VLh6vrb77N5aK3l1pijXaNvgu97OefTWUhsPBj5DUO1gFtMGJKurXTPzfR3ZJJ9Bz0pV5xB7EgKyhrywXPSgwIxFCnSR3bgCrVK4KTTS6+Zu7Oy5E1APOgqfAMx/hug8H7Z9uMic9STQ6BnyTObVf5bH0uE8ExO/LFdvCba5VRBJuUQFQgie+zm7fGutGWO1yH4mO7v9j4qPtTzk91VdBP16WjwskTvM8V0PWYQitVz4V8dFncKOrAFUDI1m7X4L05caqy8SFq5Tfj9Q== 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=WBBeZ1vkrerG75hvnJo9bC/qCY7gF8XZ7qq80akbQT8=; b=m1zxPBtrGiOTxAyDBm9CYrMt1oWXrkj68qbAN7RDtHyPn8LYjpMN+xJsCVBsbbc46bdcfi5LnAzsfK3jH748y2qIrmfPkKzHTazZyMjQDnlfKgU/qR33IrtuE7gFWEtTmdKsf2W9e1hDoUrJLFCd6DAC56dxi9PTWbG7XStB3JxnQshJSwlmOG8x6mhcMDbhrXZmz48KLPR6oGgO+w3Nnmwn5fyKyyxUeM2ZOth/m/xOuOQuq79Aw8COOWn+yUSKUg9NP3acJ71JHgFbCq56WkDF/yVlUfybhdA21MtV5zWc4+pjxX5XXI6Du1oFCTcuKh8vVozZWhAopj7N6yBtBg== 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=WBBeZ1vkrerG75hvnJo9bC/qCY7gF8XZ7qq80akbQT8=; b=usq0/Gb86O1rADLjwsHSc/0704VFhq7ez1SeKJaYiUbPxv0EViS1TK4WJAxQWU+RUdYdtzLwaXSAR5a+VLSCGu+jF0kNdXImCzaZId2n4HL1zgL0C3Y4mUhtyXqb0mvM2ettzRoInbPXYQbLNynpkUhQQxrw3ybCw0C//gbj9p0= 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:39:39 +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:39:39 +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.10 fix build id for arm64 2/5] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT Date: Fri, 27 Jan 2023 13:39:24 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SJ0PR05CA0074.namprd05.prod.outlook.com (2603:10b6:a03:332::19) 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: 9d61e2f1-5bee-4510-7e05-08db00a69c91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jMvjggrDM8FwqdNWbLbX4Me1m51B+DbFfaSR/U9RVQVqTllKVh/dvE/P8oH+2ngwCb7rw1MHvdRZf9pgrfH9WJJvxs9mBAYJwNAhay8HV/gsjSdyU8++PdKeb5WX9XxhiSnGROsXWMut7Ku+KcwEaQVBan9ssvy+fGZm/ntuR5xwJi+7kbh0HpFC683QYzr47KfN/OaXZO4BCpabH50JhH4xnlPTHsG1ZGNSF/WRbu9+2y3CL2j6WSrSOv7J7txeO26MCPRwfGffRzHg3aZouJZ+V/ql1kmlZpy5nnp2LP/oNRVAypHrWBujWrBNIJ3nwoknHt20eoaijIR8O2OYtbR/TqMT0p64Uo+72YF4RqYZj9EU2NTGiOfjwoothGlnutDoiAKamWcYzxNDXuyFNOzRvkpERfbLrz9V7nSiE4Ru6vVlZwYY/PFJJ/J5sPbqUkq05EcFB2/XMEoJrtAxU4bIIwyEAvY7J1mQtRaiABpUSm5iym88g9seGjjuAM+X71xFCuxYZWTR0yrwnIQhs3gmWMpLpJ6wwqdBwj8wIrJ6fn3KWI6bDso5pbyetKD6qgQs5eZW6irnVFLFb+5Sdvdcu8gRihJ3ee5fIqYDHQuTw4pd70/HwC/q8avR0JAbjaf595YKzMCHW5I/09L3pqLxuu4bRU4ji9cwlge3PggzfFqy9b77lkKRpetIrITDkiYWz2qsY6u02cd1b9ij8Q== 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)(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: 103YXfr9mt0KYRC4ZuZA8SGiu1eXYjef7Sfc2aoPQKMpkunyV6jsANe3Gyom8RHiG597xXAPH5PGMDJdfdu3tCs+1SnhfORE8N/jWeuFijzyu+V8H8qPqz/0MFVoxfoZugerrgISP3wHLClcEp0jUCoYRwOOohY3ecV7HGYg7GywYNRIZVWcfXlxc7eK/DOGlRHl+aiGC2dZBX06xtYDK7KuF3aZFrDvi+rL1ifi7ddj5pJjmefjFuuqVC5gYf8WW9wY7cTwbApn/rl2TpFNa/6z3Xm0GUDH7oc6sbt53Yw4mZzGELUD2w/sNaAk9vBjgpUg2oudobJkxXJTZOOFlUfCPP8O2wF62R8IPcKu5WvVB3tSqX/NowpnH3fllpfFaQU32IW/r7kiuOI6uUwmQLWkgbCokgCqEpEzueCkDO3/DV4daU+JPbcsvziXkNeh37PtCpQCGbY3FZc9slwOSG12qM+Q/TSltC7QvqSFEcqWCfBukQc9XPqTuWBH7Vq1EBnCF2mYe76bGnaN1O/kavWBvdClTkEJzSBm4BXB5UI55VkigYf8UdecR+pnj2V9XcUN0akhAr6asMf7WA3cz1dMYkmqRYbNR6FZYj1W+3uV0kdE6+Y2g9fz+wOA6w34ND3NmbqbTL/aN6ZwjY/jYvGEfWZW5JKcqqVeIFYUFgr4/4aCI0axWEDjUdxtidmf1XZZGaix7rJgFzGfykZJN8SZSCgprucH5OWi+hm8yzfoAceIO3TiOD/c4J5KwqY0tuVCODbrnJabb49twwJW1v3ogxeHysfOm7j3de2PJmpZXD0sJggtveGFizWB94QyBxTnOFbEhWouhsv0s2YmceHErC1LDMe5L8VsKj89HfkqA/j42C5S62BXFuemZtqiWj68USrd7zNRoJ5M8Mg4A0Zn8O5O3DZqlnycsC/KYv9j0DiCnxeYenDsq3CMJ/y5syv2m3AJBilYW2mRemN43OSoHWgSAHH8xbGAcT5cGnvKm+VH1k5e/ALOWNc7Gc+SH6VS6UfnCd8KSjTqgYCiqUkSk4BZ/yJJgJ56Y1ktlt3saI6Ls3eSJ47LKJa8PCvdOAZAde3mW6LkFJcMV9qSYKg7KZ66GyNepqGDVbz7oAd3Ft/50BTWzuVqlM8SoHExZljVWg6WbpPJyDrpyKYKD/KPxpAnU702bZBI2nZtLSVzXZWseRmIuTYy0Xl9mKDjuWy/RbZChW5zELHFDFSNUjOLnRA0grTHPqPCv6IYv9l2JmQfnvZJ6nQ/SLRAAX+CQjmAEStQY/TH7Hd9+nLUHScqIGN0i/VQU3MRg9bgU7rZDuJ+Umo/9Ei6RLE69pIuLdtbun+mCryue8l8luYrt8femtb/eESRiBYLPkT3rI97dT/N3ifPwUdhTCegd2jpjDOXRvvJvZHyKlDsrYwxER6pbYnjtYZX1HIu10ttoxC3Ol/yyQHja93M7WnA2AeDJy0rACK7lh8LfgKYATl6e9LXDl+xeVhhxHo2LYs7uGYqzCG4nskh/1JPw8rDtMCjjNRu0niLKkH8wr/7JM1hAgO3pX83mEmRuGv9kIFX6nKmgtg+oUwwXhE8H6OvxXCoJRfl9AUOaRpfBxYROg+X1bnqizJyIbKhWfanc32WzPs= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: I9x/bPi3i6kF0hQcNI7faCZu2pEQD9p2+yEfAczga+nlU1XNmM+OMerVNIqND8Oj/ZwW9lBPeiTeHoXrfT946PDfQRz9RrmNF/E61220yMTVkYayzcMKn0aRnV94S4+bZ09DktXE8DM9SOwMhfZlHiVadHos2rappCuMyF1E2CVY/87jnhLP2KAOuTo+JoB3a/3h1yu8A+/tUXn8r/4ZWgKWxodA3uOqW0wL8pqLXfPL5C3dGdj+jTk2sLL2YYLOQ9F8y0HU3EctznttO4dOXBGnIrh7UGIAwLHgZM4LlKBC9VmAOnu4eBcUFd43yeUzyEX6//s3SyBqi8/7S3ydx/RNwqTelprzhQYOU2cJf7QHpxO86O524y8fCMx9d67yznfuBtWwqYhaF22kh5VIFajdLWdwumVNnJtJ3XFwGBRSNqegH+xBKKRcMYMCPpXK06gG1q8NohxdHY9XGy9Et0qAMuf9bm2jgHZHL6Xq228I7Rtu4e6Gp0g8jLJsPT80DHWVjSKHPf/hyadW9TvlShpNhDXWpwHLF5tGvGkqERG6Y6QXrCNaaIUQQ7IK3ylbSsQHCE75ev/+e04rDTgFzDLaKa/xIWnKVQ1O4AAfisFZh/CmsTivWgbiaaFgW21ocW3k8hNcHpE4GCWMbSZrHXgH7RyPRovg1i6pxFmVjY2EeE7X+ebk5Lt+ZDtUp0IaTa4Xzj8uGKLWpUb0zJ9GnrKQSzKzXhnEagx9+JcXY5FMK/VMf8WyIm6QmTvv8mDrOxxJsE8pSh7dgidPWugfSv47Aw9nW0mGAThPrHAHdCiAMiJfRLeSgdFzkjV9qxlIWEAAwam44iJT8JRzrTaXh+QndHgH0JSF9RCigLhfHOFY78dm0Y95OlTF3C+33LTegtnWtkgNgiSpD3Sb5UmdI65dFXwl94fVt1CTaOYSLZpwL2SjM5nsiTOUsVQc3OzvjqEKUi2mpU8sw3O0bYsmABmE7VjpBc+TsdKp4MsLUiWLxJBvIDHf/vPUcZv8d6bdljphFaVkN93uxz7K9DCGUh/4/7vfNAJRvf6+RbMuZD89Hi+gAm6utAtFskKhqCgwc8HjewGUiiUopWI9XM4rvg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d61e2f1-5bee-4510-7e05-08db00a69c91 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:39:39.6752 (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: QIPW0ZIQvn0ooAqvcZY7wY7orscwSJC2NOTr3gdcoLH9Ed18TFD/6MkXBGTQXVxoAn7pOr4hwQldgCVOYtUQQQ== 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 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-ORIG-GUID: g4K-odHXXrPLifIY0uiLAfzuCIs3I7p9 X-Proofpoint-GUID: g4K-odHXXrPLifIY0uiLAfzuCIs3I7p9 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 4a1f494ef03f..e3984389f8ef 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -8,6 +8,7 @@ #define BSS_FIRST_SECTIONS *(.bss.prominit) #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 0 +#define RUNTIME_DISCARD_EXIT #include #include From patchwork Fri Jan 27 20:39:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119384 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 78245C54EAA for ; Fri, 27 Jan 2023 20:40:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232536AbjA0UkS (ORCPT ); Fri, 27 Jan 2023 15:40:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbjA0UkN (ORCPT ); Fri, 27 Jan 2023 15:40:13 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 497571DB82; Fri, 27 Jan 2023 12:40:11 -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 30RESXj8004170; Fri, 27 Jan 2023 20:39:45 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=yln7lMtptT9qb7+g1/+yOwK11oyVjmlAZQLx9R3Mbbg=; b=XCbwqMoG/xqZa3MwMlk9gzYwoelighuLfcGGrv2Zgonj2fAKMzjCRENhSJvrV+xKG+lg /do/VouGR/Fplw5ITs2JEcLWruWV1zJZdbLpEGF+y24ZP/jvOSshN01HwCmuGL1feVcY ITMozPZWHFN1xUEZ5bMJGZfGOxmcE+df68pDwxo1D37fnFnbyilTQGW/YXygwLv/hhHn bhYAzAMGHvhi6yo6ZnAGy2uMbKFXdvehY9YCL8aUj1LwMg3AwhYNKcm4lntygqLTRDXw KjoeERhzcmexPXOH8yXs6vh2Wgifa2dps1UKOP5V8d37DAGaPsUj7khfaKIzY+9Fc4sw UA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncfd190ua-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:44 +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 30RKEm2P005020; Fri, 27 Jan 2023 20:39:44 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2176.outbound.protection.outlook.com [104.47.55.176]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86ggjdt2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cN21wuUQFtdwUcZAmpoGZm3bRKJB00t3VRVSlk03RzanYXK9wYAkhqwGgvJ3N3sDJmM4OpObzVn0eOeRZM+Bt9qMpdS0S26pplDfzWDTDPuEsMQdFwv7QdfjxfWKuATcPWORowW/roQC4spwKSDwqLYuaiWY/3oNjLD1QlNjs2zlteI2MYHvP+8sNvZKSClusQYdDh7KfY3xim8CwoPatraG1IF/h/PHO8cZ4MCtBqTmv78NFMRIIyk2KeVyiSxGWC3eIi5kYxqUwvcCs5TrBARfzTstLTQjtKuI4pY2VtzIKMyEC6USTDK/PfCGUV4NfG4DQrwfPK0fHIvvrj7ZIw== 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=yln7lMtptT9qb7+g1/+yOwK11oyVjmlAZQLx9R3Mbbg=; b=MZN877hlv442oI5LyqCYkGzP8XEYDQFQhHNduMFkduwm6Qs7OqU8zk86IFMo+MgQBYSv4aXzg7zOW+z3IfyN3geIE9RTfCEDx4VB4agnrJyyCE2uvPF9i9W1nvTztRlddqsmS5FekhBw62lYNPW0RjEz2BXgqHp9c2lWNVBaDjWiwTs90o47AihkVP7jyQkAbZLXDQU589y3pK7WZEOwrA4KGo80Ni83NW+0MXcnq2T7d/EbPF2/q66sntgZjL8TIxhMgPAXiXdjLlYwSJ/u4gXwY3ot2pJQ5CjPT2H4FzfLnpZFf7ut7SF0zFWZ2M46yiCdfeJNe8qsKqQMhUw8Gg== 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=yln7lMtptT9qb7+g1/+yOwK11oyVjmlAZQLx9R3Mbbg=; b=Q87VyJ63mzOsI5/MCEpUmAtKgSj7vgX72IDJ1chjvafur5pOlT4AczQbn2zat+5Ju78A5aCBPO4P4Z7krjDXzKJvLNcVvA1J7j0KMjnw8YCOi04yOXdaI+Dow8yJRcVOhwdqdwn2ur1SoMk+K3foQdtLhQUKHgftwFUfolCjbps= 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:39:42 +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:39:42 +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.10 fix build id for arm64 3/5] powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Date: Fri, 27 Jan 2023 13:39:25 -0700 Message-Id: <660d4d976be94bbbb022bac659ca7b5fb89ab5c9.1674850666.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SJ0PR03CA0268.namprd03.prod.outlook.com (2603:10b6:a03:3a0::33) 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: ca18f853-7347-4ad0-2477-08db00a69e67 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NALd0fwugR9N+so3NzjkwrhkM5z8HalgaREDKN5bvvCq24UQrO5L/dxUs+HdvLdK3iePNjpdnc0qmUq12C1lnQGf9ux6Eik32GcPuWH559f5jFCQH7AZifexrzYRJ2Nmpe79Nh3gWJDhjDjK2F1YDj2w926mNu6JsduAliauv/ujHITtyATFYn8dGQ1WEITi9VJBYUomqFuFgJHRg0zI2xlbKnSNbqP/77vmjXqryQXmdTOxZ/J+Rk3YZ9gJ8SATxPkOZMunpsoR7eiE2Klk70C1ABh5TL4VLzEAJS7r9R24SuuMh89HfWfNwUCR1BSTwYfLOV0FpDy3loR5wXvXwafIgS1NjYO53pwy9no+PrMRjYZjsco8jOrFrmtx8j1qQDujNttcbnFzrAo5zzJwkahO3QbTB0fSnAerHD8DKCF+4NoX5/TgwBHfAcjv4OxZq+whzYLoaQyeS2ksAByrxq++0ZOeOnCzNT8EJ8R1OLQyKApq8PMbsTWSfDjlH56Ur19wEt617ml+4//mijlUPtugQbQ3vDrf7Bb3WrRzoDXTsdtOj+yMtVN1Iyyl0Fxn5CpPUkJNfbFTCw1HbokTME1an/O53V2LplryFQnArmFrujYKpgytbul0xGV4vZcM+kdRGEgIgE67leowyfoPo9g8OHPP664QJ112J4cydCjAH2W3R6IK78U66CU7QS8EZhmvZnuhOI+6VC7xGzJVgqKA7Nh1RXaBkahWyZ2kCy8= 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)(142923001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +0VxapSJIPIFh4c9IyJeIULnfp2KsF77hdqlv3kxP8Oga/asNiVMDiML1kLLiXiChEeDuRp4QfFOoPpBReAWY0aRCze94+47O3ROyPZmZrJRdy6RRlnA7cU0UWfNygI16bb/eFs/k5blMHJpBKDqwpqe/Tb1DPTjAcJWcgMkxmPZlNj9uMAHrUObx9LgHgcOb2bVFazi8bGavs55Xaff/iQ7yebxeSGghtdqsUT85T7wXdZMFz/qERK+Yeq4V3ByBOaT/nGYsOzGKDAT4R3UeIel+ccLWqxK8DTRqEQJ9KxQLUf7W9NnhpmE6tQY5aYwnGxEIRS5dDHx9/bxflc0/kJhP3lncfDQWeWfyvB/hWxx8oofgBOwA3LqGBmmK9zUyuuZ1nbXEU/kG+WhIYixua5ADx0B7TXtWlQUiFFdJ9dMzV6PwVRdmWB22gkcvYhhoskNWOQMVlCKyAG+Ba8YaXqKIRMnO/LKV8Mopq9goN1hhYq9ncQvOW434j2s6hgZ7s3KeiFlquYmO5aCPHT0HGcAIWCC2ap6Ox3I8zupiop/yFrqoixxzkNxMFXCqzf/Y2qfy+9i+xHAaax3ypDzNeZveOO4xJ//jeiSpCpI0b28eeXnHfFqtRK4O7O0dXZG6/CEzDmhhULrTIRtz1/NCxke9Sgv9sJ4M7bIIephE67HTn7mZGIFAtpif2Ttdz4Iu5CKYOacdDOlC0P4J4/GRJXI1224wnT+uUGn6XeJfOet3ShlFkWWTXj1SyFwpHW3yQQabv/KQm4QDxuB3d3vsSnP79eZcqVahCVJ1hhMXmHKIjOtXXeRgn0xuh0A8SIo705I8ZrwJPUmG7zm8AfMmLdRXsUxVpERzo6bZgjHfFv6OS5EgvXcsKgsO7X+MocJ8c8WCLMoeqF5GeHBAPCrWzY6KRbEXP+1Tpm3Y4pR/DF4UxFT/sbJoJoo+6ah+afNapLZJBeBplzRZL0GB4a1UBAXAgJcf4rVfTK85h9QCAvQXO81seV+cmHrayR3DQQZkm6GKkU/et6snX0uGQQQQtVqXnvwUlbMWb7cQD27Ab4j8m8AFNDYoba3phzc420IfQGxrE1gdLs9ZiSmRSd2gsQLapaqv+Lc8Akq56alGOEgYObje9QoJCT4B4zEL8kDeh/OseyCqT+sR71ybSt4BQUi70BA7KlnisiuVVkQi5C3oUXipN0tdGEYn9LmC5YJck4wLij46VJSPnIHORsNVHuHqnZH+E1hOb7r+j+FOl03uiZhe1xlSKctbrTvIb1t7JYeVxv3HfSYs5DczB1tL3Kgn05fTEClIiovq5JOTkFDcbEBz2MjLN2NRVajW/or/2/BSQZRSmlZc+K8ZO9SThIIFxyj2GDfYRkwKkoqDxC1oXUpYL9d+wD3277lmTU1Fzcb+pAe3zVvXGqtJkGN7NwXhXXg8gfDUe4McNveg363RWFfIzJqmqkd5gIIctXcYqPruWXQxLN06VZuDMmS2djvBA7Wj8P5cUgMVK5wDqloawe3wcu4T7i7K0PO+hNoQ0VMRAODy/Mh8LU9iIujqdTfJPbq9cSoZCiVamZTrwhsdq9mFZm1/prcz83j2+b1FSMkCsfad3R58R2F+GkjVqy2M8LxIAeSJ2vCG6lJQTw= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: miOxZ1IRzvWIHTybW5vLTs2PPSrZNSnPMd9oxZDqpWw3ovqJC7YL74VBNvdKpgzUocODQdRdHaq8pPFtRg8HlZzsdpR5VqazJFqitLO/lQFdmimcysqnGv4MUuCVNuthVJ93tqijBRAIBmLk2zxpZALNpz4KMCcJgEZrSkSbAoL56ZhLPc6P7JIr6dgDEr+r6kN5VObnALCANDGe/DjDkFh1eyYHxZTuJ7MDP4MA2wIkg6T6FthOpLoj0caDyT3n/QgGC1RR4hypkM8ZqeIkafRM7ZPjDi4NS5yM0/jnykZj3ia54iiHiFxsanJeI5CpHu8Jy7573FCvTd+Dn2FegzbEznlVA/EymtUKWPOLwSyh8df4E1reULqr0qImeE6VAho1MTcR7HWKUVovIGvdLoLzeFEmpKnRcHLtNiq4VjWerWrML4Y0o3ZXKCdEn3C3fBV7sbfUC/wx/l7EUaxTSDFCpUD6KiswkLmv7OM93jWHv/uWs8BveBE0j5+IB1zTyi3jrIUk9LSSsUz/7AFYcvC63mPE/xkcsBD+JbJeEyYEjgwqbjMEuxhgx9PLzAU2TQFU8loDjGkRP3UDHWMJEiQXav0xzRScnOA94/fzne2fC+cIGiHCJtmhdkVmSppx8EnzT7aPZ/S2lnC5INdPq1BHYNSjuCKRJmtIfYAkd6tMnjdTe8BpCHUnrHlE0JsxULR4uXhkLUYw2qCv1LBKR9nIrkUA/y9c0kWhk3FMu83mdfY/5I7hN1fMtAs4mrOkliGo1C2gGQ9H+OLPFXFuPVS6eJmd334FQclQQNU7gFLHT/Ra9vcPuJaXp5y/PFG0Plq9KipNrFg8lzsAMGdm4xxrkYRoPqwxbwgRWuyHX4+J8c8v6k9CcEdd5xGhiwdbsCvdvFjQ5K4MiVw987A5B2jRhQUsNPi1L+hi7MGyKvcWG4rJ0Rudz5YMmHnZMaVI9s+/1gdn+lqtOidPzOv6kTeKGJ6OR9mkHYCZ8Xz0yGHFTj2LCvy/MY3Giq4/KDfeb/COEnGdQJJRtQd05MCdzA6Ls4wo/TdNt8KRhS9ij+OnXh08CnZ0pL8TVxjjp/cSXappdCbeU+h5C6uhklY3Fw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ca18f853-7347-4ad0-2477-08db00a69e67 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:39:42.7531 (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: cs3RFjNvXAxqIwAkW//TvpsRaJdS3l4ToNvGuQrfH5htKkg+nkk/vv3IYnPVduyuzvScXviANkfaTe2WXL82+A== 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 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: de1f8OExtlM3CVitqot1tHNhPyoypEwu X-Proofpoint-GUID: de1f8OExtlM3CVitqot1tHNhPyoypEwu 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 e3984389f8ef..fabe6cf10bd2 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -379,9 +379,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:39:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119385 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 404D2C38142 for ; Fri, 27 Jan 2023 20:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232979AbjA0Uku (ORCPT ); Fri, 27 Jan 2023 15:40:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231216AbjA0Ukh (ORCPT ); Fri, 27 Jan 2023 15:40:37 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91D831DB82; Fri, 27 Jan 2023 12:40:17 -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 30RESge3022484; Fri, 27 Jan 2023 20:39:49 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=CeCiDvFqoroZ+/6q+j2twNZ+6BumE63fnf6aTYkt65w=; b=L411uNlj+1juYsQAk55wz8K5+AcCno4hlJeTNxELeGamQm2YJvu31CVSCfkemKKfbqBA VQttQohBy4ezs0YFiTm1xkr8447DeYgSk9OuR+PgK4X8LEoOPeOVOGei6MYB6vr4P5PQ MsxPWXWZTqERAo0q1esqP/FNH4U4sctyWvhvFLFrti707bJruzZnvKrpH+19ANxe55SY lzeDXH9QZiINQEBv/mZs9iQ3MvWqIxJGUUkbQ0hRRQFeo64XfHoH+lBe2bX+xAO+rl/X M0tIu7WkYcqvMqLJxvgz7ATzBkoWF/pzohVEQwAdtQat6PkblY/l7OnoEySlaLnihgZp zw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n87ntdq9w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:49 +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 30RKFp5E037858; Fri, 27 Jan 2023 20:39:48 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2170.outbound.protection.outlook.com [104.47.55.170]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3n86g9pq3f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nfQev1BDTdQlxDizJiYVIjWuAoWlK6tvr6YcmE9ALxWMh6nyNSjlwfDhNXjh/ui1+A6TWmKU4alwePag+eQw6y566c1q06U24sv+rwRg5RIPFkvuieTEZCCaXsxbGaEsPyxEmG0TzFBiMw00+abFLTvbzZ+KDMXHdPI8HoN8rydKQ9sB16vk0eFqtKEbzsR4i8eP8+5fg6CEsdP2XM1dhPm7UcYrSPijNMsFmE51QfogssCtuRnpw8owCJewaugtzgLCQDQMAZBZyu2/lLEDaC5A3GowcWDQfNbxcYPT1Pjtlv1ce7edbvPH/GtZ6h/KXoRgOBgWfntWLmIOawH0iQ== 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=CeCiDvFqoroZ+/6q+j2twNZ+6BumE63fnf6aTYkt65w=; b=fac4J7f4rbsII/FrdHfiWm0ef0IH6Ck11+i+HBve0u/okC9LlQxWJdXZJI3CWLLBBHLJdkmL9tsGQ349JbYVEQaLnOnyy0LlEQp1Co4aJXY4rNXYni8xUvNXVxd/NSy4jd6+BCSbTh0R4C73CYzQ7Sq4XeDlheq4ULyZfgh8fUi98ND+aSgoz3wmd8MuzJ2l6Wiybi0SFmzvIq1+Fum92/oetHfpo9t6Xf88RKSP7KUE4UOtEFr46tuSbHCu73dP+hSPfG8DPbD9ounAX3GCIzN77l2i0ilCUQtWqznhhj2qQyJZSR97rzUmOwVWRuvjFXPFp8sFd5vcHMUIdaU2Tg== 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=CeCiDvFqoroZ+/6q+j2twNZ+6BumE63fnf6aTYkt65w=; b=LrcI95eg2pZ8sjR7o5G5OCCN3TSxEiFsdrGJf2fhMN9ZzKt6L3Ma3vGoNS9iE6DuV80N54AeHx1uto8+D92eGf2pVRQXCGaXGx9ZFlkLfSccZaKRVTsEyDgGcSshUrBzYLJA7jT2QVwaMPEl6s/gUd3zg0NgQO1+xUeOwK/qfJs= 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:39:46 +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:39:46 +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.10 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:39:26 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SJ0PR03CA0283.namprd03.prod.outlook.com (2603:10b6:a03:39e::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_|SJ0PR10MB4605:EE_ X-MS-Office365-Filtering-Correlation-Id: d0aab767-4531-4b5f-18ca-08db00a6a04b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Kmzr0DlKhgdEkrXA8n5kARgoMvnmXtkLNYw/98fizEB2uCcSY1xIkzhmApxcJmN7Iyu/drfyJAq+Tx7FNrXJj6nLKRM0Mm/WZPQOkjon0ZB7fNYptmZSW5DzYwbMfPSW8H61lnSVmZjC2vyd6takPa182hzCHKwK28PVVKyIsXr9ms0HYnwvQ/SSOD/yC/eeY9ZwUMHAWjD77NgJlSLeSfqvpSK6dRXPBW4NEwrx2g4OW7TQYuHjiqcnpUoHYDBI7WQf1ASYCOSis37ir3mhgpR1Vg8RF374UJDrelcIJA3Kw/1AbwWudCgauqjeNXvod0x4L0JEmiUzteTeHTRRzzmSl3QcyuisDPivolEdUc/qe366GhePBlNLP7ht1R2QEw5PI/cAm4TC5k+0aiaVdQXDu2wJ/MaNZfNlJLgG0D4KwhQ3xq9se45b1aYPPIfj6vlf5iBuyDa6KaKWXH8gOpzy71170+4HgODjo7ZfTgMui3zyRfsUMQG4vAqUyYHfPPcmUJiqkirrbf/8MSSea2vwSB8cWXNmq3PXhUe0G160Pu2Y/R8JXRaDVQihjskKPN1oqGeY+k+a10RoRTJeSrA50LDGy74tYYLsoOZWkdYkV6yXN7ES9jXwreJMRA6Eq8XNzrHMAzvyj1dpOkrhfcUXUrYn0+sA+TcVP2ikHgDqme5SFyYfNpCeGMweIaxrhWyIvBdCp0YVf9xmHqiUMQ== 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)(66899018)(54906003)(6506007)(6486002)(966005)(478600001)(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: yypb+3VO9CTQgCqhbe9clhskolaizucFOl5U6YlZsipUzlwKQBmf9ynAQtRwR+T7wyr2sRVGu96OMuMArR+IZ/X0tj/ftEwPkEb+UIV4jxM+KegPAaAiMZmf9okQix4MmGdWNvWSUMGxmzW0WAwCfeL6LtenOz227a+bjx/SA8M3sRl0aUhaMijtgnH+xOKeQxE5nyUyZjmSaLIsiOUnGEvp8N0Fax4h2+cCKhQc39L7uYxMSSReuCp4BvqlSsS32sZc1jeVR4ofn5Nat0cQUXPlNAtkh3jreA9Vv67chZtPt1zKCOygUzwulAzYnNYkqy+hJQR3uQME+QSAG3w7UCcPcJAhFh+nFUO/r3KK//QnO7MZs3lyFcRdr9XZqSzfaUfd2qZxQ/qAlofXqYawhI81IMEP4Yp3gxTMAmHQKU7Gx12SA2QQ6Vc9yhgOITV3ZCby05DiVwKK1kdLpnqw+m4trX/dunR7kHASeXydBQaRrq23VZbEeQTFkd4yxlKGyzuOXClC8hSVObU8zQ26vBwZAIEl+iMuKfDobp1MSF7h3HANe9L4B0ZqbvW/3ZrvTi71CY3Za/1P4fedgvq5E2nmCTf8QTfwczK2t3VoTDoLlxoJknuXrbLaJfuFB/MdphU/FBN4nw9evQ0et5D5cmIz6mMDMSHV1PmQJ36fR0P0oJSH86mtPN4AKfzf5OM5pSk9Ejjlq9D+IDnsUM/2PUbcOZMYcvCrC8M1rLsri6b3dHOYsfsMHfqy/1dp7OHEESsGD0ahkyDAsbPPA9c3nA93oJj1B8UKA8a0v8FVMJPgA8XJKq3VafhsiYUjpwj6zeNg4Y1LYskv6BjULBKN/itaKaZzGXe7Ljwj6R9YiWMja8GCI/pyLfmjBsBwAHUYVE4JAKQ+UtRa0TYB9RivJVOvUpx6+MpPRxdO1qZBXOLnGJnN05MrSejBix6l8bqczDbI55GfN59GY8gQfgoOWkic064Az/BgpjOTxeI/ZO3sB/1QLzUaXqoNIzTIXOpGT9SJEkCA+eDOzYIJb2GhvUn3pRjTAY2ftRzxft6MZRPK8wxIkI5P+SWnmcgqvommcXWOF+h2ky0KJuCDbpkpb6ceRMUj+CyTy3hNDl3AsXW6MzJniOJu1OCCI/LLaiWj5x+UctHDQRsSZTQvJLzjI4LuKsOxlHWQLNfvnUTee2KNYhefV9hUT24YFxcRWyZk3FHaatDKmAWSIOpgyopzqsu2zeOdVIrdTTL5Ah6y3pboiA5pX94fCwzqMupI0B1tVTDliVGFy7gtFeIPRicNHENO1VFWcCJku+u5hL++0TZycURY0VgC4a014lDNHpgG9u7e6/+BuaBQteKTLO4aNg8PZ3P+7FG/5C3yNGzS2LDEW9j5O3kEJF6Jd/j79QBnWDsH3md6K6GdqmAY8f0aHTCNjJlSNmj1/GYHP+LPsRZVRkfax75aTtSerH7F79LlRyt6vQdRHU5BZw6yrGFlcRbuSkNaLdDuUjrIIJyMzBfyvvcEXp3NACdCsjNUTZQMTGS0gFESu2UcjeHdhlFvnnppWkOou/FWfbTBFLg4O6/ajYu7qzXQFj2032VuGhoqtc1M86eywXwVaWjiSKnnnGsIYheQ5fYeN8aJl2RV1FU= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: T4cZxI0gUe7L26d9Msi1AOnQh46zXEXaQu0etPqsK2qEABch717AhdByxyPlVgN4h6MOqbDtYnx2kSFVke9p5Le68wJaTJx+55Ve3IIZd/7wQQzlPLqz4wfKpDfwg5AAsMl63FRy+EX7A2cQN8rLtpJQyN7fHTjDaZV+/5wkuSfCDaGM6uC0pGDpIwfUY3pYHYVi+Z+i8CLDmhqeW/enIhiqPL3bnaSj8nQ/qX6UMla3VLwaYGtHV0nxCT+ANezgH+mYQaIUh7cphTgc7NuNN/peDNvUeCuhn5FHt/RNu6Dkgx7HuhLKx/V4yYY3PuhAe1ZOrvTAc40oaj80rfrjVmSKdfoZkvgTcZ+V5eJuzlaV4OiIFn0R4ws/4Rz51wIOrT5oEgvjOzcKuzLZqv7Lh/GNojOWH2lLlOLVS8pPE7mWvU7Hht0/flA/85fUwT2yLBhzcUD78g8lS0FuCFd/0vchzRlo6svhbUS/jZGGrOmjf88kworWq61GVZirauHMwitfSCM/KBNzVf6asiJ2K8PYg6k0OPnC9FH0nAvBnNsJPbRtp93/r4AEACijiCTG44q53uCvZzueZq1RzyIDXpNTKMZ/5XcVEPAwsZEdkut1KdO2AqVdbdU0m6kLlb096t8KnsI8X69haDTjqT31g+a6kIdXEfLni/3F1ANPGlaZkuutjgj2eg0QYwG8riY+vXiC8Dwie3VbUZAnJlKzdWkd0o7LvUUah/d+1FK2QmU0lJoocLRiUchXYuPqfnWoAn+oa8VEvsShotJ0bUFsDFiIxtEz81iEkwQk5hObxu+IN8hQbLnb3Ja+IRKluYrIv+0Ii2ozYXzyiFzrbuYOwqyv5sjIGdxaUK8XAcbp3Cq4EVtvG9G5GKAPbXa+X1+Niy8s0rhCvRtcJeX2v8PTLNGUOwev1z38ZWpr55At4A6B/LhL+7bbFsGXJGV4lLQfpZD/Wsh2prearWzjFReZ4ExkYkpS7BSXiuJKGq0Zfq+9HDpL1+uLwR8m1YOC6CCj6DuBLxzE2bti+1XM6izYlizbmBcdCLDugAKgPBvnYFxz0IFcNhUOo6qSSuLFjsAimERbWW0ZUcz2d0cYqMrLOw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0aab767-4531-4b5f-18ca-08db00a6a04b 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:39:45.9091 (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: JTglB7pTZZCPEg7mYoQJY+mEZa0b61KBJ1ft2yzHG/qMrMMwU3jfsfSz+2gRg9bd8goArm5Zvo+8cXqLdO+Gzg== 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 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-ORIG-GUID: LfMlQqGsXXVMFaImiGg5k6AlgAm_Yl_F X-Proofpoint-GUID: LfMlQqGsXXVMFaImiGg5k6AlgAm_Yl_F 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 9505bdb0aa54..137c805d6896 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 +#define RUNTIME_DISCARD_EXIT + #define EMITS_PT_NOTE #include From patchwork Fri Jan 27 20:39:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119380 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 9B8E1C61DA4 for ; Fri, 27 Jan 2023 20:40:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231956AbjA0UkC (ORCPT ); Fri, 27 Jan 2023 15:40:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231898AbjA0UkB (ORCPT ); Fri, 27 Jan 2023 15:40:01 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F29BA2116; Fri, 27 Jan 2023 12:39:59 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30REScOC005521; Fri, 27 Jan 2023 20:39: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=liGK6Cfe7R3hLz9yjT29KaP2fem8h5ZkQP1LS4op+YU=; b=iwb2TKLJPa/k4adKBS7hJ3cPQII295JdbdYJ5AxIiOnxLvrxMRAEX5fT1B/OTfu1ej6I Qz3Z1Az0jT7PtGx3IWpVjjSsog1ww4/ehOcl4iXhqchyS9u+heI2qZDQUgfARPrPreq1 XLYjFVa/VnY/H0yiLXOBXTxPbU8UYq8ZJLA3VtOffLWGgQoigXNoUPMw6vPuWptQCgUB 4eZNpnO3ADvzCFO0VFpe5KC32cLtqAyac1wrKUQOJRGs/BfgmF3K8feF2wX6YtmJQ7NH iwSkOuGD9Gg/o4cBess8h1T/T0yM82TV1/Cgwiypy0EqoYEEXYj5GI+8hemH+LzGSO85 YQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n86u35rbq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:51 +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 30RKIs3G004965; Fri, 27 Jan 2023 20:39:50 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n86ggjdwe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jan 2023 20:39:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RiVoE0nZsWJMgHdIu/Mmib2Y3Tcvw7uLCGAvb1KUd316t/rUQFabsNzmKQ9n+NfK/4oqESMHo3UyHFjE8GE358rrQtkl+OJWtrou87D63GFuUfVYzE6ziZqOzZYciFiImup5spwuJFUXA0Gqdvf3nQW23ZI0iGgflbKZjjjeiDo3EIxwgqobaeDzgFUY/jSZOG9e/NyMNjKYrE7x/eaGnfJO9XXqB6KYRV4NjFEoXm6JYZb/DvcSWzGWyRISTi/f4mrBBlthICi9k/giUDuxW6BrvDGvWQA5PzBXbkaG9vDAy4CNlFjVto0wk93RnALgD5/YEIUrNm/TIvrW5siCLA== 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=eYSJqMhSYUH/IwbJpB6u0o0PmIT8E+iGbEyRDmq4a54X05Iaz/9Q7EJLTdhC85XZHW8Bdzm5weI23SDnpMjiKjbh74NwKPuD7IryFxUxYHBlRwL4qOMXJXEJpJAT07Y1DUY9+iOq4PxI6AeHDQr1QkkDT7IA2Y8zzt2EGukPGPlwZ7v68VBztB4M/gCM9cAtiJVswymTTcVw/HOeN1IUi7GEo1ZEM3NyJCakdDMCxPbMmH4gKODhMAm/aOwWJ49ziobdHNoWLaUb4gNizZAAMga6t5f7KHo6c7v/LXRq9akPE8CyxUtOIQRo/PC+0H58hxVVQRo0tWLF3MNpN8yJKQ== 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=IWWt5l9c/MpnFniD4SaqoSx1H+j//njhubZ/lVsaQXXn32IkW3B8/+zQJK3GZREPeiD5ZHVKPauCrjHHN7HrjD8j2xnKJ8lJEm119DK4NAEHeRSnFWDrUGZx8tXe45G1TxlWViciBTumXH+DDttXBZ+agH9erRaS7sCRkVOwqJw= 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:39:49 +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:39:49 +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.10 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT Date: Fri, 27 Jan 2023 13:39:27 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: BYAPR01CA0050.prod.exchangelabs.com (2603:10b6:a03:94::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_|SJ0PR10MB4605:EE_ X-MS-Office365-Filtering-Correlation-Id: 5534f1c0-ba9e-43c9-4682-08db00a6a249 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hjXmw/yRFbeXiIQ5siXhNJU+6dT1fH0q+BC0FAhJdgPYQPe0WFR/bJRi1BLotOxw2kogvtyChGUsR1csOmYvlEY1LEi8tNSX9aI598R5cZrYm74eokPoRfKBhGzW4EES/IhN0lMN2szjmHgHqUZMamzSAczkE1HKBihyUqNcaM76Tm2AnmgIVL6/WYi6GvwZ9EGN0u0/tKd1qZc+fLO/z3IadbAVylkuidXs5CmIzeNxWmLVLQPo7UKscWnUyXMUs4s7J1vtUhi+ejzGFsfC5H4xueI328X5a2oN3zz2pXpX04EGV/4wl6kt0SUVe0R3ZtKLPCbE7pQxfvpqAmDjZZ2S7PiebAP2u7Qt3wpAqQBEgy2YFvBpfow00Z2GIbb+OtJ6urRz70FLq1j0eHn+OLAcF2ul/kfkTpm1s+L53EWW6AFyxDeL9a3/uVfzF7Y1GdiRLh4m0wKNwC2JAxeUm3zP1U6nQdxnwVr44JF6vCJ8BNfe/jKzc/T3A3Cx5S3qzLcB9ALiYy6oZA6hMGl+3yV6PVIWTncGXvscWR88m9CUGXljj4Vlqzf5cbuEJAd4zxKSXJGxRMGkA8Y52AaUTKIqT5JZYQgkHBQncjDoUS2E8aBED4ZBVTSQKR2+PPoBbGeJEi0VZ34CtrLM8FYkw28PS7EsuiYUTNWo9CqXCt4trBSN2SBa5rcDSdNC4Z1APxS8V3ih/4LvOFRr6ViWlQ== 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)(66899018)(54906003)(6506007)(6486002)(966005)(478600001)(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: hNvBSM6+eQhsO+ZILwqm6kNSRVs++X6GPBgaDwQGQjDtmLaAgUkUGc3EWDn4I1EH5r/Jxve7u6cl+CwEbjn8Y0CrG4VjRUr+ES1NiKGols+ktxrrv5I9wTRdNEg/VXrjmBqSMnzhfxLxLGWanxOBvHsk2DCHv1DnqdC0ZJAlfGj0m6C8IUDDVUKhf1GOHE+F8vQ1f8mOEyXCvvUVPwZ38FquUhEfZqyHYGNzI8uyej0l/rNawkiY39d9/iyW/6M2b8Cho+i8d+qXMtV6pDEyzL/9yOaomKLo73hPQ6iz54aao4iPoDx0v+8ZuG7j2gaLoZG3383m30hG94rKNM9V/hkaPSwf26EuvgpyaeD+5/uC1o3MPAl+dldiUVJ7zvJeC2nEIe2mZ5UDBCGihu0WR51NsDzeP2Tam54iMqT3DNCLDb6OCvgK2h+8YB2w572DV1x7/XavBCNlExYLjl7dOJMPlLR95q9VBv4vLG2BlxIshnbqwxGl+KOt4lFgMFsChRlZTpgd7Jt2ZI6JBmd0Hcam+yp7+rLSB/ie4ZyGB0tuJMUmlE8yZUYHH7kFlaDFE/dXHuhA71P+hv7LzTu+dmq30eSB5ek0Ak4gWdu/dVYrIMLKPjERtnoNHYq66FV/+8gQpMsjhdPVAzDo8fQt0TQdtI0eInc/YCKeNe1VYwz2bzKNvH1QlLCVWxZ8W9QYFR35FfIlcfuyMBZzmLOEcxZGJVZ7DrmDQzQimp184astG6fm1lhsVfFh4Z0VRpokL2xXhijE4ZMei3aI1Afh/ap5I2a0P01+YdycZFtg9OdoVy8zxVtNEqgnTdvBIThy/2/1AKOYmeqUK//8wa2srm/pTQ4qCxbTAkCCBMJm7t2eOijKfqrgvZjlNK/dlCnA1a+S1mAMdiKVA28It1dYQhePkg174u5n50Tt89XVN2glLAPIJzVJOHXlHrClP4XRlkPLZHN3cHRXdB8Ol63lzj03WlJVJr2C5BTfCJQaboOxnsn23vQEdEq3yUztOnfXrz7qB2I1JlY6nLYPAbNDa9uWJ4g7LQOLYTNiOGjm+t3wVHE+YCglNVxpWFf1UlwPOIUfUWd1X2UU/Y5jfs41xM6ELUalbEXdpj53itB4J8HQBSvmIU5dGUS5gcFx3aEBPc1ZzmCKemm5xaBwwgM+jgJ2v0/4VDAsm0WKF4o4+aFQSRhIPuMLal+gXJtP+uLGHHdNuxoKb/+j469KH0W/tTYijIlzJVh3I9EuVAhN3Jl9mwY5t6weJqCM1wTVAaWRj9nMgrKsO3xP5LrKZkOEubAqP47fT+rHfSEiT1Pn1s5sh2wAtRanfR9XI7u+HSXMQXHRpQW9F9KRICS0GneAXxc2YTIUmFCyxob/7qZTCvIrgRW2ECVhQHYcjrB7KO59rS4MF9oVd2GEvqsF2T+KNK5Gd9m83i19K53AtNN49h/CECSj68p6njwlWFX1H0O957zVvpPDvc8GVev+QTO+WZFIPYvjJPg3LBAOfZQgE9A6C+v+JyqFI/MReNgikhII5Crq67u/WrkEZSOhPLRk+/RmieEd8D6cZPKt+r0KUH51n/TmmjVULKD6zy1D0Efl92UNunZbHVOMo3yDIriYh/4boJeTGNkG6LTHSou54SE= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CCmNCmEmsz4vl7FYnfsZzCyVmJG/g8JNSu/0saezVLN0X0YYFZ8iwQq6blgvFp7RpuFvrtJXkQ0O5bO28h1QFeA6v6luhZpnBcA5Cut/hvLe6oo17A7EFbAsZso5Hc9d9Y0LqU4MzT5WjdELbabtBCq07nlHuEvg0JQL7bxHUX2aT78T3KT739LECe21Htp4sjrtLEZeB/KPAD7MDt6bHauMJfM7IiGqEcnP+EqUSHbTiSpxkey4Po2TDVipyfpzNEehXYUt4/gmpEUtT//yv2gc8ZWE8nZI5MNQ8nV1xeA/YiS1yfDZH+R+uqRaHpI1naac365x+gSmrdpOVexfncNq+c9f4d/v5FJTrGW4w+wIp5QcxFJubFz5o5E3bf29Recoh8tXxDf70R8vCFrURCyFsK7uoXwE8zyDBF6aPYcZfxpGXSwcVHdxxqLDHxhLY7Q5E8MWvM1c2EgpNNqC3ymw/wxtynTblPn2PnFosWovk6iyJSG9yS9CCEpYj/vCBqxgUDkpfvWc1yQQBAyz520vd+Lo6N8NADVv5WKxylsl5QKPwzn1c7OfyJJgsLUDkIhGh1FKKOdHK15Hsl20f1f/3HoFNJyJod5wLHgyPKQIbqALuaDPD9lft/DAtFE8kGCB8pZ5hNR0V6hc0i9YW9eFXsBD8cvv9JB4jevSjL0HPd1sA/oxWrmCJQDiPpVC08FZTmPp0ONybRJdS9r79slp4/wCPRy/3Xhexwm9cIFIlCy6QLmj3AXe72JPqSh6aAMS60uA5Y+N/blNFGRM3fPvIgM9k00739Dc2JHj6q0iUpyizQl6nsN/KOCsAbApXkL3Fr3v01xdongcLlbMqrPs76fxb3QEbE0+lyQ/UOTO0kOwl9SxWBe3pSjhYGlXXwEF3km+wiFgu/LoophKxSfD49f/gK6OhiopW+BU5LOYAfAh2+OL4nWCMyt+KKoOfq5Cy/P8glURbs5KzLHnRaa8P8+XAuQSKc9NK2m4aO6F8wB9rwrvu7wMvSlaGJ4kv1Qq6lwsVaouueZmr5NBFTy/+T694t8qcyU7Y8rZvifvtniCRx6484at8goyoL4nPayhOVm4s0KmBIzcGWi0QA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5534f1c0-ba9e-43c9-4682-08db00a6a249 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:39:49.2526 (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: 4WU3eqAavS6pgXzHlZzjf8U3aUhhMYyuEqbD5OOzUMPfv6Ih8OEBouzPTgy8zQ1MTXuekszSEPaPMEKUufjkIg== 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 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: t852A3SWCFGKr3eLB_omL9xVhnUAM6Hu X-Proofpoint-ORIG-GUID: t852A3SWCFGKr3eLB_omL9xVhnUAM6Hu 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