From patchwork Wed Jul 31 06:42:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 263596 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 D8EE32C0040 for ; Wed, 31 Jul 2013 16:44:51 +1000 (EST) Received: from localhost ([::1]:60554 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q9Q-0005rI-Bf for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 02:44:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q74-0002Yu-1Q for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4Q6y-0002Ns-Mz for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:21 -0400 Received: from [222.73.24.84] (port=44964 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q6y-0002Le-2p for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:16 -0400 X-IronPort-AV: E=Sophos;i="4.89,785,1367942400"; d="scan'208";a="8074958" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 31 Jul 2013 14:39:04 +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 r6V6g2ur009398; Wed, 31 Jul 2013 14:42:04 +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 2013073114395009-281722 ; Wed, 31 Jul 2013 14:39:50 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 14:42:15 +0800 Message-Id: <1375252936-28496-11-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.rc0.11.g35f5eaa In-Reply-To: <1375252936-28496-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1375252936-28496-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/07/31 14:39:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/31 14:39:52, Serialize complete at 2013/07/31 14:39:52 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, 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 V7 10/11] NUMA: add qmp command query-numa 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 Add qmp command query-numa to show guest NUMA information. Signed-off-by: Wanlong Gao --- numa.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 36 +++++++++++++++++++++++++++++ qmp-commands.hx | 49 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+) diff --git a/numa.c b/numa.c index c260d73..f9ba01d 100644 --- a/numa.c +++ b/numa.c @@ -373,3 +373,72 @@ error: numa_info[nodeid].relative = old_relative; return; } + +NUMAInfoList *qmp_query_numa(Error **errp) +{ + NUMAInfoList *head = NULL, *cur_item = NULL; + CPUState *cpu; + int i; + + for (i = 0; i < nb_numa_nodes; i++) { + NUMAInfoList *info; + uint16List *cur_cpu_item = NULL; + info = g_malloc0(sizeof(*info)); + info->value = g_malloc0(sizeof(*info->value)); + info->value->nodeid = i; + for (cpu = first_cpu; cpu != NULL; cpu = cpu->next_cpu) { + if (cpu->numa_node == i) { + uint16List *node_cpu = g_malloc0(sizeof(*node_cpu)); + node_cpu->value = cpu->cpu_index; + + if (!cur_cpu_item) { + info->value->cpus = cur_cpu_item = node_cpu; + } else { + cur_cpu_item->next = node_cpu; + cur_cpu_item = node_cpu; + } + } + } + info->value->memory = numa_info[i].node_mem; + +#ifdef CONFIG_NUMA + info->value->policy = numa_info[i].policy; + info->value->relative = numa_info[i].relative; + + unsigned long first, next; + next = first = find_first_bit(numa_info[i].host_mem, MAX_CPUMASK_BITS); + if (first == MAX_CPUMASK_BITS) { + goto end; + } + uint16List *cur_node_item = g_malloc0(sizeof(*cur_node_item)); + cur_node_item->value = first; + info->value->host_nodes = cur_node_item; + do { + if (next == numa_max_node()) { + break; + } + + next = find_next_bit(numa_info[i].host_mem, MAX_CPUMASK_BITS, + next + 1); + if (next > numa_max_node() || next == MAX_CPUMASK_BITS) { + break; + } + + uint16List *host_node = g_malloc0(sizeof(*host_node)); + host_node->value = next; + cur_node_item->next = host_node; + cur_node_item = host_node; + } while (true); +end: +#endif + + if (!cur_item) { + head = cur_item = info; + } else { + cur_item->next = info; + cur_item = info; + } + } + + return head; +} diff --git a/qapi-schema.json b/qapi-schema.json index a1e0d36..b80669c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3868,3 +3868,39 @@ { 'command': 'set-mem-policy', 'data': {'nodeid': 'uint16', '*policy': 'NumaNodePolicy', '*relative': 'bool', '*host-nodes': ['uint16'] } } + +## +# @NUMAInfo: +# +# Information about guest NUMA nodes +# +# @nodeid: NUMA node ID +# +# @cpus: VCPUs contained in this node +# +# @memory: memory size of this node +# +# @policy: memory policy of this node +# +# @relative: if host nodes are relative for memory policy +# +# @host-nodes: host nodes for its memory policy +# +# Since: 1.7 +# +## +{ 'type': 'NUMAInfo', + 'data': {'nodeid': 'uint16', 'cpus': ['uint16'], 'memory': 'uint64', + 'policy': 'NumaNodePolicy', 'relative': 'bool', + 'host-nodes': ['uint16'] }} + +## +# @query-numa: +# +# Returns a list of information about each guest node. +# +# Returns: a list of @NUMAInfo for each guest node +# +# Since: 1.7 +## +{ 'command': 'query-numa', 'returns': ['NUMAInfo'] } diff --git a/qmp-commands.hx b/qmp-commands.hx index c8356c5..a5a69ae 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3155,3 +3155,52 @@ Notes: to all available host nodes. EQMP + + { + .name = "query-numa", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_numa, + }, + +SQMP +query-numa +--------- + +Show NUMA information. + +Return a json-array. Each NUMA node is represented by a json-object, +which contains: + +- "nodeid": NUMA node ID (json-int) +- "cpus": a json-arry of contained VCPUs +- "memory": amount of memory in each node in Byte (json-int) +- "policy": memory policy of this node (json-string) +- "relative": if host nodes is relative for its memory policy (json-bool) +- "host-nodes": a json-array of host nodes for its memory policy + +Arguments: + +Example: + +-> { "excute": "query-numa" } +<- { "return":[ + { + "nodeid": 0, + "cpus": [0, 1], + "memory": 536870912, + "policy": "membind", + "relative": false, + "host-nodes": [0, 1] + }, + { + "nodeid": 1, + "cpus": [2, 3], + "memory": 536870912, + "policy": "interleave", + "relative": false, + "host-nodes": [1] + } + ] + } + +EQMP