From nobody Tue Dec 23 10:27: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 F3B31C83F3E for ; Tue, 5 Sep 2023 16:42:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240569AbjIEQmQ (ORCPT ); Tue, 5 Sep 2023 12:42:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354198AbjIEKJl (ORCPT ); Tue, 5 Sep 2023 06:09:41 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 666561BE; Tue, 5 Sep 2023 03:09:38 -0700 (PDT) Date: Tue, 05 Sep 2023 10:09:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1693908577; 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=4XJUOH23dTSWoWK37vBLSO/blKErsQ6muwpWeqFJt5o=; b=CUMmClJir5KK5z1aBYXKuQ+CmYr4UM3Jhs/boi06XD+v69P+1s0FOm46xauqUl12VPWQkh dmhvgYB3rx7KBZ546hoe9fY7FDdt10d2rf/Hfr/B8Xb37JDAYn9yy6DGgAwKravDzBfLmw HEgvTIO1JtJtPgVkwhuOEWEMJLpYes0i724ictY6NOTdO5un8H/OFDCsViR0LXmhQeDrFW hVyu55WcJDWaXAabuzmDaPC4D6PtUCOIEglZA4BcY9uACMLZueHSdgawgNVnYzZh/d5u5U jnTYdpUpZlA36RyMQsZI0kK/Ci58hDj4YO9PNdiCFLO7gynNPylu8y4zFCJTQA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1693908577; 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=4XJUOH23dTSWoWK37vBLSO/blKErsQ6muwpWeqFJt5o=; b=+t8RESvCd/gjHwkg1O/ukx+vVNZjIfO5yFniz/PKtT6qXo7os4OK0ID6GJbNJiGALkOiry ZQCHYCR02SH7UMCQ== 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/srso: Improve i-cache locality for alias mitigation Cc: Josh Poimboeuf , Ingo Molnar , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169390857647.27769.6880236150175152859.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: 001c04b48252282f3045acbdc4e91fb6f4142085 Gitweb: https://git.kernel.org/tip/001c04b48252282f3045acbdc4e91fb6f= 4142085 Author: Josh Poimboeuf AuthorDate: Mon, 04 Sep 2023 22:04:55 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 05 Sep 2023 12:05:07 +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 Signed-off-by: Ingo Molnar Acked-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/eadaf5530b46a7ae8b936522da45ae555d2b3393.16= 93889988.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_NO= NE) int3 SYM_FUNC_END(srso_alias_safe_ret) =20 - .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) =20 + .section .text..__x86.return_thunk /* * Some generic notes on the untraining sequences: *