All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip: x86/bugs] x86/srso: Improve i-cache locality for alias mitigation
Date: Tue, 05 Sep 2023 10:09:36 -0000	[thread overview]
Message-ID: <169390857647.27769.6880236150175152859.tip-bot2@tip-bot2> (raw)
In-Reply-To: <eadaf5530b46a7ae8b936522da45ae555d2b3393.1693889988.git.jpoimboe@kernel.org>

The following commit has been merged into the x86/bugs branch of tip:

Commit-ID:     001c04b48252282f3045acbdc4e91fb6f4142085
Gitweb:        https://git.kernel.org/tip/001c04b48252282f3045acbdc4e91fb6f4142085
Author:        Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate:    Mon, 04 Sep 2023 22:04:55 -07:00
Committer:     Ingo Molnar <mingo@kernel.org>
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 <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/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:
  *

  reply	other threads:[~2023-09-05 16:42 UTC|newest]

Thread overview: 93+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-05  5:04 [PATCH v3 00/20] SRSO fixes/cleanups Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 01/20] x86/srso: Fix srso_show_state() side effect Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 02/20] x86/srso: Set CPUID feature bits independently of bug or mitigation status Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 03/20] x86/srso: Don't probe microcode in a guest Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 04/20] x86/srso: Fix SBPB enablement for spec_rstack_overflow=off Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:45   ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 05/20] x86/srso: Fix SBPB enablement for (possible) future fixed HW Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 06/20] x86/srso: Print actual mitigation if requested mitigation isn't possible Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 07/20] x86/srso: Print mitigation for retbleed IBPB case Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 08/20] x86/srso: Fix vulnerability reporting for missing microcode Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 09/20] x86/srso: Fix unret validation dependencies Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 10/20] x86/alternatives: Remove faulty optimization Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 11/20] x86/srso: Improve i-cache locality for alias mitigation Josh Poimboeuf
2023-09-05 10:09   ` tip-bot2 for Josh Poimboeuf [this message]
2023-09-19  9:53   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 12/20] x86/srso: Unexport untraining functions Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 13/20] x86/srso: Remove 'pred_cmd' label Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 14/20] x86/bugs: Remove default case for fully switched enums Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:04 ` [PATCH v3 15/20] x86/srso: Move retbleed IBPB check into existing 'has_microcode' code block Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 16/20] x86/srso: Disentangle rethunk-dependent options Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 17/20] x86/rethunk: Use SYM_CODE_START[_LOCAL]_NOALIGN macros Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 18/20] x86/retpoline: Remove .text..__x86.return_thunk section Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 19/20] x86/nospec: Refactor UNTRAIN_RET[_*] Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  5:05 ` [PATCH v3 20/20] x86/calldepth: Rename __x86_return_skl() to call_depth_return_thunk() Josh Poimboeuf
2023-09-05 10:09   ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf
2023-09-19  9:53   ` tip-bot2 for Josh Poimboeuf
2023-09-23 12:20   ` tip-bot2 for Josh Poimboeuf
2023-10-20 11:37   ` tip-bot2 for Josh Poimboeuf
2023-09-05  6:35 ` [PATCH v3 00/20] SRSO fixes/cleanups Borislav Petkov
2023-09-05 10:02   ` Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2023-08-25  7:01 [PATCH 13/23] x86/srso: Improve i-cache locality for alias mitigation Josh Poimboeuf
2023-08-25 10:19 ` [tip: x86/bugs] " tip-bot2 for Josh Poimboeuf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=169390857647.27769.6880236150175152859.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=jpoimboe@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.