cpu/hotplug: Set CPU_SMT_NOT_SUPPORTED early

KAGA-KOKO · KAGA-KOKO · commit fee0aede6f47 · 2018-07-13T16:29:56.000+02:00
The CPU_SMT_NOT_SUPPORTED state is set (if the processor does not support SMT) when the sysfs SMT control file is initialized. That was fine so far as this was only required to make the output of the control file correct and to prevent writes in that case. With the upcoming l1tf command line parameter, this needs to be set up before the L1TF mitigation selection and command line parsing happens. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Jiri Kosina <jkosina@suse.cz> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lkml.kernel.org/r/20180713142323.121795971@linutronix.de
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
@@ -58,6 +58,12 @@ void __init check_bugs(void)
 {
 	identify_boot_cpu();
 
+	/*
+	 * identify_boot_cpu() initialized SMT support information, let the
+	 * core code know.
+	 */
+	cpu_smt_check_topology();
+
 	if (!IS_ENABLED(CONFIG_SMP)) {
 		pr_info("CPU: ");
 		print_cpu_info(&boot_cpu_data);
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
@@ -178,9 +178,11 @@ enum cpuhp_smt_control {
 #if defined(CONFIG_SMP) && defined(CONFIG_HOTPLUG_SMT)
 extern enum cpuhp_smt_control cpu_smt_control;
 extern void cpu_smt_disable(bool force);
+extern void cpu_smt_check_topology(void);
 #else
 # define cpu_smt_control		(CPU_SMT_ENABLED)
 static inline void cpu_smt_disable(bool force) { }
+static inline void cpu_smt_check_topology(void) { }
 #endif
 
 #endif /* _LINUX_CPU_H_ */
diff --git a/kernel/cpu.c b/kernel/cpu.c
@@ -361,6 +361,16 @@ void __init cpu_smt_disable(bool force)
 	}
 }
 
+/*
+ * The decision whether SMT is supported can only be done after the full
+ * CPU identification. Called from architecture code.
+ */
+void __init cpu_smt_check_topology(void)
+{
+	if (!topology_smt_supported())
+		cpu_smt_control = CPU_SMT_NOT_SUPPORTED;
+}
+
 static int __init smt_cmdline_disable(char *str)
 {
 	cpu_smt_disable(str && !strcmp(str, "force"));
@@ -2115,9 +2125,6 @@ static const struct attribute_group cpuhp_smt_attr_group = {
 
 static int __init cpu_smt_state_init(void)
 {
-	if (!topology_smt_supported())
-		cpu_smt_control = CPU_SMT_NOT_SUPPORTED;
-
 	return sysfs_create_group(&cpu_subsys.dev_root->kobj,
 				  &cpuhp_smt_attr_group);
 }

Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,16 @@ void __init cpu_smt_disable(bool force)`
`361`	`361`	`}`
`362`	`362`	`}`
`363`	`363`
	`364`	`+/*`
	`365`	`+ * The decision whether SMT is supported can only be done after the full`
	`366`	`+ * CPU identification. Called from architecture code.`
	`367`	`+ */`
	`368`	`+void __init cpu_smt_check_topology(void)`
	`369`	`+{`
	`370`	`+ if (!topology_smt_supported())`
	`371`	`+ cpu_smt_control = CPU_SMT_NOT_SUPPORTED;`
	`372`	`+}`
	`373`	`+`
`364`	`374`	`static int __init smt_cmdline_disable(char *str)`
`365`	`375`	`{`
`366`	`376`	`cpu_smt_disable(str && !strcmp(str, "force"));`
`@@ -2115,9 +2125,6 @@ static const struct attribute_group cpuhp_smt_attr_group = {`
`2115`	`2125`
`2116`	`2126`	`static int __init cpu_smt_state_init(void)`
`2117`	`2127`	`{`
`2118`		`- if (!topology_smt_supported())`
`2119`		`- cpu_smt_control = CPU_SMT_NOT_SUPPORTED;`
`2120`		`-`
`2121`	`2128`	`return sysfs_create_group(&cpu_subsys.dev_root->kobj,`
`2122`	`2129`	`&cpuhp_smt_attr_group);`
`2123`	`2130`	`}`