From:   Tom Saeger <tom.saeger@oracle.com>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     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-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: <f10e62052b7108bfbb05bc286ac33620af190047.1674850666.git.tom.saeger@oracle.com>
In-Reply-To: <cover.1674850666.git.tom.saeger@oracle.com>
References: <cover.1674850666.git.tom.saeger@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yypb+3VO9CTQgCqhbe9clhskolaizucFOl5U6YlZsipUzlwKQBmf9ynAQtRw?=
 =?us-ascii?Q?R+T7wyr2sRVGu96OMuMArR+IZ/X0tj/ftEwPkEb+UIV4jxM+KegPAaAiMZmf?=
 =?us-ascii?Q?9okQix4MmGdWNvWSUMGxmzW0WAwCfeL6LtenOz227a+bjx/SA8M3sRl0aUha?=
 =?us-ascii?Q?MijtgnH+xOKeQxE5nyUyZjmSaLIsiOUnGEvp8N0Fax4h2+cCKhQc39L7uYxM?=
 =?us-ascii?Q?SSReuCp4BvqlSsS32sZc1jeVR4ofn5Nat0cQUXPlNAtkh3jreA9Vv67chZtP?=
 =?us-ascii?Q?t1zKCOygUzwulAzYnNYkqy+hJQR3uQME+QSAG3w7UCcPcJAhFh+nFUO/r3KK?=
 =?us-ascii?Q?//QnO7MZs3lyFcRdr9XZqSzfaUfd2qZxQ/qAlofXqYawhI81IMEP4Yp3gxTM?=
 =?us-ascii?Q?AmHQKU7Gx12SA2QQ6Vc9yhgOITV3ZCby05DiVwKK1kdLpnqw+m4trX/dunR7?=
 =?us-ascii?Q?kHASeXydBQaRrq23VZbEeQTFkd4yxlKGyzuOXClC8hSVObU8zQ26vBwZAIEl?=
 =?us-ascii?Q?+iMuKfDobp1MSF7h3HANe9L4B0ZqbvW/3ZrvTi71CY3Za/1P4fedgvq5E2nm?=
 =?us-ascii?Q?CTf8QTfwczK2t3VoTDoLlxoJknuXrbLaJfuFB/MdphU/FBN4nw9evQ0et5D5?=
 =?us-ascii?Q?cmIz6mMDMSHV1PmQJ36fR0P0oJSH86mtPN4AKfzf5OM5pSk9Ejjlq9D+IDns?=
 =?us-ascii?Q?UM/2PUbcOZMYcvCrC8M1rLsri6b3dHOYsfsMHfqy/1dp7OHEESsGD0ahkyDA?=
 =?us-ascii?Q?sbPPA9c3nA93oJj1B8UKA8a0v8FVMJPgA8XJKq3VafhsiYUjpwj6zeNg4Y1L?=
 =?us-ascii?Q?Yskv6BjULBKN/itaKaZzGXe7Ljwj6R9YiWMja8GCI/pyLfmjBsBwAHUYVE4J?=
 =?us-ascii?Q?AKQ+UtRa0TYB9RivJVOvUpx6+MpPRxdO1qZBXOLnGJnN05MrSejBix6l8bqc?=
 =?us-ascii?Q?zDbI55GfN59GY8gQfgoOWkic064Az/BgpjOTxeI/ZO3sB/1QLzUaXqoNIzTI?=
 =?us-ascii?Q?XOpGT9SJEkCA+eDOzYIJb2GhvUn3pRjTAY2ftRzxft6MZRPK8wxIkI5P+SWn?=
 =?us-ascii?Q?mcgqvommcXWOF+h2ky0KJuCDbpkpb6ceRMUj+CyTy3hNDl3AsXW6MzJniOJu?=
 =?us-ascii?Q?1OCCI/LLaiWj5x+UctHDQRsSZTQvJLzjI4LuKsOxlHWQLNfvnUTee2KNYhef?=
 =?us-ascii?Q?V9hUT24YFxcRWyZk3FHaatDKmAWSIOpgyopzqsu2zeOdVIrdTTL5Ah6y3pbo?=
 =?us-ascii?Q?iA5pX94fCwzqMupI0B1tVTDliVGFy7gtFeIPRicNHENO1VFWcCJku+u5hL++?=
 =?us-ascii?Q?0TZycURY0VgC4a014lDNHpgG9u7e6/+BuaBQteKTLO4aNg8PZ3P+7FG/5C3y?=
 =?us-ascii?Q?NGzS2LDEW9j5O3kEJF6Jd/j79QBnWDsH3md6K6GdqmAY8f0aHTCNjJlSNmj1?=
 =?us-ascii?Q?/GYHP+LPsRZVRkfax75aTtSerH7F79LlRyt6vQdRHU5BZw6yrGFlcRbuSkNa?=
 =?us-ascii?Q?LdDuUjrIIJyMzBfyvvcEXp3NACdCsjNUTZQMTGS0gFESu2UcjeHdhlFvnnpp?=
 =?us-ascii?Q?WkOou/FWfbTBFLg4O6/ajYu7qzXQFj2032VuGhoqtc1M86eywXwVaWjiSKnn?=
 =?us-ascii?Q?nGsIYheQ5fYeN8aJl2RV1FU=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?T4cZxI0gUe7L26d9Msi1AOnQh46zXEXaQu0etPqsK2qEABch717AhdByxyPl?=
 =?us-ascii?Q?VgN4h6MOqbDtYnx2kSFVke9p5Le68wJaTJx+55Ve3IIZd/7wQQzlPLqz4wfK?=
 =?us-ascii?Q?pDfwg5AAsMl63FRy+EX7A2cQN8rLtpJQyN7fHTjDaZV+/5wkuSfCDaGM6uC0?=
 =?us-ascii?Q?pGDpIwfUY3pYHYVi+Z+i8CLDmhqeW/enIhiqPL3bnaSj8nQ/qX6UMla3VLwa?=
 =?us-ascii?Q?YGtHV0nxCT+ANezgH+mYQaIUh7cphTgc7NuNN/peDNvUeCuhn5FHt/RNu6Dk?=
 =?us-ascii?Q?gx7HuhLKx/V4yYY3PuhAe1ZOrvTAc40oaj80rfrjVmSKdfoZkvgTcZ+V5eJu?=
 =?us-ascii?Q?zlaV4OiIFn0R4ws/4Rz51wIOrT5oEgvjOzcKuzLZqv7Lh/GNojOWH2lLlOLV?=
 =?us-ascii?Q?S8pPE7mWvU7Hht0/flA/85fUwT2yLBhzcUD78g8lS0FuCFd/0vchzRlo6svh?=
 =?us-ascii?Q?bUS/jZGGrOmjf88kworWq61GVZirauHMwitfSCM/KBNzVf6asiJ2K8PYg6k0?=
 =?us-ascii?Q?OPnC9FH0nAvBnNsJPbRtp93/r4AEACijiCTG44q53uCvZzueZq1RzyIDXpNT?=
 =?us-ascii?Q?KMZ/5XcVEPAwsZEdkut1KdO2AqVdbdU0m6kLlb096t8KnsI8X69haDTjqT31?=
 =?us-ascii?Q?g+a6kIdXEfLni/3F1ANPGlaZkuutjgj2eg0QYwG8riY+vXiC8Dwie3VbUZAn?=
 =?us-ascii?Q?JlKzdWkd0o7LvUUah/d+1FK2QmU0lJoocLRiUchXYuPqfnWoAn+oa8VEvsSh?=
 =?us-ascii?Q?otJ0bUFsDFiIxtEz81iEkwQk5hObxu+IN8hQbLnb3Ja+IRKluYrIv+0Ii2oz?=
 =?us-ascii?Q?YXzyiFzrbuYOwqyv5sjIGdxaUK8XAcbp3Cq4EVtvG9G5GKAPbXa+X1+Niy8s?=
 =?us-ascii?Q?0rhCvRtcJeX2v8PTLNGUOwev1z38ZWpr55At4A6B/LhL+7bbFsGXJGV4lLQf?=
 =?us-ascii?Q?pZD/Wsh2prearWzjFReZ4ExkYkpS7BSXiuJKGq0Zfq+9HDpL1+uLwR8m1YOC?=
 =?us-ascii?Q?6CCj6DuBLxzE2bti+1XM6izYlizbmBcdCLDugAKgPBvnYFxz0IFcNhUOo6qS?=
 =?us-ascii?Q?SuLFjsAimERbWW0ZUcz2d0cYqMrLOw=3D=3D?=
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Masahiro Yamada <masahiroy@kernel.org>

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 <nathan@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20230105031306.1455409-1-masahiroy@kernel.org
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Tom Saeger <tom.saeger@oracle.com>
---
 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 <asm-generic/vmlinux.lds.h>
-- 
2.39.1