From:   Tom Saeger <tom.saeger@oracle.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Sasha Levin <sashal@kernel.org>,
        Naresh Kamboju <naresh.kamboju@linaro.org>,
        John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
        Rich Felker <dalias@libc.org>,
        Masahiro Yamada <masahiroy@kernel.org>,
        Ard Biesheuvel <ardb@kernel.org>,
        Nathan Chancellor <nathan@kernel.org>,
        Dennis Gilmore <dennis@ausil.us>,
        Palmer Dabbelt <palmer@rivosinc.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Andrew Morton <akpm@linux-foundation.org>,
        Tom Saeger <tom.saeger@oracle.com>, stable@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org,
        linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
        linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
        Michael Ellerman <mpe@ellerman.id.au>
Subject: [PATCH 5.10 v2 2/5] powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT
Date:   Fri, 10 Feb 2023 13:19:36 -0700
Message-Id: <20230210-tsaeger-upstream-linux-5-10-y-v2-2-ada7b8d36096@oracle.com>
In-Reply-To: <20230210-tsaeger-upstream-linux-5-10-y-v2-0-ada7b8d36096@oracle.com>
References: <20230210-tsaeger-upstream-linux-5-10-y-v2-0-ada7b8d36096@oracle.com>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QWkySkIvTDF0MUZScEg2dXFSSGlzejhFUWR1M1JmRHJXcFpQYW84M1RtQVZY?=
 =?utf-8?B?WTMwYXh2NUJ4VUdHQ1lNR2pic2hJdUhRQ3ZRT0txcXNYRitWL3BveTJSU0k0?=
 =?utf-8?B?NlB4aFZnTDVpTDlWSTd6SnlHWDIvaEUwRUdWQlRrdkYyWHZpWnlMMzRySzAx?=
 =?utf-8?B?SG9VdjU3TW8zNFVLREdDbm9VWHo5Vlp5cVhRc0dXNWVmRlk1STBnWHBCTlha?=
 =?utf-8?B?dGNtUFZLUmU0ZXMrWDhiY1N2ZytSL3hhbFk0SkNSQXRmbU9jNmhGUkZ6amVX?=
 =?utf-8?B?SDJ5RmNObVFud2VtYWVzckFiQnJLOFh2RWloTXpacmU3RERqNUV6Q2N5TGVE?=
 =?utf-8?B?b3RyR1cvWVpKUE50UUtONW1WeXhCbUQ4ckpPbU5DM3BreXpGNUdWbkRlWXFT?=
 =?utf-8?B?MGMxcThsU3Jjak1qZ1YrUTRYanVxUzMySXVaczlDMnY1TTh4QWtsVVAwQlNB?=
 =?utf-8?B?TjZTTWYvZEg0OW5OdjBnK2VDVXlNN0dtaG9SS1ZLaXdsYnBvVEtmQllvQ3o3?=
 =?utf-8?B?NmdRZERSMkZYZTNtYWJMSU9QMWRIbndENjdWZXZCVG95RE8vWnY2bDg2OWlD?=
 =?utf-8?B?RmM2MkVnSDR2RVVVcktjZjJ3dllFNnkyUFY1WEZwNmtZRlVtZWRjTlEyZi80?=
 =?utf-8?B?dVprYTl4c1UydDhoQnR1RkJ2SkJhYnRFRi93VDRxQmp6T3FxUUJlb1M4S3hw?=
 =?utf-8?B?djFiaDZSc3hLRmxna3BpR0hmeHhiWDFNWXZkUlJ0Z3p1QnpKWE5ldTk1YWpJ?=
 =?utf-8?B?Qm5SejFHUDM0cExSSlBoYmxUdlpRKzluT2ovMWJ2azREODE2NDFyUC9td3VC?=
 =?utf-8?B?WjZhdUFvQUZQZjM1UFNUWHEyUkUrM1ErZ2VMVTZmN3UzVkNBbktLNzA1bGpr?=
 =?utf-8?B?VzdNMXU3WTdOQVNTK25PT1FMUzhia2NGWCtpZlArU1VMUExIZm41ekVaQ05V?=
 =?utf-8?B?ck5CUHVDOTJFcGNuazVRWE9CbjVQS1UyWTl2VHE2alpEL2lWUlVkamo3VGRQ?=
 =?utf-8?B?Zzc0RDIxZVd4SkFkbHJTSjRrVm9QVnE0MXI1clY2aEpXRFh5TnlFaFZrbmFZ?=
 =?utf-8?B?clBtRXNsMWwwWWpLNGJ2NHhkUklRK2Z2cjBaTUwwMzRSNmpJY1dKWk1WeTAw?=
 =?utf-8?B?VjZ0enRRUWVxbWV4WFp3THBWZE9FZE1iMVNBQVFuaWVkUWV2UjlNMi9tNmFa?=
 =?utf-8?B?TmNXVGlQQTd5V0FmYSszWmVLQ1BZL09UUHc5d1RqL2UzdmVKQ0lWYWQwUnJU?=
 =?utf-8?B?UjREU01RNjhjRURKeFpLZHFGT20zbnFGejdLN2hmcDBwaU4yeXl3eUtXMlRZ?=
 =?utf-8?B?NS9qNTJCUlBsd20vcjhBczczekxnSnBpSk9aK3BlQnh6b2V2RWV5alBKVUcy?=
 =?utf-8?B?U0EySW1WcXZxNmpEYnpzajN6aVhZWC9OZzRtakJFNWNYYkxCWVZ3T0FSUnB2?=
 =?utf-8?B?SUI3UHF1S1Z6aks4Sm41MDVyb01MUm9aTHlIaWdkNVp1dlRoRHhxMWY4enhJ?=
 =?utf-8?B?bUNPUFd6aE1OV1VTNDU0dkJzSENIRjBhcml0LzM2SThFTisxWjlHSGtCRVJi?=
 =?utf-8?B?c3JaTmhUZXRrNExEeFZyRTNvNTdkUDB2WlFuQ2NOamdENlBCMkxrbmtaai92?=
 =?utf-8?B?aXNSQ0NxbjhFanQ1aWlHKzhpZ3hhbmZSUmE4MzY0cW5Pc0o4bGR0dzJBaWpi?=
 =?utf-8?B?NGc0NlNzU0VBOU9VYkNWY1lSL2VQUFVQL1JoYmgxZGRCRnZ4dVp4WkhqOTl5?=
 =?utf-8?B?cDJVeWFnRmFBaERaNWhMaVJRdE9XSUkrdWtwcHJpdW5JeEt0NDF6dW9XdU14?=
 =?utf-8?B?UmVTTzZ3dm43c1dwczQ5eENVTkdVM3pKajBaWVRzc21vNXZYZkkxSnNmaThN?=
 =?utf-8?B?N1p1dUYvblljUHpveWY4OHM1ZWV0ZEtYOTdEYnpUdy9KZUtqL1VncGZMdXNH?=
 =?utf-8?B?TGYzakJiNDJSY05pd1h5UStGQkZjWGViQy95WXpjTjR1eHNrWEdjMlF4T0s0?=
 =?utf-8?B?NERXYXVSTWRHOGY2SEJFZjJUNGV6NXFFaGJzOFk0Yk1ZeE92cVBCdzF2NlJK?=
 =?utf-8?B?UkhJaWRtN2VyYTFZanhsYmVJVENBWWJoV3NMTis1TzZuK3gzUmh4U0VUU1Fo?=
 =?utf-8?B?Z1d3dzd5aS9XL2tBa0xYeGJTRTNORXRVZ0g2WkVMM3RiUk9XY0dWeDZVbHVp?=
 =?utf-8?Q?X5yzFkFADYvmStL++b2oKwQ=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?TEV2TzB0R3FwWmZIM253bkl5N1lpM2hlKzZ0NjhGb0RMb2JSR0ZNQkQrQ0pt?=
 =?utf-8?B?WWxUd0k5Y1d3RlZMZWczamFaU3pKNGhtK2ZpMTdJY054NEFTMG9JdEtGVHVl?=
 =?utf-8?B?NGdSKzUwM1R2TnBBd0dTQlhLZkNYT2g5amU4OUhhUVhHenova3pmV1NPbFJ3?=
 =?utf-8?B?bm0rRkZjYUVZTE9ZaTcxSDIvOFltWDFpOWxDTGIzZ3ZvZHdWZTZPMmgyN0hY?=
 =?utf-8?B?c1RCWVg1ZGRteVpTMUQ3c3RUcmhrWGVzY0tSV3ltcE9hTkNneGFQY2NvWnpp?=
 =?utf-8?B?Q1hTdWRmSVE5dUFYakpOejZyYW9NQ01RUTlhN1ZiMUhXdXM4ditFSEhNV3Bx?=
 =?utf-8?B?Qm1yYlo1Q0ljRFlzNlZOaEZGaWpYbERXNXFVSjh1bSs3TWs0VXVHcERqRmpN?=
 =?utf-8?B?U2FHbklVKzNyRFd1UUJvcmZudmdMUENsdSsxbUk0aktuRjZpQXRtRnRXVllw?=
 =?utf-8?B?cGJLZlZYdkhFMnJ0czVvNm1HTHlYS3YrL2gzV3czekdWUkFNNzdVY3dvS1Nl?=
 =?utf-8?B?cnA4S3JWWmVsMFp3NzJXTU5xbVdzOWJjYnFkQnlleUlqUmIwcEpVc3N1dnhH?=
 =?utf-8?B?WnBZc0swR2N2cU5BZ0NyS1hwNHhKcGhpWTRqOXg2UkNZbzBkNFVoWHdFTXRx?=
 =?utf-8?B?ZUxrbGNUc0FHQ3dGSFE3VjlpRnJXc3JCU21xRVRWRzNIREsrbFk4b1JnMkxq?=
 =?utf-8?B?b1BtcEF0OEt4cmNUNnZnMC81WUFzNm1qSzhvSVRiR1QvQkpWTlVEeGZncXVp?=
 =?utf-8?B?N1pFdDUyQ2J2WXdKVkN3SGVTMGZRUXdtWnhsQmwvNndwS1Z0OFFkcCtJOUZS?=
 =?utf-8?B?Qmk0aEwxUFhyWEoxNjMra3NTM01aWk5FOW1nU3p6bCtRN0JUN3FqMXlFcHdR?=
 =?utf-8?B?c2kveGpTVFkzd2NrZU5mR01MK0tKQ25BWmVjenBqenMrY0JaeFlmVTM1djAy?=
 =?utf-8?B?UEN3YzZOTkYxUEJDazU5TXZic0hack1qTTN6SmpGRVFLMnpoQVFVelZUUnRI?=
 =?utf-8?B?eDBad2xyUDFhZ0dUN2VBV0l1YlFROENmUHB5M0ZkUE9ZR29yeDNNTTRFQ2lK?=
 =?utf-8?B?Q29qZ3NXVTdCd3ZITEM1OUdWVTJlOXFvbENDUVR5YXl0WFNLenVYdjdWNGVv?=
 =?utf-8?B?ejFra2dmR0sxTVNFMXFnbVNxN0VVb09IUldXcTdqZDV6RDNkaDVMdDd5am9C?=
 =?utf-8?B?M29TM0J5SFo3NFNlR3p5ZVIwWS9uY0IvSmdsUlVZVGdqRWxxSHVzL0JqRGtX?=
 =?utf-8?B?dEJFV1FSQm9NN1FsSy9JaTlPNWgrVjNtMlg1L2VwZlYrcWxDZ1VTb3BuNTlU?=
 =?utf-8?B?amxXN0crZW84S1ZIL3N4RzZmclVtVmJnTklDSGh1TDBSNXdMQzhteE0zbzha?=
 =?utf-8?B?Q0RIMHhQMXMvSG1wdW1PV1NUMVZDUWEyVHFIb1o3em9JV3V4bXZBdDBwOEJD?=
 =?utf-8?B?TG1JdnVnbTYvR2E4ZFQwWlcxRWd1ZWVtOTR3OFpPdkNiZWt3SmJidmVpK1ZV?=
 =?utf-8?B?WlJvL2h1VjZkdDFlaGVpZ1lDSTZOYlR5ZUlOR2lUZUo0NWRCd0VaY1pFVXds?=
 =?utf-8?B?SklEWmVid3BESVhndWVBQUdoTnE3Z1FYZnlTenFDZVRCWW9DVm1LTkdYL1lW?=
 =?utf-8?Q?boeVM0MICtukpDsOdNs8fiubYcTFZkgdo+4wUf7p7uw0=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ef4d4272-d167-4629-e9bb-08db0ba4292b
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3794.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2023 20:19:49.8842
 (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: XS/ZyJW4JSzknWRG/UBwLzyvKgaTz451R1CkRmQEcjrp3MAcrJIuGMYSorutjrDTOnDLAT0VHCE1IWQIZe0xaQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5652
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22
 definitions=2023-02-10_15,2023-02-09_03,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999
 malwarescore=0 adultscore=0 phishscore=0 suspectscore=0 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2302100173
X-Proofpoint-GUID: tEaPRlKyinHWM0fM63SamRKWUdYq8U8B
X-Proofpoint-ORIG-GUID: tEaPRlKyinHWM0fM63SamRKWUdYq8U8B
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Michael Ellerman <mpe@ellerman.id.au>

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 <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230105132349.384666-1-mpe@ellerman.id.au
Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
---
 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 <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>

-- 
2.39.1