diff options
| author | Josh Poimboeuf <jpoimboe@redhat.com> | 2019-04-02 09:59:33 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-14 19:17:58 +0200 |
| commit | f7a119a762efd7fcbe7546a6e20b6867ee59e0dd (patch) | |
| tree | 7be46b3a5bc5b4fed98133fb885ba3b08080ecbe /Documentation | |
| parent | cfaa3d76301e002b024e119e2c8f5fe0ec1f1407 (diff) | |
| download | linux-stable-f7a119a762efd7fcbe7546a6e20b6867ee59e0dd.tar.gz linux-stable-f7a119a762efd7fcbe7546a6e20b6867ee59e0dd.tar.bz2 linux-stable-f7a119a762efd7fcbe7546a6e20b6867ee59e0dd.zip | |
x86/speculation/mds: Add mds=full,nosmt cmdline option
commit d71eb0ce109a124b0fa714832823b9452f2762cf 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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/hw-vuln/mds.rst | 3 | ||||
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/admin-guide/hw-vuln/mds.rst b/Documentation/admin-guide/hw-vuln/mds.rst index 1de29d28903d..244ab47d1fb3 100644 --- a/Documentation/admin-guide/hw-vuln/mds.rst +++ b/Documentation/admin-guide/hw-vuln/mds.rst @@ -260,6 +260,9 @@ time with the option "mds=". The valid arguments for this option are: 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. ============ ============================================================= diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 290f0946f2ef..df8d10668b11 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2335,8 +2335,10 @@ This parameter controls the MDS mitigation. The options are: - full - Enable MDS mitigation on vulnerable CPUs - off - Unconditionally disable MDS mitigation + full - Enable MDS mitigation on vulnerable CPUs + full,nosmt - Enable MDS mitigation and disable + SMT on vulnerable CPUs + off - Unconditionally disable MDS mitigation Not specifying this option is equivalent to mds=full. |