On Wed, May 03, 2017 at 02:57:17PM +0200, Igor Mammedov wrote: > legacy cpu to node mapping is using cpu index values to map > VCPU to node with help of '-numa node,nodeid=node,cpus=x[-y]' > option. However cpu index is internal concept and QEMU users > have to guess /reimplement qemu's logic/ to map it to > a concrete cpu socket/core/thread to make sane CPUs > placement across numa nodes. > > This patch allows to map cpu objects to numa nodes using > the same properties as used for cpus with -device/device_add > (socket-id/core-id/thread-id/node-id). > > At present valid properties/values to address CPUs could be > fetched using hotpluggable-cpus monitor/qmp command, it will > require user to start qemu twice when creating domain to fetch > possible CPUs for a machine type/-smp layout first and > then the second time with numa explicit mapping for actual > usage. The first step results could be saved and reused to > set/change mapping later as far as machine type/-smp stays > the same. > > Proposed impl. supports exact and wildcard matching to > simplify CLI and allow to set mapping for a specific cpu > or group of cpu objects specified by matched properties. > > For example: > > # exact mapping x86 > -numa cpu,node-id=x,socket-id=y,core-id=z,thread-id=n > > # exact mapping SPAPR > -numa cpu,node-id=x,core-id=y > > # wildcard mapping, all cpu objects that match socket-id=y > # are mapped to node-id=x > -numa cpu,node-id=x,socket-id=y > > Signed-off-by: Igor Mammedov <[email protected]> > --- > v2: > - use new NumaCpuOptions instead of CpuInstanceProperties in > NumaOptions, so that in future we could decouple both > if needed. (Eduardo Habkost <[email protected]>) > - clarify effect of NumaCpuOptions.node-id in qapi-schema.json > --- > numa.c | 25 +++++++++++++++++++++++++ > qapi-schema.json | 21 +++++++++++++++++++-- > qemu-options.hx | 23 ++++++++++++++++++++++- > 3 files changed, 66 insertions(+), 3 deletions(-) > > diff --git a/numa.c b/numa.c > index 40e9f44..61521f5 100644 > --- a/numa.c > +++ b/numa.c > @@ -227,6 +227,7 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error > **errp) > NumaOptions *object = NULL; > MachineState *ms = opaque; > Error *err = NULL; > + CpuInstanceProperties cpu; > > { > Visitor *v = opts_visitor_new(opts); > @@ -246,6 +247,30 @@ static int parse_numa(void *opaque, QemuOpts *opts, > Error **errp) > } > nb_numa_nodes++; > break; > + case NUMA_OPTIONS_TYPE_CPU: > + if (!object->u.cpu.has_node_id) { > + error_setg(&err, "Missing mandatory node-id property"); > + goto end; > + } > + if (!numa_info[object->u.cpu.node_id].present) { > + error_setg(&err, "Invalid node-id=%" PRId64 ", NUMA node must be > " > + "defined with -numa node,nodeid=ID before it's used with " > + "-numa cpu,node-id=ID", object->u.cpu.node_id); > + goto end; > + } > + > + memset(&cpu, 0, sizeof(cpu)); > + cpu.has_node_id = object->u.cpu.has_node_id; > + cpu.node_id = object->u.cpu.node_id; > + cpu.has_socket_id = object->u.cpu.has_socket_id; > + cpu.socket_id = object->u.cpu.socket_id; > + cpu.has_core_id = object->u.cpu.has_core_id; > + cpu.core_id = object->u.cpu.core_id; > + cpu.has_thread_id = object->u.cpu.has_thread_id; > + cpu.thread_id = object->u.cpu.thread_id; > + > + machine_set_cpu_numa_node(ms, &cpu, &err);
It's possible I've confused myself by not looking at this whole series
at once.
But, would it be possible to make a single machine hook which maps a
constructed cpu property set to a "canonical" cpu property set from
the table of CPU slots (or errors, of course). That would let you do
what you need here, and I suspect in other places, without multiple
hooks.
> + break;
> default:
> abort();
> }
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 76d137d..5baf3a4 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -5680,10 +5680,12 @@
> ##
> # @NumaOptionsType:
> #
> +# @cpu: property based CPU(s) to node mapping (Since: 2.10)
> +#
> # Since: 2.1
> ##
> { 'enum': 'NumaOptionsType',
> - 'data': [ 'node' ] }
> + 'data': [ 'node', 'cpu' ] }
>
> ##
> # @NumaOptions:
> @@ -5696,7 +5698,8 @@
> 'base': { 'type': 'NumaOptionsType' },
> 'discriminator': 'type',
> 'data': {
> - 'node': 'NumaNodeOptions' }}
> + 'node': 'NumaNodeOptions',
> + 'cpu': 'NumaCpuOptions' }}
>
> ##
> # @NumaNodeOptions:
> @@ -5725,6 +5728,20 @@
> '*memdev': 'str' }}
>
> ##
> +# @NumaCpuOptions:
> +#
> +# Option "-numa cpu" overrides default cpu to node mapping.
> +# It accepts the same set of cpu properties as returned by
> +# query-hotpluggable-cpus[].props, where node-id could be used to
> +# override default node mapping.
> +#
> +# Since: 2.10
> +##
> +{ 'struct': 'NumaCpuOptions',
> + 'base': 'CpuInstanceProperties',
> + 'data' : {} }
> +
> +##
> # @HostMemPolicy:
> #
> # Host memory policy types
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 787b9c3..e88f534 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -139,13 +139,16 @@ ETEXI
>
> DEF("numa", HAS_ARG, QEMU_OPTION_numa,
> "-numa node[,mem=size][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n"
> - "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n",
> QEMU_ARCH_ALL)
> + "-numa node[,memdev=id][,cpus=firstcpu[-lastcpu]][,nodeid=node]\n"
> + "-numa cpu,node-id=node[,socket-id=x][,core-id=y][,thread-id=z]\n",
> QEMU_ARCH_ALL)
> STEXI
> @item -numa
> node[,mem=@var{size}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}]
> @itemx -numa
> node[,memdev=@var{id}][,cpus=@var{firstcpu}[-@var{lastcpu}]][,nodeid=@var{node}]
> +@itemx -numa
> cpu,node-id=@var{node}[,socket-id=@var{x}][,core-id=@var{y}][,thread-id=@var{z}]
> @findex -numa
> Define a NUMA node and assign RAM and VCPUs to it.
>
> +Legacy VCPU assignment uses @samp{cpus} option where
> @var{firstcpu} and @var{lastcpu} are CPU indexes. Each
> @samp{cpus} option represent a contiguous range of CPU indexes
> (or a single VCPU if @var{lastcpu} is omitted). A non-contiguous
> @@ -159,6 +162,24 @@ a NUMA node:
> -numa node,cpus=0-2,cpus=5
> @end example
>
> +@samp{cpu} option is a new alternative to @samp{cpus} option
> +which uses @samp{socket-id|core-id|thread-id} properties to assign
> +CPU objects to a @var{node} using topology layout properties of CPU.
> +The set of properties is machine specific, and depends on used
> +machine type/@samp{smp} options. It could be queried with
> +@samp{hotpluggable-cpus} monitor command.
> +@samp{node-id} property specifies @var{node} to which CPU object
> +will be assigned, it's required for @var{node} to be declared
> +with @samp{node} option before it's used with @samp{cpu} option.
> +
> +For example:
> +@example
> +-M pc \
> +-smp 1,sockets=2,maxcpus=2 \
> +-numa node,nodeid=0 -numa node,nodeid=1 \
> +-numa cpu,node-id=0,socket-id=0 -numa cpu,node-id=1,socket-id=1
> +@end example
> +
> @samp{mem} assigns a given RAM amount to a node. @samp{memdev}
> assigns RAM from a given memory backend device to a node. If
> @samp{mem} and @samp{memdev} are omitted in all nodes, RAM is
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
