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 CA490CE7A89 for ; Sat, 23 Sep 2023 12:20:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231656AbjIWMUX (ORCPT ); Sat, 23 Sep 2023 08:20:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbjIWMUQ (ORCPT ); Sat, 23 Sep 2023 08:20:16 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6ADA19E; Sat, 23 Sep 2023 05:20:08 -0700 (PDT) Date: Sat, 23 Sep 2023 12:20:06 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695471607; 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=yGM3OuNYOeLEY9A/PpFZJmRG5FMx2lMx2k/At7qKd+Q=; b=TB1CVDFU3mC3IPOw5KDkwcT4JS/vTFtYesNjBF25Uj0A8CK32z61e1JJ/Bvx4fm+/Cc0aZ AyoiTLX3rgL3nSJzoosm8AtzpJdHOrpGfj2KiObli/OFEKm2O4x7InKzZjjtKgz3nRGdQX E3tVcl61ZSMehzW3AMQXvjF0eisViXoFWoHZ+GWeWu5kCnggJ/ga6jPO1WGy1QNTeilJWA 6RdtzN1iCXLwORKXhAIYtF58eP+rEbIBsy2MZ5mtOcdgQjcTXzl/TcAB3tGoD/ZKimbANS Uvz4tiuLj9Z8wcBDGY+n2H3ePt9xwQ8eBueHS4xf2I00KN2dA1Ucfme8yC6wiA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695471607; 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=yGM3OuNYOeLEY9A/PpFZJmRG5FMx2lMx2k/At7qKd+Q=; b=Ei6O5dZCeQPc0lYILwt87GQbIGuij4JWYqLV5bzomX81BSHlo4YgdxNsDPe+Cv6d2rRn+P QGv4MktJJcigtRAw== 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 , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <291aad1dcb2d27c6241fe3f182d66119857757fd.1693889988.git.jpoimboe@kernel.org> References: <291aad1dcb2d27c6241fe3f182d66119857757fd.1693889988.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <169547160659.27769.5070102102622144817.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: e92626af3234708fe30f53b269d210d202b95206 Gitweb: https://git.kernel.org/tip/e92626af3234708fe30f53b269d210d20= 2b95206 Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:05:02 -07:00 Committer: Ingo Molnar CommitterDate: Sat, 23 Sep 2023 14:13:03 +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 Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/291aad1dcb2d27c6241fe3f182d66119857757fd.16= 93889988.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 54a5596..9cdb1a7 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 /*