[v4,1/4] arch_topology: Support basic SMT control for the driver
Commit Message
From: Yicong Yang <yangyicong@hisilicon.com>
The core CPU control framework supports runtime SMT control which
is not yet supported by arch_topology driver and thus arch_topology
based architectures. This patch implements it in the following aspects:
- implement topology_is_primary_thread() to indicate the primary thread,
required by the framework
- architecture code can get/set the SMT thread number by
topology_smt_{get, set}_num_threads()
- update the SMT thread number for the framework after the topology
enumerated on arm64, which is also required by the framework
For disabling SMT we'll offline all the secondary threads and
only leave the primary thread. Since we don't have restriction
for primary thread selection, the first thread is chosen as the
primary thread in this implementation.
This patch only implements the basic support for SMT control, which
needs to collabrate with ACPI/OF based topology building to fully
enable the feature. The SMT control will be enabled unless the
correct SMT thread number is set and HOTPLUG_SMT kconfig is selected.
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
drivers/base/arch_topology.c | 38 +++++++++++++++++++++++++++++++++++
include/linux/arch_topology.h | 14 +++++++++++++
2 files changed, 52 insertions(+)
@@ -729,6 +729,36 @@ const struct cpumask *cpu_clustergroup_mask(int cpu)
return &cpu_topology[cpu].cluster_sibling;
}
+#ifdef CONFIG_HOTPLUG_SMT
+
+/* Maximum threads number per-Core */
+static unsigned int topology_smt_num_threads = 1;
+
+void __init topology_smt_set_num_threads(unsigned int num_threads)
+{
+ topology_smt_num_threads = num_threads;
+}
+
+unsigned int __init topology_smt_get_num_threads(void)
+{
+ return topology_smt_num_threads;
+}
+
+/*
+ * On SMT Hotplug the primary thread of the SMT won't be disabled. For x86 they
+ * seem to have a primary thread for special purpose. For other arthitectures
+ * like arm64 there's no such restriction for a primary thread, so make the
+ * first thread in the SMT as the primary thread.
+ */
+bool topology_is_primary_thread(unsigned int cpu)
+{
+ if (cpu == cpumask_first(topology_sibling_cpumask(cpu)))
+ return true;
+
+ return false;
+}
+#endif
+
void update_siblings_masks(unsigned int cpuid)
{
struct cpu_topology *cpu_topo, *cpuid_topo = &cpu_topology[cpuid];
@@ -841,6 +871,14 @@ void __init init_cpu_topology(void)
reset_cpu_topology();
}
+ /*
+ * By this stage we get to know whether we support SMT or not, update
+ * the information for the core. We don't support
+ * CONFIG_SMT_NUM_THREADS_DYNAMIC so make the max_threads == num_threads.
+ */
+ cpu_smt_set_num_threads(topology_smt_get_num_threads(),
+ topology_smt_get_num_threads());
+
for_each_possible_cpu(cpu) {
ret = fetch_cache_info(cpu);
if (!ret)
@@ -92,6 +92,20 @@ void update_siblings_masks(unsigned int cpu);
void remove_cpu_topology(unsigned int cpuid);
void reset_cpu_topology(void);
int parse_acpi_topology(void);
+
+#ifdef CONFIG_HOTPLUG_SMT
+bool topology_is_primary_thread(unsigned int cpu);
+void topology_smt_set_num_threads(unsigned int num_threads);
+unsigned int topology_smt_get_num_threads(void);
+#else
+static inline bool topology_is_primary_thread(unsigned int cpu) { return false; }
+static inline void topology_smt_set_num_threads(unsigned int num_threads) { }
+static inline unsigned int topology_smt_get_num_threads(void)
+{
+ return 1;
+}
+#endif
+
#endif
#endif /* _LINUX_ARCH_TOPOLOGY_H_ */