From patchwork Fri Aug 30 03:10:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 271048 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 CB0202C00A4 for ; Fri, 30 Aug 2013 13:12:45 +1000 (EST) Received: from localhost ([::1]:46998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFF8c-00089s-JU for incoming@patchwork.ozlabs.org; Thu, 29 Aug 2013 23:12:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFF86-00089K-JZ for qemu-devel@nongnu.org; Thu, 29 Aug 2013 23:12:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFF7y-0006VC-Eo for qemu-devel@nongnu.org; Thu, 29 Aug 2013 23:12:10 -0400 Received: from [222.73.24.84] (port=35765 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFF7y-0006Ti-2a for qemu-devel@nongnu.org; Thu, 29 Aug 2013 23:12:02 -0400 X-IronPort-AV: E=Sophos;i="4.89,987,1367942400"; d="scan'208";a="8349106" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 30 Aug 2013 11:08:44 +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 r7U3Bnrj032006; Fri, 30 Aug 2013 11:11:49 +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 2013083011095019-1084038 ; Fri, 30 Aug 2013 11:09:50 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Fri, 30 Aug 2013 11:10:42 +0800 Message-Id: <1377832250-1672-4-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377832250-1672-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1377832250-1672-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/08/30 11:09:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/30 11:09:51, Serialize complete at 2013/08/30 11:09:51 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 V11 03/11] 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 --- vl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vl.c b/vl.c index 0ef5c5a..92aacc1 100644 --- a/vl.c +++ b/vl.c @@ -4174,6 +4174,16 @@ int main(int argc, char **argv, char **envp) 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;