From mboxrd@z Thu Jan 1 00:00:00 1970 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 16610C433F5 for ; Mon, 28 Mar 2022 11:25:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240112AbiC1L0q (ORCPT ); Mon, 28 Mar 2022 07:26:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241354AbiC1LXo (ORCPT ); Mon, 28 Mar 2022 07:23:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DA8959A53; Mon, 28 Mar 2022 04:20:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C29C961169; Mon, 28 Mar 2022 11:20:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF36BC36AE2; Mon, 28 Mar 2022 11:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648466440; bh=YCzwUFyhUEJ/GM5eR1opJD1pGTH09ZAKXiiX9wurdYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q349NkGz5NDen8ED33I9Ov7ONQoBEkJ96K5XOnQv04FljAS95H55Gl1J1VG7qDgH/ Mf6Qt1JQhGeX4xvR7bUiS2Ejq96bQbjJiCd3xpXu9bIdTIhdyKXF8RJ56qv7unvBbp wZFuOiYajjbRFYim72fkG3peKYwMTzwofwHtuPKrJxYp+2l45/KZLFXgwZEmQr9bqu huLiZbbJFJNRsQd1WnfpbuurYVeBXEZ8kkUxkag2irYtfOOLSH2lxd/Xlh8tTO1Zt9 GNXsUSuRMyfHSP7BitG5WAkRWpb3WfBbtrOGmBi+nY7g4WwaVA/OqEoFnxMQeZbeld KXLJx8QbFZV+A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fangrui Song , Nathan Chancellor , Ard Biesheuvel , Will Deacon , Sasha Levin , catalin.marinas@arm.com, ndesaulniers@google.com, pcc@google.com, andreyknvl@gmail.com, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev Subject: [PATCH AUTOSEL 5.16 16/35] arm64: module: remove (NOLOAD) from linker script Date: Mon, 28 Mar 2022 07:19:52 -0400 Message-Id: <20220328112011.1555169-16-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220328112011.1555169-1-sashal@kernel.org> References: <20220328112011.1555169-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fangrui Song [ Upstream commit 4013e26670c590944abdab56c4fa797527b74325 ] On ELF, (NOLOAD) sets the section type to SHT_NOBITS[1]. It is conceptually inappropriate for .plt and .text.* sections which are always SHT_PROGBITS. In GNU ld, if PLT entries are needed, .plt will be SHT_PROGBITS anyway and (NOLOAD) will be essentially ignored. In ld.lld, since https://reviews.llvm.org/D118840 ("[ELF] Support (TYPE=) to customize the output section type"), ld.lld will report a `section type mismatch` error. Just remove (NOLOAD) to fix the error. [1] https://lld.llvm.org/ELF/linker_script.html As of today, "The section should be marked as not loadable" on https://sourceware.org/binutils/docs/ld/Output-Section-Type.html is outdated for ELF. Tested-by: Nathan Chancellor Reported-by: Nathan Chancellor Signed-off-by: Fangrui Song Acked-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20220218081209.354383-1-maskray@google.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/module.lds.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/module.lds.h b/arch/arm64/include/asm/module.lds.h index a11ccadd47d2..094701ec5500 100644 --- a/arch/arm64/include/asm/module.lds.h +++ b/arch/arm64/include/asm/module.lds.h @@ -1,8 +1,8 @@ SECTIONS { #ifdef CONFIG_ARM64_MODULE_PLTS - .plt 0 (NOLOAD) : { BYTE(0) } - .init.plt 0 (NOLOAD) : { BYTE(0) } - .text.ftrace_trampoline 0 (NOLOAD) : { BYTE(0) } + .plt 0 : { BYTE(0) } + .init.plt 0 : { BYTE(0) } + .text.ftrace_trampoline 0 : { BYTE(0) } #endif #ifdef CONFIG_KASAN_SW_TAGS -- 2.34.1