Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3092ad5c authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Greg Kroah-Hartman
Browse files

x86/speculation/mds: Add 'mitigations=' support for MDS 



commit 5c14068f87d04adc73ba3f41c2a303d3c3d1fa12 upstream.

Add MDS to the new 'mitigations=' cmdline option.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
[bwh: Backported to 4.4:
 - Drop the auto,nosmt option, which we can't support
 - Adjust filenames, context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a50e2ca5

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -2187,6 +2187,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					       nospectre_v2 [X86]

					       spectre_v2_user=off [X86]

					       spec_store_bypass_disable=off [X86]

					       mds=off [X86]



			auto (default)

				Mitigate all CPU vulnerabilities, but leave SMT

arch/x86/kernel/cpu/bugs.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static const char * const mds_strings[] = { 


static void __init mds_select_mitigation(void)

{

	if (!boot_cpu_has_bug(X86_BUG_MDS)) {

	if (!boot_cpu_has_bug(X86_BUG_MDS) || cpu_mitigations_off()) {

		mds_mitigation = MDS_MITIGATION_OFF;

		return;

	}