From: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>

Date: Thu, 19 May 2022 20:30:12 -0700

Subject: x86/bugs: Group MDS, TAA & Processor MMIO Stale Data mitigations

Git-commit: e5925fb867290ee924fcf2fe3ca887b792714366

Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

Patch-mainline: Queued in tip for v5.19

References: bsc#1199650 CVE-2022-21166 CVE-2022-21127 CVE-2022-21123 CVE-2022-21125 CVE-2022-21180

MDS, TAA and Processor MMIO Stale Data mitigations rely on clearing CPU

buffers. Moreover, status of these mitigations affects each other.

During boot, it is important to maintain the order in which these

mitigations are selected. This is especially true for

md_clear_update_mitigation() that needs to be called after MDS, TAA and

Processor MMIO Stale Data mitigation selection is done.

Introduce md_clear_select_mitigation(), and select all these mitigations

from there. This reflects relationships between these mitigations and

ensures proper ordering.

Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>

Signed-off-by: Borislav Petkov <bp@suse.de>

---

 arch/x86/kernel/cpu/bugs.c |   26 ++++++++++++++++----------

 1 file changed, 16 insertions(+), 10 deletions(-)

--- a/arch/x86/kernel/cpu/bugs.c

+++ b/arch/x86/kernel/cpu/bugs.c

@@ -42,6 +42,7 @@ static void __init ssb_select_mitigation

 static void __init l1tf_select_mitigation(void);

 static void __init mds_select_mitigation(void);

 static void __init md_clear_update_mitigation(void);

+static void __init md_clear_select_mitigation(void);

 static void __init taa_select_mitigation(void);

 static void __init mmio_select_mitigation(void);

 static void __init srbds_select_mitigation(void);

@@ -114,18 +115,9 @@ void __init check_bugs(void)

 	spectre_v2_select_mitigation();

 	ssb_select_mitigation();

 	l1tf_select_mitigation();

-	mds_select_mitigation();

-	taa_select_mitigation();

-	mmio_select_mitigation();

+	md_clear_select_mitigation();

 	srbds_select_mitigation();

-	/*

-	 * As MDS, TAA and MMIO Stale Data mitigations are inter-related, update

-	 * and print their mitigation after MDS, TAA and MMIO Stale Data

-	 * mitigation selection is done.

-	 */

-	md_clear_update_mitigation();

-

 	arch_smt_update();

 #ifdef CONFIG_X86_32

@@ -504,6 +496,20 @@ out:

 		pr_info("MMIO Stale Data: %s\n", mmio_strings[mmio_mitigation]);

 }

+static void __init md_clear_select_mitigation(void)

+{

+	mds_select_mitigation();

+	taa_select_mitigation();

+	mmio_select_mitigation();

+

+	/*

+	 * As MDS, TAA and MMIO Stale Data mitigations are inter-related, update

+	 * and print their mitigation after MDS, TAA and MMIO Stale Data

+	 * mitigation selection is done.

+	 */

+	md_clear_update_mitigation();

+}

+

 #undef pr_fmt

 #define pr_fmt(fmt)	"SRBDS: " fmt