Skip to contentSkip to conversation

x86/bugs: Move enum taa_mitigations to bugs.c

PATCH Applied Borislav Petkov 2 participants 4 messages Nov 12, 2019 – Dec 15, 2019

Subsystems (2)
lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/2 x86/bugs: Move enum taa_mitigations to bugs.c

From: Borislav Petkov <[email protected]>

... because it is used only there.

No functional changes.

---
 arch/x86/include/asm/processor.h | 7 -------
 arch/x86/kernel/cpu/bugs.c       | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/processor.h +0 -7
index 54f5d54280f6..6e0a3b43d027 100644
@@ -988,11 +988,4 @@ enum mds_mitigations {
 	MDS_MITIGATION_VMWERV,
 };
 
-enum taa_mitigations {
-	TAA_MITIGATION_OFF,
-	TAA_MITIGATION_UCODE_NEEDED,
-	TAA_MITIGATION_VERW,
-	TAA_MITIGATION_TSX_DISABLED,
-};
-
 #endif /* _ASM_X86_PROCESSOR_H */
arch/x86/kernel/cpu/bugs.c +7 -0
index 4c7b0fa15a19..513a7f807412 100644
@@ -273,6 +273,13 @@ early_param("mds", mds_cmdline);
 #undef pr_fmt
 #define pr_fmt(fmt)	"TAA: " fmt
 
+enum taa_mitigations {
+	TAA_MITIGATION_OFF,
+	TAA_MITIGATION_UCODE_NEEDED,
+	TAA_MITIGATION_VERW,
+	TAA_MITIGATION_TSX_DISABLED,
+};
+
 /* Default mitigation for TAA-affected CPUs */
 static enum taa_mitigations taa_mitigation __ro_after_init = TAA_MITIGATION_VERW;
 static bool taa_nosmt __ro_after_init;
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH 2/2 x86/cpu/tsx: Define pr_fmt()

From: Borislav Petkov <[email protected]>

... so that all current and future pr_* statements in this file have the proper prefix.

No functional changes.

---
 arch/x86/kernel/cpu/tsx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/tsx.c +4 -1
index 3e20d322bc98..1674c8da003e 100644
@@ -14,6 +14,9 @@
 
 #include "cpu.h"
 
+#undef pr_fmt
+#define pr_fmt(fmt) "tsx: " fmt
+
 enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
 
 void tsx_disable(void)
@@ -99,7 +102,7 @@ void __init tsx_init(void)
 			tsx_ctrl_state = x86_get_tsx_auto_mode();
 		} else {
 			tsx_ctrl_state = TSX_CTRL_DISABLE;
-			pr_err("tsx: invalid option, defaulting to off\n");
+			pr_err("invalid option, defaulting to off\n");
 		}
 	} else {
 		/* tsx= not provided */
Signature · 1 line
2.21.0
#2 lore raw

[tip: x86/cpu] x86/cpu/tsx: Define pr_fmt()

The following commit has been merged into the x86/cpu branch of tip:

The following commit has been merged into the x86/cpu branch of tip:

Commit-ID:     d157aa0fb241646e8818f699653ed983e6581b11
Gitweb:        https://git.kernel.org/tip/d157aa0fb241646e8818f699653ed983e6581b11
Author:        Borislav Petkov <[email protected]>
AuthorDate:    Tue, 12 Nov 2019 22:06:03 +01:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Sun, 15 Dec 2019 10:58:54 +01:00

x86/cpu/tsx: Define pr_fmt()

... so that all current and future pr_* statements in this file have the proper prefix.

No functional changes.

---
 arch/x86/kernel/cpu/tsx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/tsx.c +4 -1
index 3e20d32..1674c8d 100644
@@ -14,6 +14,9 @@
 
 #include "cpu.h"
 
+#undef pr_fmt
+#define pr_fmt(fmt) "tsx: " fmt
+
 enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
 
 void tsx_disable(void)
@@ -99,7 +102,7 @@ void __init tsx_init(void)
 			tsx_ctrl_state = x86_get_tsx_auto_mode();
 		} else {
 			tsx_ctrl_state = TSX_CTRL_DISABLE;
-			pr_err("tsx: invalid option, defaulting to off\n");
+			pr_err("invalid option, defaulting to off\n");
 		}
 	} else {
 		/* tsx= not provided */
#3 lore raw
In reply to Borislav Petkov
The following commit has been merged into the x86/cpu branch of tip:

The following commit has been merged into the x86/cpu branch of tip:

Commit-ID:     72c2ce9867d9e8535f8c29eb6d842d1caad281af
Gitweb:        https://git.kernel.org/tip/72c2ce9867d9e8535f8c29eb6d842d1caad281af
Author:        Borislav Petkov <[email protected]>
AuthorDate:    Tue, 12 Nov 2019 21:58:57 +01:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Sat, 14 Dec 2019 16:06:33 +01:00

x86/bugs: Move enum taa_mitigations to bugs.c

... because it is used only there.

No functional changes.

---
 arch/x86/include/asm/processor.h | 7 -------
 arch/x86/kernel/cpu/bugs.c       | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/processor.h +0 -7
index 0340aad..7c071f8 100644
@@ -1015,11 +1015,4 @@ enum mds_mitigations {
 	MDS_MITIGATION_VMWERV,
 };
 
-enum taa_mitigations {
-	TAA_MITIGATION_OFF,
-	TAA_MITIGATION_UCODE_NEEDED,
-	TAA_MITIGATION_VERW,
-	TAA_MITIGATION_TSX_DISABLED,
-};
-
 #endif /* _ASM_X86_PROCESSOR_H */
arch/x86/kernel/cpu/bugs.c +7 -0
index 8bf6489..ed54b3b 100644
@@ -286,6 +286,13 @@ early_param("mds", mds_cmdline);
 #undef pr_fmt
 #define pr_fmt(fmt)	"TAA: " fmt
 
+enum taa_mitigations {
+	TAA_MITIGATION_OFF,
+	TAA_MITIGATION_UCODE_NEEDED,
+	TAA_MITIGATION_VERW,
+	TAA_MITIGATION_TSX_DISABLED,
+};
+
 /* Default mitigation for TAA-affected CPUs */
 static enum taa_mitigations taa_mitigation __ro_after_init = TAA_MITIGATION_VERW;
 static bool taa_nosmt __ro_after_init;