| Message ID | 1374053373-30499-12-git-send-email-gaowanlong@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 07/17/2013 03:29 AM, Wanlong Gao wrote: > Add qmp command query-numa to show guest NUMA information. > > Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> > --- > numa.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > qapi-schema.json | 34 ++++++++++++++++++++++++ > qmp-commands.hx | 49 +++++++++++++++++++++++++++++++++++ > 3 files changed, 161 insertions(+) Focusing on just the interface... > +++ b/qapi-schema.json > @@ -3748,3 +3748,37 @@ > { 'command': 'set-mem-policy', > 'data': {'nodeid': 'int', '*policy': 'str', > '*host-nodes': 'str'} } > +## > +# @NUMAInfo: > +# > +# Information about guest NUMA nodes > +# > +# @nodeid: NUMA node ID > +# > +# @cpus: VCPUs contained to this node s/to/in/ > +# > +# @memory: memory size of this node In what unit? Preferably bytes, please (although your example listed 512, which is awfully small). HMP can round to nearest k or M, but QMP should be precise. > +# > +# @policy: memory policy of this node > +# > +# @relative: if host nodes is relative for memory policy s/is/are/ > +# > +# @host-nodes: host nodes for its memory policy > +# > +# Since: 1.6 > +# > +## > +{ 'type': 'NUMAInfo', > + 'data': {'nodeid': 'int', 'cpus': ['int'], 'memory': 'int', > + 'policy': 'str', 'relative': 'bool', 'host-nodes': ['int'] }} 'policy' needs to be an 'enum' type (the same one as I have requested you to use in your other patches). > + > +## > +# @query-numa: > +# > +# Returns a list of information about each guest node. > +# > +# Returns: a list of @NUMAInfo for each guest node > +# > +# Since: 1.6 > +## > +{ 'command': 'query-numa', 'returns': ['NUMAInfo'] } Seems like a reasonable command. As in 1/12, you may end up using 'Since: 1.7' by the time this patch is actually taken.
On 07/17/2013 08:41 PM, Eric Blake wrote: > On 07/17/2013 03:29 AM, Wanlong Gao wrote: >> Add qmp command query-numa to show guest NUMA information. >> >> Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> >> --- >> numa.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> qapi-schema.json | 34 ++++++++++++++++++++++++ >> qmp-commands.hx | 49 +++++++++++++++++++++++++++++++++++ >> 3 files changed, 161 insertions(+) > > Focusing on just the interface... > >> +++ b/qapi-schema.json >> @@ -3748,3 +3748,37 @@ >> { 'command': 'set-mem-policy', >> 'data': {'nodeid': 'int', '*policy': 'str', >> '*host-nodes': 'str'} } >> +## >> +# @NUMAInfo: >> +# >> +# Information about guest NUMA nodes >> +# >> +# @nodeid: NUMA node ID >> +# >> +# @cpus: VCPUs contained to this node > > s/to/in/ OK. > >> +# >> +# @memory: memory size of this node > > In what unit? Preferably bytes, please (although your example listed > 512, which is awfully small). HMP can round to nearest k or M, but QMP > should be precise. > >> +# >> +# @policy: memory policy of this node >> +# >> +# @relative: if host nodes is relative for memory policy > > s/is/are/ OK. > >> +# >> +# @host-nodes: host nodes for its memory policy >> +# >> +# Since: 1.6 >> +# >> +## >> +{ 'type': 'NUMAInfo', >> + 'data': {'nodeid': 'int', 'cpus': ['int'], 'memory': 'int', >> + 'policy': 'str', 'relative': 'bool', 'host-nodes': ['int'] }} > > 'policy' needs to be an 'enum' type (the same one as I have requested > you to use in your other patches). Yeah, got it. > >> + >> +## >> +# @query-numa: >> +# >> +# Returns a list of information about each guest node. >> +# >> +# Returns: a list of @NUMAInfo for each guest node >> +# >> +# Since: 1.6 >> +## >> +{ 'command': 'query-numa', 'returns': ['NUMAInfo'] } > > Seems like a reasonable command. As in 1/12, you may end up using > 'Since: 1.7' by the time this patch is actually taken. Yeah, got it. Thank you very much for your review. Wanlong Gao >
diff --git a/numa.c b/numa.c index 3befc56..21fc7b9 100644 --- a/numa.c +++ b/numa.c @@ -433,3 +433,81 @@ error: numa_info[nodeid].flags = flags; 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; + intList *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) { + intList *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 >> 20; + +#ifdef CONFIG_NUMA + switch (numa_info[i].flags & NODE_HOST_POLICY_MASK) { + case NODE_HOST_BIND: + info->value->policy = g_strdup("membind"); + break; + case NODE_HOST_INTERLEAVE: + info->value->policy = g_strdup("interleave"); + break; + case NODE_HOST_PREFERRED: + info->value->policy = g_strdup("preferred"); + break; + default: + info->value->policy = g_strdup("defalut"); + break; + } + + if (numa_info[i].flags & NODE_HOST_RELATIVE) { + info->value->relative = true; + } + + unsigned long first, next; + next = first = find_first_bit(numa_info[i].host_mem, MAX_CPUMASK_BITS); + intList *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; + + intList *host_node = g_malloc0(sizeof(*host_node)); + host_node->value = next; + cur_node_item->next = host_node; + cur_node_item = host_node; + } while (true); +#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 fd4c615..085ba75 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3748,3 +3748,37 @@ { 'command': 'set-mem-policy', 'data': {'nodeid': 'int', '*policy': 'str', '*host-nodes': 'str'} } +## +# @NUMAInfo: +# +# Information about guest NUMA nodes +# +# @nodeid: NUMA node ID +# +# @cpus: VCPUs contained to this node +# +# @memory: memory size of this node +# +# @policy: memory policy of this node +# +# @relative: if host nodes is relative for memory policy +# +# @host-nodes: host nodes for its memory policy +# +# Since: 1.6 +# +## +{ 'type': 'NUMAInfo', + 'data': {'nodeid': 'int', 'cpus': ['int'], 'memory': 'int', + 'policy': 'str', 'relative': 'bool', 'host-nodes': ['int'] }} + +## +# @query-numa: +# +# Returns a list of information about each guest node. +# +# Returns: a list of @NUMAInfo for each guest node +# +# Since: 1.6 +## +{ 'command': 'query-numa', 'returns': ['NUMAInfo'] } diff --git a/qmp-commands.hx b/qmp-commands.hx index aac88e0..998fb00 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3082,3 +3082,52 @@ Notes: 2. If "host-nodes" is not set, the node mask of this "policy" will be set to "all". 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 MB (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": 512, + "policy": "membind", + "relative": false, + "host-nodes": [0, 1] + }, + { + "nodeid": 1, + "cpus": [2, 3], + "memory": 512, + "policy": "interleave", + "relative": false, + "host-nodes": [1] + } + ] + } + +EQMP
Add qmp command query-numa to show guest NUMA information. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- numa.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qapi-schema.json | 34 ++++++++++++++++++++++++ qmp-commands.hx | 49 +++++++++++++++++++++++++++++++++++ 3 files changed, 161 insertions(+)