From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vo7O7-0001DT-VK for qemu-devel@nongnu.org; Wed, 04 Dec 2013 03:00:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vo7O3-0006GM-Br for qemu-devel@nongnu.org; Wed, 04 Dec 2013 03:00:51 -0500 Received: from [222.73.24.84] (port=53995 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vo7O2-0006GC-Rc for qemu-devel@nongnu.org; Wed, 04 Dec 2013 03:00:47 -0500 From: Wanlong Gao Date: Wed, 4 Dec 2013 15:58:50 +0800 Message-Id: <1386143939-19142-3-git-send-email-gaowanlong@cn.fujitsu.com> In-Reply-To: <1386143939-19142-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1386143939-19142-1-git-send-email-gaowanlong@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH V17 02/11] 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: drjones@redhat.com, ehabkost@redhat.com, lersek@redhat.com, hutao@cn.fujitsu.com, mtosatti@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, bsd@redhat.com, anthony@codemonkey.ws, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com 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 talb, 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 --- numa.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/numa.c b/numa.c index ce7736a..beda80e 100644 --- a/numa.c +++ b/numa.c @@ -150,6 +150,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 to ram_size\n"); + exit(1); + } + for (i = 0; i < nb_numa_nodes; i++) { if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { break; -- 1.8.5