| Message ID | 169547160659.27769.5070102102622144817.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp143811vqu;
Sat, 23 Sep 2023 05:21:18 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IFa8cMlhGHDd7hGYg3We7lhta7kG6Mj6qyyq2w26XCUGxqxBlc5x1ZGoEzPFAMTcYS/grc9
X-Received: by 2002:a05:6a20:9704:b0:15d:42d5:6cc1 with SMTP id
hr4-20020a056a20970400b0015d42d56cc1mr1618313pzc.33.1695471677616;
Sat, 23 Sep 2023 05:21:17 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1695471677; cv=none;
d=google.com; s=arc-20160816;
b=CHDdKwc6l+H3Ufb5KQX9xrqoYt5hVayWMHmi5Ey5jHoilc19EspAslUY/iLv7DarGA
obc8dtf4DeMNpcRq6fN6tvqFkjJPnQs7CX5LlOvi2qMg46W4gX13kUkTDDhnn7+5L/Ke
gBGNEDiT2i061nO0uRFWpm6MNtQ76vcNCqporz+n6qKPLHpyZEWxnjHUA9vphej2zqhN
E0bjZmwgmDHMjnsvIjazUsBOII6QXfmLRcnoRNF/NZvWZzjayfpsezgw1pPotxJ5nDvd
MIpKHN5d16bs5FVzKGmtNY8QxnfPLaTm5MS5O8Kl9w0RHMJ4rBRSeimBPIK75wn4F/hm
YbWA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:robot-unsubscribe
:robot-id:message-id:mime-version:references:in-reply-to:cc:subject
:to:reply-to:sender:from:dkim-signature:dkim-signature:date;
bh=yGM3OuNYOeLEY9A/PpFZJmRG5FMx2lMx2k/At7qKd+Q=;
fh=TJa98jjcJcAUyvo2yQiOqi+wukdLlQU80th5XskGe8U=;
b=0oC+IiJ5jrEophFuB/B9DQM2mNesoxR3bfcV7JaU4Sohd2Zg2h1Blqmlzihn7EmmDf
hH/2FGXdAJoQWb/XFY/RFt/aROfE1uaQG3tCr+DnwVZji/C2YgDa99bjVMzIQ3bldzEl
ZcEmzdcV6QlR9t+wIZlyfU3VLUag/LsnouE5jBBdjf1DWEjY7yWV0SUnpiLfPtjduxS4
iJtT2sy2DXX6uvfIuHxkyWNdHroQTNFGfmOwJisSxlXUajzqEvnf+owdleiLVkHKfbVC
1mH91YV/zpcRcxWvjp7n++H0dmsYJDc4xrP5B6y9/l41zjuJDL+Sz2+QzznZyipaHi5h
H2tA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=TB1CVDFU;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=Ei6O5dZC;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from snail.vger.email (snail.vger.email. [23.128.96.37])
by mx.google.com with ESMTPS id
kg3-20020a170903060300b0019c354055d0si5473418plb.304.2023.09.23.05.21.17
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 23 Sep 2023 05:21:17 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=TB1CVDFU;
dkim=neutral (no key) header.i=@linutronix.de header.s=2020e
header.b=Ei6O5dZC;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.37 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by snail.vger.email (Postfix) with ESMTP id 866CB812DBED;
Sat, 23 Sep 2023 05:20:23 -0700 (PDT)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231653AbjIWMUV (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 29 others); Sat, 23 Sep 2023 08:20:21 -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
<rfc822;linux-kernel@vger.kernel.org>);
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" <tip-bot2@linutronix.de>
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 <jpoimboe@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>, 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: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]);
Sat, 23 Sep 2023 05:20:23 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1776217642846242382
X-GMAIL-MSGID: 1777830909847738780
|
| Series |
[tip:,x86/bugs] x86/retpoline: Remove .text..__x86.return_thunk section
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Sept. 23, 2023, 12:20 p.m. UTC
The following commit has been merged into the x86/bugs branch of tip: Commit-ID: e92626af3234708fe30f53b269d210d202b95206 Gitweb: https://git.kernel.org/tip/e92626af3234708fe30f53b269d210d202b95206 Author: Josh Poimboeuf <jpoimboe@kernel.org> AuthorDate: Mon, 04 Sep 2023 22:05:02 -07:00 Committer: Ingo Molnar <mingo@kernel.org> 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 <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/291aad1dcb2d27c6241fe3f182d66119857757fd.1693889988.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 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) #ifdef CONFIG_RETHUNK - .section .text..__x86.return_thunk - #ifdef CONFIG_CPU_SRSO /*