| Message ID | 20240530101539.768484-2-zhao1.liu@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introduce SMP Cache Topology | expand |
Zhao Liu <zhao1.liu@intel.com> writes: > 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_SMT > and CPU_TOPO_LEVEL_PACKAGE to CPU_TOPO_LEVEL_THREAD and > CPU_TOPO_LEVEL_SOCKET. > > Also, enumerate additional topology levels for non-i386 arches, and add > helpers for topology enumeration and string conversion. > > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > --- > Changes since RFC v1: > * Use QAPI to enumerate CPU topology levels. > * Drop string_to_cpu_topo() since QAPI will help to parse the topo > levels. > --- > MAINTAINERS | 2 ++ > hw/core/cpu-topology.c | 36 ++++++++++++++++++++++++++++++ > hw/core/meson.build | 1 + > include/hw/core/cpu-topology.h | 20 +++++++++++++++++ > include/hw/i386/topology.h | 18 +-------------- > qapi/machine.json | 40 ++++++++++++++++++++++++++++++++++ > target/i386/cpu.c | 30 ++++++++++++------------- > target/i386/cpu.h | 4 ++-- > 8 files changed, 117 insertions(+), 34 deletions(-) > create mode 100644 hw/core/cpu-topology.c > create mode 100644 include/hw/core/cpu-topology.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 448dc951c509..09173e8c953d 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1875,6 +1875,7 @@ R: Yanan Wang <wangyanan55@huawei.com> > S: Supported > F: hw/core/cpu-common.c > F: hw/core/cpu-sysemu.c > +F: hw/core/cpu-topology.c > F: hw/core/machine-qmp-cmds.c > F: hw/core/machine.c > F: hw/core/machine-smp.c > @@ -1886,6 +1887,7 @@ F: qapi/machine-common.json > F: qapi/machine-target.json > F: include/hw/boards.h > F: include/hw/core/cpu.h > +F: include/hw/core/cpu-topology.h > F: include/hw/cpu/cluster.h > F: include/sysemu/numa.h > F: tests/unit/test-smp-parse.c > diff --git a/hw/core/cpu-topology.c b/hw/core/cpu-topology.c > new file mode 100644 > index 000000000000..20b5d708cb54 > --- /dev/null > +++ b/hw/core/cpu-topology.c > @@ -0,0 +1,36 @@ > +/* > + * QEMU CPU Topology Representation > + * > + * Copyright (c) 2024 Intel Corporation > + * > + * Authors: > + * Zhao Liu <zhao1.liu@intel.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/core/cpu-topology.h" > + > +typedef struct CPUTopoInfo { > + const char *name; > +} CPUTopoInfo; > + > +CPUTopoInfo cpu_topo_descriptors[] = { > + [CPU_TOPO_LEVEL_INVALID] = { .name = "invalid", }, > + [CPU_TOPO_LEVEL_THREAD] = { .name = "thread", }, > + [CPU_TOPO_LEVEL_CORE] = { .name = "core", }, > + [CPU_TOPO_LEVEL_MODULE] = { .name = "module", }, > + [CPU_TOPO_LEVEL_CLUSTER] = { .name = "cluster", }, > + [CPU_TOPO_LEVEL_DIE] = { .name = "die", }, > + [CPU_TOPO_LEVEL_SOCKET] = { .name = "socket", }, > + [CPU_TOPO_LEVEL_BOOK] = { .name = "book", }, > + [CPU_TOPO_LEVEL_DRAWER] = { .name = "drawer", }, > + [CPU_TOPO_LEVEL__MAX] = { .name = NULL, }, > +}; This looks redundant with generated const QEnumLookup CPUTopoLevel_lookup = { .array = (const char *const[]) { [CPU_TOPO_LEVEL_INVALID] = "invalid", [CPU_TOPO_LEVEL_THREAD] = "thread", [CPU_TOPO_LEVEL_CORE] = "core", [CPU_TOPO_LEVEL_MODULE] = "module", [CPU_TOPO_LEVEL_CLUSTER] = "cluster", [CPU_TOPO_LEVEL_DIE] = "die", [CPU_TOPO_LEVEL_SOCKET] = "socket", [CPU_TOPO_LEVEL_BOOK] = "book", [CPU_TOPO_LEVEL_DRAWER] = "drawer", }, .size = CPU_TOPO_LEVEL__MAX }; > + > +const char *cpu_topo_to_string(CPUTopoLevel topo) > +{ > + return cpu_topo_descriptors[topo].name; > +} And this with generated CPUTopoLevel_str(). > diff --git a/hw/core/meson.build b/hw/core/meson.build > index a3d9bab9f42a..71dc396e9bfc 100644 > --- a/hw/core/meson.build > +++ b/hw/core/meson.build > @@ -13,6 +13,7 @@ hwcore_ss.add(files( > )) > > common_ss.add(files('cpu-common.c')) > +common_ss.add(files('cpu-topology.c')) > common_ss.add(files('machine-smp.c')) > system_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) > system_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) > diff --git a/include/hw/core/cpu-topology.h b/include/hw/core/cpu-topology.h > new file mode 100644 > index 000000000000..0e21fe8a9bf8 > --- /dev/null > +++ b/include/hw/core/cpu-topology.h > @@ -0,0 +1,20 @@ > +/* > + * QEMU CPU Topology Representation Header > + * > + * Copyright (c) 2024 Intel Corporation > + * > + * Authors: > + * Zhao Liu <zhao1.liu@intel.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > + */ > + > +#ifndef CPU_TOPOLOGY_H > +#define CPU_TOPOLOGY_H > + > +#include "qapi/qapi-types-machine.h" > + > +const char *cpu_topo_to_string(CPUTopoLevel topo); > + > +#endif /* CPU_TOPOLOGY_H */ > diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h > index dff49fce1154..c6ff75f23991 100644 > --- a/include/hw/i386/topology.h > +++ b/include/hw/i386/topology.h > @@ -39,7 +39,7 @@ > * CPUID Fn8000_0008_ECX[ApicIdCoreIdSize[3:0]] is set to apicid_core_width(). > */ > > - > +#include "hw/core/cpu-topology.h" > #include "qemu/bitops.h" > > /* > @@ -62,22 +62,6 @@ typedef struct X86CPUTopoInfo { > 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, > -}; > - > /* Return the bit width needed for 'count' IDs */ > static unsigned apicid_bitwidth_for_count(unsigned count) > { > diff --git a/qapi/machine.json b/qapi/machine.json > index bce6e1bbc412..7ac5a05bb9c9 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1667,6 +1667,46 @@ > '*reboot-timeout': 'int', > '*strict': 'bool' } } > > +## > +# @CPUTopoLevel: > +# > +# An enumeration of CPU topology levels. > +# > +# @invalid: Invalid topology level, used as a placeholder. Placeholder for what? > +# > +# @thread: thread level, which would also be called SMT level or logical > +# processor level. The @threads option in -smp is used to configure > +# the topology of this level. > +# > +# @core: core level. The @cores option in -smp is used to configure the > +# topology of this level. > +# > +# @module: module level. The @modules option in -smp is used to > +# configure the topology of this level. > +# > +# @cluster: cluster level. The @clusters option in -smp is used to > +# configure the topology of this level. > +# > +# @die: die level. The @dies option in -smp is used to configure the > +# topology of this level. > +# > +# @socket: socket level, which would also be called package level. The > +# @sockets option in -smp is used to configure the topology of this > +# level. > +# > +# @book: book level. The @books option in -smp is used to configure the > +# topology of this level. > +# > +# @drawer: drawer level. The @drawers option in -smp is used to > +# configure the topology of this level. As far as I can tell, -smp is sugar for machine property "smp" of QAPI type SMPConfiguration. Should we refer to SMPConfiguration instead of -smp? > +# > +# Since: 9.1 > +## > +{ 'enum': 'CPUTopoLevel', > + 'prefix': 'CPU_TOPO_LEVEL', > + 'data': [ 'invalid', 'thread', 'core', 'module', 'cluster', > + 'die', 'socket', 'book', 'drawer' ] } > + > ## > # @SMPConfiguration: > # [...]
Zhao Liu <zhao1.liu@intel.com> writes: > 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_SMT > and CPU_TOPO_LEVEL_PACKAGE to CPU_TOPO_LEVEL_THREAD and > CPU_TOPO_LEVEL_SOCKET. > > Also, enumerate additional topology levels for non-i386 arches, and add > helpers for topology enumeration and string conversion. > > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> [...] > diff --git a/qapi/machine.json b/qapi/machine.json > index bce6e1bbc412..7ac5a05bb9c9 100644 > --- a/qapi/machine.json > +++ b/qapi/machine.json > @@ -1667,6 +1667,46 @@ > '*reboot-timeout': 'int', > '*strict': 'bool' } } > > +## > +# @CPUTopoLevel: I understand you're moving existing enum CPUTopoLevel into the QAPI schema. I think the idiomatic QAPI name would be CpuTopologyLevel. Would you be willing to rename it, or would that be too much churn? > +# > +# An enumeration of CPU topology levels. > +# > +# @invalid: Invalid topology level, used as a placeholder. > +# > +# @thread: thread level, which would also be called SMT level or logical > +# processor level. The @threads option in -smp is used to configure > +# the topology of this level. > +# > +# @core: core level. The @cores option in -smp is used to configure the > +# topology of this level. > +# > +# @module: module level. The @modules option in -smp is used to > +# configure the topology of this level. > +# > +# @cluster: cluster level. The @clusters option in -smp is used to > +# configure the topology of this level. > +# > +# @die: die level. The @dies option in -smp is used to configure the > +# topology of this level. > +# > +# @socket: socket level, which would also be called package level. The > +# @sockets option in -smp is used to configure the topology of this > +# level. > +# > +# @book: book level. The @books option in -smp is used to configure the > +# topology of this level. > +# > +# @drawer: drawer level. The @drawers option in -smp is used to > +# configure the topology of this level. docs/devel/qapi-code-gen.rst section Documentation markup: For legibility, wrap text paragraphs so every line is at most 70 characters long. Separate sentences with two spaces. > +# > +# Since: 9.1 > +## > +{ 'enum': 'CPUTopoLevel', > + 'prefix': 'CPU_TOPO_LEVEL', > + 'data': [ 'invalid', 'thread', 'core', 'module', 'cluster', > + 'die', 'socket', 'book', 'drawer' ] } > + > ## > # @SMPConfiguration: > # [...]
Hi Markus, On Mon, Jun 03, 2024 at 02:25:36PM +0200, Markus Armbruster wrote: > Date: Mon, 03 Jun 2024 14:25:36 +0200 > From: Markus Armbruster <armbru@redhat.com> > Subject: Re: [RFC v2 1/7] hw/core: Make CPU topology enumeration > arch-agnostic > > Zhao Liu <zhao1.liu@intel.com> writes: > > > 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_SMT > > and CPU_TOPO_LEVEL_PACKAGE to CPU_TOPO_LEVEL_THREAD and > > CPU_TOPO_LEVEL_SOCKET. > > > > Also, enumerate additional topology levels for non-i386 arches, and add > > helpers for topology enumeration and string conversion. > > > > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > > [...] > > > diff --git a/qapi/machine.json b/qapi/machine.json > > index bce6e1bbc412..7ac5a05bb9c9 100644 > > --- a/qapi/machine.json > > +++ b/qapi/machine.json > > @@ -1667,6 +1667,46 @@ > > '*reboot-timeout': 'int', > > '*strict': 'bool' } } > > > > +## > > +# @CPUTopoLevel: > > I understand you're moving existing enum CPUTopoLevel into the QAPI > schema. I think the idiomatic QAPI name would be CpuTopologyLevel. > Would you be willing to rename it, or would that be too much churn? Sure, I'll rename it as you suggested. > > +# > > +# An enumeration of CPU topology levels. > > +# > > +# @invalid: Invalid topology level, used as a placeholder. > > +# > > +# @thread: thread level, which would also be called SMT level or logical > > +# processor level. The @threads option in -smp is used to configure > > +# the topology of this level. > > +# > > +# @core: core level. The @cores option in -smp is used to configure the > > +# topology of this level. > > +# > > +# @module: module level. The @modules option in -smp is used to > > +# configure the topology of this level. > > +# > > +# @cluster: cluster level. The @clusters option in -smp is used to > > +# configure the topology of this level. > > +# > > +# @die: die level. The @dies option in -smp is used to configure the > > +# topology of this level. > > +# > > +# @socket: socket level, which would also be called package level. The > > +# @sockets option in -smp is used to configure the topology of this > > +# level. > > +# > > +# @book: book level. The @books option in -smp is used to configure the > > +# topology of this level. > > +# > > +# @drawer: drawer level. The @drawers option in -smp is used to > > +# configure the topology of this level. > > docs/devel/qapi-code-gen.rst section Documentation markup: > > For legibility, wrap text paragraphs so every line is at most 70 > characters long. > > Separate sentences with two spaces. Thank you for pointing this. About separating sentences, is this what I should be doing? # @drawer: drawer level. The @drawers option in -smp is used to # configure the topology of this level. Thanks, Zhao
[snip] > > +CPUTopoInfo cpu_topo_descriptors[] = { > > + [CPU_TOPO_LEVEL_INVALID] = { .name = "invalid", }, > > + [CPU_TOPO_LEVEL_THREAD] = { .name = "thread", }, > > + [CPU_TOPO_LEVEL_CORE] = { .name = "core", }, > > + [CPU_TOPO_LEVEL_MODULE] = { .name = "module", }, > > + [CPU_TOPO_LEVEL_CLUSTER] = { .name = "cluster", }, > > + [CPU_TOPO_LEVEL_DIE] = { .name = "die", }, > > + [CPU_TOPO_LEVEL_SOCKET] = { .name = "socket", }, > > + [CPU_TOPO_LEVEL_BOOK] = { .name = "book", }, > > + [CPU_TOPO_LEVEL_DRAWER] = { .name = "drawer", }, > > + [CPU_TOPO_LEVEL__MAX] = { .name = NULL, }, > > +}; > > This looks redundant with generated > > const QEnumLookup CPUTopoLevel_lookup = { > .array = (const char *const[]) { > [CPU_TOPO_LEVEL_INVALID] = "invalid", > [CPU_TOPO_LEVEL_THREAD] = "thread", > [CPU_TOPO_LEVEL_CORE] = "core", > [CPU_TOPO_LEVEL_MODULE] = "module", > [CPU_TOPO_LEVEL_CLUSTER] = "cluster", > [CPU_TOPO_LEVEL_DIE] = "die", > [CPU_TOPO_LEVEL_SOCKET] = "socket", > [CPU_TOPO_LEVEL_BOOK] = "book", > [CPU_TOPO_LEVEL_DRAWER] = "drawer", > }, > .size = CPU_TOPO_LEVEL__MAX > }; > > > + > > +const char *cpu_topo_to_string(CPUTopoLevel topo) > > +{ > > + return cpu_topo_descriptors[topo].name; > > +} > > And this with generated CPUTopoLevel_str(). Thanks! I missed these generated helpers. [snip] > > +## > > +# @CPUTopoLevel: > > +# > > +# An enumeration of CPU topology levels. > > +# > > +# @invalid: Invalid topology level, used as a placeholder. > > Placeholder for what? I was trying to express that when no specific topology level is specified, it will be initialized to this value by default. Or what about just deleting this placeholder related words and just saying it's "Invalid topology level"? > > +# > > +# @thread: thread level, which would also be called SMT level or logical > > +# processor level. The @threads option in -smp is used to configure > > +# the topology of this level. > > +# > > +# @core: core level. The @cores option in -smp is used to configure the > > +# topology of this level. > > +# > > +# @module: module level. The @modules option in -smp is used to > > +# configure the topology of this level. > > +# > > +# @cluster: cluster level. The @clusters option in -smp is used to > > +# configure the topology of this level. > > +# > > +# @die: die level. The @dies option in -smp is used to configure the > > +# topology of this level. > > +# > > +# @socket: socket level, which would also be called package level. The > > +# @sockets option in -smp is used to configure the topology of this > > +# level. > > +# > > +# @book: book level. The @books option in -smp is used to configure the > > +# topology of this level. > > +# > > +# @drawer: drawer level. The @drawers option in -smp is used to > > +# configure the topology of this level. > > As far as I can tell, -smp is sugar for machine property "smp" of QAPI > type SMPConfiguration. Should we refer to SMPConfiguration instead of > -smp? Yes, SMPConfiguration is better. Thanks, Zhao
Zhao Liu <zhao1.liu@intel.com> writes: [...] >> > +## >> > +# @CPUTopoLevel: >> > +# >> > +# An enumeration of CPU topology levels. >> > +# >> > +# @invalid: Invalid topology level, used as a placeholder. >> >> Placeholder for what? > > I was trying to express that when no specific topology level is > specified, it will be initialized to this value by default. > > Or what about just deleting this placeholder related words and just > saying it's "Invalid topology level"? Works for me. [...]
Zhao Liu <zhao1.liu@intel.com> writes: > Hi Markus, > > On Mon, Jun 03, 2024 at 02:25:36PM +0200, Markus Armbruster wrote: >> Date: Mon, 03 Jun 2024 14:25:36 +0200 >> From: Markus Armbruster <armbru@redhat.com> >> Subject: Re: [RFC v2 1/7] hw/core: Make CPU topology enumeration >> arch-agnostic >> >> Zhao Liu <zhao1.liu@intel.com> writes: >> >> > 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_SMT >> > and CPU_TOPO_LEVEL_PACKAGE to CPU_TOPO_LEVEL_THREAD and >> > CPU_TOPO_LEVEL_SOCKET. >> > >> > Also, enumerate additional topology levels for non-i386 arches, and add >> > helpers for topology enumeration and string conversion. >> > >> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> >> >> [...] >> >> > diff --git a/qapi/machine.json b/qapi/machine.json >> > index bce6e1bbc412..7ac5a05bb9c9 100644 >> > --- a/qapi/machine.json >> > +++ b/qapi/machine.json >> > @@ -1667,6 +1667,46 @@ >> > '*reboot-timeout': 'int', >> > '*strict': 'bool' } } >> > >> > +## >> > +# @CPUTopoLevel: >> >> I understand you're moving existing enum CPUTopoLevel into the QAPI >> schema. I think the idiomatic QAPI name would be CpuTopologyLevel. >> Would you be willing to rename it, or would that be too much churn? > > Sure, I'll rename it as you suggested. > >> > +# >> > +# An enumeration of CPU topology levels. >> > +# >> > +# @invalid: Invalid topology level, used as a placeholder. >> > +# >> > +# @thread: thread level, which would also be called SMT level or logical >> > +# processor level. The @threads option in -smp is used to configure >> > +# the topology of this level. >> > +# >> > +# @core: core level. The @cores option in -smp is used to configure the >> > +# topology of this level. >> > +# >> > +# @module: module level. The @modules option in -smp is used to >> > +# configure the topology of this level. >> > +# >> > +# @cluster: cluster level. The @clusters option in -smp is used to >> > +# configure the topology of this level. >> > +# >> > +# @die: die level. The @dies option in -smp is used to configure the >> > +# topology of this level. >> > +# >> > +# @socket: socket level, which would also be called package level. The >> > +# @sockets option in -smp is used to configure the topology of this >> > +# level. >> > +# >> > +# @book: book level. The @books option in -smp is used to configure the >> > +# topology of this level. >> > +# >> > +# @drawer: drawer level. The @drawers option in -smp is used to >> > +# configure the topology of this level. >> >> docs/devel/qapi-code-gen.rst section Documentation markup: >> >> For legibility, wrap text paragraphs so every line is at most 70 >> characters long. >> >> Separate sentences with two spaces. > > Thank you for pointing this. > > About separating sentences, is this what I should be doing? > > # @drawer: drawer level. The @drawers option in -smp is used to > # configure the topology of this level. Like this: ## # @CPUTopoLevel: # # An enumeration of CPU topology levels. # # @invalid: Invalid topology level. # # @thread: thread level, which would also be called SMT level or # logical processor level. The @threads option in -smp is used to # configure the topology of this level. # # @core: core level. The @cores option in -smp is used to configure # the topology of this level. # # @module: module level. The @modules option in -smp is used to # configure the topology of this level. # # @cluster: cluster level. The @clusters option in -smp is used to # configure the topology of this level. # # @die: die level. The @dies option in -smp is used to configure the # topology of this level. # # @socket: socket level, which would also be called package level. # The @sockets option in -smp is used to configure the topology of # this level. # # @book: book level. The @books option in -smp is used to configure # the topology of this level. # # @drawer: drawer level. The @drawers option in -smp is used to # configure the topology of this level. # # Since: 9.1 ##
On Tue, Jun 04, 2024 at 10:47:44AM +0200, Markus Armbruster wrote: > Date: Tue, 04 Jun 2024 10:47:44 +0200 > From: Markus Armbruster <armbru@redhat.com> > Subject: Re: [RFC v2 1/7] hw/core: Make CPU topology enumeration > arch-agnostic > > Zhao Liu <zhao1.liu@intel.com> writes: > > > Hi Markus, > > > > On Mon, Jun 03, 2024 at 02:25:36PM +0200, Markus Armbruster wrote: > >> Date: Mon, 03 Jun 2024 14:25:36 +0200 > >> From: Markus Armbruster <armbru@redhat.com> > >> Subject: Re: [RFC v2 1/7] hw/core: Make CPU topology enumeration > >> arch-agnostic > >> > >> Zhao Liu <zhao1.liu@intel.com> writes: > >> > >> > 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_SMT > >> > and CPU_TOPO_LEVEL_PACKAGE to CPU_TOPO_LEVEL_THREAD and > >> > CPU_TOPO_LEVEL_SOCKET. > >> > > >> > Also, enumerate additional topology levels for non-i386 arches, and add > >> > helpers for topology enumeration and string conversion. > >> > > >> > Signed-off-by: Zhao Liu <zhao1.liu@intel.com> > >> > >> [...] > >> > >> > diff --git a/qapi/machine.json b/qapi/machine.json > >> > index bce6e1bbc412..7ac5a05bb9c9 100644 > >> > --- a/qapi/machine.json > >> > +++ b/qapi/machine.json > >> > @@ -1667,6 +1667,46 @@ > >> > '*reboot-timeout': 'int', > >> > '*strict': 'bool' } } > >> > > >> > +## > >> > +# @CPUTopoLevel: > >> > >> I understand you're moving existing enum CPUTopoLevel into the QAPI > >> schema. I think the idiomatic QAPI name would be CpuTopologyLevel. > >> Would you be willing to rename it, or would that be too much churn? > > > > Sure, I'll rename it as you suggested. > > > >> > +# > >> > +# An enumeration of CPU topology levels. > >> > +# > >> > +# @invalid: Invalid topology level, used as a placeholder. > >> > +# > >> > +# @thread: thread level, which would also be called SMT level or logical > >> > +# processor level. The @threads option in -smp is used to configure > >> > +# the topology of this level. > >> > +# > >> > +# @core: core level. The @cores option in -smp is used to configure the > >> > +# topology of this level. > >> > +# > >> > +# @module: module level. The @modules option in -smp is used to > >> > +# configure the topology of this level. > >> > +# > >> > +# @cluster: cluster level. The @clusters option in -smp is used to > >> > +# configure the topology of this level. > >> > +# > >> > +# @die: die level. The @dies option in -smp is used to configure the > >> > +# topology of this level. > >> > +# > >> > +# @socket: socket level, which would also be called package level. The > >> > +# @sockets option in -smp is used to configure the topology of this > >> > +# level. > >> > +# > >> > +# @book: book level. The @books option in -smp is used to configure the > >> > +# topology of this level. > >> > +# > >> > +# @drawer: drawer level. The @drawers option in -smp is used to > >> > +# configure the topology of this level. > >> > >> docs/devel/qapi-code-gen.rst section Documentation markup: > >> > >> For legibility, wrap text paragraphs so every line is at most 70 > >> characters long. > >> > >> Separate sentences with two spaces. > > > > Thank you for pointing this. > > > > About separating sentences, is this what I should be doing? > > > > # @drawer: drawer level. The @drawers option in -smp is used to > > # configure the topology of this level. > > Like this: > > ## > # @CPUTopoLevel: > # > # An enumeration of CPU topology levels. > # > # @invalid: Invalid topology level. > # > # @thread: thread level, which would also be called SMT level or > # logical processor level. The @threads option in -smp is used to > # configure the topology of this level. > # > # @core: core level. The @cores option in -smp is used to configure > # the topology of this level. > # > # @module: module level. The @modules option in -smp is used to > # configure the topology of this level. > # > # @cluster: cluster level. The @clusters option in -smp is used to > # configure the topology of this level. > # > # @die: die level. The @dies option in -smp is used to configure the > # topology of this level. > # > # @socket: socket level, which would also be called package level. > # The @sockets option in -smp is used to configure the topology of > # this level. > # > # @book: book level. The @books option in -smp is used to configure > # the topology of this level. > # > # @drawer: drawer level. The @drawers option in -smp is used to > # configure the topology of this level. > # > # Since: 9.1 > ## > I see, thanks very much for your patience.
diff --git a/MAINTAINERS b/MAINTAINERS index 448dc951c509..09173e8c953d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1875,6 +1875,7 @@ R: Yanan Wang <wangyanan55@huawei.com> S: Supported F: hw/core/cpu-common.c F: hw/core/cpu-sysemu.c +F: hw/core/cpu-topology.c F: hw/core/machine-qmp-cmds.c F: hw/core/machine.c F: hw/core/machine-smp.c @@ -1886,6 +1887,7 @@ F: qapi/machine-common.json F: qapi/machine-target.json F: include/hw/boards.h F: include/hw/core/cpu.h +F: include/hw/core/cpu-topology.h F: include/hw/cpu/cluster.h F: include/sysemu/numa.h F: tests/unit/test-smp-parse.c diff --git a/hw/core/cpu-topology.c b/hw/core/cpu-topology.c new file mode 100644 index 000000000000..20b5d708cb54 --- /dev/null +++ b/hw/core/cpu-topology.c @@ -0,0 +1,36 @@ +/* + * QEMU CPU Topology Representation + * + * Copyright (c) 2024 Intel Corporation + * + * Authors: + * Zhao Liu <zhao1.liu@intel.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/core/cpu-topology.h" + +typedef struct CPUTopoInfo { + const char *name; +} CPUTopoInfo; + +CPUTopoInfo cpu_topo_descriptors[] = { + [CPU_TOPO_LEVEL_INVALID] = { .name = "invalid", }, + [CPU_TOPO_LEVEL_THREAD] = { .name = "thread", }, + [CPU_TOPO_LEVEL_CORE] = { .name = "core", }, + [CPU_TOPO_LEVEL_MODULE] = { .name = "module", }, + [CPU_TOPO_LEVEL_CLUSTER] = { .name = "cluster", }, + [CPU_TOPO_LEVEL_DIE] = { .name = "die", }, + [CPU_TOPO_LEVEL_SOCKET] = { .name = "socket", }, + [CPU_TOPO_LEVEL_BOOK] = { .name = "book", }, + [CPU_TOPO_LEVEL_DRAWER] = { .name = "drawer", }, + [CPU_TOPO_LEVEL__MAX] = { .name = NULL, }, +}; + +const char *cpu_topo_to_string(CPUTopoLevel topo) +{ + return cpu_topo_descriptors[topo].name; +} diff --git a/hw/core/meson.build b/hw/core/meson.build index a3d9bab9f42a..71dc396e9bfc 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -13,6 +13,7 @@ hwcore_ss.add(files( )) common_ss.add(files('cpu-common.c')) +common_ss.add(files('cpu-topology.c')) common_ss.add(files('machine-smp.c')) system_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) system_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) diff --git a/include/hw/core/cpu-topology.h b/include/hw/core/cpu-topology.h new file mode 100644 index 000000000000..0e21fe8a9bf8 --- /dev/null +++ b/include/hw/core/cpu-topology.h @@ -0,0 +1,20 @@ +/* + * QEMU CPU Topology Representation Header + * + * Copyright (c) 2024 Intel Corporation + * + * Authors: + * Zhao Liu <zhao1.liu@intel.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. + */ + +#ifndef CPU_TOPOLOGY_H +#define CPU_TOPOLOGY_H + +#include "qapi/qapi-types-machine.h" + +const char *cpu_topo_to_string(CPUTopoLevel topo); + +#endif /* CPU_TOPOLOGY_H */ diff --git a/include/hw/i386/topology.h b/include/hw/i386/topology.h index dff49fce1154..c6ff75f23991 100644 --- a/include/hw/i386/topology.h +++ b/include/hw/i386/topology.h @@ -39,7 +39,7 @@ * CPUID Fn8000_0008_ECX[ApicIdCoreIdSize[3:0]] is set to apicid_core_width(). */ - +#include "hw/core/cpu-topology.h" #include "qemu/bitops.h" /* @@ -62,22 +62,6 @@ typedef struct X86CPUTopoInfo { 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, -}; - /* Return the bit width needed for 'count' IDs */ static unsigned apicid_bitwidth_for_count(unsigned count) { diff --git a/qapi/machine.json b/qapi/machine.json index bce6e1bbc412..7ac5a05bb9c9 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1667,6 +1667,46 @@ '*reboot-timeout': 'int', '*strict': 'bool' } } +## +# @CPUTopoLevel: +# +# An enumeration of CPU topology levels. +# +# @invalid: Invalid topology level, used as a placeholder. +# +# @thread: thread level, which would also be called SMT level or logical +# processor level. The @threads option in -smp is used to configure +# the topology of this level. +# +# @core: core level. The @cores option in -smp is used to configure the +# topology of this level. +# +# @module: module level. The @modules option in -smp is used to +# configure the topology of this level. +# +# @cluster: cluster level. The @clusters option in -smp is used to +# configure the topology of this level. +# +# @die: die level. The @dies option in -smp is used to configure the +# topology of this level. +# +# @socket: socket level, which would also be called package level. The +# @sockets option in -smp is used to configure the topology of this +# level. +# +# @book: book level. The @books option in -smp is used to configure the +# topology of this level. +# +# @drawer: drawer level. The @drawers option in -smp is used to +# configure the topology of this level. +# +# Since: 9.1 +## +{ 'enum': 'CPUTopoLevel', + 'prefix': 'CPU_TOPO_LEVEL', + 'data': [ 'invalid', 'thread', 'core', 'module', 'cluster', + 'die', 'socket', 'book', 'drawer' ] } + ## # @SMPConfiguration: # diff --git a/target/i386/cpu.c b/target/i386/cpu.c index bc2dceb647fa..b11097b5bafd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -247,12 +247,12 @@ static uint32_t max_thread_ids_for_cache(X86CPUTopoInfo *topo_info, case CPU_TOPO_LEVEL_DIE: num_ids = 1 << apicid_die_offset(topo_info); break; - case CPU_TOPO_LEVEL_PACKAGE: + case CPU_TOPO_LEVEL_SOCKET: num_ids = 1 << apicid_pkg_offset(topo_info); break; default: /* - * Currently there is no use case for SMT and MODULE, so use + * Currently there is no use case for THREAD and MODULE, so use * assert directly to facilitate debugging. */ g_assert_not_reached(); @@ -304,7 +304,7 @@ static uint32_t num_threads_by_topo_level(X86CPUTopoInfo *topo_info, enum CPUTopoLevel topo_level) { switch (topo_level) { - case CPU_TOPO_LEVEL_SMT: + case CPU_TOPO_LEVEL_THREAD: return 1; case CPU_TOPO_LEVEL_CORE: return topo_info->threads_per_core; @@ -313,7 +313,7 @@ static uint32_t num_threads_by_topo_level(X86CPUTopoInfo *topo_info, case CPU_TOPO_LEVEL_DIE: return topo_info->threads_per_core * topo_info->cores_per_module * topo_info->modules_per_die; - case CPU_TOPO_LEVEL_PACKAGE: + case CPU_TOPO_LEVEL_SOCKET: return topo_info->threads_per_core * topo_info->cores_per_module * topo_info->modules_per_die * topo_info->dies_per_pkg; default: @@ -326,7 +326,7 @@ static uint32_t apicid_offset_by_topo_level(X86CPUTopoInfo *topo_info, enum CPUTopoLevel topo_level) { switch (topo_level) { - case CPU_TOPO_LEVEL_SMT: + case CPU_TOPO_LEVEL_THREAD: return 0; case CPU_TOPO_LEVEL_CORE: return apicid_core_offset(topo_info); @@ -334,7 +334,7 @@ static uint32_t apicid_offset_by_topo_level(X86CPUTopoInfo *topo_info, return apicid_module_offset(topo_info); case CPU_TOPO_LEVEL_DIE: return apicid_die_offset(topo_info); - case CPU_TOPO_LEVEL_PACKAGE: + case CPU_TOPO_LEVEL_SOCKET: return apicid_pkg_offset(topo_info); default: g_assert_not_reached(); @@ -347,7 +347,7 @@ static uint32_t cpuid1f_topo_type(enum CPUTopoLevel topo_level) switch (topo_level) { case CPU_TOPO_LEVEL_INVALID: return CPUID_1F_ECX_TOPO_LEVEL_INVALID; - case CPU_TOPO_LEVEL_SMT: + case CPU_TOPO_LEVEL_THREAD: return CPUID_1F_ECX_TOPO_LEVEL_SMT; case CPU_TOPO_LEVEL_CORE: return CPUID_1F_ECX_TOPO_LEVEL_CORE; @@ -371,7 +371,7 @@ static void encode_topo_cpuid1f(CPUX86State *env, uint32_t count, unsigned long level, next_level; uint32_t num_threads_next_level, offset_next_level; - assert(count + 1 < CPU_TOPO_LEVEL_MAX); + assert(count + 1 < CPU_TOPO_LEVEL__MAX); /* * Find the No.(count + 1) topology level in avail_cpu_topo bitmap. @@ -380,7 +380,7 @@ static void encode_topo_cpuid1f(CPUX86State *env, uint32_t count, level = CPU_TOPO_LEVEL_INVALID; for (int i = 0; i <= count; i++) { level = find_next_bit(env->avail_cpu_topo, - CPU_TOPO_LEVEL_PACKAGE, + CPU_TOPO_LEVEL_SOCKET, level + 1); /* @@ -388,7 +388,7 @@ static void encode_topo_cpuid1f(CPUX86State *env, uint32_t count, * and it just encodes the invalid level (all fields are 0) * into the last subleaf of 0x1f. */ - if (level == CPU_TOPO_LEVEL_PACKAGE) { + if (level == CPU_TOPO_LEVEL_SOCKET) { level = CPU_TOPO_LEVEL_INVALID; break; } @@ -399,7 +399,7 @@ static void encode_topo_cpuid1f(CPUX86State *env, uint32_t count, offset_next_level = 0; } else { next_level = find_next_bit(env->avail_cpu_topo, - CPU_TOPO_LEVEL_PACKAGE, + CPU_TOPO_LEVEL_SOCKET, level + 1); num_threads_next_level = num_threads_by_topo_level(topo_info, next_level); @@ -6435,7 +6435,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, /* Share the cache at package level. */ *eax |= max_thread_ids_for_cache(&topo_info, - CPU_TOPO_LEVEL_PACKAGE) << 14; + CPU_TOPO_LEVEL_SOCKET) << 14; } } } else if (cpu->vendor_cpuid_only && IS_AMD_CPU(env)) { @@ -7935,10 +7935,10 @@ static void x86_cpu_init_default_topo(X86CPU *cpu) env->nr_modules = 1; env->nr_dies = 1; - /* SMT, core and package levels are set by default. */ - set_bit(CPU_TOPO_LEVEL_SMT, env->avail_cpu_topo); + /* thread, core and socket levels are set by default. */ + set_bit(CPU_TOPO_LEVEL_THREAD, env->avail_cpu_topo); set_bit(CPU_TOPO_LEVEL_CORE, env->avail_cpu_topo); - set_bit(CPU_TOPO_LEVEL_PACKAGE, env->avail_cpu_topo); + set_bit(CPU_TOPO_LEVEL_SOCKET, env->avail_cpu_topo); } static void x86_cpu_initfn(Object *obj) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index c64ef0c1a287..c6d07f38a1e8 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1606,7 +1606,7 @@ typedef struct CPUCacheInfo { * Used to encode CPUID[4].EAX[bits 25:14] or * CPUID[0x8000001D].EAX[bits 25:14]. */ - enum CPUTopoLevel share_level; + CPUTopoLevel share_level; } CPUCacheInfo; @@ -1921,7 +1921,7 @@ typedef struct CPUArchState { unsigned nr_modules; /* Bitmap of available CPU topology levels for this CPU. */ - DECLARE_BITMAP(avail_cpu_topo, CPU_TOPO_LEVEL_MAX); + DECLARE_BITMAP(avail_cpu_topo, CPU_TOPO_LEVEL__MAX); } CPUX86State; struct kvm_msrs;
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_SMT and CPU_TOPO_LEVEL_PACKAGE to CPU_TOPO_LEVEL_THREAD and CPU_TOPO_LEVEL_SOCKET. Also, enumerate additional topology levels for non-i386 arches, and add helpers for topology enumeration and string conversion. Signed-off-by: Zhao Liu <zhao1.liu@intel.com> --- Changes since RFC v1: * Use QAPI to enumerate CPU topology levels. * Drop string_to_cpu_topo() since QAPI will help to parse the topo levels. --- MAINTAINERS | 2 ++ hw/core/cpu-topology.c | 36 ++++++++++++++++++++++++++++++ hw/core/meson.build | 1 + include/hw/core/cpu-topology.h | 20 +++++++++++++++++ include/hw/i386/topology.h | 18 +-------------- qapi/machine.json | 40 ++++++++++++++++++++++++++++++++++ target/i386/cpu.c | 30 ++++++++++++------------- target/i386/cpu.h | 4 ++-- 8 files changed, 117 insertions(+), 34 deletions(-) create mode 100644 hw/core/cpu-topology.c create mode 100644 include/hw/core/cpu-topology.h