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.15 fix build id for arm64 5/5] sh: define RUNTIME_DISCARD_EXIT
Date:   Fri, 27 Jan 2023 13:40:11 -0700
Message-Id: <4ce08524259cc3f1a0eff588aeb5ce6b7105630c.1674851705.git.tom.saeger@oracle.com>
In-Reply-To: <cover.1674851705.git.tom.saeger@oracle.com>
References: <cover.1674851705.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?jP/gY6lFI7vn4Q90srVjlTE/9QzZ12urOvlXLfg8aqZQxj8d4OLqNTzGqNd5?=
 =?us-ascii?Q?Zy8iHypb2O+8lV+aL3xFkopiLGa9Ksw6Bpgbw22fuB7O4fas7gLRSiE7/pBw?=
 =?us-ascii?Q?+clYlZ4P/dx+bVPdHdDPsR0Ia0/ZqzNd9LHsG/DLlrOJq+EBena1KdVrLlYp?=
 =?us-ascii?Q?EdI5igLixyXXBdEzkJ8e7hSW+iUudXsuWIHvHYP49YtVUNWMQHq4jtWm7tCU?=
 =?us-ascii?Q?vKh33mgGW+EZWzu1AAxgWR5fG/IYnS8uqNVh1KObR1ttdySJ4RSogZXkdXPi?=
 =?us-ascii?Q?w2Y6wmjCjXShyVtL0RkNDv/WYfPyqH5X/RFBnkHz10GjkTwpxHz3nzZpMwgx?=
 =?us-ascii?Q?MixucM8dMjTEfknI1mjL9TnVehGMvU1kw1jiQHb/vURpM74U8WOzdyhXxXAp?=
 =?us-ascii?Q?O160TW9qmsXk1pAEuV9jDZx04L0K1hluMa17XG8Y2spvZkKKGxFU4an6QL/+?=
 =?us-ascii?Q?vsu15oP/7xmJrzU0lIl56PJqhMPHhCzfOMmtvUbO3yxSXKynbegO8cRWC4eS?=
 =?us-ascii?Q?1A1DwMPpy0VRFvLII83ViIarxFFExpV9nmpRRy7RthYK16XS1IWOITRuRmYo?=
 =?us-ascii?Q?74o2LaqeUeL5URX4Pc3dhrE9NB+nqJD9msS46/tnpTrvrRszZ2xSpiipXD0a?=
 =?us-ascii?Q?kMDCIwe8Siq8jqA7vNmXj3MW6+oWqQhdLx2ELWsqg1tzi02Z5Pg/Ha8jCft2?=
 =?us-ascii?Q?miXNbxC2idpp6yejCMGsHr7NQdDcm0Cfo8ut79qNywuQ7522HQ5ZZsJOjfsO?=
 =?us-ascii?Q?AESYuMnTYXL+vMzB2BAijUnzOHvKQcefqjz6QOB99hzUcLDqpaEAP+iWzlYO?=
 =?us-ascii?Q?0PX/1wNdtSUMio2jNlzltq8KcqvpTO8umCeZqPnYXhXEkMiUx7leI1rHldZz?=
 =?us-ascii?Q?2UyR0xruxniPPkvP5pQ7eGfKi7a8kOGQWmD4nUiYFSQkLMjFK4Bd4s0ok+mq?=
 =?us-ascii?Q?01lV3/WCaeKMUQfRYayJ6cPPo3WHR9jgGGTgJzxHVXKIyKSN+a215FOGf201?=
 =?us-ascii?Q?4ZwUR8wm1WpMcuzxYtmFxgo6y3JGFcu7HIpG4gcYJVPixqmQ3W08pnulWh3i?=
 =?us-ascii?Q?3p8tXQRCMnGtZASA9cjYn9RoU42sRnBAttP2/ON21Gl/yC00IQ9kX2x333ei?=
 =?us-ascii?Q?eDncSXaI9Dd8Oc9h8KDDp25+Qlji9UsfSqIt92ibm1cCPGCsJNT+Mlo7FMSc?=
 =?us-ascii?Q?Ejiiqs2CgUDxMvHrbH0RtxkBn6wv9fm1UrUafIu9ztVJYFC+It/zIMNbWxvD?=
 =?us-ascii?Q?FpiTDp0W2VPAStpXVNaAb3lALhmYHOyBI0DhGE8dccrjf3dKISSG7fuswTgp?=
 =?us-ascii?Q?LPyPPZN+MEMZMTl7Qb5aU906s0lxB6VLee4kyzYo9vrOuHiHI+1HgK93zHSD?=
 =?us-ascii?Q?jOXPVQaT26wi5RHMl+X9/ooEALtI1zmKztUQGHdLzmKz6ExcoD+2N0trcZ9q?=
 =?us-ascii?Q?0uB2QsmzMbiUQk2tn/ENzBc3lv0JgioAIgEe0mAeA853ubTx0Zen/hyY9okr?=
 =?us-ascii?Q?Z2bDNOR0ago3fTM+W5Kyy1nIsfe+y9t8zxi5rBm/VOx1aGpy39X+QRAqmDuf?=
 =?us-ascii?Q?J3Yn8aZqWGn7RHXBnu9/b0/QsxjJeEKGeoT6ECV7oJA1CBQkY2K512fQfTuI?=
 =?us-ascii?Q?y4FpBmWC3hTJhizhLg0e0Gc=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?8dCGPcR6fE5Vr9fnkntK3PdEff5XVKF8BeHiSnNVaxVqSdvdDS9I/Y/wCY0N?=
 =?us-ascii?Q?Y1yptyUAjOfHZOaIzj2TYsuEr1HJG2IAyUuMULqB2qFgKYu+A+59mLYFgOmR?=
 =?us-ascii?Q?/Ks+j5hf3h4gYnkeZ/pP0Jkam43g48mXsMWsVzdxHil8BvSNp/ZUndN2Mkum?=
 =?us-ascii?Q?MzVV7J5V2IrYnAcl8LMRrU4oKiBXde9NBeOPl46NIdm+A2d/vni3yBg9+wZT?=
 =?us-ascii?Q?x9Eqxgo7FBO04oPrdAN+mhjiwWmuT8an1kNZ0FQ5bGkyynKTnnsyrrNE6xKE?=
 =?us-ascii?Q?b3r4K8OSm05tQ+3yiChVpo07Oz7jDQXvXmTjWT6Y2tzv4ZWPZnWdM9slvFWo?=
 =?us-ascii?Q?bjhWczwirLVplP/K6VKcx0ac4L4m7Emkwb4SZA++0fc55FvTKxN2Jh6zM2C0?=
 =?us-ascii?Q?FdddVHmJa7kEjNzssuy7b6Sqo725orbBZXb8dgVK/Vm3uhvdHkbXr6C2e7dx?=
 =?us-ascii?Q?/NGZz7sLBrJ0GIrx1IqZ6vHay1J6Z7TucULetUVP/c+OEUNvdvIfgeHCvBy+?=
 =?us-ascii?Q?biDF801ylIqSjqW0dIaLqiQgWagr4dt8ecDsGfb4amxXedaThEt4na22gBdN?=
 =?us-ascii?Q?unu3LBWF9Gsmq0AbxmCRkMmFDA1DPKkAHfZiRipuRhGN3sMbDGOm0wibbUuB?=
 =?us-ascii?Q?UPoGVBd0fu0+SzxIDohpLTohE8Q1SMVq3DkIi9XTvQd0lCjrHoXP8B0tBBEo?=
 =?us-ascii?Q?Qncy0QMjyJHZblm1JoQxxsblBfoUO5T2HZVvHMoyODqMOkb5gTGzWRNZ2qw0?=
 =?us-ascii?Q?qZfdozavg8m4KgJ4slMUJuhO97/uTjTjPhpxrLpoW8gbspwSP64Olk0SOu0I?=
 =?us-ascii?Q?Ro8lTWSGyxtuxkOD84g27mIbLflWeWgRevX/qbeIoV5dXq0rQtXALSIcnxBe?=
 =?us-ascii?Q?v7E5RA4hyOweldzUo4oQz+A6ew119m8E9rVFdeMWfuakzzxWhXz8DCdIlxUo?=
 =?us-ascii?Q?Eo+RuuGNMNmHEhAUg1++M1vSofl6SMeErXrllePG698+hr81HOApKuUmQkfd?=
 =?us-ascii?Q?l6p2tK/cIq22tipFw6KqZeO3tvc+slS7AdUPAygr+Dy1LTwcnhdn99k2A64M?=
 =?us-ascii?Q?jgengB9Lr8H9530296R+7qmod5uXcg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8027853c-addd-4f7a-343b-08db00a6bc4e
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:40:32.8901
 (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: XZnEfEfaUuc/qzzY4iZH/ENxuYvNuwX+17brD02SLJkseuntcxRorQWr2vhN5dXMbAxK41GEFDTk+orfCUbm6w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7459
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 spamscore=0 phishscore=0
 suspectscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301270190
X-Proofpoint-GUID: GE7wxkUCBFyTRi-k1DANxRl9w-uA6Mfl
X-Proofpoint-ORIG-GUID: GE7wxkUCBFyTRi-k1DANxRl9w-uA6Mfl
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <tom.saeger@oracle.com>
---
 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 <asm/thread_info.h>
 #include <asm/cache.h>
 #include <asm/vmlinux.lds.h>
-- 
2.39.1