All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86/its: use Sapphire Rapids+ feature to opt out
@ 2025-10-17  1:12 Jon Kohler
  2025-10-20 15:48 ` Sean Christopherson
  2025-10-20 19:44 ` Pawan Gupta
  0 siblings, 2 replies; 23+ messages in thread
From: Jon Kohler @ 2025-10-17  1:12 UTC (permalink / raw)
  To: Thomas Gleixner, Borislav Petkov, Peter Zijlstra, Josh Poimboeuf,
	Pawan Gupta, Jonathan Corbet, Ingo Molnar, Dave Hansen, x86,
	H. Peter Anvin, Brian Gerst, Brendan Jackman, Ahmed S. Darwish,
	Alexandre Chartre, linux-doc, linux-kernel
  Cc: Jon Kohler

A VMM may not expose ITS_NO or BHI_CTL, so guests cannot rely on those
bits to determine whether they might be migrated to ITS-affected
hardware. Rather than depending on a control that may be absent, detect
ITS-unaffected hosts via a CPU feature that is exclusive to Sapphire
Rapids and newer processors.

Use X86_FEATURE_BUS_LOCK_DETECT as the canary: it is present on
Sapphire Rapids+ parts and provides a reliable indicator that the guest
won't be moved to ITS-affected hardware. This avoids false negatives
caused by VMMs that omit ITS_NO or BHI_CTL. For example, QEMU added
bhi-ctrl only in v9.2.0 [1], well after adding the Sapphire Rapids
model in v8.0.0 [2].

[1] 10eaf9c0fb7 ("target/i386: Add more features enumerated by CPUID.7.2.EDX")
[2] 7eb061b06e9 ("i386: Add new CPU model SapphireRapids")

Cc: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Fixes: 159013a7ca1 ("x86/its: Enumerate Indirect Target Selection (ITS) bug")
Signed-off-by: Jon Kohler <jon@nutanix.com>
---
 .../admin-guide/hw-vuln/indirect-target-selection.rst       | 5 +++--
 arch/x86/kernel/cpu/common.c                                | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Documentation/admin-guide/hw-vuln/indirect-target-selection.rst b/Documentation/admin-guide/hw-vuln/indirect-target-selection.rst
index d9ca64108d23..3cfe4b9f9bd0 100644
--- a/Documentation/admin-guide/hw-vuln/indirect-target-selection.rst
+++ b/Documentation/admin-guide/hw-vuln/indirect-target-selection.rst
@@ -98,8 +98,9 @@ Mitigation in guests
 ^^^^^^^^^^^^^^^^^^^^
 All guests deploy ITS mitigation by default, irrespective of eIBRS enumeration
 and Family/Model of the guest. This is because eIBRS feature could be hidden
-from a guest. One exception to this is when a guest enumerates BHI_DIS_S, which
-indicates that the guest is running on an unaffected host.
+from a guest. One exception to this is when a guest enumerates BHI_DIS_S or
+BUS_LOCK_DETECT, either of which indicates that the guest is running on an
+unaffected host and would not be migratable to an affected host.
 
 To prevent guests from unnecessarily deploying the mitigation on unaffected
 platforms, Intel has defined ITS_NO bit(62) in MSR IA32_ARCH_CAPABILITIES. When
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c7d3512914ca..3de4b51d8681 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1361,9 +1361,11 @@ static bool __init vulnerable_to_its(u64 x86_arch_cap_msr)
 	/*
 	 * If a VMM did not expose ITS_NO, assume that a guest could
 	 * be running on a vulnerable hardware or may migrate to such
-	 * hardware.
+	 * hardware, except in the situation where the guest is presented
+	 * with a feature that only exists in non-vulnerable hardware.
 	 */
-	if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
+	if (boot_cpu_has(X86_FEATURE_HYPERVISOR) ||
+	    boot_cpu_has(X86_FEATURE_BUS_LOCK_DETECT))
 		return true;
 
 	if (cpu_matches(cpu_vuln_blacklist, ITS))
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2025-10-21 15:47 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-17  1:12 [PATCH] x86/its: use Sapphire Rapids+ feature to opt out Jon Kohler
2025-10-20 15:48 ` Sean Christopherson
2025-10-20 16:05   ` Jon Kohler
2025-10-20 16:21     ` Dave Hansen
2025-10-20 16:26       ` Jon Kohler
2025-10-20 19:26       ` Pawan Gupta
2025-10-20 19:38         ` Jon Kohler
2025-10-20 19:53           ` Pawan Gupta
2025-10-20 20:29             ` Jon Kohler
2025-10-20 19:44 ` Pawan Gupta
2025-10-20 19:54   ` Jon Kohler
2025-10-20 20:40     ` Pawan Gupta
2025-10-20 21:02       ` Jon Kohler
2025-10-20 22:09       ` Dave Hansen
2025-10-20 22:41         ` Pawan Gupta
2025-10-21 13:40           ` Jon Kohler
2025-10-21 14:01             ` Dave Hansen
2025-10-21 14:39               ` Jon Kohler
2025-10-21 15:21                 ` Dave Hansen
2025-10-21 15:40                   ` Jon Kohler
2025-10-21 15:27                 ` Konrad Rzeszutek Wilk
2025-10-21 15:35                   ` Jon Kohler
2025-10-21 15:46                     ` Konrad Rzeszutek Wilk

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.