mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] x86/speculation: Fix incorrect MDS/TAA mitigation status
@ 2019-11-13 19:33 Waiman Long
  2019-11-14 17:45 ` Borislav Petkov
  2019-11-14 20:12 ` Pawan Gupta
  0 siblings, 2 replies; 12+ messages in thread
From: Waiman Long @ 2019-11-13 19:33 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, H. Peter Anvin, x86
  Cc: linux-kernel, Josh Poimboeuf, Greg Kroah-Hartman, Pawan Gupta,
	Mark Gross, Tony Luck, Waiman Long

For MDS vulnerable processors with TSX support, enabling either MDS
or TAA mitigations will enable the use of VERW to flush internal
processor buffers at the right code path. IOW, they are either both
mitigated or both not mitigated. However, if the command line options
are inconsistent, the vulnerabilites sysfs files may not report the
mitigation status correctly.

For example, with only the "mds=off" option:

  vulnerabilities/mds:Vulnerable; SMT vulnerable
  vulnerabilities/tsx_async_abort:Mitigation: Clear CPU buffers; SMT vulnerable

The mds vulnerabilities file has wrong status in this case.

Change taa_select_mitigation() to sync up the two mitigation status
and have them turned off if both "mds=off" and "tsx_async_abort=off"
are present.

Signed-off-by: Waiman Long <longman@redhat.com>
---
 arch/x86/kernel/cpu/bugs.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 4c7b0fa15a19..418d41c1fd0d 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -304,8 +304,12 @@ static void __init taa_select_mitigation(void)
 		return;
 	}
 
-	/* TAA mitigation is turned off on the cmdline (tsx_async_abort=off) */
-	if (taa_mitigation == TAA_MITIGATION_OFF)
+	/*
+	 * TAA mitigation via VERW is turned off if both
+	 * tsx_async_abort=off and mds=off are specified.
+	 */
+	if (taa_mitigation == TAA_MITIGATION_OFF &&
+	    mds_mitigation == MDS_MITIGATION_OFF)
 		goto out;
 
 	if (boot_cpu_has(X86_FEATURE_MD_CLEAR))
@@ -339,6 +343,15 @@ static void __init taa_select_mitigation(void)
 	if (taa_nosmt || cpu_mitigations_auto_nosmt())
 		cpu_smt_disable(false);
 
+	/*
+	 * Update MDS mitigation, if necessary, as the mds_user_clear is
+	 * now enabled for TAA mitigation.
+	 */
+	if (mds_mitigation == MDS_MITIGATION_OFF &&
+	    boot_cpu_has_bug(X86_BUG_MDS)) {
+		mds_mitigation = MDS_MITIGATION_FULL;
+		mds_select_mitigation();
+	}
 out:
 	pr_info("%s\n", taa_strings[taa_mitigation]);
 }
-- 
2.18.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2019-11-15 14:41 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-13 19:33 [PATCH] x86/speculation: Fix incorrect MDS/TAA mitigation status Waiman Long
2019-11-14 17:45 ` Borislav Petkov
2019-11-14 17:53   ` Waiman Long
2019-11-14 18:48     ` Thomas Gleixner
2019-11-14 19:11       ` Waiman Long
2019-11-14 20:12 ` Pawan Gupta
2019-11-14 20:35   ` Josh Poimboeuf
2019-11-14 21:48     ` Waiman Long
2019-11-14 21:58   ` Waiman Long
2019-11-14 22:09     ` Borislav Petkov
2019-11-15 14:40       ` Waiman Long
2019-11-14 23:03     ` Thomas Gleixner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®