aboutsummaryrefslogtreecommitdiff
path: root/numa.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2015-02-09 17:32:04 -0200
committerEduardo Habkost <ehabkost@redhat.com>2015-03-19 16:01:22 -0300
commit3ef7197505e483e2f28c5fbd6ed54b4061221200 (patch)
treead87631668b91c28d89a12cfcd41a30929b0f070 /numa.c
parent8979c945c1a7ffd20edbd5da2513c04baccfd7de (diff)
numa: Reject configuration if CPU appears on multiple nodes
Each CPU can appear in only one NUMA node on the NUMA config. Reject configuration if a CPU appears in multiple nodes. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'numa.c')
-rw-r--r--numa.c37
1 files changed, 37 insertions, 0 deletions
diff --git a/numa.c b/numa.c
index 6b4ab0eae4..518aedd88e 100644
--- a/numa.c
+++ b/numa.c
@@ -167,6 +167,41 @@ error:
return -1;
}
+static char *enumerate_cpus(unsigned long *cpus, int max_cpus)
+{
+ int cpu;
+ bool first = true;
+ GString *s = g_string_new(NULL);
+
+ for (cpu = find_first_bit(cpus, max_cpus);
+ cpu < max_cpus;
+ cpu = find_next_bit(cpus, max_cpus, cpu + 1)) {
+ g_string_append_printf(s, "%s%d", first ? "" : " ", cpu);
+ first = false;
+ }
+ return g_string_free(s, FALSE);
+}
+
+static void validate_numa_cpus(void)
+{
+ int i;
+ DECLARE_BITMAP(seen_cpus, MAX_CPUMASK_BITS);
+
+ bitmap_zero(seen_cpus, MAX_CPUMASK_BITS);
+ for (i = 0; i < nb_numa_nodes; i++) {
+ if (bitmap_intersects(seen_cpus, numa_info[i].node_cpu,
+ MAX_CPUMASK_BITS)) {
+ bitmap_and(seen_cpus, seen_cpus,
+ numa_info[i].node_cpu, MAX_CPUMASK_BITS);
+ error_report("CPU(s) present in multiple NUMA nodes: %s",
+ enumerate_cpus(seen_cpus, max_cpus));;
+ exit(EXIT_FAILURE);
+ }
+ bitmap_or(seen_cpus, seen_cpus,
+ numa_info[i].node_cpu, MAX_CPUMASK_BITS);
+ }
+}
+
void parse_numa_opts(void)
{
int i;
@@ -244,6 +279,8 @@ void parse_numa_opts(void)
set_bit(i, numa_info[i % nb_numa_nodes].node_cpu);
}
}
+
+ validate_numa_cpus();
}
}