@@ -28,6 +28,25 @@ static uint8_t (*node_distance_fn)(nodeid_t a, nodeid_t b);
extern nodemask_t processor_nodes_parsed;
static bool_t dt_numa = 1;
+/*
+ * Setup early cpu_to_node.
+ */
+void __init init_cpu_to_node(void)
+{
+ int i;
+
+ for ( i = 0; i < NR_CPUS; i++ )
+ numa_set_node(i, 0);
+}
+
+void __init numa_set_cpu_node(int cpu, unsigned int nid)
+{
+ if ( !node_isset(nid, processor_nodes_parsed) || nid >= MAX_NUMNODES )
+ nid = 0;
+
+ numa_set_node(cpu, nid);
+}
+
uint8_t __node_distance(nodeid_t a, nodeid_t b)
{
if ( node_distance_fn != NULL);
@@ -48,6 +67,7 @@ void numa_failed(void)
dt_numa = 0;
init_dt_numa_distance();
node_distance_fn = NULL;
+ init_cpu_to_node();
}
void __init numa_init(void)
@@ -55,6 +75,7 @@ void __init numa_init(void)
int ret = 0;
nodes_clear(processor_nodes_parsed);
+ init_cpu_to_node();
init_dt_numa_distance();
if ( is_numa_off() )
goto no_numa;
@@ -29,6 +29,7 @@
#include <xen/timer.h>
#include <xen/irq.h>
#include <xen/console.h>
+#include <xen/numa.h>
#include <asm/cpuerrata.h>
#include <asm/gic.h>
#include <asm/psci.h>
@@ -106,6 +107,7 @@ static void __init dt_smp_init_cpus(void)
[0 ... NR_CPUS - 1] = MPIDR_INVALID
};
bool_t bootcpu_valid = 0;
+ nodeid_t *cpu_to_nodemap;
int rc;
mpidr = boot_cpu_data.mpidr.bits & MPIDR_HWID_MASK;
@@ -117,11 +119,18 @@ static void __init dt_smp_init_cpus(void)
return;
}
+ cpu_to_nodemap = xzalloc_array(nodeid_t, NR_CPUS);
+ if ( !cpu_to_nodemap )
+ {
+ printk(XENLOG_WARNING "Failed to allocate memory for cpu_to_nodemap\n");
+ return;
+ }
+
dt_for_each_child_node( cpus, cpu )
{
const __be32 *prop;
u64 addr;
- u32 reg_len;
+ u32 reg_len, nid;
register_t hwid;
if ( !dt_device_type_is_equal(cpu, "cpu") )
@@ -146,6 +155,15 @@ static void __init dt_smp_init_cpus(void)
continue;
}
+ if ( !dt_property_read_u32(cpu, "numa-node-id", &nid) )
+ {
+ printk(XENLOG_WARNING "cpu node `%s`: numa-node-id not found\n",
+ dt_node_full_name(cpu));
+ nid = 0;
+ }
+
+ cpu_to_nodemap[cpuidx] = nid;
+
addr = dt_read_number(prop, dt_n_addr_cells(cpu));
hwid = addr;
@@ -224,6 +242,7 @@ static void __init dt_smp_init_cpus(void)
{
printk(XENLOG_WARNING "DT missing boot CPU MPIDR[23:0]\n"
"Using only 1 CPU\n");
+ xfree(cpu_to_nodemap);
return;
}
@@ -233,7 +252,10 @@ static void __init dt_smp_init_cpus(void)
continue;
cpumask_set_cpu(i, &cpu_possible_map);
cpu_logical_map(i) = tmp_map[i];
+ numa_set_cpu_node(i, cpu_to_nodemap[i]);
}
+
+ xfree(cpu_to_nodemap);
}
void __init smp_init_cpus(void)
@@ -313,6 +335,7 @@ void start_secondary(unsigned long boot_phys_offset,
*/
smp_wmb();
+ numa_add_cpu(cpuid);
/* Now report this CPU is up */
cpumask_set_cpu(cpuid, &cpu_online_map);
@@ -14,12 +14,36 @@ extern uint8_t __node_distance(nodeid_t a, nodeid_t b);
#ifdef CONFIG_NUMA
extern void numa_init(void);
extern int dt_numa_init(void);
+extern void numa_set_cpu_node(int cpu, unsigned int nid);
+extern void numa_add_cpu(int cpu);
+
+extern nodeid_t cpu_to_node[NR_CPUS];
+extern cpumask_t node_to_cpumask[];
+/* Simple perfect hash to map pdx to node numbers */
+extern unsigned int memnode_shift;
+extern uint8_t *memnodemap;
+
+#define cpu_to_node(cpu) (cpu_to_node[cpu])
+#define parent_node(node) (node)
+#define node_to_first_cpu(node) (__ffs(node_to_cpumask[node]))
+#define node_to_cpumask(node) (node_to_cpumask[node])
+
#else
static inline void numa_init(void)
{
return;
}
+static inline void numa_set_cpu_node(int cpu, unsigned int nid)
+{
+ return;
+}
+
+static inline void numa_add_cpu(int cpu)
+{
+ return;
+}
+
/* Fake one node for now. See also node_online_map. */
#define cpu_to_node(cpu) 0
#define node_to_cpumask(node) (cpu_online_map)