Changes since v1:
* arm (Drew)
- s/virt_idx2mp_affinity/virt_cpu_mp_affinity/
- add arm_cpu_mp_affinity() to reduce code duplication
- use cpu list returned by possible_cpu_arch_ids() instead of
directly accessing MachineState::possible_cpus field
* various checkpatch/cleanups/spelling fixes (Eric/Drew)
* simplify spapr_cpu_index_to_props() (David)
* add/use numa_[has_]node_id() wrappers (Drew)
* use new NumaCpuOptions instead of CpuInstanceProperties
in NumaOptions (Eduardo)
* better documment NumaCpuOptions.node-id in qapi-schema.json (Eduardo)
Changes since RFC:
* convert all targets that support numa (Eduardo)
* add numa CLI tests
* support wildcard matching with "-numa cpu,..." (Paolo)
Series introduces a new CLI option to allow mapping cpus to numa
nodes using public properties [socket|core|thread]-ids instead of
internal cpu_index and moving internal handling of cpu<->node
mapping from cpu_index based global bitmaps to MachineState.
New '-numa cpu' option is supported only on PC and SPAPR
machines that implement hotpluggable-cpus query.
ARM machine user-facing interface stays cpu_index based due to
lack of hotpluggable-cpus support, but internally cpu<->node
mapping will be using the common for PC/SPAPR/ARM approach
(i.e. store mapping info in MachineState:possible_cpus)
It only provides CLI interface to do mapping, there is no QMP
one as I haven't found a suitable place/way to update/set mapping
after machine_done for QEMU started with -S (stopped mode) so that
mgmt could query hopluggable-cpus first, then map them to numa nodes
in runtime before actually allowing guest to run.
Another alternative I've been considering is to add CLI option
similar to -S but that would pause initialization before machine_init()
callback is run so that user can get CPU layout with hopluggable-cpus,
then map CPUs to numa nodes and unpause to let machine_init() initialize
machine using previously predefined numa mapping.
Such option might also be useful for other usecases.
git repo for testing:
https://github.com/imammedo/qemu.git cphp_numa_cfg_v2
reference to v1:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg438955.html
CC: Eduardo Habkost <ehabk...@redhat.com>
CC: Peter Maydell <peter.mayd...@linaro.org>
CC: Andrew Jones <drjo...@redhat.com>
CC: David Gibson <da...@gibson.dropbear.id.au>
CC: Eric Blake <ebl...@redhat.com>
CC: Paolo Bonzini <pbonz...@redhat.com>
CC: Shannon Zhao <zhaoshengl...@huawei.com>
CC: qemu-...@nongnu.org
CC: qemu-...@nongnu.org
Igor Mammedov (24):
tests: add CPUs to numa node mapping test
hw/arm/virt: extract mp-affinity calculation in separate function
hw/arm/virt: use machine->possible_cpus for storing possible topology
info
hw/arm/virt: explicitly allocate cpu_index for cpus
numa: move source of default CPUs to NUMA node mapping into boards
spapr: add node-id property to sPAPR core
pc: add node-id property to CPU
virt-arm: add node-id property to CPU
numa: add check that board supports cpu_index to node mapping
numa: mirror cpu to node mapping in MachineState::possible_cpus
numa: do default mapping based on possible_cpus instead of node_cpu
bitmaps
numa: add numa_[has_]node_id() wrappers
pc: get numa node mapping from possible_cpus instead of
numa_get_node_for_cpu()
spapr: get numa node mapping from possible_cpus instead of
numa_get_node_for_cpu()
virt-arm: get numa node mapping from possible_cpus instead of
numa_get_node_for_cpu()
QMP: include CpuInstanceProperties into query_cpus output output
tests: numa: add case for QMP command query-cpus
numa: remove no longer used numa_get_node_for_cpu()
numa: remove no longer need numa_post_machine_init()
machine: call machine init from wrapper
numa: use possible_cpus for not mapped CPUs check
numa: remove node_cpu bitmaps as they are no longer used
numa: add '-numa cpu,...' option for property based node mapping
tests: check -numa node,cpu=props_list usecase
include/hw/boards.h | 11 +-
include/hw/ppc/spapr_cpu_core.h | 1 +
include/qom/cpu.h | 2 +
include/sysemu/numa.h | 16 ++-
target/arm/cpu.h | 2 +
cpus.c | 10 ++
hw/acpi/cpu.c | 7 +-
hw/arm/virt-acpi-build.c | 19 +--
hw/arm/virt.c | 123 +++++++++++++---
hw/core/machine.c | 132 ++++++++++++++++++
hw/i386/acpi-build.c | 11 +-
hw/i386/pc.c | 54 +++++--
hw/ppc/spapr.c | 44 +++++-
hw/ppc/spapr_cpu_core.c | 21 ++-
numa.c | 157 +++++++++------------
qapi-schema.json | 27 +++-
qemu-options.hx | 23 ++-
target/arm/cpu.c | 13 +-
target/i386/cpu.c | 1 +
tests/Makefile.include | 5 +
tests/numa-test.c | 302 ++++++++++++++++++++++++++++++++++++++++
vl.c | 6 +-
22 files changed, 796 insertions(+), 191 deletions(-)
create mode 100644 tests/numa-test.c
--
2.7.4
