OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

NUMA: check if the total numa memory size is equal to ram_size

Browse Source 
If the total number of the assigned numa nodes memory is not
equal to the assigned ram size, it will write the wrong data
to ACPI table, then the guest will ignore the wrong ACPI table
and recognize all memory to one node. It's buggy, we should
check it to ensure that we write the right data to ACPI table.

Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>

MST: error message reworded
This commit is contained in:
Wanlong Gao 2014-05-14 17:43:06 +08:00 committed by Michael S. Tsirkin
parent 96d0e26c23
commit 2b631ec255
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
numa.c
View File

@ -26,6 +26,8 @@
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "qemu/bitmap.h" #include "qemu/bitmap.h"
#include "qom/cpu.h" #include "qom/cpu.h"
#include "qemu/error-report.h"
#include "include/exec/cpu-common.h" /* for RAM_ADDR_FMT */
static void numa_node_parse_cpus(int nodenr, const char *cpus) static void numa_node_parse_cpus(int nodenr, const char *cpus)
{ {
@ -126,6 +128,7 @@ void numa_add(const char *optarg)
void set_numa_nodes(void) void set_numa_nodes(void)
{ {
if (nb_numa_nodes > 0) { if (nb_numa_nodes > 0) {
uint64_t numa_total;
int i; int i;
if (nb_numa_nodes > MAX_NODES) { if (nb_numa_nodes > MAX_NODES) {
@ -153,6 +156,17 @@ void set_numa_nodes(void)
node_mem[i] = ram_size - usedmem; node_mem[i] = ram_size - usedmem;
} }
numa_total = 0;
for (i = 0; i < nb_numa_nodes; i++) {
numa_total += node_mem[i];
}
if (numa_total != ram_size) {
error_report("total memory for NUMA nodes (%" PRIu64 ")"
" should equal RAM size (" RAM_ADDR_FMT ")",
numa_total, ram_size);
exit(1);
}
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) {
break; break;