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>,
        Jisheng Zhang <jszhang@kernel.org>,
        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 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>
In-Reply-To: <cover.1674876902.git.tom.saeger@oracle.com>
References: <cover.1674876902.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?pRvPllddHArOOgl0adt0q/X/hN/OLsG0wc/Pr/Pm+x9x1mEZu7mVJZWcR9Yy?=
 =?us-ascii?Q?cevsoK83BvvUcz7Tq0RhOpMZUab26s4MaMUwlJLAfhqZBUaKJeVagtHubqtA?=
 =?us-ascii?Q?prtL6qtoxvv4jS9fmM9OB+NkWz9/OEVY0lD0Y2RxAsqtxFZye7lW0MhlTvrW?=
 =?us-ascii?Q?1yktJa7OQnTfTIHwmQq/LIjRBF4vrS8/3axwEMRAsYh7nUgqWojt3S3DYWy5?=
 =?us-ascii?Q?Suu6ICJ+M9f66LNAQTKDZHsBDhPsi5R00zEoTvcE/W0pdFB8DJdXXexrGF5u?=
 =?us-ascii?Q?1QtS/ARC7omER/2lQgQSURSd7AzD7Knjf9LYf/TNw/nGqXnAKbpwF5gfVZoc?=
 =?us-ascii?Q?h4Bb+GdKnf7WG8X0iPyB9v8BGGz97MgjVYaBFKi8urvwgIGwbeaJAHM23MZe?=
 =?us-ascii?Q?gWbaRukK1TWA18kgu4SG7+CCmFezXcobXRaLR6Y9g3T9UwEKpHmVztuTdOzs?=
 =?us-ascii?Q?rgLJDYE5ur12SJX4UvGvX2JOl2F3YMuqNzq9+sx/zTxOUM+XIe814Q7lY5Fo?=
 =?us-ascii?Q?aFi+IXpOGoD3epfYntHozVh0wH+EMnSwYnPz8W0yS2mh8az0KPrg3aFFArYL?=
 =?us-ascii?Q?oaYlTv65Rnk964RMLTDZN26VhZmNWjJdywGHwVEiJsQP2PUFbpzUxK9kJFHZ?=
 =?us-ascii?Q?wQ+Cv300lN8g+NenKduduvuSBL9OGGmNtfqwNZ+hkllZxflm8Kou3ApxFjRe?=
 =?us-ascii?Q?GEX5LVkeo3fWymVndNfqQHVeXRv/iIWYeqAVD81hllxQrLM8APeZ5RljQ+PN?=
 =?us-ascii?Q?huZ2ySxdUvDQk5c8Cz8lGGzQiQAooO5PWDJPXr34NaFEMoXCcX1Jo4r5UeYz?=
 =?us-ascii?Q?x94WvVsXpJ6gG0UiBC2LVK3/NrMsXZfZk+udBsHQh/XzODuhdWQql5LC35IL?=
 =?us-ascii?Q?2ODV1BZtwddwI9kdAm8dKXq2mby5kQLzczPH3K+l0ak/Fn6HS9gNUE3CT2pR?=
 =?us-ascii?Q?IemJhrM9VFE8e2LFdGZOlGBzfQPNW4lmt9wdIGDQlsRgrpTyLbAgjaXV/Cv9?=
 =?us-ascii?Q?JvCfZOHDv88XWicPxoydRFa4xHPv/N7x0XUNpEozYJdK3cZlOC0/qlA4aecx?=
 =?us-ascii?Q?O2Licc3/6Welvb+Qi+c49+/a48Z6+XwYHEWD5gFqcOWudCOrN+9JxBuE2atc?=
 =?us-ascii?Q?ZO2hU4855JlTkfw5mMWp9cBOSWtY1oCv5SWojHq+sU/CnlJNgo0ot1YNqNtM?=
 =?us-ascii?Q?689tOTL1deP3rLLSS2tskrhGg/2Cg5kULuEZM1oTvBtyjSWQXflBVTT/l8Wk?=
 =?us-ascii?Q?Rf2dVMprp9Dhg9z0Jjb1Rzk3S8JwgXPguEd3lQYMDwc6nAak/vmq1001qDmS?=
 =?us-ascii?Q?Abnjw2H1+dUSv+l+XkjyB/pIKy+o1mRfvgYlE8U+wW5VvV4sy16cV3oZS5NY?=
 =?us-ascii?Q?IRP7dtfr+Mdf9XzK/h302gRgaRLSvZqEKGQU29W0PvvVpHTzSfoXW8SYhdJ9?=
 =?us-ascii?Q?al89pxTr0Gj/S7ekSybYz6aPOLrWSuZYe6z/0neeAGLUqujEsm7EyJyBECqa?=
 =?us-ascii?Q?Ej859lm93AWs0oKdDDInV+0DteC4bO5dyNI8sqPhTDLnpzz1ih05IBfKMEmh?=
 =?us-ascii?Q?cmg6VCajnzgel+KGoZzmNYgM5zxYaSmpuieb7mUgAVltKz6xQO0BG/IroiHp?=
 =?us-ascii?Q?0Vij8aGkTG97kYvA6MvMsKY=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?6ls+sacQ8SL0PEfW9kjctYDdD5J6t/FoEBePLEu6s0jE8AF/DEkzjxWeU78+?=
 =?us-ascii?Q?FcvXHrBKGWZhuXwWorGtuD9U/YnD1socbB/5lnjZdel2E9DgvxC26hv8jVaB?=
 =?us-ascii?Q?T8jvV4k3LmTIlZTKuWWfwIqGTqo8hP4LDrGe/DLBjJuqYK6XuGC5Lrd8X4AQ?=
 =?us-ascii?Q?aTH9eQHeVonQDYj+keJiXR0LbX91o4+/iyPGo+DYIcd5eyueHPMhASIwSgcU?=
 =?us-ascii?Q?9AJUYNxfyUZBqYbrPX65FBR344aT+DcT3z9VMO9icfmO6V9l5umxzjVPl9uS?=
 =?us-ascii?Q?TfDUYWtaIcxh69c1Its8cLqpf0qmfr3pAlPJV6uIh0MFvyeA9EGBJ5jmj+Zw?=
 =?us-ascii?Q?bv4SOA5Z8bPJwYZuSM2/4ddOFKEJLuivCddxnj2LyBPttZ64DIR+njpR9xRl?=
 =?us-ascii?Q?6Hnwju6yxeBO6TIuCt5mSGCNY7fWYkMHdM5mDfM44TxIW6UH87d5NSWryDID?=
 =?us-ascii?Q?NEHO9+yBEhmk4tDs6P36YlPpFpQ3erxWr0PKV/FRCwo7DVSzshKdUSnMYS9o?=
 =?us-ascii?Q?S15Oz06iVad2ENZeF++Bp/N74M1F//0tLUpTKq4Hbav91qUcx64AgF2HFhKf?=
 =?us-ascii?Q?wUvPo1qXy7zvUZ9pvre7JD+bGEM4D7iqEoB9vRpJysahg9WShG0MHneVSMQV?=
 =?us-ascii?Q?BvX8rrtnkx2XDYMpmox0DrUgKPhApeDONVjb52yGeB7j7H+njUF7anH4qHC5?=
 =?us-ascii?Q?glg7lH/EmhNkeJ1s1d7B1rRQoWe6g7pQZh0Duui3aobOFweWPmn9EEHARBqW?=
 =?us-ascii?Q?zESeLCcG5FUVRzIcTYC884uayKfc6pDruhQBya6jdheTbOM4YTtPHA4s02Ic?=
 =?us-ascii?Q?1nXWAB2a3thuRpPkAJdzeQH8f0b2sGMY2biadwhNXeGvxgFxFcdwojre6hbF?=
 =?us-ascii?Q?3EtmrIOloyuM2io39rs0r50tvxH4rCATLLFQCrKVNthQm1IrkVCaX3W7G8La?=
 =?us-ascii?Q?+lGg08xepgoK9dkYJ057x1UIbKG/Sq60PSYqGpcCb72Vy+8mNfnvODgEh2Q6?=
 =?us-ascii?Q?HzOm9g8ny0F26PbyrUgFjiHfQptraJI2lut2TD4jLeAQMcXDTy6solpoqaxv?=
 =?us-ascii?Q?s2JYI8EDH0JhoRScyqzGSzF6Xo1iLw=3D=3D?=
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: <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 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 <asm-generic/vmlinux.lds.h>
-- 
2.39.1