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 AE395C636D4 for ; Tue, 7 Feb 2023 09:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231670AbjBGJjJ (ORCPT ); Tue, 7 Feb 2023 04:39:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231296AbjBGJjH (ORCPT ); Tue, 7 Feb 2023 04:39:07 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 332054224; Tue, 7 Feb 2023 01:39:02 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id DF611B81853; Tue, 7 Feb 2023 09:39:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2578C433D2; Tue, 7 Feb 2023 09:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675762739; bh=ZzAHI1LT4G/lTV8P3W1mFUjcbymsnTeBRScA6ykUc6Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Wcxcd+5llLBzGT8i9WnJP3dTh2nl6pyPHq6K7ckWMyG+481tE2obDZshVv0n/9xG1 QTo35kww28A0n6ipqo9b8P2lspxXS2ozEfSWQy/42rpk9mttj8r2SFq94QRd7m2tq5 IkBNwcPP4q/LNOuQbKshr6tBw22O0oO0C9PIilx4= Date: Tue, 7 Feb 2023 10:38:56 +0100 From: Greg Kroah-Hartman To: Tom Saeger Cc: Naresh Kamboju , John Paul Adrian Glaubitz , Rich Felker , Masahiro Yamada , Ard Biesheuvel , Nathan Chancellor , Dennis Gilmore , Jisheng Zhang , Palmer Dabbelt , Arnd Bergmann , Andrew Morton , stable@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org Subject: Re: [PATCH 6.1 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT Message-ID: References: <20230206192655.ydjr333ljcirm26j@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230206192655.ydjr333ljcirm26j@oracle.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 06, 2023 at 01:26:55PM -0600, Tom Saeger wrote: > On Sat, Jan 28, 2023 at 07:52:39AM +0100, Greg Kroah-Hartman wrote: > > On Fri, Jan 27, 2023 at 09:10:22PM -0700, Tom Saeger wrote: > > > sh vmlinux fails to link with GNU ld < 2.40 (likely < 2.36) since > > > commit 99cb0d917ffa ("arch: fix broken BuildID for arm64 and riscv"). > > > > > > This is similar to fixes for powerpc and s390: > > > commit 4b9880dbf3bd ("powerpc/vmlinux.lds: Define RUNTIME_DISCARD_EXIT"). > > > commit a494398bde27 ("s390: define RUNTIME_DISCARD_EXIT to fix link error > > > with GNU ld < 2.36"). > > > > > > $ sh4-linux-gnu-ld --version | head -n1 > > > GNU ld (GNU Binutils for Debian) 2.35.2 > > > > > > $ make ARCH=sh CROSS_COMPILE=sh4-linux-gnu- microdev_defconfig > > > $ make ARCH=sh CROSS_COMPILE=sh4-linux-gnu- > > > > > > `.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 `__bug_table' of > > > drivers/char/hw_random/core.o: defined in discarded section > > > `.exit.text' of drivers/char/hw_random/core.o > > > make[2]: *** [scripts/Makefile.vmlinux:34: vmlinux] Error 1 > > > make[1]: *** [Makefile:1252: vmlinux] Error 2 > > > > > > arch/sh/kernel/vmlinux.lds.S keeps EXIT_TEXT: > > > > > > /* > > > * .exit.text is discarded at runtime, not link time, to deal with > > > * references from __bug_table > > > */ > > > .exit.text : AT(ADDR(.exit.text)) { EXIT_TEXT } > > > > > > However, EXIT_TEXT is thrown away by > > > DISCARD(include/asm-generic/vmlinux.lds.h) because > > > sh does not define RUNTIME_DISCARD_EXIT. > > > > > > GNU ld 2.40 does not have this issue and builds fine. > > > This corresponds with Masahiro's comments in a494398bde27: > > > "Nathan [Chancellor] 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/ > > > Link: https://lore.kernel.org/all/20230123194218.47ssfzhrpnv3xfez@oracle.com/ > > > Signed-off-by: Tom Saeger > > > --- > > > arch/sh/kernel/vmlinux.lds.S | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S > > > index 3161b9ccd2a5..791c06b9a54a 100644 > > > --- a/arch/sh/kernel/vmlinux.lds.S > > > +++ b/arch/sh/kernel/vmlinux.lds.S > > > @@ -4,6 +4,8 @@ > > > * Written by Niibe Yutaka and Paul Mundt > > > */ > > > OUTPUT_ARCH(sh) > > > +#define RUNTIME_DISCARD_EXIT > > > + > > > #include > > > #include > > > #include > > > -- > > > 2.39.1 > > > > > > > As my bot said last time you sent this: > > > > > > > > This is not the correct way to submit patches for inclusion in the > > stable kernel tree. Please read: > > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html > > for how to do this properly. > > > > > > > > Sorry, we can not take ANY of this until it hits Linus's tree. You know > > this! > Yep - sorry for the confusion, is it better to send as RFC in cases like > this where folks on list have asked for the series to test? > > > > > Please wait until then and then send the needed backports. I'm dropping > > all of these from you from my review queue. > > > > greg k-h > > This patch is now in Linus's tree. > > c1c551bebf92 ("sh: define RUNTIME_DISCARD_EXIT") > > $ git describe --contains c1c551bebf92 > v6.2-rc7~18^2~5 > > commit c1c551bebf928889e7a8fef7415b44f9a64975f4 upstream. > > Do you prefer I resend series for 6.1, 5.19, 5.15, and 5.4? > > My questions for 6.1 still remain, > > https://lore.kernel.org/all/cover.1674876902.git.tom.saeger@oracle.com/ > This 6.1 series is not strictly necessary, as the problem > does not present itself in the current 6.1 stable kernels. > > However, 6.1 WOULD be broken with inclusion of either: > 994b7ac1697b ("arm64: remove special treatment for the link order of head.o") > 2348e6bf4421 ("riscv: remove special treatment for the link order of head.o") > Should we just include these as well? > > My own preference is to included them, to track closer to upstream, and > hopefully avoid 'ld' subtlties going forward. > > Thoughts? Stick to what is in Linus's tree as closely as possible whenever possible please. thanks, greg k-h