From patchwork Sat Jan 28 04:10:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119654 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 CA406C636CC for ; Sat, 28 Jan 2023 04:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232574AbjA1ELO (ORCPT ); Fri, 27 Jan 2023 23:11:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbjA1ELK (ORCPT ); Fri, 27 Jan 2023 23:11:10 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E62F7C310; Fri, 27 Jan 2023 20:11:08 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30S3Nxaj007751; Sat, 28 Jan 2023 04:10:35 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=mHh23EwbHtTCjdAD6V+MUBygjOeY1qmSVswxlKOVqmk=; b=dBx4wdsDROELNoLpnPcesDiUurpVClv7MS7zzs1Z8cfY/MPllspcu9vtFueaxA9EGyj7 BuwHg7KBKkaCrtpASkEoLED7HXA8LvP3+KASPB33mj/JDNBC8/ThRJh0e+zD1lBg+sJw lgY3l8RVq5MBj+wijN+aTxvuW8OPPJ/oIYdTJkQ6b+3h94c3ypuZc23zy4Oq31p4nKkH VrGhouQJLTfcdDhWOoUz290TI8t8OK6kuG0cFwrJe2pmk1pGBO9sat1d5N7Itr/79Be1 rUtvDyPUq+xa7HZ5U37g+ja2iNP4tKvLsEXrDVLLQvldbbKE97J0bmNjZ0qpWQcSu+Gq OQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncuka8156-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:35 +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 30S1XcXv007430; Sat, 28 Jan 2023 04:10:33 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3nct58u38b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KDfrCFdsJWw4+jfemY/UIXXEDdIbu1BnIXbog2UwR0LlVh0nHpMXMAWbJG/mnKWwU9cZQuN/SYGkSi3int/fmueLIrZXKJN4M3Y3zyc707zoPHGZZiXo9wp1JeMuwbwQjliHIZbKkFihUFjqVIhrINbR5rCdr7H/rRiyEBQGUWxF5ocRZ4UOIx8fRGbA/ynEOqQLPolJ6oBPtchpo/qLaiVpHNWBIVq/WW7XtIzfoZYIcd4IWUaaXj9jAGKfnCMsp+3Cgo8SK3Ym/9McO0ZN8bfmtQb2+0qC0Z3i4k6BLjNago2ZxIv9Q95S9TSMu1BgOPYlv0IyDImZ47H/2XPOvA== 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=mHh23EwbHtTCjdAD6V+MUBygjOeY1qmSVswxlKOVqmk=; b=Mxp7Llxr3DYh+a6Kg/6V+J6out470fB4+WVYcGX+yaNi3PmmSDkPVkaqSfl+Dn5llBVMng8u+skmVQMVBtmqo3zJv1YGxByjFhGHTXZt4T+ZABLD9c/GQ0mFyRAd2ZkC+1wNNdc+Y3xr3i9F5ARxNewqLfqxvybMuOhU51MJx12Ba5E46gjY5BTbu/xnsJoAxlW0Wk4S6DmOa480mctcfQ9Yqbjg8PhaMGflWlpAPXsMkRcGMW6zQV5xh158wXH7hkAVUqk0NUeFTlcxEouc3aGM0Anm1oxdOfUGGe9O/JSwNhS7xVZDixDhJHJQcrkTZweivXu3cc2uV6tSl7AYJg== 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=mHh23EwbHtTCjdAD6V+MUBygjOeY1qmSVswxlKOVqmk=; b=0GcQN1f/8RPg2Uu1XjQZQQqpyaTM0U15LxH15x2O91Hbrz8WKNMesbUtdRyHecsnqqu3UjSQhXuzV0HIWsEOUucceewMpEckZy7OmBZoRB0CFD0ImwBeqWsLAqjhPzV0qVeLovpbBn2zmguxSwiySuVvzesCuFbz9pmIoIiudc0= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CY8PR10MB7124.namprd10.prod.outlook.com (2603:10b6:930:75::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Sat, 28 Jan 2023 04:10:32 +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; Sat, 28 Jan 2023 04:10:31 +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 , Jisheng Zhang , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 6.1 fix build id for arm64 1/5] arch: fix broken BuildID for arm64 and riscv Date: Fri, 27 Jan 2023 21:10:18 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: BYAPR01CA0035.prod.exchangelabs.com (2603:10b6:a02:80::48) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CY8PR10MB7124:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c272355-ccee-4d54-f547-08db00e598f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iD3I8OstcqouhkTmjOJQAzYlfvwsfzpnYr+vfgtoE2h1ACAd5aPWISSPRh78SIwN7oti2AqFgCl9OdjRKfndGF/P6kaIATffMxjvA3+T8P04/e8J2v0TkBr6BOCw+C/D4EgtdC44OD0ZDbwDKrc1r2/bQdl1biZ1zXYAStkW/Uoth5+2N8zHgeRfqQnjuVZdif172i3R0Wd+WmgLiwjd/3ZfH7DlqfD7h0JyrJZ+jKugkrPWfI8TCv6Z2lkXeQVfZB+CHXBtM2DXdcVYKKQG76o/TObTC60rNcvnI791terh2bd9mbI/z4ZFYRFVXIuBAAoQlF5H3azAI9fHII7f9xamYYuuTuv7I5tjJ7LE9fbIlKmHGsMGTdHkOPfHz8P4ZD9V1PL37TxfqI7XMikSGIvRqg9sVSC35/Y09dYNTvm2FxhFCcsjJk1eEuWCPm52xoNGYBuciLLYBSiBnGEArkTcKAcx3E+/ZF3QuZDE3KFma56xn76vcH2Y9IsHoRA7oGXHcN6oLqE4GrcvCjrn/2AWH1EFZkSjvqS8nolsBZY0bn+ckz2HQiyqi5r6wpSF/YXsTpw2zGv3llSYmHJcVi6E/tpPAVQj5oSGR00cPI4xsq4LkHN0fOu7wzxMrOh1S4nP2aCDhm1MYjynfmeGrirlF5Btis95Gu7Oge1yfL4sb94HtYurlbJyrSzUvQtI X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(39860400002)(136003)(346002)(376002)(396003)(451199018)(6666004)(186003)(8936002)(6512007)(6506007)(7416002)(54906003)(5660300002)(2906002)(36756003)(44832011)(86362001)(966005)(6486002)(478600001)(316002)(6916009)(8676002)(66556008)(66946007)(4326008)(66476007)(83380400001)(41300700001)(2616005)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iBfQ42DKz5loCq7dg9jo6u4e708LCsEmC1KXV6k+vnOva+MaC+RCRRtzTECExlJdRz4DgrWF03lodoz+tP4uTvTNpqKBDMirbvFl4mcV0O2HwUWdzGh9K1YKIGfw/jU4fBwWo3neRIUFTwv2ZaE3rl7BojqK7WaC/ADLy9kO55DrpJ66C1pzEa/lOReaP9u/W21aZzHYLy6TC9KFM/76chrbpQ2oPaBegqoJuajxaIjWY3Lpm7hwRAczplndBkflpEguBJ7/AIi00t14N2hrFrGWsak5IVzVlSzQDVCmOJi8Z5n29cWyiGqJTEJXQxldrbS5jrGZ42qF5yTym/Y33VJHARrO11gtO0CYVaAWDB0thWWupfQV65IwgRagqn3FThTR5FUFFPVgmNw0Y/2Vcy+JUZ5MHPva43PlVXeKBTm/gzvAszBlRBt5mauoDb+kVRKohZJ68duw73VAAhhqIFBhrKSHCi+NH4PAz57flFZ0tTkWdNcpkDuiIONbNmCPiB3XAMb06VYhBlRsu2jdKqhi2KsYMAmBgBOeDaGTm60X9qDjJmcNLtvqCT3ZOlPxVQoW40KaXCw5mRWGuJtYJRH2QrF+2fDmPkVdLj4VU3aoAWYOi6/JIQfE5g1RE+xZLlx5GLtYMMS8XdymBN1HQW4YDMf7a1Afao7xkgzV+uhHSX91ru4+CXLO3ovbFvFKG8nK4xpgEl81JZDsJ+9KPQ9bnJbB2MWt1vJOfeJEag//TdnRSp3eWziv0Ob7dhL0+o5HkbYSRBRkfaQQBAbUAB7wqrvhZw+FZg/RioBwSveootedtLte3JQOVeTR74QSRYmqSUGPlB9jQBtSzaiWLAPS4PmOuvfg8HltGungNWl1/mnJuGNQmc6KFCw+lEkK8XYesh6/ymDTYCZEYGwta+YPHE1MWk8t8FuyRe8YQwy95PMAZs9w8nbU8kzCvSZXAbYcp0PiT6XR34JexpU+8y3uYEKM+665T2gkPS+AUNwf0jWr6lojKjZBtSEcVDiM10btwHVt+i5jFcO9Dut4n8f7YYpV33RC6/np25YZIJDIRaKsrwPgjNxPCXogQpZY1x0I5j3qqIr5q3P4SlUEeDMcIe/Orr8Ezmi+Vzv6FyUgc0BZmoFTBfpe/U+Jz03O+JVGKZ1t6D5VlijLDoV93zVcPYoh8QEJxzv/MWLha5mPPAKtnHoEMo60tba3SEjUdaBUmPhOJ+McERSv2h+MemMSKTJs0WyfspXb/VMa2tKEp4vCRHMhruIJuFQv0b9GTIHBIw0W5wVnb/4TOONcFN6eOH6LL518II1InCxEkKG/nk3usLxYw9v3LloPIkGAgP/kKipuBWcKIndTz5uJ9Gxib4TzFBgTccOs4p09R8PcFWisXAvwZtK/Q59MYynspvjvbLf0jU5lG2cITBXtfyqXl/woBGWoN0njesJfHIyx12TbEjPiIWeDT28WTcDin0Yep+fmxuMunEEwOfrDQ7NndUYkfH+6TzOoyQ2mOV/jOJIS5wuE8PTbcn36PqK4zvPS9VbDy/jSjD0ziAOKjNVQ8mzQo0zSAAakU5dW/bK65c8LMbh8Ym7uVjmkhIrkOuq488SidX+kdLTLieRR3b0ibQtvT8u3C9jdCZL84Lo= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mTVKk0RBrPFtwcPTHAa3rDGyuS5V8TYK/YG/h+keUnjjAl4CuhMtmk/NNTqgqr3rbtho2DOV6ZUYwAhMcnQVszEZnc1liIeSIX8auJtA9nNhnM+xgXqm4xYOrrj9cOJ3DiBBh94EE1V4TaR7Gv+4pnnQLDd0tqPdH1wAtsboMKJme6rhIKtKFZlFXOA59x9e5dTqY1Phg3UqASLAdrpw76Z9cP2FFLKqNIVzfcognie0D+T7EPT/jqSMjqXFXbzF0zIiD+tLDN2O2Ht141+MbYWRMVMrdI33X2PhHGs5N4AdHHuj7eNbodqrb7ACYHpR9xCNfKsKXOg3aSS7WSOMshwgBK3oieB6NPH6+Gaw7ViC41Q9vwUssjCgILDKu3HT+K5D2PLaNgxRjyzQYEPco9MQa9CQnCV4eA0CfXeHFTlFlqx/e8viT6J5b2XQBm+wX2aOq97MUoc5qq6T6tqFSqtUHM9UhNQN7MCO6C6TfP77pxvtg3j5Or0uBcnZQuVYMxLPEFarigiRIjmz/QxPnEvvZo8wBrM9pg++rHNV4ouW0ADEhFcruJYEEWupd/mawYRVfttlrJn00mZTemZPeNlzmkTulFfSuKapba9DmiO6GECEKPL8PmTnOor0FjnCyTvaYwzmKizJw0D8nkK3x+dKmUytq0QNGqr9gK8JfQ1PrTCD7LgQPRnQEI2bghAeNsfAgMH07FlJWJ7YH4fEkjrSohTzRaZHkoq4w7biiXaRZHeuhHOamvKpyAVgFn6RbJ32XksVBJvH2mQ+XRYfujJ4k0jmzDntszBoTlCT3tk0E11RkOS/gTjdoDNaG7S0O4Ts6TpXS8pR86mEqwwYuHZl68TNWtDx4CirLJlYOkrIiv7NxVeX+oYU/gb+m+fuo+77RjhcvjZbE2a7LjYh2lnC1jxMSOCycz+NjYqdyRjvtPONJSYEzsuDygl7kvCZMkProa2hle30TpdBcC45wGtxuqh9ean9k9rkTYrxwm+HLVis7ImVTd0rsrfGrd7T0+sAuLHpxd2orz1LkGHh37c3pYwytMVA/9W2JngMfzNtd2kQGYUnKLst8a8At1fHoPQ6KOkTe61IZoTXQDAOJQ== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c272355-ccee-4d54-f547-08db00e598f4 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:31.8789 (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: rZgJu9wOa56yfzCG1hDm/QuhINvB/AsBjPHYh4FmVEj2VRAav5CHqaQXr7xxHdvIN1Ehf3tVs+u5vSUGVYkhtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124 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-28_01,2023-01-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0 adultscore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301280039 X-Proofpoint-GUID: zIcIlSf0rT_JIOvorLnp4tIitX0Y1w1S X-Proofpoint-ORIG-GUID: zIcIlSf0rT_JIOvorLnp4tIitX0Y1w1S 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 3dc5824141cd..7ad6f51b3d91 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -929,7 +929,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 Sat Jan 28 04:10:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119653 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 EFBFAC636D0 for ; Sat, 28 Jan 2023 04:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232793AbjA1ELP (ORCPT ); Fri, 27 Jan 2023 23:11:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231951AbjA1ELN (ORCPT ); Fri, 27 Jan 2023 23:11:13 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 127C97BE5E; Fri, 27 Jan 2023 20:11:12 -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 30S2sdpk026779; Sat, 28 Jan 2023 04:10:39 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=vKB4CJNJx9rwiAfEtIpX8Saj+gc4wZsUrC4a0Kg3MCI=; b=Qn0JhDOUEkLN50Siv4XL7cza0CHN4DAEYlEzW5MOItF8QzdBiPIIXAzmT5j+ZlnJh8/k 4ww9OXGMQICZUUAjEd4c9W5F7zFOmcJLlAMX9OmrtlSODwFaqGMPgp9x7mWzxbMTBBo+ K0yCowrF4rJhzX+BDgv+b8aYhFoldLQ4YfM4vwzj5MIzkhpX+NxGWpfJ+qkFO0cR//Ue kBa1Ypi8SxErCVKnPy2i67DznpwaY2TM3Y6ZDBEi8WcdoeqH/lgo/lUgdBqo/xZ58xLO 3pQ5l37cGHgOsx/i/gAh4YajFVkmpA8aG5WlpixYuXwnsoXFSMetuZUXY93wbLlXfSlF Yw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncuat81h0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:38 +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 30S1XEm7019074; Sat, 28 Jan 2023 04:10:37 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2101.outbound.protection.outlook.com [104.47.58.101]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3nct52b27x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=INA2CJE6S24URYLUXUZGo1qZvTlQpor5wweL6Uk8Urj8MXSBG9gej9/7c1C9XgtFQqf/dmEzEhmBNCfNHg2fr56xfYzfogp2gWddcnIt2toL/nreUbljFLs/IFVs1RM5ohLjU3XlWJvxaY0NtydbWSoP6q00RAM7nLFJHrDeOrxlMpJZEklIaaDO8cQeGSMj8EQEbWiI+fI0eL20xxLbjqPKE8aeS8lGbpHDKqhAHFrtTUAKSgueifftEDI52pSI8YXaweGuMlmoXkDy8+kZLBqa29w5qUCdYDkLfI8xDrm+HoVJtLXknlxg25pC6XTAe8BFGugQaW2IyrD9sJ3rPg== 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=vKB4CJNJx9rwiAfEtIpX8Saj+gc4wZsUrC4a0Kg3MCI=; b=kaNeHz38hdqeQ2OpKURXtDwM6uNVn+V+CC+mK9taEU+d53J9XorWcooOvFKmCDtunyRdp+JL4YGOo7LN/seOIJhF4ZjWuJB5quYoY61IB2QX3sTLUlmj4YKREJS1SCjTEFu/xXbgp7sMxuYXxML/emsegnnbRONbY0uraz+zQQxOdEcBfLW0PK2Dv3OWg9YcjU1r0Ej0xLr337jP5hKLcfWMwlsWKcvnKHdcLRSS8OP4zUFhkr9NBAHGAgv86q03mNlmSHzk5RHFSNbMdZYZNLHka/iq3QVnHcS5KSm4b6cUsEkClfwmEeJ+2sNVQJSaxw6jvKj16jLpNROyKN1ORQ== 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=vKB4CJNJx9rwiAfEtIpX8Saj+gc4wZsUrC4a0Kg3MCI=; b=agCl7/aI2rsovvbn4Beong+NuGcWnKEEnJQ736bl6A2a2kVXu/v5Cji8azDkutUm0bvEAXw6cVVdLbvQLWjZxLT5+nawS3mZ/wV3gXL2/qGL2RN98SszO/f01xWFwG94T9h8NE5fxFkFzEgzY8CQjrUsZeddKKA2Qclfdjz4J+M= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CY8PR10MB7124.namprd10.prod.outlook.com (2603:10b6:930:75::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Sat, 28 Jan 2023 04:10:35 +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; Sat, 28 Jan 2023 04:10:34 +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 , Jisheng Zhang , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 6.1 fix build id for arm64 2/5] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT Date: Fri, 27 Jan 2023 21:10:19 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: BYAPR07CA0008.namprd07.prod.outlook.com (2603:10b6:a02:bc::21) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CY8PR10MB7124:EE_ X-MS-Office365-Filtering-Correlation-Id: 720f5e1a-ef8c-4a5b-b041-08db00e59abe X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SH91w9YfQsYTPmPpEX6COEFCrEUFDsLvPmQH3mMbv3C/kBMvbhoars7Jr5us9F3ikkWCvu4gPcM+E6YCzsW32lXAFhD5jzsykJvVYI21mAE77ayFtKClCC/R/ty6PLjORIhgBTyHwl5soG+GORDOn2m5o8fFK/QEwy4eG2fmm75j3JPUxwVecFfmtn9aKG/Y0as5J9Cvlz1ANrON9/qb/8yQT/P+NYetoI0Gx+pFafyO3DpTo+v2J5/YbFRmnyaRVeEytzVMxExL7s1mbtR6PXuscs5zuFchUYGovr7ob3fHarwH5xync4Lxli7mUynT2M+4g+3L+8HZHJm5ookeVde9OOjvJIiqKBQBp7Cce+ZGbIG01Bdkxh5JVW7/blORZvY4TPsJsrBTH8cg7MHjzeBkTTqfqIxTZzrP4StyvT7UIq96rBGojig8FOsnm+7f48+/WkmuGoILSG3daUhHk85CWJUT7PABYo53T6awClq/3ZwwISd6uL8PlTjZc8myrUUubvfg7JFV5Uv2ySim7wi922Y5PnexSw41qVjL58IMRDsMz+a0egkw8Cp0n7zbJqKiF1I3FtCFPHOHVYC06ULruevlVzk0yvVTn1zXe/1ZAD6LE/TuCmvx20HvJA1UaWeQIBoT7FvyJsQILmk+obqb6oyN/lYjMg34y4VB5aatpyLmPso+PwHUbSxsBgmAEXkCrD5dU5j9xhqToyW5Jg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(39860400002)(136003)(346002)(376002)(396003)(451199018)(6666004)(186003)(8936002)(6512007)(6506007)(7416002)(54906003)(5660300002)(2906002)(36756003)(44832011)(86362001)(966005)(6486002)(478600001)(316002)(6916009)(8676002)(66556008)(66946007)(4326008)(66476007)(41300700001)(2616005)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NltXa6NkSVp635s5CjXotGn87bh1MeeTLo1qSKKPAMcFzdrEI5H0XocXuFndSkvvJO6fM732hVB4lQtbOIedMkiXRJx+XSqjho6PfkuIJr33m7f32D6vjofSBef4Vjsh1vlnaLRKmxWHAxGVRkZRxBgYnUX0Dhc2+psjmjMWGOApZMIMRplGn32YzYkWn3FWQjgO0YKKRuxQfC5HieLuxCPn+lvyUBgdvdK6WSb6ps9gEDec6HrFSF+IMtkoK8n2TKTT+SsSSzVN2T2Q7PuAZbX5RewrwU3XQ7+bw0zmx+i6AyDgp0otuo+8IhfoMKWVOjcdK1JBo51tK7+iwI64wt/s7/HXjnOj0U58MHf5Zh676ox0BqCG/z3SjTS4alvOqGWclJmcoyyypMdalPhweW/VuWj6sfEkxQbLvI6M5hUmfWZFTzSWP8IKja9OBJNVMfGBav+RFi6pYnBAvFqlI9DURTaXcm4dcxqcOAkwtLZH2GZ6eAuTZA7WWBV7EZ9bfaxpqt13sZr9ugzJYy0wA09SUMLUDsovWXvY0xHkxtoOyz8+eqE001q7fRJgBNV9eH+lVNEz0ersCn020SYzCarlYnEMvpUwAYo4OFy1t/F71F3biKf0SNhV/TXPkiq6GcXvg9AEg9hexEDadHSdssrD3SnNMsG+64LSms7Gm10EB8urc4RhotDAzmUL8nLsTnLnVZQLkvzpepKc/PIJ+9KrnqapoaKyki4clP//6QeG37Nmn5e1WQ0e4oazE3Dnij+wn8ovuPH6/MUBytVXkqhiAWKz/zpTN4jpnm6wSIEZfr3P01Sbxt56wEQAexaieEB+juJIdaoZnwWC99lcvX7WbX8Q6XF/q9xhZfyy/Zk0S8W8DRc9+zNNvjqy2W1wnfNrCutNZxv6DezITyFsm3MxTWI8LsJia7X35bJI1xMOotji/tDaJVgJ/goUw3ZJv19//kBWCA/kxbNQkKOVppiou7ZEqn5ECehJDJKa4VvZBU8PshSdUkZOp54z/nh0tLZYL58Vv3YuEUpZpEAj7a7dVhvNa3fcBhwMGLDi/u7go2yVFbzOSmbk3UX76tYE1PLeGUQIdVONhtvo000Oh6YgraHs5j6+bTiEdzkUFw0/muObnBoqaxWDHgCPYXI5xF0hmEcExNCcXBCqKbVLHQysHSfN8IW7B7BhNso8oemwAv80tXb8O/nHAG0X6SzL6O16NJD4IRzimxoCnj24q0ibLFjTQD+Il3BQd506x8jldxmQYc47BtVKduVxef4GBH5l4vvVL3BnO5armLyjsqy7Wo2QcPdssGJvCWKTg4aRbHuNtESmNs/SBLNqlMjU1YtRfJTwmEuAHiGmsNA3+oW/uQpO7KKW8sb0O8fJ5wL+6QJk3AFapbJI4HFmApZ6IgV2CMsf9hWjD/haK52iSNwQLrT48T5i+fZvAjVIwCm2JIH83WeFBPI5cAijMmK8cJbcdoX0qvGarq9FIJEd6XEc+FnZOHFRG+0lYX/LG/RtjlkOHRYKxXPsPeJ5mH9Zs4tlJFFNmfO8KFDHnD8wWr37IAhFzPNTCwIAHgpw9PRK3S1LLLKpe1BaiS1p620yglEVTC6dpLYySW6SzgXRcwTQlMuGrPhI5hy+tOO71sw= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CJfFOmVEiFDx5BrGEqaJjra3Oi/US3GeEaRoNXP7jTwQW96CrpCR+YXG8Bag+I7w+cvFoG1AokljLcN/3IFCjRvXjdmG/MEI3ZRVbGil1HmcjI2j5jIGQVbMlt5ofSs/727DhbG84wvnH8T3uUiy9s8w297c/T69U4uKZmiXNjgZh28Tj31hLvHMf6DZP8+lHi/+MiYd9PmiL0613zjOQYxa+eo0bM3H+OWwIRHTu6FaLs7CTN4dGTPqLPzgNXY0KqyojFZkwPaIYy+a2G0joIjwQgVo/GcXC5sEPvD2t8iu+ZWndIgUqmJ5u4AydiCnW20eQVatnrrNoHHHzmZW7FDGyT13GQKTN6kF8l4U7x24RRS4RDPqFYDMkTW2vkE7UE4V+UspN5Bg27e2rNGXQ4Uy+eLLTiOkcvmc62dmABvcENdaxaZIJYyVmAD4NflmHmd41ZqHFB31Ji7QCRURC7Hq4DoA0SMANER0k+6xC3r5DcP+R8gPl2Cn7RGuoAwLbitNn1Z3xI+4tbL06HRP/q/uIlDhmM5KEkW4L+r1u8qDjuVX438qDaEkZ8ggPdhVP2WX2l/X3hl/muWged21ultH20U9VAv6G1KFc8m0UWdamAO896SAQPORlyyggqsXXmnOlBN2B6ndpA/LAzTsuFE8Il68d4306EH5G/Ks2SP8437rj4m2TkUl48ZVb/lQRKNgA+WauBvw02haRnZWlJv1A1LGZjLwOs1BKKiZ5o1Bzg4zzwBwDcIn8scshRwwyoALB/Ue6899aVWbk1oS65G0TCIuHDg+7aM5gymL/xjnUzCmf2+4NgHcmbfdTmo8I/0eTi5Smp805dpa7aF51YeDFXsoc9ezD+EIKG+SNOU7k/h0HYfbgjtX/7HO6E6URnUHNQ4wGd7T6FSy5GREMfC8W3PiExYohagb/KYd8poDOQQ09U4JpPlDXl9mdGJmNZc+zwRdsn1kgwoIbjpRcIv6ui2F6cTDmqOuuqikCRVaNkTihuXTVfFONirqH6Zyx7Dbm4yJiKdVw5S+FF6+2AdTIvMtSj8kp6JhbTwlGObmDel3mTnhkhDrhKc09eaP7ur3rBqfZB7FXBy+lPaE0A== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 720f5e1a-ef8c-4a5b-b041-08db00e59abe X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:34.8474 (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: 2AT38PMGXrB3iL2AAcYT4/Z0BdxRtriiKRt1EJYgJdwlViBe3qleyiTRcEDTBMZkqdYuy9YIuzngkRP5oCp5ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124 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-28_01,2023-01-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301280039 X-Proofpoint-ORIG-GUID: QbYqKjwBleZwFRpnw8YvU0sy3JnAtuIM X-Proofpoint-GUID: QbYqKjwBleZwFRpnw8YvU0sy3JnAtuIM 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 8c3862b4c259..b24b53134bad 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 Sat Jan 28 04:10:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119652 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 28D14C61D97 for ; Sat, 28 Jan 2023 04:11:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231938AbjA1ELN (ORCPT ); Fri, 27 Jan 2023 23:11:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbjA1ELK (ORCPT ); Fri, 27 Jan 2023 23:11:10 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02ECD7BE75; Fri, 27 Jan 2023 20:11:07 -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 30S3N6qF008293; Sat, 28 Jan 2023 04:10: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=SOR9L9S2gESsojG7jbWfxFEj2E1dBoIJl/TES8CchmM=; b=FknzWdCPUcilziS/q03rkQWzlI/HVmOojoJeishFTFimXh0veTnbU8Mupdol8d42oA9O sUtr1vduZlpS5cFd9SR+9RLaRkhK1KL6lAfmLpuemxj93UhFLVJ0wvA6IC4Hd2zl/RrP lY7R+EKuphFmo41dbaRRXAWpB/b3hpw8CRV940XaDujiXbQieHhL2HSkv7Eu4c2IVxhA 6/TGR42g1XWkxsjFvwmjNefefyVnXayDsW6Tk5MKQUd/Kq710n9BQFTOfNymhfIeWIz4 D6WVdDQkSvu6KUzVLq2hOJz1ePXPcTBCLn7IejERl973iOrp3X3BJYoqe9jzq38MgdGN dw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncurbr0w2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:40 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30S1XeYS037510; Sat, 28 Jan 2023 04:10:40 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3nct58u4g0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NTHh2RACIER7wiqsVHMRcJavsqD+7T64t5cSsnzRijQt/EvTw8BTf/l56FRoJ7XFxuWFO71OhblhUjkqpZUthZ1lSrRgmK+9Mq+nu1apMh+eLfmbcfSIQRMCq/CijUyevZ4F24cnrcwB+vVlZMVgAv2Ikj+JhTLguI7j495cTDfd3Vd3BRX1SX07M05VAB4uVU+UtIjCuEH92FcTJCwfVy/FHFhkzqCX70MWZNARkkIHgg99sKKU4egQxiDOmkemIHg1eBovJktvQWls9zgPTxJjNK2nAGmSYWo/NiCZpIQ7tcSNhnWJSIgyOXxWmMawN7ieKDmoKzt2ngDD51eLbw== 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=SOR9L9S2gESsojG7jbWfxFEj2E1dBoIJl/TES8CchmM=; b=HJBmRC+cABowUrnVz44joRyf5N6/oM+gH1IvsmK5FTa0PPIG/JJEEIHET57i2wQ8Ww+CsTT9Di19iTLbymWC4wJ/m/NA04QR2Sv/0xZ7uOv5rWnDEep5mOyrop/GwiDbH+9Dmzzkv+c55g5v7hL0g67OfZf69p94BDYghxZR1IAJ/OGtRVqymFKA33g2ekTmh4EzhztuH+v37AzBo/6vwjcKygT7KFq3Mx+fLVwsewNYA5g2s1UiXht7SxaPWEocjpWCLfZqEf+c6BcQYXoJi6/jeJC8D9mRxbK8qVOR6a99efEfO2LOrtkZJf7/S9vCvd5KiLt77RIHpPausIkJ2A== 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=SOR9L9S2gESsojG7jbWfxFEj2E1dBoIJl/TES8CchmM=; b=YphBwaXTahncoQU2kiKG3A/2P70J1/ECdih0moCo8Opo2UHN+uCRz3eYQJtSM/oGxy9t2h6Btvz5d3nhV8RpgoSUo1nNEpXBvoDQsAtWcEAbcoejSgZrrZpWVfGUofmAh0PDwq/7n/ionBQ/DZx/01QuMoe7qLtCV/o3ZxoJn8U= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CY8PR10MB7124.namprd10.prod.outlook.com (2603:10b6:930:75::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Sat, 28 Jan 2023 04:10:38 +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; Sat, 28 Jan 2023 04:10:38 +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 , Jisheng Zhang , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 6.1 fix build id for arm64 3/5] powerpc/vmlinux.lds: Don't discard .rela* for relocatable builds Date: Fri, 27 Jan 2023 21:10:20 -0700 Message-Id: <6e4db0d62b534dda21568c491dbf2e04dd9c6101.1674876902.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SA9PR03CA0006.namprd03.prod.outlook.com (2603:10b6:806:20::11) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CY8PR10MB7124:EE_ X-MS-Office365-Filtering-Correlation-Id: 056b9933-53ba-47c0-b90b-08db00e59c96 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /aiSN/cTogQtcLoU4Buwll5zVGRX0Q0kK79ut+0+L0ezrj14Gl4jBiorrX+rP3kwp3Izn0H8TIbQ36i5cfwzOf6Fex7iBx/idl7701zKnSoZB28kNfvK7XJr4Ap2HANCPvZLyR8CzbfHjPizvhJQ4JKP5vnFcaBlHRH/UKjlUgZdVredGT8B35zSYQmF6MTgelsssegSr5BdAX8lc5NJJs9VrsONFRRcxyure+tliNlfc7GvgkhzTO445mEKG/EA0u2qWsvznoCesnJHhKP2xEMk3gmd3Wrm5kRNu8OQMZey5GcWDzDjki7iy0lsY84vdM3+bRy2bWw1qS3G1i0E0uA0N5ElDLCpLdfrJzfrM+KExiUL6/EMEZuRJ0tf5e5tbKYZTq4lsMoT2QTzSrrksg5FdSgBwKWSKh5j3LX/DU1D4///01KPj+qh3kihdSGg+/GbuiJWzSFxjhws9KQjkpBGZNvWqHfFNrlVY7aQen/WUeg3YxPUT96ERKBmdk0d0mj34ohOFZ+XCbB0QNJ136wG9per6KMfc+KqHiEyxyI5hViZY98dgUhCYszIYJ9OUjc2QcLCJUmsgu75JFoLc+o5jf59AByATY5ujz2ag8bgibX68vH40v6cGJwh+dX6M8Q6e08NdW8F+3FPvhr0Vjbz8p3iTkUrzU40tiw0ACIUhJOgnu0pwGxX0xls57bD5rLpUtaYsTLHQdybszBxvw015oAl8Z2r3YD1YP54H2I= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(39860400002)(136003)(346002)(376002)(396003)(451199018)(6666004)(186003)(8936002)(6512007)(6506007)(7416002)(54906003)(5660300002)(2906002)(36756003)(44832011)(86362001)(966005)(6486002)(478600001)(316002)(6916009)(8676002)(66556008)(66946007)(4326008)(66476007)(83380400001)(41300700001)(2616005)(38100700002)(142923001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i1HqYHII5IjMnHF7BshHtU83iRsRonXdkVq3wBrwOgNCKmUQfUfpkQ4aOf58OPF8YRkiGCPs7dCx+K95ZDVC4solFtvZMyJHJoIBRPoIRUJWavz5Zy1KTTLn1gb5agKBkwbxCaEyvXzr8o3q8Ms8JCxey45DiyK3h05QLEiVZYrwqghzORCZkXWhkAUt076zkyi4ZkyEzmqWc0Qnux7ZK2IDckWvCc84O9xjFah+AfwO4DD2eHvPjNLNIpVr7l7Q2aRnlKJBJxSP6z9Okwkc/w+bZ9rlJwWyTfoga3TS2DXNn0yuXTuUNP6jAtw3dvHwvuuFF+clz3QZyDYtrj5sNCWWr+XMhDLdbhBHrXvGoXjZJLZpO5IlTB06WhEL2lzoO/CyzWqfdRNKbJuLcorRt5fwk8YFX1JCm+dIs/JQYtlD0CIBNU9Xe/8+FJesh/MQbApD/dta2iRNKKlUe9ROxBCwyivLyeEmYLJD7kmgpQHyzqoyPurB2Df+a4Lb6HHRwK92eHaMTFGWvTYFf0GNYNDAGb+er802EAQglLzMvPA7QcSQEJICdn++p8bnF5+Pe3OyQiy8ufE2x3z58X0JkNY4bsFN2p8IHoPkJMxFb15whcO6op0nzrS4V/7IqeI8AzOP+QbScG/flgmWG9GVdtzxvNqBYEBVpgA1KoXn864Nn+RjmCACSbsNDt8hGc2u9XjyyQwuNKH0213vK4JtMZoib+JKxrQkXSG+8gIo0mrVAOZa/UvOgzklLtxY+8qkPD9nrdotTmtYumdPEFVEuLCxrfUVcR0UqM5Xe7CjiAbFQes4kP1HMyd0qeJMaFBnzr5rez22YYaYfYP3Fm3jRByN/nnYV/vgr5UBc7XfteArlE7Iu9I8fW8eQ3UKeoitMOkhQ0Z4IzZhAqu6V6FWdxF0FrfYjS0erg6eZ5BTKEYWue2XMnMeI0MIAGhQO8VD/gsUv5cmaPQrrMmAHaCf6/HeNlo/9GL9dyBo2pgEw2B9LQWNBZgzGXsqL83pvbr0I7jbtVJCm8a40VBmI0O8dOXI5YNvGS4DCFDiL4tXOS1u9MvZhk2YolsKAsibpDYoJ7DLQZ5s5tpnIZFHPYvlEgIuy2+jHe5eh6ewanELmEoWzJdBRnqi7HXvULS6QoQjwTj/Wur40jIH7WqeGphhh8U+bVjch5AnKwge50GzFC1cQuIs+nfVsQV2kPmRwKGwLQw4SCxRY1LLQureQk66MOxLlY0lVhfhRLxxM7IoHPt/fGX7kPuJBJp28QGNEsVf2fK9nxTWQ4NDRrLWJQt1hzsccJcnPgaDogHcEIp8vK2l8mKwmLdvlCtE7CUxyISaJAcHaG8uDJ/eZCzPt3AmtGNhCWjxDrSO6HjEFCzduKh49Uuv5Il/aAxGBkyCT2F4f/jDotIzOHwGA22qYIgv56ULir8M2iB7HGirz2gnmZ3OP5E5GSDtfxq5Mf84ukugmVO/QtpesAKIvYwN1KWaDCn6MJYkoUftc1S2iHcXNngo3qjflGJbJXVqeqGrZwylqoXEaz6cSMintAWX8tEpeZ2ZF20keBcc5j0F5D9velzjZzngyy4MY4Nn9FL8x8ql6z7ORlXa7YMkPTLxwz7mDCjUXj/Xq0mK83j9XsJcuwU= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NdXEg7783tjr54VR7FHmJIYhZQAsYqJTi9R2eHMxeHfZpe3dyWo1f71y68VseoYyka7sKkx5x15CesX/QFNoWmTlpYBTf0QVfA2JmhgkThowCzrOb5e7k3q06vs8yEES15X3rF5vDdePc/82JJHYtUjgdwWCh7sU8GbkbKWIwwkB5PpevkPvrov6B9jTlslfTOBDlvXlrhxuVFdr8PfNYU7heN+GH3EPIiEbjqvoCnS99B7hhQ4D/V2flDMHT2Z1bveAfb1PbJ1Bxk3/zh1FZvPu1FKPPeUCK/vcYFZ+dKSlsweHIwuC4z/NtPhKfoUXSaXHtUYzRyXrt0HaE4I/3Tq0jDEeSKnRGFmYbvgZcZ8vyv76ujsXUJeWsWrR0vT25Sz39e03paXw3VEU+Fsc3OuqmuhH6GF5sAZnch8V2I4zrqJyriKOCC7c49H5OirLEbeJ0QF85d1YqP2c2cS2kxQPQohaGY89cpibJr8VsUt9AjH6pX7XZS7QqGJlVEWxmY6BBDGldVrdQsjKgHFWZeZCCzRjLN8AUzZeDGNhSjziqeU3kImbqKWagLq8kdULZdtNt6XS13oJg53jGifn6gtvqkbFJ37nE7LXH+S/ovu5bQORR1i98E+xSxoSX2YeZk8zzQ4m3KUQdEQD6sy2lh3PlMBMpRITgozHJ06qs+tdPdp0kp1GU/cqzJ3v5uJ/ackAU6dZ1K3ey4iJW2LkSUpy62vnDAGLxc8KOb9FJ4ymw/vgKgxBBJxdYDRiLYQc0bAl1Dojua6stRNxB5OyFBAZxgSr3NhRrElBEbKq+0zMu/aeSKPm1oT5ahZea36OMpAlNqrVmlEN/ctljzlQN/HtYmSoLwwo1Rt7so8lsNvK1fVY1mhvhR84sFSPDxJpXs+9Iv30H/b/MZjH5jLtfxSEvh5Qx/GHAUzSm3ptIJvi3mDD2Gwh/yxTk6CMJEvZnAC8RH+1GBmJ6Ph23A2VG+bL9MziHab0Qr99gRFj0L9UIV2y2S/0qqYTqsxzDa8ekE3sJhTy0u/7qSD40Mc9wH0xNh/9D50dQv96qDA4ja3Yj/PV1n+uvi5WfC8K8fJ1fISSHs9/MQb2yy7WCa+GJg== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 056b9933-53ba-47c0-b90b-08db00e59c96 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:37.9410 (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: vgffr2+egjezgc8LXTS7plEhnpPg8Rw5CANVLfhtOsT9V1dkhoE2tCq3wvF4dGGM7lYmiFEiCq7HTdtYV/PLzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124 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-28_01,2023-01-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 suspectscore=0 adultscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301280039 X-Proofpoint-GUID: iD-oaASsZi5x2XYr91dYRb93a4hHYe2c X-Proofpoint-ORIG-GUID: iD-oaASsZi5x2XYr91dYRb93a4hHYe2c 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 b24b53134bad..078ead9cf6d3 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -411,9 +411,12 @@ SECTIONS DISCARDS /DISCARD/ : { *(*.EMB.apuinfo) - *(.glink .iplt .plt .rela* .comment) + *(.glink .iplt .plt .comment) *(.gnu.version*) *(.gnu.attributes) *(.eh_frame) +#ifndef CONFIG_RELOCATABLE + *(.rela*) +#endif } } From patchwork Sat Jan 28 04:10:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119655 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 B7DE8C38142 for ; Sat, 28 Jan 2023 04:11:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233121AbjA1ELg (ORCPT ); Fri, 27 Jan 2023 23:11:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232878AbjA1ELP (ORCPT ); Fri, 27 Jan 2023 23:11:15 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA7237BE5E; Fri, 27 Jan 2023 20:11:13 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30S3COJp018126; Sat, 28 Jan 2023 04:10:44 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=PMJHbJUV9TsNLR1TxLp2Qc8kSGvFdolfal06baWnJ9M=; b=BwOwmEQ3vPq7H2k5L+ldVVNlGL8GDQX81Uc0xuSJBrckNxpIHXDuE5xZzligGjq2Z0zJ EuJOmduWTYpP3QGgrwO8et4sUXnl3wCVlljLxBVAleAU635j58AvP0qTceHHAcvJpHKM 6qG6Ppa3MsY6zZo5iKp/PWPL/E/nRS52hMQkw0bHYeusjUBvCQkqz+EuH3M/L3rj8d/J XKb8MGE1igyaLdNIWmPSIQwLSWXTZGIFHP0TmmWGVMiTjs/MJ4fIia4vxvQZhJbCViw2 GUTZkv0y5NsrtHgrIZV1jLGWIYExTmbc1yUmhvr/DTf5CsB3hZmjeyg03eWhONp2tN14 vQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ncuka8157-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:44 +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 30S1XAF1024972; Sat, 28 Jan 2023 04:10:43 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2106.outbound.protection.outlook.com [104.47.58.106]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3nct52b2rm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EkQixqObNmHl+AUJXfMydjdn8jHK69SKjyj+19mo4b3PoFsUis+DB9mjYkHKLDO1R6cjJngXDgJ2orD0lSSxvX63KwK6a3jhN+Zt92WaGOJ8mLQVNJ8uy9qhWTinBxJjCGaP/2eKR1SoEr6EE79EzUzEDTLPseJw+JLURTl48I2hb0lzF2D1nqtJmovo4AwMQkit7+PaaHnF+rxXnBiG67w9BVJzyWqeZymh3S85JVAF7CEVD0fSUo9lVH0tpgyHbK5q1pdqNxMPfMFlCRidl9HHzN+BfxdlVrBwww9PHidZOZ06jx7g4hCeN3YVG+GUHxmQ0Tr1A/yLash+OO8PpA== 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=PMJHbJUV9TsNLR1TxLp2Qc8kSGvFdolfal06baWnJ9M=; b=hOlBsstKXZYVAAqbvqXQsWx16lWE0pgh8cYPLGk5kv3Frg6+8wiVttgKKWP2ndQ1u9ams775Qko+GlhhqytkoM9AN+1YUDwKIyNu0aY1JJAIKvp61gAYRcHY8+Z5fFmCrafR4Sj7olBNMvERnDL1EuCpg7uN3AA2GvGY7KADlu06FxDcIRRVDvhbu3vPbOCar5BD6mxrkXNQEonD95hA+sVsvlp8+1HrI6r8h4THSRkmYdCk0jx7MIujHC956he/iR3F2NjB4Wxgx4dvrDQHlz6aiW7z2ir4BcMshs0QpQC1dPINQaoqoyqtufKZVcQ+gRGlJzEUAsGXviDii9T6fQ== 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=PMJHbJUV9TsNLR1TxLp2Qc8kSGvFdolfal06baWnJ9M=; b=X25hVZDq/Ya//r39ypNB8b0x3EYw3j6A9pqc5mte1C4oXDwqp5tQfw8mI8tQPJ+CkJtt5+nsbrSR/+tZRGbj4JMuWUkZvg3MFjZXobaNl9Nvmxh0BudT0RO/M9+1vD/ITrsGPe/Ah+242EY6jhX9aA7wA40x0kn/sGZSuRNIc+A= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CY8PR10MB7124.namprd10.prod.outlook.com (2603:10b6:930:75::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Sat, 28 Jan 2023 04:10:41 +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; Sat, 28 Jan 2023 04:10:41 +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 , Jisheng Zhang , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 6.1 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 21:10:21 -0700 Message-Id: <533aea4983992ceb623d012cde18410867f0878b.1674876902.git.tom.saeger@oracle.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SA9PR03CA0011.namprd03.prod.outlook.com (2603:10b6:806:20::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_|CY8PR10MB7124:EE_ X-MS-Office365-Filtering-Correlation-Id: 17f2c412-6643-46d5-2229-08db00e59e90 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ni1Xzv2KKc6EKM4JnW3stx9GTWavoGjKSUI3iKg6T7AMdQ7CqKXibTGt57qhHYEm1NKjo2KsLd+8P21vPvp018Y/MUXshcaQZOstvT/IociWCs+fWG/+tcPSeIkXCTuD1g/bjvfG0ohT43hfOs3aaHvorL7QRKrWYEmlu8vgRi4zmrHeRaE/f/QdiyIC455Uthm4dFjbSD2fDsxV2Hy2S9dy0MVnpNyDW8yLxsTgfNN2JYkUOrVegTPeTaKsG4QwEawng/4rLXkVSfTNvzu42ODHSyg5BKD5I4uGvk2ZZEJuDp7pXgK/9wLKgL1DzavwcRaVwBhUI5CHwSz5vRatsK8s9D1hN9vZFGLvB6K/V1z5bRo0qoFAG10NkWnNHPfxpcxrM6hvZRQv4ORU0pO59o8dF+J1SMjW+06PAQs/3Eoxxdpfrvg0umicNwpuPrPdDRyuqQbxHKNXP5rN4Ntosa/SbPkpBivdYghKvh/itM5gl/45ejuek683c012Q3yJaaHICwiS3KgXrF093/1sBEg4SLBdWCVWL/BQvHg9SXRAbEBaUUe9em5aa0XnaWl37JmJjm41qcpLTleighqcjVacZoY8WEr6TubyAuiSLrqIjaNOgTuj4gUjwo93xahURqLncuAEJaO+vRi1qoPkGP1QtYD8R031rmmDSrzeoEl3sXMTmUNrqv4RqEfHKeVx7QY9L4Ch6DyzZ8biJl5HGw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(39860400002)(136003)(346002)(376002)(396003)(451199018)(6666004)(186003)(8936002)(6512007)(6506007)(7416002)(54906003)(5660300002)(2906002)(36756003)(44832011)(86362001)(966005)(6486002)(478600001)(316002)(6916009)(8676002)(66556008)(66946007)(4326008)(66476007)(66899018)(41300700001)(2616005)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pRvPllddHArOOgl0adt0q/X/hN/OLsG0wc/Pr/Pm+x9x1mEZu7mVJZWcR9YycevsoK83BvvUcz7Tq0RhOpMZUab26s4MaMUwlJLAfhqZBUaKJeVagtHubqtAprtL6qtoxvv4jS9fmM9OB+NkWz9/OEVY0lD0Y2RxAsqtxFZye7lW0MhlTvrW1yktJa7OQnTfTIHwmQq/LIjRBF4vrS8/3axwEMRAsYh7nUgqWojt3S3DYWy5Suu6ICJ+M9f66LNAQTKDZHsBDhPsi5R00zEoTvcE/W0pdFB8DJdXXexrGF5u1QtS/ARC7omER/2lQgQSURSd7AzD7Knjf9LYf/TNw/nGqXnAKbpwF5gfVZoch4Bb+GdKnf7WG8X0iPyB9v8BGGz97MgjVYaBFKi8urvwgIGwbeaJAHM23MZegWbaRukK1TWA18kgu4SG7+CCmFezXcobXRaLR6Y9g3T9UwEKpHmVztuTdOzsrgLJDYE5ur12SJX4UvGvX2JOl2F3YMuqNzq9+sx/zTxOUM+XIe814Q7lY5FoaFi+IXpOGoD3epfYntHozVh0wH+EMnSwYnPz8W0yS2mh8az0KPrg3aFFArYLoaYlTv65Rnk964RMLTDZN26VhZmNWjJdywGHwVEiJsQP2PUFbpzUxK9kJFHZwQ+Cv300lN8g+NenKduduvuSBL9OGGmNtfqwNZ+hkllZxflm8Kou3ApxFjReGEX5LVkeo3fWymVndNfqQHVeXRv/iIWYeqAVD81hllxQrLM8APeZ5RljQ+PNhuZ2ySxdUvDQk5c8Cz8lGGzQiQAooO5PWDJPXr34NaFEMoXCcX1Jo4r5UeYzx94WvVsXpJ6gG0UiBC2LVK3/NrMsXZfZk+udBsHQh/XzODuhdWQql5LC35IL2ODV1BZtwddwI9kdAm8dKXq2mby5kQLzczPH3K+l0ak/Fn6HS9gNUE3CT2pRIemJhrM9VFE8e2LFdGZOlGBzfQPNW4lmt9wdIGDQlsRgrpTyLbAgjaXV/Cv9JvCfZOHDv88XWicPxoydRFa4xHPv/N7x0XUNpEozYJdK3cZlOC0/qlA4aecxO2Licc3/6Welvb+Qi+c49+/a48Z6+XwYHEWD5gFqcOWudCOrN+9JxBuE2atcZO2hU4855JlTkfw5mMWp9cBOSWtY1oCv5SWojHq+sU/CnlJNgo0ot1YNqNtM689tOTL1deP3rLLSS2tskrhGg/2Cg5kULuEZM1oTvBtyjSWQXflBVTT/l8WkRf2dVMprp9Dhg9z0Jjb1Rzk3S8JwgXPguEd3lQYMDwc6nAak/vmq1001qDmSAbnjw2H1+dUSv+l+XkjyB/pIKy+o1mRfvgYlE8U+wW5VvV4sy16cV3oZS5NYIRP7dtfr+Mdf9XzK/h302gRgaRLSvZqEKGQU29W0PvvVpHTzSfoXW8SYhdJ9al89pxTr0Gj/S7ekSybYz6aPOLrWSuZYe6z/0neeAGLUqujEsm7EyJyBECqaEj859lm93AWs0oKdDDInV+0DteC4bO5dyNI8sqPhTDLnpzz1ih05IBfKMEmhcmg6VCajnzgel+KGoZzmNYgM5zxYaSmpuieb7mUgAVltKz6xQO0BG/IroiHp0Vij8aGkTG97kYvA6MvMsKY= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6ls+sacQ8SL0PEfW9kjctYDdD5J6t/FoEBePLEu6s0jE8AF/DEkzjxWeU78+FcvXHrBKGWZhuXwWorGtuD9U/YnD1socbB/5lnjZdel2E9DgvxC26hv8jVaBT8jvV4k3LmTIlZTKuWWfwIqGTqo8hP4LDrGe/DLBjJuqYK6XuGC5Lrd8X4AQaTH9eQHeVonQDYj+keJiXR0LbX91o4+/iyPGo+DYIcd5eyueHPMhASIwSgcU9AJUYNxfyUZBqYbrPX65FBR344aT+DcT3z9VMO9icfmO6V9l5umxzjVPl9uSTfDUYWtaIcxh69c1Its8cLqpf0qmfr3pAlPJV6uIh0MFvyeA9EGBJ5jmj+Zwbv4SOA5Z8bPJwYZuSM2/4ddOFKEJLuivCddxnj2LyBPttZ64DIR+njpR9xRl6Hnwju6yxeBO6TIuCt5mSGCNY7fWYkMHdM5mDfM44TxIW6UH87d5NSWryDIDNEHO9+yBEhmk4tDs6P36YlPpFpQ3erxWr0PKV/FRCwo7DVSzshKdUSnMYS9oS15Oz06iVad2ENZeF++Bp/N74M1F//0tLUpTKq4Hbav91qUcx64AgF2HFhKfwUvPo1qXy7zvUZ9pvre7JD+bGEM4D7iqEoB9vRpJysahg9WShG0MHneVSMQVBvX8rrtnkx2XDYMpmox0DrUgKPhApeDONVjb52yGeB7j7H+njUF7anH4qHC5glg7lH/EmhNkeJ1s1d7B1rRQoWe6g7pQZh0Duui3aobOFweWPmn9EEHARBqWzESeLCcG5FUVRzIcTYC884uayKfc6pDruhQBya6jdheTbOM4YTtPHA4s02Ic1nXWAB2a3thuRpPkAJdzeQH8f0b2sGMY2biadwhNXeGvxgFxFcdwojre6hbF3EtmrIOloyuM2io39rs0r50tvxH4rCATLLFQCrKVNthQm1IrkVCaX3W7G8La+lGg08xepgoK9dkYJ057x1UIbKG/Sq60PSYqGpcCb72Vy+8mNfnvODgEh2Q6HzOm9g8ny0F26PbyrUgFjiHfQptraJI2lut2TD4jLeAQMcXDTy6solpoqaxvs2JYI8EDH0JhoRScyqzGSzF6Xo1iLw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 17f2c412-6643-46d5-2229-08db00e59e90 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:41.2376 (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: pRYAkYwQrlJdUDaG3BI5Nalqh8a7+Rtht8bV6vaR4Q7zGM51oZHLPFJv7RBjvXWrnQ3dhFehEBmSxzuemxySzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124 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-28_01,2023-01-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301280039 X-Proofpoint-GUID: qkjyVUIni74klMffuIRpR5CHLtEonpd2 X-Proofpoint-ORIG-GUID: qkjyVUIni74klMffuIRpR5CHLtEonpd2 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 5ea3830af0cc..6e101e6f499d 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 Sat Jan 28 04:10:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Saeger X-Patchwork-Id: 13119656 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 90AB7C61D97 for ; Sat, 28 Jan 2023 04:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233210AbjA1ELi (ORCPT ); Fri, 27 Jan 2023 23:11:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232947AbjA1ELR (ORCPT ); Fri, 27 Jan 2023 23:11:17 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570B47C33D; Fri, 27 Jan 2023 20:11:14 -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 30S1XKLI008330; Sat, 28 Jan 2023 04:10:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=liGK6Cfe7R3hLz9yjT29KaP2fem8h5ZkQP1LS4op+YU=; b=Wnrm6d8KZNWEGRLKXWvzNhzdfzjBduvIWOq6HWCeVLlDGn0dCAxnIK8vG+RuqHyLX0z6 upF03A/bdJxUEazq88MBdFh6nyJIS7aR8QpINl2pNX7cxYQsKjGgI+zd5VnvOYLhIV5Z LiNn2o7Kt+sq6TUJEhJuOspp20cRkXSYPpOhBpU0DFFbQiGngUkZy6GF/Kbv2whMqvQ5 oqacAMYe6XHjOlVYAOb7FiqaFilAzJWd6+VFMoI0qgEKLvBZ7WPEbkhuaW8e14y7APtn d+6mkoQUFbjAEj4B7vv0SL7yQ3pmTliSMR9ed5hSk8nJKz+wcExQaNsbt9bQm8tfltmI 9A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3nct4d03ae-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:47 +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 30S1XEmA019074; Sat, 28 Jan 2023 04:10:46 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3nct52b29q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2023 04:10:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iGeghwGJXBMzYzzkQMdPmkNjmFFs8kj0eoZ9PmK6oci+adEgplVNsMQNhtTNNy8apyyTooqAh+NugmX70xZv1Fqbriqjf9MG1tvyMjLaLSOdePivDMZkrxL9wfmXES8ytnr2w/KKuTCe1yTyhreoGzCSPS+GyWv5stkkMpFkkitTSW0Tavc8wRtkbhricJg+Gv1vvRA8vTxNmFejo1u0u1iBMbyR3TzRQwo6nvqRFCAsBnQUupWbNQ9PsLSY/mcDtJGFN/X2WS+m3KvCXhxM0vo0sqpcMWtGKgsm1FUBw7QtTTnYk8QRKYW7jvSmMH4n7SK7ZYt4CB5OAp1L6CPfcg== 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=eSGmJWApkJF//4cniE5tN/aeycLkncaCJIazs5KDSycsaWvshxgbmTh+Yyn7S48iqZ+IGL83Ue3VnMuoqZvvZ4Hbuz8CzQNlmKDUNS3ka3kxE/rFN67Z/cMsTxoTxwTcxE2rADIzUqr4PZRCu2z+OxhW4+WQTkkPolqW0NO1BsmjQs4ejQU9+fbkdC3P/S1IEvCrHzuUmOvMgwxjd8lJAq8RtOjdCBXNnQMIElXFxPs8kReQcr+suVMHNSGDeQtznVLR/Iu+RTIs/CP67RvVokqf4qJkMkERIjiBgt9iUEBybDz5w8UauWJgXmSeWkZDxkskbxhmaJM9BflY78Mrgw== 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=IQMI+Nzxl1C/W+u0fKk44q7X0GmWrZKNX6sILDx2Hl8FJIfBbj/uqIb2+J4zu/AQJ7M68L604dBNdHHMKM3TaYUPU4pIaXjRcYapRd6Pdfr1NDMsxIK7ZoswfkZyYyAlSarWMYvyMCMEwh4uL4c2+mt8L7+TrrSaWFuvBdIZDNw= Received: from BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) by CY8PR10MB7124.namprd10.prod.outlook.com (2603:10b6:930:75::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.22; Sat, 28 Jan 2023 04:10:44 +0000 Received: from BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d]) by BY5PR10MB3794.namprd10.prod.outlook.com ([fe80::f37e:ad45:7d9e:d84d%6]) with mapi id 15.20.6043.022; Sat, 28 Jan 2023 04:10:44 +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 , Jisheng Zhang , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , Tom Saeger , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: [PATCH 6.1 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT Date: Fri, 27 Jan 2023 21:10:22 -0700 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: X-ClientProxiedBy: SA9PR03CA0009.namprd03.prod.outlook.com (2603:10b6:806:20::14) To BY5PR10MB3794.namprd10.prod.outlook.com (2603:10b6:a03:1b2::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY5PR10MB3794:EE_|CY8PR10MB7124:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a4ff290-17e4-468c-6661-08db00e5a063 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J4IJThHhD3NXQBL+Xp7Cat4ur26Ad61jOwqPU97svN16zFATStxOseejqDFgfED7B2N1+d0URkGFICOxJZGb+IOKcL9q1C/91gfojL2PkhXZ5XeAgUFSWv7vCvGG4JcI1AMpOYRiuvWEbasAX5NsNTOdcT3YJ7jCvjysS5xbFdrFagu8gDF0bnJLlHG/8Lb97Ik8CYBgQp0gu7kEv7+8Hcw8SVYEbvgaIi2nNY5I3QhhmujEy8QcnPsLwi1tNKwN04+K+4tyk/pRhGFyJoOw/c43Dv9y/z4lrwIo9ds1vv9uV7zmCBbCCTTQERZCNxMKOJB58T1w+dB37TCEj1zXmfW99XCeTO+rUjaygVi0BTeAiv8hafPqqhtkgUkNBB/8ETXGme0AAenCKuP6X0odcznV/TuFAzvq0vD1cRJPLSS5gr9Gh7x1qjg7JwoWFw08YO17R8H02HlM3KmNLVtRusUWRzAfe4W6ndMC8/rtrk31Xv3mPpWogt4GXp0AQj9DVsHPvFF9vJrdFT3F/tOqnPQQIidUflwLlt98+9SQ4zsJCPhIdm+oled8BmDgaaKrkrnKMsO7ZMCwmX8ai1nHuA00YFqDxx/5TqUPeGJddtzGl8SYuGa+kYLTwqp4/fT7nn/GYdVpzqCquzQi+OJI6oANzr30kQrig3lJNPR3SWDMsEGFH50gLegf5cBK0ett4ugjiy7VXBvrS5ssKTnv/A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB3794.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230025)(366004)(39860400002)(136003)(346002)(376002)(396003)(451199018)(6666004)(186003)(8936002)(6512007)(6506007)(7416002)(54906003)(5660300002)(2906002)(36756003)(44832011)(86362001)(966005)(6486002)(478600001)(316002)(6916009)(8676002)(66556008)(66946007)(4326008)(66476007)(66899018)(41300700001)(2616005)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LScoh7VaUbMhQdP6wscZfHLlqb3k3ejV8LZ2LQL0J34yj9kjtVLlcf0JJfeFOCMAIP2YedDfuKGhJAJImiWshHNYAfX/zkFxLoMsXzkwebeglDv+Kj99OSpwmEdVzpzzOLBkhXeH/ptodwedvOqZaCmIKly3PF3vfrEeLgGQuDww44MenaT2IUzdA49/6ce4pL+OciXmVkFVkfrpqWH09kKe+5+DAxfxvmOJe8jNUkh8RtI+8zOd2Pu/w5uCmGHQTjFqnLMfp4Ex9/s8KjpeKhQCLIW7fhcdSOcZRsHJ8uTK8dqOPGbcs4RS5q3v8pUEbQtw1xco5Lqomz/X4wTQB/CiWHUAtd5c+geywaY20MerWXXpegrHp3A6yIPStSGfOVxZDQn+QzAUzhLxAGHIjask5tBlwjonLVmfy81sOA0fy7e8nJ+DU/TTHaIJIv+hwXF8WtMYgSJuN6JOjSrlWBrKjWjnxNZPwu5E1tDwYFHkTucP+wFVFph3FvIRjCTAaSgnJ5sXeaGXvB/CxbFvjKSJYPpu8iH1rWvucwsA4M6jnqv1T8580iFL9EqRx23mB0kSPd03BZ/0baXalbHR0PXnHXQvFJ/oMc4/8ljv0r+kXhHk/GPeJhaLClFlMpFVK8Fq2NlrH3J4M09wnCR/jUSfegSbdRbvNi0DtwE3HXgdFUyE0vrD+kz7cFFSxCWFtbdk/VqPUBDrqljYt+h+wQoyfJnwAoHT2BNq1pRJ8TErdXhla6y/7E3/fY+0P34RoFAmFTJwzlvAJPVSVIUHuwXpgijsBb6L7mSMwiTnItUVz00HJWs0xOW7YV7W7EIrO6zIckpILvUTgUjpEKCcUE1HsJ5iyOKiczTwXInO9J/d3KyLDEQjem9SuaIto3ZznuiBt5uIeEqT4W2skpaxdLc6ibXfgJ1QRBDYp5xHoqn8ddUYNgl0FE2gtvJlxZMdHGMmgym2IQbCj0f7qXDbXQ5GMszKeJrFil0gJUiIZqpqsfhoUqjenTNA1CgHx3z3kDRpBqPs4CJQ3b8qkghizvntR7idxyMlUcdLwZ6O/8+KhYj7MpJXw4xdR3f/m5+dycKMM2S85f4JH1kH67WYJXTP9zJmwl7AaxXRo4c/5uEtTEzRXOnZgGsfbdJWtKeok/2N6n3pu81qoheXVQI3Zk8nVOQX4zs6ufgHygQo9Egu5l5KI2GQKPBISMyEPbpB3kpgL88Iz+n/BJ7xcad9+vP0vTaTpLeq+HMdZ/q9KEsNzUvptFNpw3n5pnBBuYmHTXCdCoXIDuD9OvT2e0/KPw7lJcT/0xdzD2uFGL/2hhtqT81U7oATm2KzocOf8eL/AW9+qIf49IpOt0Lyn/MkXTWT+tP6FhOF4BCyKqZhI5gUiMOD2uN4w0aTVRUHO/oApHHENHaHMiYpTt39gx2ZCSuepkl3ijbvtzJYvxUMhP9aoHS4SoMljW8vol4r9/tPgpHCf1gs+IM+skjKubjhFa6MoZzs0BJtxPlGJWzZypbrV5+P01msJGY+n5MLqsmZm6kZZeo/K1BpApK22YAWDaeG9qQXpEM4k+/HYqOSPUzlq1+YUp/XFIvzie5e+0lhIGnpnwkZGsSBIzUuPKVx0LRLSYBHvuAzIm5dcmAVc0M= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1xsMPWja1iK6unUB/WP254kHvkJaZUcmIgT5vB92nf7MhG78w5O6bH/nhzMHfM1gnKdoicspHHmSTNEr8krvLqRvIU7S7us4x6dly5xyyVq9KAsPgolNO96N4EVchQPcSeYyYd65m+aYOLW8i8fbvepsos8KlpMq3EFPnGfg3+lm/akLmdTpEx9/n88LCqztHCDqoEBFcw61Q8qWmTw1O7XX77OB8Um/9vM92ixCzLzcmP5LgT/CzJNfzkyEwBCswqv+scIMPmSlr7KP0usp2hxd2E3saG2VeqNhDXSt6rxChTCid/Iforp3oG0mlRsOcOxDQI0cuXCGMplbhfDj0v3SOr9+qD27PHDFW+X4yola2VzlDKhJgoOimWQAcqcadAOHDPn7lPHVGlO5F3n8wkk083MSVDZVY2hE8ODFGPK59hB2/BaRO2Bt13gw0KYmfBtFAcH23azPltwqNiBIbz4M13WfC29+8DmUXBE9MmNwl2GXurdx+NfycU6JyghLUW/CDORGkFH6T+aX7ir8AQw1IsG0P7Q7mhi8XarM6VMo1FjimLR9SqKTml5Xyv78TvxcdMFx3gDIuSpNlMQGMrmStW3Uo/EyYP6g3iPtfWVBiLKVPNiT2wekV+JaajibwmaMPS6sUtELUcMgXfkZn0jQUJ1P/AJwYrZ+Cge2/0N5SPqXGE16yaMvohvuxUOPR7SYOcOb89BT/tjr+D10T5AZXZUNGPjRLtZCQiCSl80QrmZeFFkK23UBGBR4Aj1BvAX2flpYupIfeVSJvDpF1XELvZ9AuUfU8+wmDebUJrFtJI8CUamCGcFbgOtMuJRfZ25LVMQKnq7219AnpcRQ1Ifj8yGXkE9wnfZxW5AV5CU5HjxOtebKswEIaardQtWaToh/iweP1WvL1rZlk51ZcA7pX9+Oez/wniBmX51CGrEKerW1SyxkEBEFxrhiivZe5mtooiyFK51JUIsI6dJSbZeoEuXvsX+B9KynaqvDfosO26Rz6IHWtW4GBR06SFtZmRsI/7wt4QTSxZKBZpo7PKDZg/wG4I+gktepVyl9/BfnXMj1diRxIeUYrPMZw3f3VcE2KX8n3imPE2Ahehz8XA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a4ff290-17e4-468c-6661-08db00e5a063 X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jan 2023 04:10:44.3155 (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: Nzo7yqXNVK6Y8INm8o9U48gfQ6bQFQcaK43TMFNa6Q2yZ8dB5162zzqQEuUTor+KT/N0ykpTBmkh4SIEPXXhBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB7124 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-28_01,2023-01-27_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301280039 X-Proofpoint-GUID: HQwOE0q3YeA2I65LaR6pD4HXMpuzmgnI X-Proofpoint-ORIG-GUID: HQwOE0q3YeA2I65LaR6pD4HXMpuzmgnI 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