From nobody Wed Dec 17 01:48:00 2025 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 24FE5C3DA6F for ; Fri, 25 Aug 2023 10:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244173AbjHYKUB (ORCPT ); Fri, 25 Aug 2023 06:20:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244413AbjHYKTu (ORCPT ); Fri, 25 Aug 2023 06:19:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3A93211B; Fri, 25 Aug 2023 03:19:29 -0700 (PDT) Date: Fri, 25 Aug 2023 10:19:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692958768; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yGnbo0UCy1jiV63yTKGTInHYBSyWoZfSHCRypChFJiA=; b=VCWUWbFOCoVA8D6vURHzaMT5ibRrnE2RqtkTEYJo6gBdesmq7KuB4OYox4AX6xWy8jYmG3 seWrK9+EDdqsoTI5HCLfXiAc7DJpM7inLx9veCjsN0obK94FUJIVPq7w0Te/D0MINRajN2 3HLSUbzB2cotoukaRTmOvLXaQbs3dUfztphV7FPv4Z3roDSzhmsHi09ox+aWqszSnkb1wP 72yYRlSGbR4LI9FCa9RYDCQk5FsHXpoyQJjYlq2zB2CvvJizWKGuzJCA/fgv6kM7+WBcpg 1ke1ADexI0GduYamK5V2abU+udaAW2GHc76AfmSFiT9s4vJvMchVXEFiLukfLw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692958768; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yGnbo0UCy1jiV63yTKGTInHYBSyWoZfSHCRypChFJiA=; b=J+wE5Hl92Jlg3xXMYjKWtkGbCvY6hhzhVAlOZG/DT7NfZIZGBIFA4RB+aMy1Jz5lFnU9nT 2/uldypyXjx6CbAA== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/bugs] x86/retpoline: Remove .text..__x86.return_thunk section Cc: Josh Poimboeuf , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <34947acf1c8a1be2d3ba9a4d0dd8a3001ae3c0db.1692919072.git.jpoimboe@kernel.org> References: <34947acf1c8a1be2d3ba9a4d0dd8a3001ae3c0db.1692919072.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169295876766.27769.14642045062732796018.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/bugs branch of tip: Commit-ID: dc184c7c1fe9670148fd74d9d5d7cf8894a65e64 Gitweb: https://git.kernel.org/tip/dc184c7c1fe9670148fd74d9d5d7cf889= 4a65e64 Author: Josh Poimboeuf AuthorDate: Fri, 25 Aug 2023 00:01:52 -07:00 Committer: Ingo Molnar CommitterDate: Fri, 25 Aug 2023 11:22:02 +02:00 x86/retpoline: Remove .text..__x86.return_thunk section The '.text..__x86.return_thunk' section has no purpose. Remove it and let the return thunk code live in '.text..__x86.indirect_thunk'. Signed-off-by: Josh Poimboeuf Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/34947acf1c8a1be2d3ba9a4d0dd8a3001ae3c0db.16= 92919072.git.jpoimboe@kernel.org --- arch/x86/kernel/vmlinux.lds.S | 3 --- arch/x86/lib/retpoline.S | 2 -- 2 files changed, 5 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 9188834..f1c3516 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -132,10 +132,7 @@ SECTIONS LOCK_TEXT KPROBES_TEXT SOFTIRQENTRY_TEXT -#ifdef CONFIG_RETPOLINE *(.text..__x86.indirect_thunk) - *(.text..__x86.return_thunk) -#endif STATIC_CALL_TEXT =20 ALIGN_ENTRY_TEXT_BEGIN diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index 415521d..49f2be7 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -129,8 +129,6 @@ SYM_CODE_END(__x86_indirect_jump_thunk_array) =20 #ifdef CONFIG_RETHUNK =20 - .section .text..__x86.return_thunk - #ifdef CONFIG_CPU_SRSO =20 /*