raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-08 19:09:57 +00:00
Code Issues Projects Releases Wiki Activity

x86/speculation/mds: Add mds=full,nosmt cmdline option

Browse Source 
commit d71eb0ce10 upstream

Add the mds=full,nosmt cmdline option.  This is like mds=full, but with
SMT disabled if the CPU is vulnerable.

Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Josh Poimboeuf
2019-04-02 09:59:33 -05:00
committed by Greg Kroah-Hartman
parent 563a2e3936
commit 56c4c99cc9
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/admin-guide/hw-vuln/mds.rst
View File

@@ -260,6 +260,9 @@ time with the option "mds=". The valid arguments for this option are:
It does not automatically disable SMT. It does not automatically disable SMT.
full,nosmt The same as mds=full, with SMT disabled on vulnerable
CPUs. This is the complete mitigation.
off Disables MDS mitigations completely. off Disables MDS mitigations completely.
============ ============================================================= ============ =============================================================

6
Documentation/admin-guide/kernel-parameters.txt
View File

@@ -2403,8 +2403,10 @@
This parameter controls the MDS mitigation. The This parameter controls the MDS mitigation. The
options are: options are:
full - Enable MDS mitigation on vulnerable CPUs full - Enable MDS mitigation on vulnerable CPUs
off - Unconditionally disable MDS mitigation full,nosmt - Enable MDS mitigation and disable
SMT on vulnerable CPUs
off - Unconditionally disable MDS mitigation
Not specifying this option is equivalent to Not specifying this option is equivalent to
mds=full. mds=full.

10
arch/x86/kernel/cpu/bugs.c
View File

@@ -221,6 +221,7 @@ static void x86_amd_ssb_disable(void)
/* Default mitigation for L1TF-affected CPUs */ /* Default mitigation for L1TF-affected CPUs */
static enum mds_mitigations mds_mitigation __ro_after_init = MDS_MITIGATION_FULL; static enum mds_mitigations mds_mitigation __ro_after_init = MDS_MITIGATION_FULL;
static bool mds_nosmt __ro_after_init = false;
static const char * const mds_strings[] = { static const char * const mds_strings[] = {
[MDS_MITIGATION_OFF] = "Vulnerable", [MDS_MITIGATION_OFF] = "Vulnerable",
@@ -238,8 +239,13 @@ static void __init mds_select_mitigation(void)
if (mds_mitigation == MDS_MITIGATION_FULL) { if (mds_mitigation == MDS_MITIGATION_FULL) {
if (!boot_cpu_has(X86_FEATURE_MD_CLEAR)) if (!boot_cpu_has(X86_FEATURE_MD_CLEAR))
mds_mitigation = MDS_MITIGATION_VMWERV; mds_mitigation = MDS_MITIGATION_VMWERV;
static_branch_enable(&mds_user_clear); static_branch_enable(&mds_user_clear);
if (mds_nosmt && !boot_cpu_has(X86_BUG_MSBDS_ONLY))
cpu_smt_disable(false);
} }
pr_info("%s\n", mds_strings[mds_mitigation]); pr_info("%s\n", mds_strings[mds_mitigation]);
} }
@@ -255,6 +261,10 @@ static int __init mds_cmdline(char *str)
mds_mitigation = MDS_MITIGATION_OFF; mds_mitigation = MDS_MITIGATION_OFF;
else if (!strcmp(str, "full")) else if (!strcmp(str, "full"))
mds_mitigation = MDS_MITIGATION_FULL; mds_mitigation = MDS_MITIGATION_FULL;
else if (!strcmp(str, "full,nosmt")) {
mds_mitigation = MDS_MITIGATION_FULL;
mds_nosmt = true;
}
return 0; return 0;
} }