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,
        Heiko Carstens <hca@linux.ibm.com>
Subject: [PATCH 6.1 v2 6/7] s390: define RUNTIME_DISCARD_EXIT to fix link error with GNU ld < 2.36
Date:   Fri, 10 Feb 2023 13:17:21 -0700
Message-Id: <20230210-tsaeger-upstream-linux-6-1-y-v2-6-3689d04e29fc@oracle.com>
In-Reply-To: <20230210-tsaeger-upstream-linux-6-1-y-v2-0-3689d04e29fc@oracle.com>
References: <20230210-tsaeger-upstream-linux-6-1-y-v2-0-3689d04e29fc@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?MTJOeElXOTZ0c2I2VCsvbHRLRWRNaDUrVjV5TXM1aW9KVjJBKzdpMHE4Y2FG?=
 =?utf-8?B?UWZmdW1zaGJ6ckUxcW5uTmg3a0d3S3Z3WWZzQm9FcWJmbnVYekh3cmFPY3hl?=
 =?utf-8?B?NXBhYWlTNFR1QmF0UU5CVndWTmVzbitXaHFJNWtCSjRHWWkxQTdLNTNNUElT?=
 =?utf-8?B?ejBmd0p0cVZKTHMyZEEyNk80dVgzanMxSGZ0bFp3TDRZMjhFOHZpYkh1Nlpy?=
 =?utf-8?B?Y2dzNFQwalM5azN6UStXNHJMZEJxTUpCRUQrMUxWZXJVclZGTStKOXBLSHhO?=
 =?utf-8?B?bVZWeHJiTzJYRkpHTW5ZRklCak1tRE1YR2w2OHljcUYwbzR4WWdQZ2t4UUpZ?=
 =?utf-8?B?OGZHUWR3YWMyN3N4T3hiaGhuWFVnamZyL1ZCN2dNN2RqQ0NmT2l1NlYySm1P?=
 =?utf-8?B?anYwS01QSkdsb25iOVNJZWN2amFLZ3d1WVlnbW5leUViVTNRbGI3a1BvWXVp?=
 =?utf-8?B?N2ZRQkhFSk9qZ1J0akRYZWp1L3NXSFlqOWs0amcyOHd2TUo3SDBTNWs3QWxw?=
 =?utf-8?B?Z01lQ1c2RWx3ZHhpejFZNnp6TlBTd2pQTzhWbVpCeVFITDRIZUtMemZucnJV?=
 =?utf-8?B?c0ZjQmY4RmpRaFhwWXhXRUR3Z2ZobmhZUTNUcEdUOUh5aE0wOVRUK1pPemFz?=
 =?utf-8?B?bTZiS2V5ZXRLL0xqcGt2bFZQQlUzNkxER2Z2QTZsZXB4Sk9WRTUySVJCUXV4?=
 =?utf-8?B?YWprUXFsZ0pCWXlZM3hZakovcGxIQjdEVkhDVFprcVUyRDR1Z3BvOERHcGhP?=
 =?utf-8?B?RUNrT2xGUFJuYnlEd3dNSXFXRlh5OUQycm9mQVVMTUtyaGg1ekk2T1REd1VZ?=
 =?utf-8?B?ZHgxclVCaTBtNjFUUTYwam5yYkF0MCtiYU5rWGdOaG50eFgrWE1uWlNHQTJR?=
 =?utf-8?B?MUc1NHB1T3RxVm9ETmtBY0VPS3VCSkRGRWsycHhWa09VdGdnaUpSUGRYQ05M?=
 =?utf-8?B?VDdTeXpERUdGditKcFhVeTNSTGticnUwNFFyT3ViRnEvYWVCQ3BKQWZ3bkZs?=
 =?utf-8?B?Y25aN2VBcmlncURHYzNKUzUvTThETEtuZ3Z3aisrTGpIeFB6cGcwTHByWW1O?=
 =?utf-8?B?WkpnVEF3RzNUUFdrbGU5MjYzRkU0SFZRYXhJQTJlM2hVdW5CZVdkVllaNGJx?=
 =?utf-8?B?Z0R5V3lOaVN5enJqN3NlTzFSUEVsTFJlUVNuZWhDUEJhZTJIN0tlRHdoWE0w?=
 =?utf-8?B?dFhGZ0VVTFVKdXZVaHNHWmNHUTRlQmd3YTJ2YktCaFNxbllJRmRYdmRxYlJ6?=
 =?utf-8?B?Y01VbDJWUU1JQ3ZPR0ZwODBuVCsrcEhrc1VlRGNpKzJlSEtQSmgvQ2NzbmRm?=
 =?utf-8?B?VUU3a0FlNnlxS25pWTJzaDhBeXhPVit6MlRDZzRISThtQS9IOFE1UnJzcHJ4?=
 =?utf-8?B?WjZybUdHeWR2Qi9TQllPMnRRK2RONkpTd0RVMHF0U3lHSlk1d1NhNnR0SVl6?=
 =?utf-8?B?dXMwQmd2c1VOYUJDb2FNS1hvajEwNHhxY0pHZk9UVmpMUjhYN1NaamxoWkc5?=
 =?utf-8?B?V2ZvNytzdWFBM3lvdEtQTXBhdDlBaEI5clRKRTFvWkVZOU1PZkRSYVd1ZVcw?=
 =?utf-8?B?d21lQVozTHJJZ2RDMlJ5M1ZRVTBMdFF2c0JpU3NHZU9xZEZhdm9RZTR4eXda?=
 =?utf-8?B?MDNOVVJ1cGlRSEdvYXJIYXRBVmhwVExhVkNUaW03ZXc4eFByeWt3UDRVdXdQ?=
 =?utf-8?B?VmxxdDZRMWtRSDBHSDdsb3hlWllKeUtVN1U5RUJaTk9nSkJPTlV0RDRPdlJi?=
 =?utf-8?B?V3paTjdTSFJzWmcyZjNxYlA4aGhxTkFCYUd2aDhsOThRK09BNm5PdkRPNjdw?=
 =?utf-8?B?TlRqUUdCT2QzcWxkamdXd04rTHpEb014aWZ6a2Z4d3AwNUdYMTRhNFpzSHVx?=
 =?utf-8?B?Q3puOGxTSVgydDJwbGtiNzVSc0lsSnFPMUFGVHlEcERmNlZ6RFp0L0JaS1U3?=
 =?utf-8?B?aENyWmxUYk92b1hKMXd0NkNpcmhxUFBjSktGcXBGUHFSTW5pcEs1c0EweU9Z?=
 =?utf-8?B?dWdyaEZGNXZ4RUxnQzRIRGdBMzMwb0NIZ2JVbERhZ2txMXhUeUVRK2s4SEly?=
 =?utf-8?B?RXNtUVNrQUFza2RWTm51bjMzYW1NNlJKOVZhMlNDaE9hYTBwamFVVHNBNzYz?=
 =?utf-8?B?b0RvYlVPb29KRGphTmF1QVJ6RjJsZmliTmVMdWFBaCszVklkSStNaUtONzNl?=
 =?utf-8?Q?T4esKuz6u+8ehGedPMZhHq8=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?UER5YUFMY3NlK0pCVS9kcGNkbjh3OUxaWXhXcGd3bERtb3J0eEJvbjFSenJp?=
 =?utf-8?B?Z0IwWk9pY2xFZ0dXOFhsenAxRVd4c3F1UGtUTHlUdzVHbW9Na0VUeDB1ZFNB?=
 =?utf-8?B?NkxWN05kVTNyelNwakJiNmRuOEtpY3h0S05GMWpSTXR4OHE0ejFvaVlmeDlk?=
 =?utf-8?B?bGRIU1I3dGpIbjArZ01CUTBUemtYSGtnVnVwRTBPVnFRalFYMTE5S2RxNHRm?=
 =?utf-8?B?VWV4OGQrSUhwdkcwNmdDY1FsbDhQWFhkR0M5aEJSMmNDWXM0OXl0OU5QVnlv?=
 =?utf-8?B?di8wN3RhbjhrSDl2YWRmaVdoUkc1SExzYkxlZmxxanV2UkJPbDNDYStKTkRJ?=
 =?utf-8?B?Z0JxckVoWm5PQjM0U3V4TzZtSlI1bzBwcXlmMTN4Z3VMUVBabXBIcXhHbzU3?=
 =?utf-8?B?aElpZ00xQWZ1VXEyR0ZrbGlUUTFUSHJZbGs2U0pyUmF6WjlmQ0hUWkVEU0xZ?=
 =?utf-8?B?bTZ1SndWbC8ra28yc2prbHdvMXFoL2h2ZHdkbWpBVUorUGJmUEs1U0VCRjB5?=
 =?utf-8?B?eFV5dmJaQ1d4cFROVlorM01TekhVYzU0d2hUUy9XZTJkWTRJU1c0NEp1UmxD?=
 =?utf-8?B?U1g5Q2cxTHFwek1xaGxXeTRtYzJ5M3pLSjVMVHJDb2VTNS9EVE1vZW1QOXdC?=
 =?utf-8?B?NCsyQS9kbWdKbkovZzdzRU1odmQxRnlOazdNSHRYVFJVKy8vZjZsK1IrSExC?=
 =?utf-8?B?N01DRU8rSFphcXlpY1ovZEdRZ3h6NmllZVROaTdwcmJBcStpTE8wUjhmR09D?=
 =?utf-8?B?czZhcVdsR1RTd0prVkM5UkZHK2xvd1VQYkdMUVJaVEcwdnh4MnpGTmpha3hJ?=
 =?utf-8?B?Y1Z4bk5wTGVnTUtPdE9WRDVmRVZzNlJ1OExxTlI2OUh5cGlaT1NLaUpvSEJu?=
 =?utf-8?B?emVyUi9TNXZDM2U1dGNrNW8wYWNoa3JUUUlFdzh1bW80TDZET0oxT00zcGc5?=
 =?utf-8?B?NmdMcS9jaTRZSjd4My92bjZvandvOVdwMVNMWGx1bFVnaEd4SUJlZlJ0OEt1?=
 =?utf-8?B?RzFudW1ETDRtSjVaM1lHaHNGcG43azVndm5PWlhKMTdGN0RCZmZjUWdCbE03?=
 =?utf-8?B?OGFIQ0lqdUZPbUJjdlROZXJZSjh0OTA1aU0yOC9oRXdBblNiVm1LVHhXWDhQ?=
 =?utf-8?B?TlRZbmFVaFc1Rm5tY2ttTGd3bUFuSHZKSEMvc2lienVqU01wajdDM243OWJL?=
 =?utf-8?B?V2tqV1E0TktkL0lSOXZzSVB0T0plRnJYN3EzSmJxd1dKanhRKzd6OW5CeE85?=
 =?utf-8?B?YytUdHJDVmg4SE5PaTNKaXRvdWFJb3NsS0o3eVB6OGNCRmtEVWVOY1d5NnJS?=
 =?utf-8?B?S2kvRzJwMmg5dE9xanRHSzV2dFY4K2Vod1ZGR3QvK0N2SzVMcVVmWTZVRUZ5?=
 =?utf-8?B?dWluMjRRdVFRYkNKYmg1azRZRXlYQWl0VmZmRnM0K2hHTlFIMURQWXpxSG96?=
 =?utf-8?B?S3gxZ1M4SlJ5UWxqNWd6blF1OWFQaXJNdVRZdlhlZ1JWcHVjdWt3SUdmQkFL?=
 =?utf-8?B?anhhTHd3bzZZeVJvUkVsdEE4ZGF2N3FaOFh0VFZPcjB6OWFKYWhJakJ6T1Yr?=
 =?utf-8?B?aU1YalNGYjE4UU5GK0Fyd1RNYXo4WlpZSnNzQnRzNzkxVFRCTmFuTTBoaHp2?=
 =?utf-8?B?QWFlOGlIa0VSS3JqcXh1MmNKOW1ncFE9PQ==?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 16eba4ef-d3ab-4e7c-fad0-08db0ba3e1d3
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:17:50.2366
 (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: uz+tOWb0j4hWSKE9Ovt0k6pBeHhWKIhowTr96pmTIPIe80bjzKJlXfIChy+K+vrZTBv4Yl7Vn8VsmAuyMitCWA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB7093
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 spamscore=0 suspectscore=0
 mlxlogscore=999 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2302100172
X-Proofpoint-ORIG-GUID: YxTXEfjr7-fu0FZmY7DZ2KTx9fAqTm9t
X-Proofpoint-GUID: YxTXEfjr7-fu0FZmY7DZ2KTx9fAqTm9t
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 f81d96710595..cbf9c1b0beda 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 <asm-generic/vmlinux.lds.h>

-- 
2.39.1