From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFQZ8-0000Ig-8u for qemu-devel@nongnu.org; Mon, 17 Feb 2014 10:57:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFQZ3-00059i-Ix for qemu-devel@nongnu.org; Mon, 17 Feb 2014 10:57:06 -0500 From: Igor Mammedov Date: Mon, 17 Feb 2014 16:49:44 +0100 Message-Id: <1392652187-28381-4-git-send-email-imammedo@redhat.com> In-Reply-To: <1392652187-28381-1-git-send-email-imammedo@redhat.com> References: <1392652187-28381-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 3/6] NUMA: check if the total numa memory size is equal to ram_size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, andre.przywara@amd.com, stefanha@redhat.com, mst@redhat.com, peter.maydell@linaro.org, armbru@redhat.com, ehabkost@redhat.com, lcapitulino@redhat.com, qemu-ppc@nongnu.org, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com, rth@twiddle.net From: Wanlong Gao 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 Signed-off-by: Paolo Bonzini Signed-off-by: Igor Mammedov --- numa.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/numa.c b/numa.c index 7845036..d12a4f2 100644 --- a/numa.c +++ b/numa.c @@ -151,6 +151,16 @@ void set_numa_nodes(void) node_mem[i] = ram_size - usedmem; } + uint64_t numa_total = 0; + for (i = 0; i < nb_numa_nodes; i++) { + numa_total += node_mem[i]; + } + if (numa_total != ram_size) { + fprintf(stderr, "qemu: numa nodes total memory size " + "should equal ram_size\n"); + exit(1); + } + for (i = 0; i < nb_numa_nodes; i++) { if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { break; -- 1.7.1