Skip to content

Commit 7e44909

Browse files
pa1guptabp3tk0v
authored andcommitted
x86/bugs: Use switch/case in its_apply_mitigation()
Prepare to apply stuffing mitigation in its_apply_mitigation(). This is currently only done via retbleed mitigation. Also using switch/case makes it evident that mitigation mode like VMEXIT_ONLY doesn't need any special handling. Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Nikolay Borisov <nik.borisov@suse.com> Link: https://lore.kernel.org/20250611-eibrs-fix-v4-4-5ff86cac6c61@linux.intel.com
1 parent 9f85fdb commit 7e44909

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

arch/x86/kernel/cpu/bugs.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1468,15 +1468,21 @@ static void __init its_update_mitigation(void)
14681468

14691469
static void __init its_apply_mitigation(void)
14701470
{
1471+
switch (its_mitigation) {
1472+
case ITS_MITIGATION_OFF:
1473+
case ITS_MITIGATION_AUTO:
1474+
case ITS_MITIGATION_VMEXIT_ONLY:
14711475
/* its=stuff forces retbleed stuffing and is enabled there. */
1472-
if (its_mitigation != ITS_MITIGATION_ALIGNED_THUNKS)
1473-
return;
1474-
1475-
if (!boot_cpu_has(X86_FEATURE_RETPOLINE))
1476-
setup_force_cpu_cap(X86_FEATURE_INDIRECT_THUNK_ITS);
1476+
case ITS_MITIGATION_RETPOLINE_STUFF:
1477+
break;
1478+
case ITS_MITIGATION_ALIGNED_THUNKS:
1479+
if (!boot_cpu_has(X86_FEATURE_RETPOLINE))
1480+
setup_force_cpu_cap(X86_FEATURE_INDIRECT_THUNK_ITS);
14771481

1478-
setup_force_cpu_cap(X86_FEATURE_RETHUNK);
1479-
set_return_thunk(its_return_thunk);
1482+
setup_force_cpu_cap(X86_FEATURE_RETHUNK);
1483+
set_return_thunk(its_return_thunk);
1484+
break;
1485+
}
14801486
}
14811487

14821488
#undef pr_fmt

0 commit comments

Comments
 (0)