[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] numa: Reject configuration if CPU appears on mul
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 3/6] numa: Reject configuration if CPU appears on multiple nodes |
Date: |
Thu, 19 Mar 2015 16:26:11 -0300 |
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 <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
numa.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/numa.c b/numa.c
index 6b4ab0e..518aedd 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();
}
}
--
2.1.0
- [Qemu-devel] [PULL 0/6] NUMA queue 2015-03-19, Eduardo Habkost, 2015/03/19
- [Qemu-devel] [PULL 1/6] numa: Fix off-by-one error at MAX_CPUMASK_BITS check, Eduardo Habkost, 2015/03/19
- [Qemu-devel] [PULL 4/6] numa: introduce machine callback for VCPU to node mapping, Eduardo Habkost, 2015/03/19
- [Qemu-devel] [PULL 2/6] numa: Reject CPU indexes > max_cpus, Eduardo Habkost, 2015/03/19
- [Qemu-devel] [PULL 6/6] numa: Print warning if no node is assigned to a CPU, Eduardo Habkost, 2015/03/19
- [Qemu-devel] [PULL 3/6] numa: Reject configuration if CPU appears on multiple nodes,
Eduardo Habkost <=
- [Qemu-devel] [PULL 5/6] pc: fix default VCPU to NUMA node mapping, Eduardo Habkost, 2015/03/19
- Re: [Qemu-devel] [PULL 0/6] NUMA queue 2015-03-19, Peter Maydell, 2015/03/20