From patchwork Wed Sep 4 09:03:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 272488 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BACB22C00C3 for ; Wed, 4 Sep 2013 19:06:14 +1000 (EST) Received: from localhost ([::1]:51168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH92S-0003tN-Pk for incoming@patchwork.ozlabs.org; Wed, 04 Sep 2013 05:06:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH91b-0003gp-1I for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:05:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VH91W-0007nR-G2 for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:05:18 -0400 Received: from [222.73.24.84] (port=20422 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VH91W-0007n6-2K for qemu-devel@nongnu.org; Wed, 04 Sep 2013 05:05:14 -0400 X-IronPort-AV: E=Sophos;i="4.89,1020,1367942400"; d="scan'208";a="8405802" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 04 Sep 2013 17:02:01 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r84955bV010423; Wed, 4 Sep 2013 17:05:06 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.226.75]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013090417025172-1215155 ; Wed, 4 Sep 2013 17:02:51 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2013 17:03:31 +0800 Message-Id: <1378285422-7361-3-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.21.g992c386 In-Reply-To: <1378285422-7361-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1378285422-7361-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/04 17:02:51, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/09/04 17:03:00, Serialize complete at 2013/09/04 17:03:00 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, lersek@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, drjones@redhat.com, bsd@redhat.com, hutao@cn.fujitsu.com, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V12 02/13] NUMA: check if the total numa memory size is equal to ram_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;