Skip to content

Commit 2bb658a

Browse files
pa1guptagregkh
authored andcommitted
x86/vmscape: Warn when STIBP is disabled with SMT
Commit b7cc988 upstream. Cross-thread attacks are generally harder as they require the victim to be co-located on a core. However, with VMSCAPE the adversary targets belong to the same guest execution, that are more likely to get co-located. In particular, a thread that is currently executing userspace hypervisor (after the IBPB) may still be targeted by a guest execution from a sibling thread. Issue a warning about the potential risk, except when: - SMT is disabled - STIBP is enabled system-wide - Intel eIBRS is enabled (which implies STIBP protection) Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 923ab9f commit 2bb658a

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

arch/x86/kernel/cpu/bugs.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3223,6 +3223,28 @@ void cpu_bugs_smt_update(void)
32233223
break;
32243224
}
32253225

3226+
switch (vmscape_mitigation) {
3227+
case VMSCAPE_MITIGATION_NONE:
3228+
case VMSCAPE_MITIGATION_AUTO:
3229+
break;
3230+
case VMSCAPE_MITIGATION_IBPB_ON_VMEXIT:
3231+
case VMSCAPE_MITIGATION_IBPB_EXIT_TO_USER:
3232+
/*
3233+
* Hypervisors can be attacked across-threads, warn for SMT when
3234+
* STIBP is not already enabled system-wide.
3235+
*
3236+
* Intel eIBRS (!AUTOIBRS) implies STIBP on.
3237+
*/
3238+
if (!sched_smt_active() ||
3239+
spectre_v2_user_stibp == SPECTRE_V2_USER_STRICT ||
3240+
spectre_v2_user_stibp == SPECTRE_V2_USER_STRICT_PREFERRED ||
3241+
(spectre_v2_in_eibrs_mode(spectre_v2_enabled) &&
3242+
!boot_cpu_has(X86_FEATURE_AUTOIBRS)))
3243+
break;
3244+
pr_warn_once(VMSCAPE_MSG_SMT);
3245+
break;
3246+
}
3247+
32263248
mutex_unlock(&spec_ctrl_mutex);
32273249
}
32283250

0 commit comments

Comments
 (0)