| Message ID | 169780184083.3135.315755126931045324.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id
fe16csp990506vqb;
Fri, 20 Oct 2023 04:38:05 -0700 (PDT)
X-Google-Smtp-Source:
AGHT+IEON9WXTogDfwNU+UgGtVl5OsGbadpQWxBhW0Lh4pN8J+ScYJDoweCb5w0ZlHELrwONjQxB
X-Received: by 2002:a05:6e02:1a4f:b0:34f:c9b4:5f9c with SMTP id
u15-20020a056e021a4f00b0034fc9b45f9cmr1893580ilv.31.1697801885316;
Fri, 20 Oct 2023 04:38:05 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1697801885; cv=none;
d=google.com; s=arc-20160816;
b=QTWJ3oRCLxXo6wTl1/dDgEmHdAMPkLTcgCTeMujNzzdbiRTO5k/uyogOpCFannwQPN
gCclVsUoMoyTyS9hV3xLnVcoxQMu6f3nhBd97BjBSCGuGEEfmC3EjLvXYta3dnYKmypL
xkhBQDnfJQEHqLoYZGAvuExuwSZrT/1tc2jVZmUqOoOfr/Zdx5OzOYgL7GKcmwkR4pS5
GfBuismXUP9FyBzK8xXD7KQXR8gCF+JBPwS3SidBKZ0G62uILEHbkz4iFSmRQY0UzjMs
TVSN2W+KnQIGGcpJWuxB2r79i5VLxfpZIB+sTFBC/IkfhegkST+TCaIv+Aj/Oxcel4n6
04qg==
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=4MDUK7liIbBHakljKlJh+tNiTWzLiecpqWQOUGcxgGM=;
fh=TJa98jjcJcAUyvo2yQiOqi+wukdLlQU80th5XskGe8U=;
b=AUcj0lMapz3/4L/tWxRD4kZFbX1IJ/prlCCgZ0hsg2/tXm8bcsoPVH7a94nuM7ahKw
/vYom4hI1ppAxvF6ThICP5Y/VKXuk4rZ3eXWRRW67kucmodlTcQmSZJfW3PS2gYEecPS
b8mpuUBfHV0/oLi/FayC0BEBDjV67FKl25SYbI5OpTJBWRp0wXpviKueh4pXtkgrSd2p
CVWIb1+8551Kk7YZB3vDGqLXC8o/2bom1fMWrnJ0HqmDFGBH+t1xuIWo6n4UVI9E021Y
ZGigZVNXh3/qNBoqsUy6IE/HIRr/71iHvDchyQNKvGnWDywf8j+ssaQJGDW7RB1MbCEq
qvDw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=gVnL7xZL;
dkim=neutral (no key) header.i=@linutronix.de;
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
u26-20020a056a00099a00b006be5a6cd3f3si1808644pfg.285.2023.10.20.04.38.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 20 Oct 2023 04:38:05 -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=gVnL7xZL;
dkim=neutral (no key) header.i=@linutronix.de;
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 856B082F05F1;
Fri, 20 Oct 2023 04:38:04 -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 S1377314AbjJTLh7 (ORCPT <rfc822;lkml4gm@gmail.com> + 25 others);
Fri, 20 Oct 2023 07:37:59 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41108 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1377159AbjJTLh1 (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 20 Oct 2023 07:37:27 -0400
Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F006D5E;
Fri, 20 Oct 2023 04:37:23 -0700 (PDT)
Date: Fri, 20 Oct 2023 11:37:20 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1697801841;
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=4MDUK7liIbBHakljKlJh+tNiTWzLiecpqWQOUGcxgGM=;
b=gVnL7xZLyLXsuOzbHlznv/nGu+IRslKX0ZvIIUaxFwcroIe7RGj0aKMu7HhOOW+phFMmG5
uChrpxb2TQTyYlAIlxICNZ0hx668O8n/jUpknWwHygapnhcefc3SxnLg7NWlRKFfKSL3cK
t+VKLn8A1NMCe/CLU6Z0Y9legumPYb6xGaYXBCx83JNA5lCeuY2ykh4t/pr3+wPfLQ61N6
TEmAzvknl0lDKbF1b/IQroFSJ744zOp92LuYpy0HP/dWfE/pNrKsz7cU0a9jue2EZMlqWr
sf7X3+cMk8889r9aJkx7/eNzuEiGRmcJZoXXm/ouDgHyuDHUGmVzyc/WPXM2TQ==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1697801841;
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=4MDUK7liIbBHakljKlJh+tNiTWzLiecpqWQOUGcxgGM=;
b=7/2tY9uNPri68giKzyYpcsVTgpPd6mn87ZxbbAsfup6bcJJP5Q5jlpGITRoQETs7HvVHNA
/8npkclzq5dYe+DQ==
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/srso: Improve i-cache locality for alias
mitigation
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:
<eadaf5530b46a7ae8b936522da45ae555d2b3393.1693889988.git.jpoimboe@kernel.org>
References:
<eadaf5530b46a7ae8b936522da45ae555d2b3393.1693889988.git.jpoimboe@kernel.org>
MIME-Version: 1.0
Message-ID: <169780184083.3135.315755126931045324.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=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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]);
Fri, 20 Oct 2023 04:38:04 -0700 (PDT)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1777459377698584663
X-GMAIL-MSGID: 1780274309727897332
|
| Series |
[tip:,x86/bugs] x86/srso: Improve i-cache locality for alias mitigation
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Oct. 20, 2023, 11:37 a.m. UTC
The following commit has been merged into the x86/bugs branch of tip: Commit-ID: aa730cff0c26244e88066b5b461a9f5fbac13823 Gitweb: https://git.kernel.org/tip/aa730cff0c26244e88066b5b461a9f5fbac13823 Author: Josh Poimboeuf <jpoimboe@kernel.org> AuthorDate: Mon, 04 Sep 2023 22:04:55 -07:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Fri, 20 Oct 2023 12:04:18 +02:00 x86/srso: Improve i-cache locality for alias mitigation Move srso_alias_return_thunk() to the same section as srso_alias_safe_ret() so they can share a cache line. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Acked-by: Borislav Petkov (AMD) <bp@alien8.de> Link: https://lore.kernel.org/r/eadaf5530b46a7ae8b936522da45ae555d2b3393.1693889988.git.jpoimboe@kernel.org --- arch/x86/lib/retpoline.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/lib/retpoline.S b/arch/x86/lib/retpoline.S index cd86aeb..9ab634f 100644 --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -177,15 +177,14 @@ SYM_START(srso_alias_safe_ret, SYM_L_GLOBAL, SYM_A_NONE) int3 SYM_FUNC_END(srso_alias_safe_ret) - .section .text..__x86.return_thunk - -SYM_CODE_START(srso_alias_return_thunk) +SYM_CODE_START_NOALIGN(srso_alias_return_thunk) UNWIND_HINT_FUNC ANNOTATE_NOENDBR call srso_alias_safe_ret ud2 SYM_CODE_END(srso_alias_return_thunk) + .section .text..__x86.return_thunk /* * Some generic notes on the untraining sequences: *