From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Ingo Molnar <mingo@kernel.org>, Amit Shah <amit.shah@amd.com>,
Nikolay Borisov <nik.borisov@suse.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Sean Christopherson <seanjc@google.com>,
David Woodhouse <dwmw2@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline
Date: Wed, 09 Apr 2025 11:44:24 -0000 [thread overview]
Message-ID: <174419906403.31282.6211937821580800684.tip-bot2@tip-bot2> (raw)
In-Reply-To: <84a1226e5c9e2698eae1b5ade861f1b8bf3677dc.1744148254.git.jpoimboe@kernel.org>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 18bae0dfec15b24ec14ca17dc18603372f5f254f
Gitweb: https://git.kernel.org/tip/18bae0dfec15b24ec14ca17dc18603372f5f254f
Author: Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate: Tue, 08 Apr 2025 14:47:33 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 09 Apr 2025 12:41:55 +02:00
x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline
eIBRS protects against guest->host RSB underflow/poisoning attacks.
Adding retpoline to the mix doesn't change that. Retpoline has a
balanced CALL/RET anyway.
So the current full RSB filling on VMEXIT with eIBRS+retpoline is
overkill. Disable it or do the VMEXIT_LITE mitigation if needed.
Suggested-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Reviewed-by: Amit Shah <amit.shah@amd.com>
Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Link: https://lore.kernel.org/r/84a1226e5c9e2698eae1b5ade861f1b8bf3677dc.1744148254.git.jpoimboe@kernel.org
---
arch/x86/kernel/cpu/bugs.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 9926509..a10b37b 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1617,20 +1617,20 @@ static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_
case SPECTRE_V2_NONE:
return;
- case SPECTRE_V2_EIBRS_LFENCE:
case SPECTRE_V2_EIBRS:
+ case SPECTRE_V2_EIBRS_LFENCE:
+ case SPECTRE_V2_EIBRS_RETPOLINE:
if (boot_cpu_has_bug(X86_BUG_EIBRS_PBRSB)) {
- setup_force_cpu_cap(X86_FEATURE_RSB_VMEXIT_LITE);
pr_info("Spectre v2 / PBRSB-eIBRS: Retire a single CALL on VMEXIT\n");
+ setup_force_cpu_cap(X86_FEATURE_RSB_VMEXIT_LITE);
}
return;
- case SPECTRE_V2_EIBRS_RETPOLINE:
case SPECTRE_V2_RETPOLINE:
case SPECTRE_V2_LFENCE:
case SPECTRE_V2_IBRS:
- setup_force_cpu_cap(X86_FEATURE_RSB_VMEXIT);
pr_info("Spectre v2 / SpectreRSB : Filling RSB on VMEXIT\n");
+ setup_force_cpu_cap(X86_FEATURE_RSB_VMEXIT);
return;
}
next prev parent reply other threads:[~2025-04-09 11:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 21:47 [PATCH v4 0/6] x86/bugs: RSB mitigation fixes and documentation Josh Poimboeuf
2025-04-08 21:47 ` [PATCH v4 1/6] x86/bugs: Rename entry_ibpb() to write_ibpb() Josh Poimboeuf
2025-04-09 11:44 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2025-04-08 21:47 ` [PATCH v4 2/6] x86/bugs: Use SBPB in write_ibpb() if applicable Josh Poimboeuf
2025-04-09 11:44 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2025-04-08 21:47 ` [PATCH v4 3/6] x86/bugs: Fix RSB clearing in indirect_branch_prediction_barrier() Josh Poimboeuf
2025-04-09 11:44 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2025-04-08 21:47 ` [PATCH v4 4/6] x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline Josh Poimboeuf
2025-04-09 11:44 ` tip-bot2 for Josh Poimboeuf [this message]
2025-04-08 21:47 ` [PATCH v4 5/6] x86/bugs: Don't fill RSB on context switch with eIBRS Josh Poimboeuf
2025-04-09 11:44 ` [tip: x86/urgent] " tip-bot2 for Josh Poimboeuf
2025-04-08 21:47 ` [PATCH v4 6/6] x86/bugs: Add RSB mitigation document Josh Poimboeuf
2025-04-09 11:44 ` [tip: x86/urgent] " 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=174419906403.31282.6211937821580800684.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=amit.shah@amd.com \
--cc=dwmw2@infradead.org \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=nik.borisov@suse.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®