Skip to content

Commit

Permalink
x86/speculation/mds: Add mitigation control for MDS
Browse files Browse the repository at this point in the history
commit bc1241700acd82ec69fde98c5763ce51086269f8 upstream.

Now that the mitigations are in place, add a command line parameter to
control the mitigation, a mitigation selector function and a SMT update
mechanism.

This is the minimal straight forward initial implementation which just
provides an always on/off mode. The command line parameter is:

  mds=[full|off]

This is consistent with the existing mitigations for other speculative
hardware vulnerabilities.

The idle invocation is dynamically updated according to the SMT state of
the system similar to the dynamic update of the STIBP mitigation. The idle
mitigation is limited to CPUs which are only affected by MSBDS and not any
other variant, because the other variants cannot be mitigated on SMT
enabled systems.

Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Borislav Petkov <[email protected]>
Reviewed-by: Jon Masters <[email protected]>
Tested-by: Jon Masters <[email protected]>
[bwh: Backported to 4.4:
 - Drop " __ro_after_init"
 - Adjust filename, context]
Signed-off-by: Ben Hutchings <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
KAGA-KOKO authored and gregkh committed May 16, 2019
1 parent d4c1e6c commit 8c7398b
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 0 deletions.
22 changes: 22 additions & 0 deletions Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2035,6 +2035,28 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Format: <first>,<last>
Specifies range of consoles to be captured by the MDA.

mds= [X86,INTEL]
Control mitigation for the Micro-architectural Data
Sampling (MDS) vulnerability.

Certain CPUs are vulnerable to an exploit against CPU
internal buffers which can forward information to a
disclosure gadget under certain conditions.

In vulnerable processors, the speculatively
forwarded data can be used in a cache side channel
attack, to access data to which the attacker does
not have direct access.

This parameter controls the MDS mitigation. The
options are:

full - Enable MDS mitigation on vulnerable CPUs
off - Unconditionally disable MDS mitigation

Not specifying this option is equivalent to
mds=full.

mem=nn[KMG] [KNL,BOOT] Force usage of a specific amount of memory
Amount of memory to be used when the kernel is not able
to see the whole system memory or for test.
Expand Down
6 changes: 6 additions & 0 deletions arch/x86/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -845,4 +845,10 @@ bool xen_set_default_idle(void);

void stop_this_cpu(void *dummy);
void df_debug(struct pt_regs *regs, long error_code);

enum mds_mitigations {
MDS_MITIGATION_OFF,
MDS_MITIGATION_FULL,
};

#endif /* _ASM_X86_PROCESSOR_H */
70 changes: 70 additions & 0 deletions arch/x86/kernel/cpu/bugs.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
static void __init spectre_v2_select_mitigation(void);
static void __init ssb_select_mitigation(void);
static void __init l1tf_select_mitigation(void);
static void __init mds_select_mitigation(void);

/* The base value of the SPEC_CTRL MSR that always has to be preserved. */
u64 x86_spec_ctrl_base;
Expand Down Expand Up @@ -96,6 +97,8 @@ void __init check_bugs(void)

l1tf_select_mitigation();

mds_select_mitigation();

#ifdef CONFIG_X86_32
/*
* Check whether we are able to run this kernel safely on SMP.
Expand Down Expand Up @@ -201,6 +204,50 @@ static void x86_amd_ssb_disable(void)
wrmsrl(MSR_AMD64_LS_CFG, msrval);
}

#undef pr_fmt
#define pr_fmt(fmt) "MDS: " fmt

/* Default mitigation for L1TF-affected CPUs */
static enum mds_mitigations mds_mitigation = MDS_MITIGATION_FULL;

static const char * const mds_strings[] = {
[MDS_MITIGATION_OFF] = "Vulnerable",
[MDS_MITIGATION_FULL] = "Mitigation: Clear CPU buffers"
};

static void __init mds_select_mitigation(void)
{
if (!boot_cpu_has_bug(X86_BUG_MDS)) {
mds_mitigation = MDS_MITIGATION_OFF;
return;
}

if (mds_mitigation == MDS_MITIGATION_FULL) {
if (boot_cpu_has(X86_FEATURE_MD_CLEAR))
static_branch_enable(&mds_user_clear);
else
mds_mitigation = MDS_MITIGATION_OFF;
}
pr_info("%s\n", mds_strings[mds_mitigation]);
}

static int __init mds_cmdline(char *str)
{
if (!boot_cpu_has_bug(X86_BUG_MDS))
return 0;

if (!str)
return -EINVAL;

if (!strcmp(str, "off"))
mds_mitigation = MDS_MITIGATION_OFF;
else if (!strcmp(str, "full"))
mds_mitigation = MDS_MITIGATION_FULL;

return 0;
}
early_param("mds", mds_cmdline);

#undef pr_fmt
#define pr_fmt(fmt) "Spectre V2 : " fmt

Expand Down Expand Up @@ -599,6 +646,26 @@ static void update_indir_branch_cond(void)
static_branch_disable(&switch_to_cond_stibp);
}

/* Update the static key controlling the MDS CPU buffer clear in idle */
static void update_mds_branch_idle(void)
{
/*
* Enable the idle clearing if SMT is active on CPUs which are
* affected only by MSBDS and not any other MDS variant.
*
* The other variants cannot be mitigated when SMT is enabled, so
* clearing the buffers on idle just to prevent the Store Buffer
* repartitioning leak would be a window dressing exercise.
*/
if (!boot_cpu_has_bug(X86_BUG_MSBDS_ONLY))
return;

if (sched_smt_active())
static_branch_enable(&mds_idle_clear);
else
static_branch_disable(&mds_idle_clear);
}

void arch_smt_update(void)
{
/* Enhanced IBRS implies STIBP. No update required. */
Expand All @@ -619,6 +686,9 @@ void arch_smt_update(void)
break;
}

if (mds_mitigation == MDS_MITIGATION_FULL)
update_mds_branch_idle();

mutex_unlock(&spec_ctrl_mutex);
}

Expand Down

0 comments on commit 8c7398b

Please sign in to comment.