On Sat, Oct 12, 2024 at 06:44:23PM +0800, Zhao Liu wrote:
> Cache topology needs to be defined based on CPU topology levels. Thus,
> define CPU topology enumeration in qapi/machine.json to make it generic
> for all architectures.
>
> To match the general topology naming style, rename CPU_TOPO_LEVEL_* to
> CPU_TOPOLOGY_LEVEL_*, and rename SMT and package levels to thread and
> socket.
>
> Also, enumerate additional topology levels for non-i386 arches, and add
> a CPU_TOPOLOGY_LEVEL_DEFAULT to help future smp-cache object to work
> with compatibility requirement of arch-specific cache topology models.
>
> Signed-off-by: Zhao Liu <zhao1.liu@xxxxxxxxx>
> Tested-by: Yongwei Ma <yongwei.ma@xxxxxxxxx>
> ---
> Changes since Patch v2:
> * Updated version of new QAPI structures to v9.2. (Jonathan)
>
> Changes since Patch v1:
> * Dropped prefix of CpuTopologyLevel enumeration. (Markus)
> * Rename CPU_TOPO_LEVEL_* to CPU_TOPOLOGY_LEVEL_* to match the QAPI's
> generated code. (Markus)
>
> Changes since RFC v2:
> * Dropped cpu-topology.h and cpu-topology.c since QAPI has the helper
> (CpuTopologyLevel_str) to convert enum to string. (Markus)
> * Fixed text format in machine.json (CpuTopologyLevel naming, 2 spaces
> between sentences). (Markus)
> * Added a new level "default" to de-compatibilize some arch-specific
> topo settings. (Daniel)
> * Moved CpuTopologyLevel to qapi/machine-common.json, at where the
> cache enumeration and smp-cache object would be added.
> - If smp-cache object is defined in qapi/machine.json, storage-daemon
> will complain about the qmp cmds in qapi/machine.json during
> compiling.
>
> Changes since RFC v1:
> * Used QAPI to enumerate CPU topology levels.
> * Dropped string_to_cpu_topo() since QAPI will help to parse the topo
> levels.
> ---
> hw/i386/x86-common.c | 4 +-
> include/hw/i386/topology.h | 22 +-----
> qapi/machine-common.json | 46 +++++++++++-
> target/i386/cpu.c | 144 ++++++++++++++++++-------------------
> target/i386/cpu.h | 4 +-
> 5 files changed, 124 insertions(+), 96 deletions(-)
>
> diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h
> index dff49fce1154..bf740383038b 100644
> --- a/include/hw/i386/topology.h
> +++ b/include/hw/i386/topology.h
> @@ -39,7 +39,7 @@
> unsigned threads_per_core;
> } X86CPUTopoInfo;
>
> -/*
> - * CPUTopoLevel is the general i386 topology hierarchical representation,
> - * ordered by increasing hierarchical relationship.
> - * Its enumeration value is not bound to the type value of Intel (CPUID[0x1F])
> - * or AMD (CPUID[0x80000026]).
> - */
> -enum CPUTopoLevel {
> - CPU_TOPO_LEVEL_INVALID,
> - CPU_TOPO_LEVEL_SMT,
> - CPU_TOPO_LEVEL_CORE,
> - CPU_TOPO_LEVEL_MODULE,
> - CPU_TOPO_LEVEL_DIE,
> - CPU_TOPO_LEVEL_PACKAGE,
> - CPU_TOPO_LEVEL_MAX,
> -};
> -
snip
> @@ -18,3 +18,47 @@
> ##
> { 'enum': 'S390CpuEntitlement',
> 'data': [ 'auto', 'low', 'medium', 'high' ] }
> +
> +##
> +# @CpuTopologyLevel:
> +#
> +# An enumeration of CPU topology levels.
> +#
> +# @invalid: Invalid topology level.
Previously all topology levels were internal to QEMU, and IIUC
this CPU_TOPO_LEVEL_INVALID appears to have been a special
value to indicate the cache was absent ?
Now we're exposing this directly to the user as a settable
option. We need to explain what effect setting 'invalid'
has on the CPU cache config.
> +#
> +# @thread: thread level, which would also be called SMT level or
> +# logical processor level. The @threads option in
> +# SMPConfiguration is used to configure the topology of this
> +# level.
> +#
> +# @core: core level. The @cores option in SMPConfiguration is used
> +# to configure the topology of this level.
> +#
> +# @module: module level. The @modules option in SMPConfiguration is
> +# used to configure the topology of this level.
> +#
> +# @cluster: cluster level. The @clusters option in SMPConfiguration
> +# is used to configure the topology of this level.
> +#
> +# @die: die level. The @dies option in SMPConfiguration is used to
> +# configure the topology of this level.
> +#
> +# @socket: socket level, which would also be called package level.
> +# The @sockets option in SMPConfiguration is used to configure
> +# the topology of this level.
> +#
> +# @book: book level. The @books option in SMPConfiguration is used
> +# to configure the topology of this level.
> +#
> +# @drawer: drawer level. The @drawers option in SMPConfiguration is
> +# used to configure the topology of this level.
> +#
> +# @default: default level. Some architectures will have default
> +# topology settings (e.g., cache topology), and this special
> +# level means following the architecture-specific settings.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
