|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v12 1/4] xen/device-tree: Parse 'cpu-map' node for CPU topology exploration
Parse the 'cpu-map' node in the Device Tree to extract CPU topology
information. If the 'cpu-map' node is absent, simply ignore it.
Signed-off-by: Hirokazu Takahashi <taka@xxxxxxxxxxxxx>
---
Changes in v12:
- Error reporting for memory allocation failures in init_cpu_topology()
into a single error path.
- Emit an error message from init_cpu_topology() when
dt_init_cpu_topology() or acpi_init_cpu_topology() returns an error,
explicitly indicating that CPU topology initialization has failed.
- Drop the Reviewed-by tag from patch 0001 due to changes in
common/cpu-topology.c.
- In dt_smp_init_cpus(), add a comment explaining that the boot core
remains valid even if arch_cpu_init() fails.
- dt_init_cpu_topology() returns -EINVAL if a leaf node lacks the cpu
phandle property or if the target node is not a valid CPU node.
- dt_init_cpu_topology() continues parsing subsequent threads instead
of returning early when a referenced CPU is not tracked by Xen.
- Update the log message when skipping an unmapped CPU to reflect
that secondary CPUs have not yet been brought up at this stage.
- Remove trailing periods from log messages.
- Drop the Reviewed-by tag from patch 0001 due to changes in
common/cpu-topology.c.
xen/arch/arm/Kconfig | 1 +
xen/arch/arm/setup.c | 3 +
xen/arch/arm/smpboot.c | 10 +
xen/common/Kconfig | 22 ++
xen/common/Makefile | 1 +
xen/common/cpu-topology.c | 73 +++++
xen/common/cpu.c | 5 +
xen/common/device-tree/Makefile | 1 +
xen/common/device-tree/cpu-topology.c | 370 ++++++++++++++++++++++++++
xen/drivers/acpi/Makefile | 1 +
xen/drivers/acpi/topology.c | 43 +++
xen/include/xen/acpi.h | 13 +
xen/include/xen/cpu-topology.h | 34 +++
xen/include/xen/dt-cpu-topology.h | 35 +++
14 files changed, 612 insertions(+)
create mode 100644 xen/common/cpu-topology.c
create mode 100644 xen/common/device-tree/cpu-topology.c
create mode 100644 xen/drivers/acpi/topology.c
create mode 100644 xen/include/xen/cpu-topology.h
create mode 100644 xen/include/xen/dt-cpu-topology.h
diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index b9c5c40678..3d0f689220 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -19,6 +19,7 @@ config ARM
select HAS_ALTERNATIVE if HAS_VMAP
select HAS_DEVICE_TREE_DISCOVERY
select HAS_DOM0LESS
+ select HAS_GENERIC_CPU_TOPOLOGY
select HAS_GRANT_CACHE_FLUSH if GRANT_TABLE
select HAS_SHARED_INFO
select HAS_STACK_PROTECTOR
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 2cd1c021b5..c1aa06bd31 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -10,6 +10,7 @@
#include <xen/bootinfo.h>
#include <xen/compile.h>
+#include <xen/cpu-topology.h>
#include <xen/device_tree.h>
#include <xen/dom0less-build.h>
#include <xen/domain_page.h>
@@ -375,6 +376,8 @@ void asmlinkage __init noreturn start_xen(unsigned long
fdt_paddr)
nr_cpu_ids = smp_get_max_cpus();
printk(XENLOG_INFO "SMP: Allowing %u CPUs\n", nr_cpu_ids);
+ init_cpu_topology();
+
/*
* Some errata relies on SMCCC version which is detected by psci_init()
* (called from smp_init_cpus()).
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 8c9072f3c1..d34396f9b1 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -9,10 +9,12 @@
#include <xen/acpi.h>
#include <xen/cpu.h>
+#include <xen/cpu-topology.h>
#include <xen/cpumask.h>
#include <xen/delay.h>
#include <xen/device_tree.h>
#include <xen/domain_page.h>
+#include <xen/dt-cpu-topology.h>
#include <xen/errno.h>
#include <xen/init.h>
#include <xen/mm.h>
@@ -245,6 +247,14 @@ static void __init dt_smp_init_cpus(void)
}
else
tmp_map[i] = hwid;
+
+ /*
+ * Because the boot CPU (i == 0) is already running, treat it as valid
+ * even if arch_cpu_init() fails (e.g. due to a missing enable-method).
+ */
+ if ( (rc >= 0) || (i == 0) )
+ /* Pass the info to dt_init_cpu_topology() */
+ map_cpu_to_dt_node(i, cpu);
}
if ( !bootcpu_valid )
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 5b289e444f..fb42f0aa8b 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -140,6 +140,9 @@ config HAS_EX_TABLE
config HAS_FAST_MULTIPLY
bool
+config HAS_GENERIC_CPU_TOPOLOGY
+ bool
+
config HAS_IOPORTS
bool
@@ -194,6 +197,25 @@ config VM_EVENT
config NEEDS_LIBELF
bool
+config GENERIC_CPU_TOPOLOGY
+ bool
+
+config DT_CPU_TOPOLOGY
+ bool "Device tree based CPU topology support"
+ depends on HAS_GENERIC_CPU_TOPOLOGY && DEVICE_TREE_PARSE
+ select GENERIC_CPU_TOPOLOGY
+ help
+ Retrieve CPU topology information from the device tree to optimize
+ vCPU scheduling.
+
+config ACPI_CPU_TOPOLOGY
+ bool "ACPI based CPU topology support"
+ depends on HAS_GENERIC_CPU_TOPOLOGY && ACPI
+ select GENERIC_CPU_TOPOLOGY
+ help
+ Retrieve CPU topology information from the ACPI PPTT to optimize
+ vCPU scheduling.
+
config NUMA
bool
diff --git a/xen/common/Makefile b/xen/common/Makefile
index f69d47d189..d0eb39a633 100644
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_GENERIC_BUG_FRAME) += bug.o
obj-$(CONFIG_HYPFS_CONFIG) += config_data.o
obj-$(CONFIG_CORE_PARKING) += core_parking.o
obj-y += cpu.o
+obj-$(CONFIG_GENERIC_CPU_TOPOLOGY) += cpu-topology.init.o
obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o
obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += device.o
obj-$(filter-out $(CONFIG_X86),$(CONFIG_ACPI)) += device.o
diff --git a/xen/common/cpu-topology.c b/xen/common/cpu-topology.c
new file mode 100644
index 0000000000..8c64532e28
--- /dev/null
+++ b/xen/common/cpu-topology.c
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <xen/acpi.h>
+#include <xen/cpu-topology.h>
+#include <xen/cpumask.h>
+#include <xen/dt-cpu-topology.h>
+#include <xen/init.h>
+#include <xen/xvmalloc.h>
+
+static void __init free_topology_table(void)
+{
+ unsigned int cpu;
+
+ if ( !cpu_topology )
+ return;
+
+ for ( cpu = 0; cpu < nr_cpu_ids; cpu++ )
+ {
+ free_cpumask_var(cpu_topology[cpu].thread_sibling);
+ free_cpumask_var(cpu_topology[cpu].core_sibling);
+ free_cpumask_var(cpu_topology[cpu].cluster_sibling);
+ }
+
+ XVFREE(cpu_topology);
+}
+
+void __init init_cpu_topology(void)
+{
+ unsigned int cpu;
+ int ret = 0;
+
+ if ( num_possible_cpus() == 1 )
+ return;
+
+ cpu_topology = xvzalloc_array(struct cpu_topology, nr_cpu_ids);
+
+ if ( cpu_topology )
+ {
+ for ( cpu = 0; cpu < nr_cpu_ids; cpu++ )
+ {
+ if ( !zalloc_cpumask_var(&cpu_topology[cpu].thread_sibling) ||
+ !zalloc_cpumask_var(&cpu_topology[cpu].core_sibling) ||
+ !zalloc_cpumask_var(&cpu_topology[cpu].cluster_sibling) )
+ ret = -ENOMEM;
+ }
+ }
+ else
+ ret = -ENOMEM;
+
+ if ( ret != 0 )
+ printk(XENLOG_WARNING "CPU topology table allocation failed\n");
+ else if ( acpi_disabled )
+ ret = dt_init_cpu_topology();
+ else
+ ret = acpi_init_cpu_topology();
+
+ /* Free the CPU topology table if initialization fails. */
+ if ( ret != 0 )
+ {
+ printk("Failed to initialize cpu topology (error %d)\n", ret);
+ free_topology_table();
+ }
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/common/cpu.c b/xen/common/cpu.c
index f09af0444b..9591ada60a 100644
--- a/xen/common/cpu.c
+++ b/xen/common/cpu.c
@@ -1,5 +1,6 @@
#include <xen/cpumask.h>
#include <xen/cpu.h>
+#include <xen/cpu-topology.h>
#include <xen/event.h>
#include <xen/init.h>
#include <xen/sched.h>
@@ -46,6 +47,10 @@ const unsigned long
cpu_bit_bitmap[BITS_PER_LONG+1][BITS_TO_LONGS(NR_CPUS)] = {
#undef MASK_DECLARE_2
#undef MASK_DECLARE_1
+#ifdef CONFIG_GENERIC_CPU_TOPOLOGY
+struct cpu_topology *__ro_after_init cpu_topology;
+#endif /* CONFIG_GENERIC_CPU_TOPOLOGY */
+
static DEFINE_RWLOCK(cpu_add_remove_lock);
bool get_cpu_maps(void)
diff --git a/xen/common/device-tree/Makefile b/xen/common/device-tree/Makefile
index 730d202349..b15b3382d2 100644
--- a/xen/common/device-tree/Makefile
+++ b/xen/common/device-tree/Makefile
@@ -1,6 +1,7 @@
obj-y += bootfdt.init.o
obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo-fdt.init.o
obj-$(CONFIG_HAS_DEVICE_TREE_DISCOVERY) += bootinfo.init.o
+obj-$(CONFIG_DT_CPU_TOPOLOGY) += cpu-topology.init.o
obj-y += device-tree.o
obj-$(CONFIG_DOMAIN_BUILD_HELPERS) += domain-build.init.o
obj-$(filter $(CONFIG_DOM0LESS_BOOT),$(CONFIG_HAS_DEVICE_TREE_DISCOVERY)) +=
dom0less-build.init.o
diff --git a/xen/common/device-tree/cpu-topology.c
b/xen/common/device-tree/cpu-topology.c
new file mode 100644
index 0000000000..bfcf153cc4
--- /dev/null
+++ b/xen/common/device-tree/cpu-topology.c
@@ -0,0 +1,370 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Derived from Linux kernel 7.0's $drivers/base/arch_topology.c
+ * Parse cpu topology information.
+ */
+
+#include <xen/acpi.h>
+#include <xen/cpu-topology.h>
+#include <xen/cpumask.h>
+#include <xen/device_tree.h>
+#include <xen/errno.h>
+#include <xen/init.h>
+
+#define INVALID_TOPO_ID (~0U)
+
+struct cpu_map {
+ unsigned int thread_id;
+ unsigned int core_id;
+ unsigned int cluster_id;
+ unsigned int socket_id;
+};
+
+static struct cpu_map __initdata cpu_map[NR_CPUS] = {
+ [0 ... NR_CPUS - 1] = {
+ .thread_id = INVALID_TOPO_ID,
+ .core_id = INVALID_TOPO_ID,
+ .cluster_id = INVALID_TOPO_ID,
+ .socket_id = INVALID_TOPO_ID,
+ },
+};
+static struct dt_device_node *__initdata dt_cpu_table[NR_CPUS];
+
+static void __init setup_siblings_masks(unsigned int target_cpu)
+{
+ struct cpu_topology *target_topo = &cpu_topology[target_cpu];
+ const struct cpu_map *target_map = &cpu_map[target_cpu];
+ unsigned int cpu;
+
+ /* Update cluster, core and thread sibling masks */
+ for_each_possible_cpu(cpu)
+ {
+ struct cpu_topology *cpu_topo = &cpu_topology[cpu];
+ const struct cpu_map *map = &cpu_map[cpu];
+
+ if ( target_cpu > cpu )
+ continue;
+
+ if ( target_map->socket_id != map->socket_id )
+ continue;
+
+ cpumask_set_cpu(target_cpu, cpu_topo->core_sibling);
+ cpumask_set_cpu(cpu, target_topo->core_sibling);
+
+ if ( target_map->cluster_id != map->cluster_id )
+ continue;
+
+ cpumask_set_cpu(target_cpu, cpu_topo->cluster_sibling);
+ cpumask_set_cpu(cpu, target_topo->cluster_sibling);
+
+ if ( target_map->core_id != map->core_id )
+ continue;
+
+ cpumask_set_cpu(target_cpu, cpu_topo->thread_sibling);
+ cpumask_set_cpu(cpu, target_topo->thread_sibling);
+ }
+}
+
+static const struct dt_device_node *__init dt_find_child_node_by_name(
+ const struct dt_device_node *dt,
+ const char *name)
+{
+ const struct dt_device_node *np;
+
+ dt_for_each_child_node(dt, np)
+ if ( np->name && dt_node_name_is_equal(np, name) )
+ return np;
+
+ return NULL;
+}
+
+void __init map_cpu_to_dt_node(unsigned int cpu,
+ struct dt_device_node *cpu_node)
+{
+ if ( cpu < ARRAY_SIZE(dt_cpu_table) )
+ dt_cpu_table[cpu] = cpu_node;
+ else
+ printk(XENLOG_WARNING
+ "cpu %u exceeds the max cpus %zu\n",
+ cpu, ARRAY_SIZE(dt_cpu_table));
+}
+
+static unsigned int __init cpu_node_to_id(
+ const struct dt_device_node *cpu_node)
+{
+ unsigned int cpu;
+
+ for_each_possible_cpu(cpu)
+ if ( cpu_node == dt_cpu_table[cpu] )
+ return cpu;
+
+ return INVALID_TOPO_ID;
+}
+
+/*
+ * This function returns the Xen cpu number of the DT node.
+ */
+static int __init get_cpu_for_node(
+ const struct dt_device_node *dt_node, unsigned int *cpu)
+{
+ const struct dt_device_node *cpu_node =
+ dt_parse_phandle(dt_node, "cpu", 0);
+
+ if ( !cpu_node || !dt_device_type_is_equal(cpu_node, "cpu") )
+ {
+ *cpu = INVALID_TOPO_ID;
+ return -EINVAL;
+ }
+
+ *cpu = cpu_node_to_id(cpu_node);
+
+ return 0;
+}
+
+static bool __init is_cpu_map_empty(unsigned int cpu)
+{
+ return (cpu_map[cpu].socket_id == INVALID_TOPO_ID) &&
+ (cpu_map[cpu].cluster_id == INVALID_TOPO_ID) &&
+ (cpu_map[cpu].core_id == INVALID_TOPO_ID) &&
+ (cpu_map[cpu].thread_id == INVALID_TOPO_ID);
+}
+
+static int __init parse_core(const struct dt_device_node *core,
+ unsigned int socket_id,
+ unsigned int cluster_id,
+ unsigned int core_id)
+{
+ bool leaf = true;
+ unsigned int thread_id;
+ unsigned int cpu;
+ int ret;
+
+ for ( thread_id = 0; ; thread_id++ )
+ {
+ const struct dt_device_node *thread;
+ char name[20];
+
+ snprintf(name, sizeof(name), "thread%u", thread_id);
+ thread = dt_find_child_node_by_name(core, name);
+
+ if ( !thread )
+ break;
+
+ leaf = false;
+ ret = get_cpu_for_node(thread, &cpu);
+ if ( ret )
+ {
+ printk(XENLOG_ERR
+ "%s: No CPU found for thread\n", dt_node_name(thread));
+ return ret;
+ }
+
+ if ( cpu == INVALID_TOPO_ID )
+ {
+ /*
+ * Ignore this CPU node definition as the corresponding physical
+ * CPU failed to boot.
+ */
+ printk(XENLOG_INFO
+ "%s: CPU for thread is unavailable\n",
dt_node_name(thread));
+ continue;
+ }
+
+ if ( !is_cpu_map_empty(cpu) )
+ {
+ printk(XENLOG_ERR
+ "Duplicate CPU definition for CPU%u\n", cpu);
+ return -EINVAL;
+ }
+
+ cpu_map[cpu].socket_id = socket_id;
+ cpu_map[cpu].cluster_id = cluster_id;
+ cpu_map[cpu].core_id = core_id;
+ cpu_map[cpu].thread_id = thread_id;
+ }
+
+ ret = get_cpu_for_node(core, &cpu);
+
+ if ( cpu != INVALID_TOPO_ID )
+ {
+ if ( !leaf )
+ {
+ printk(XENLOG_ERR "%s: Core has both threads and CPU\n",
+ dt_node_name(core));
+ return -EINVAL;
+ }
+
+ if ( !is_cpu_map_empty(cpu) )
+ {
+ printk(XENLOG_ERR "Duplicate CPU definition for CPU%u\n", cpu);
+ return -EINVAL;
+ }
+
+ cpu_map[cpu].socket_id = socket_id;
+ cpu_map[cpu].cluster_id = cluster_id;
+ cpu_map[cpu].core_id = core_id;
+ cpu_map[cpu].thread_id = 0;
+ }
+ else if ( leaf )
+ {
+ if ( ret )
+ {
+ printk(XENLOG_ERR
+ "%s: No CPU found for leaf core\n", dt_node_name(core));
+ return ret;
+ }
+
+ /*
+ * Ignore this CPU node definition as the corresponding physical
+ * CPU failed to boot.
+ */
+ printk(XENLOG_INFO
+ "%s: CPU for leaf core is unavailable\n", dt_node_name(core));
+ }
+
+ return 0;
+}
+
+static int __init parse_cluster(const struct dt_device_node *cluster,
+ unsigned int socket_id,
+ unsigned int cluster_id)
+{
+ bool has_cores = false;
+ int ret = 0;
+
+ if ( dt_find_child_node_by_name(cluster, "cluster0") )
+ {
+ printk(XENLOG_ERR
+ "Topology for clusters of clusters not yet supported\n");
+ return -EINVAL;
+ }
+
+ for ( unsigned int core_id = 0; ; core_id++ )
+ {
+ const struct dt_device_node *core;
+ char name[20];
+
+ snprintf(name, sizeof(name), "core%u", core_id);
+ core = dt_find_child_node_by_name(cluster, name);
+
+ if ( !core )
+ break;
+
+ has_cores = true;
+
+ ret = parse_core(core, socket_id, cluster_id, core_id);
+ if ( ret != 0 )
+ return ret;
+ }
+
+ if ( !has_cores )
+ printk(XENLOG_WARNING "%s: empty cluster\n", dt_node_name(cluster));
+
+ return ret;
+}
+
+static int __init parse_socket(const struct dt_device_node *socket,
+ unsigned int socket_id)
+{
+ bool has_cluster = false;
+ int ret = 0;
+
+ for ( unsigned int cluster_id = 0; ; cluster_id++ )
+ {
+ const struct dt_device_node *cluster;
+ char name[20];
+
+ snprintf(name, sizeof(name), "cluster%u", cluster_id);
+ cluster = dt_find_child_node_by_name(socket, name);
+
+ if ( !cluster )
+ break;
+
+ has_cluster = true;
+ ret = parse_cluster(cluster, socket_id, cluster_id);
+ if ( ret != 0 )
+ return ret;
+ }
+
+ /*
+ * If no cluster node is defined, assume the socket has
+ * a single cluster.
+ */
+ if ( !has_cluster )
+ ret = parse_cluster(socket, socket_id, 0);
+
+ return ret;
+}
+
+static int __init parse_package(const struct dt_device_node *package)
+{
+ bool has_socket = false;
+ int ret = 0;
+
+ for ( unsigned int socket_id = 0; ; socket_id++ )
+ {
+ const struct dt_device_node *socket;
+ char name[20];
+
+ snprintf(name, sizeof(name), "socket%u", socket_id);
+ socket = dt_find_child_node_by_name(package, name);
+
+ if ( !socket )
+ break;
+
+ has_socket = true;
+ ret = parse_socket(socket, socket_id);
+ if ( ret != 0 )
+ return ret;
+ }
+
+ /*
+ * If no socket node is defined, assume all clusters reside under
+ * a single socket.
+ */
+ if ( !has_socket )
+ ret = parse_socket(package, 0);
+
+ return ret;
+}
+
+static int __init parse_dt_topology(void)
+{
+ const struct dt_device_node *cpus;
+ const struct dt_device_node *map;
+
+ cpus = dt_find_node_by_path("/cpus");
+ if ( !cpus )
+ return -ENOENT;
+
+ map = dt_find_child_node_by_name(cpus, "cpu-map");
+ if ( !map )
+ return -ENOENT;
+
+ return parse_package(map);
+}
+
+int __init dt_init_cpu_topology(void)
+{
+ unsigned int cpu;
+ int ret;
+
+ ASSERT(cpu_topology);
+
+ ret = parse_dt_topology();
+ if ( ret == 0 )
+ for_each_possible_cpu(cpu)
+ setup_siblings_masks(cpu);
+
+ return ret;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/drivers/acpi/Makefile b/xen/drivers/acpi/Makefile
index 477408afbe..6d676e91d4 100644
--- a/xen/drivers/acpi/Makefile
+++ b/xen/drivers/acpi/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_ACPI_NUMA) += numa.o
obj-y += osl.o
obj-$(CONFIG_PM_STATS) += pmstat.o
obj-$(CONFIG_PM_OP) += pm-op.o
+obj-$(CONFIG_ACPI_CPU_TOPOLOGY) += topology.init.o
obj-$(CONFIG_X86) += hwregs.o
obj-$(CONFIG_X86) += reboot.o
diff --git a/xen/drivers/acpi/topology.c b/xen/drivers/acpi/topology.c
new file mode 100644
index 0000000000..f9836447b2
--- /dev/null
+++ b/xen/drivers/acpi/topology.c
@@ -0,0 +1,43 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <xen/acpi.h>
+#include <xen/cpu-topology.h>
+#include <xen/cpumask.h>
+#include <xen/init.h>
+
+/*
+ * TODO: Populate the topology information by scanning the ACPI
+ * PPTT (Processor Properties Topology Table).
+ */
+int __init acpi_init_cpu_topology(void)
+{
+ unsigned int cpu;
+
+ ASSERT(cpu_topology);
+
+ /*
+ * Generate temporary cpu topology information for now.
+ * It assumes that the cpu doesn't have SMT and all CPUs
+ * belong to the same socket.
+ */
+ for_each_possible_cpu(cpu)
+ {
+ struct cpu_topology *topo = &cpu_topology[cpu];
+
+ cpumask_set_cpu(cpu, topo->thread_sibling);
+ cpumask_copy(topo->core_sibling, &cpu_possible_map);
+ cpumask_copy(topo->cluster_sibling, &cpu_possible_map);
+ }
+
+ return 0;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h
index 2fdf38cf74..cbb02e0f35 100644
--- a/xen/include/xen/acpi.h
+++ b/xen/include/xen/acpi.h
@@ -135,6 +135,19 @@ static inline int acpi_boot_table_init(void)
#endif /*!CONFIG_ACPI*/
+#ifdef CONFIG_ACPI_CPU_TOPOLOGY
+
+int acpi_init_cpu_topology(void);
+
+#else /* CONFIG_ACPI_CPU_TOPOLOGY */
+
+static inline int acpi_init_cpu_topology(void)
+{
+ return -EOPNOTSUPP;
+}
+
+#endif /* CONFIG_ACPI_CPU_TOPOLOGY */
+
int get_cpu_id(u32 acpi_id);
unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low);
diff --git a/xen/include/xen/cpu-topology.h b/xen/include/xen/cpu-topology.h
new file mode 100644
index 0000000000..27b9bd443e
--- /dev/null
+++ b/xen/include/xen/cpu-topology.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef XEN_CPU_TOPOLOGY_H
+#define XEN_CPU_TOPOLOGY_H
+
+#ifdef CONFIG_GENERIC_CPU_TOPOLOGY
+
+#include <xen/cpumask.h>
+
+struct cpu_topology {
+ cpumask_var_t thread_sibling;
+ cpumask_var_t core_sibling;
+ cpumask_var_t cluster_sibling;
+};
+
+extern struct cpu_topology *cpu_topology;
+void init_cpu_topology(void);
+
+#else /* CONFIG_GENERIC_CPU_TOPOLOGY */
+
+static inline void init_cpu_topology(void) {}
+
+#endif /* CONFIG_GENERIC_CPU_TOPOLOGY */
+
+#endif /* XEN_CPU_TOPOLOGY_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/include/xen/dt-cpu-topology.h
b/xen/include/xen/dt-cpu-topology.h
new file mode 100644
index 0000000000..43f7b31bf6
--- /dev/null
+++ b/xen/include/xen/dt-cpu-topology.h
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef XEN_DT_CPU_TOPOLOGY_H
+#define XEN_DT_CPU_TOPOLOGY_H
+
+struct dt_device_node;
+
+#ifdef CONFIG_DT_CPU_TOPOLOGY
+
+void map_cpu_to_dt_node(unsigned int cpu, struct dt_device_node *cpu_node);
+int dt_init_cpu_topology(void);
+
+#else /* CONFIG_DT_CPU_TOPOLOGY */
+
+#include <xen/errno.h>
+
+static inline void map_cpu_to_dt_node(unsigned int cpu,
+ struct dt_device_node *cpu_node) {}
+static inline int dt_init_cpu_topology(void)
+{
+ return -EOPNOTSUPP;
+}
+
+#endif /* CONFIG_DT_CPU_TOPOLOGY */
+
+#endif /* XEN_DT_CPU_TOPOLOGY_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.43.0
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |