s390x: CPU Topology
Subsystems (2)
v20 cover s390x: CPU Topology
Hi,
What is new:
- Entitlement is now an enum and the default is "auto"
Implementation discussions
==========================
CPU models
----------
Since the facility 11, S390_FEAT_CONFIGURATION_TOPOLOGY is already in the CPU model for old QEMU we could not activate it as usual from KVM but needed a KVM capability: KVM_CAP_S390_CPU_TOPOLOGY. Checking and enabling this capability enables facility 11, S390_FEAT_CONFIGURATION_TOPOLOGY.
It is the responsibility of the admin to ensure the same CPU model for source and target host in a migration.
Migration
---------
When the target guest is started, the Multi-processor Topology Change Report (MTCR) bit is set during the creation of the vCPU by KVM. We do not need to migrate its state, in the worst case, the target guest will see the MTCR and actualize its view of the topology without necessity, but this will be done only one time.
Reset
-----
Reseting the topology is done during subsystem reset, the polarization is reset to horizontal polarization.
Topology attributes
-------------------
The topology attributes are carried by the CPU object and defined on object creation.
In the case the new attributes, socket, book, drawer, dedicated, entitlement are not provided QEMU provides defaults values.
- Geometry defaults
The geometry default are based on the core-id of the core to fill the geometry in a monotone way starting with drawer 0, book 0, and filling socket 0 with the number of cores per socket, then filling socket 1, socket 2 ... etc until the book is complete and all books until the first drawer is complete before starting with the next drawer.
This allows to keep existing start scripts and Libvirt existing interface until it is extended.
- Modifiers defaults
Default entitlement is medium
Default dedication is not dedicated.
- Machine polarization default to horizontal
Dynamic topology modification
-----------------------------
QAPI interface is extended with:
- a command: 'set-cpu-topology'
- a query: 'query-cpu-polarization'
- a query: extension of qmp 'query-cpus-fast'
- a query: extension of hmp 'hotpluggable-cpus'
- an event: 'CPU_POLARITY_CHANGE'
New command and interface are specified as unstable.
The admin may use query-cpus-fast to verify the topology provided to the guest and set-cpu-topology to modify it.
The event CPU_POLARITY_CHANGE is sent when the guest successfuly uses the PTF(2) instruction to request a polarization change. In that case, the admin is supposed to modify the CPU provisioning accordingly.
Testing
=======
To use the QEMU patches, you will need Linux V6-rc1 or newer, or use the following Linux mainline patches:
f5ecfee94493 2022-07-20 KVM: s390: resetting the Topology-Change-Report 24fe0195bc19 2022-07-20 KVM: s390: guest support for topology function 0130337ec45b 2022-07-20 KVM: s390: Cleanup ipte lock access and SIIF fac..
Currently this code is for KVM only, I have no idea if it is interesting to provide a TCG patch. If ever it will be done in another series.
This series provide 12 avocado tests using Fedora-35 kernel and initrd image.
Documentation
=============
To have a better understanding of the S390x CPU Topology and its implementation in QEMU you can have a look at the documentation in the last patch of this series.
The admin will want to match the host and the guest topology, taking into account that the guest does not recognize multithreading. Consequently, two vCPU assigned to threads of the same real CPU should preferably be assigned to the same socket of the guest machine.
Regards,
Pierre
Pierre Morel (21):
s390x/cpu topology: add s390 specifics to CPU topology s390x/cpu topology: add topology entries on CPU hotplug target/s390x/cpu topology: handle STSI(15) and build the SYSIB s390x/sclp: reporting the maximum nested topology entries s390x/cpu topology: resetting the Topology-Change-Report s390x/cpu topology: interception of PTF instruction target/s390x/cpu topology: activate CPU topology qapi/s390x/cpu topology: set-cpu-topology qmp command
machine: adding s390 topology to query-cpu-fast
machine: adding s390 topology to info hotpluggable-cpus qapi/s390x/cpu topology: CPU_POLARIZATION_CHANGE qapi event qapi/s390x/cpu topology: query-cpu-polarization qmp command docs/s390x/cpu topology: document s390x cpu topology tests/avocado: s390x cpu topology core tests/avocado: s390x cpu topology polarisation tests/avocado: s390x cpu topology entitlement tests tests/avocado: s390x cpu topology test dedicated CPU tests/avocado: s390x cpu topology test socket full tests/avocado: s390x cpu topology dedicated errors tests/avocado: s390x cpu topology bad move tests/avocado: s390x cpu topology query-cpu-polarization
MAINTAINERS | 10 + docs/devel/index-internals.rst | 1 + docs/devel/s390-cpu-topology.rst | 162 ++++++++++ docs/system/s390x/cpu-topology.rst | 240 ++++++++++++++ docs/system/target-s390x.rst | 1 + qapi/machine-common.json | 22 ++ qapi/machine-target.json | 112 +++++++ qapi/machine.json | 26 +- include/hw/boards.h | 10 +- include/hw/qdev-properties-system.h | 4 + include/hw/s390x/cpu-topology.h | 80 +++++ include/hw/s390x/s390-virtio-ccw.h | 6 + include/hw/s390x/sclp.h | 4 +- target/s390x/cpu.h | 79 +++++ target/s390x/kvm/kvm_s390x.h | 1 + hw/core/machine-hmp-cmds.c | 6 + hw/core/machine-qmp-cmds.c | 2 + hw/core/machine-smp.c | 53 ++- hw/core/machine.c | 4 + hw/core/qdev-properties-system.c | 13 + hw/s390x/cpu-topology.c | 484 ++++++++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 27 +- hw/s390x/sclp.c | 5 + softmmu/vl.c | 6 + target/s390x/cpu-sysemu.c | 13 + target/s390x/cpu.c | 7 + target/s390x/cpu_models.c | 1 + target/s390x/kvm/cpu_topology.c | 308 ++++++++++++++++++ target/s390x/kvm/kvm.c | 42 ++- hw/s390x/meson.build | 1 + qapi/meson.build | 1 + qemu-options.hx | 7 +- target/s390x/kvm/meson.build | 3 +- tests/avocado/s390_topology.py | 472 +++++++++++++++++++++++++++ 34 files changed, 2193 insertions(+), 20 deletions(-) create mode 100644 docs/devel/s390-cpu-topology.rst create mode 100644 docs/system/s390x/cpu-topology.rst create mode 100644 qapi/machine-common.json create mode 100644 include/hw/s390x/cpu-topology.h create mode 100644 hw/s390x/cpu-topology.c create mode 100644 target/s390x/kvm/cpu_topology.c create mode 100644 tests/avocado/s390_topology.py
Signature · 267 lines
2.31.1 Since v19: - use enum to specify the entitlement (Nina) - Change default entitlement to "auto" - suppress skip_basis in avocado tests (after comment from Cedric) - Correction of the documentation (Cedric) - better code organization for s390_topology_add_core_to_socket and s390_socket_nb (Cedric) - Changed Copyright to respect IBM policy (Nina) - set vertical_polarization back into s390_topology (Nina) Since v18: - Changed default entitlement to S390_CPU_ENTITLEMENT__MAX because no default can be correct. - added polarization entry to the S390CcwMachineState which allow to suppress shadow entitlement - Suppress shadow entitlement (Nina) - Added query-cpu-polarization - Added more avocado tests - modified cpu_hierarchy_to_string to look better (Nina) Since v17: - bug correction in handling PTF - added avocado tests (Thomas) - Change comments on QEMU machine to 8.1 Since v16: - documentation, split, bug correction and rephrasing (Nina, Thomas) - create machine-common.json - use of entitlement_shadow to keep track of the entitlement - adding drawers and books to query-hotpluggable-cpus - keep hmp interface for set-cpu-topology for a future series Since v15: - Use Enum for polarity and entitlement (Nina) - move kvm_vm_enable_cap(KVM_CAP_S390_CPU_TOPOLOGY) to kvm_arch_init() (Thomas) - Make all CPU attributes optional for set-cpu-topology monitor command (Thomas, Nina) - Change use of the prefix "x-" to the use of feature unstable to declare set-cpu-topology as unstable. (Nina) - Make CPU_POLARITY_CHANGE even as unstable (Nina) - Documentation update (Thomas, Nina) Since v14: - move the ordering of TLE to just before filling the SYSIB, optimize TLE ordering to be done on need only. (Cedric in previous series) - remove 'query-topology' and instead extend 'query-cpus-fast' (Daniel) - rename POLARITY_CHANGE to CPU_POLARITY_CHANGE (Thomas) - Divers bugs correction and doc changes (Thomas, Nina) - Separate topology and entitlement, simplify pft handling (Nina) - add the resetting of all CPU to horizontal polarity once implementing PTF interpretation Since v13: - Suppress the topology device to simplify the code (Cedric) - moved reset of MTCR from device reset into subsystem reset and removed previous reviewed-by from Nico and Janis - No need for Migration - No need for machine dependencies (Christian, Thomas) - Adding all features, drawer/book and dynamic (Cedric) - since v12 - suppress new CPU flag "disable-topology" just use ctop - no use of special fields in CCW machine or in CPU - modifications in documentation - insert documentation in tree (Cedric) - moved cpu-topology.c from target/s390 to target/s390/kvm to compile smoothly (without topology) for TCG (Cedric) - since v11 - new CPU flag "disable-topology" I would have take "topology" if I was able to have it false on default. (Christian, Thomas) - Build the topology during the interception of the STSI instruction. (Cedric) - return CC3 in case the calculated SYSIB length is greater than 4096. (Janis) - minor corections on documentation - since v10 - change machine attribute "topology-disable" to "topology" (Cedric) - Add preliminary patch for machine properties (Cedric) - Use next machine as 7.2 (Cedric / Connie) - Remove unecessary mutex (Thomas) - use ENOTSUP return value for kvm_s390_topology_set_mtcr() (Cedric) - Add explanation on container and cpu TLEs (Thomas) - use again cpu and socket count in topology structure (Cedric) - Suppress the S390TopoTLE structure and integrate the TLE masks to the socket structure. (-) - the STSI instruction now finds the topology from the machine (Cedric) - since v9 - remove books and drawers - remove thread denying and replace with a merge of cores * threads to specify the CPUs available to the guest - add a class option to avoid topology on older machines (Cedric) - Allocate a SYSIB buffer of the maximal length to avoid overflow. (Nico, Janis) - suppress redundancy of smp parameters in topology and use directly the machine smp structure - Early check for topology support (Cedric) - since v8 - Linux patches are now mainline - simplification of the implementation (Janis) - Migration, new machine definition (Thomas) - Documentation - since v7 - Coherence with the Linux patch series changes for MTCR get (Pierre) - check return values during new CPU creation (Thomas) - Improving codding style and argument usages (Thomas) - since v6 - Changes on smp args in qemu-options (Daniel) - changed comments in machine.jason (Daniel) - Added reset (Janosch) - since v5 - rebasing on newer QEMU version - reworked most lines above 80 characters. - since v4 - Added drawer and books to topology - Added numa topology - Added documentation - since v3 - Added migration (Thomas) - Separated STSI instruction from KVM to prepare TCG (Thomas) - Take care of endianess to prepare TCG (Thomas) - Added comments on STSI CPU container and PFT instruction (Thomas) - Moved enabling the instructions as the last patch (Thomas)
PATCH v20 1/21 s390x/cpu topology: add s390 specifics to CPU topology
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.
Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
--- qapi/machine-common.json | 22 ++++++++++++ qapi/machine-target.json | 12 +++++++ qapi/machine.json | 17 +++++++-- include/hw/boards.h | 10 +++++- include/hw/qdev-properties-system.h | 4 +++ target/s390x/cpu.h | 6 ++++ hw/core/machine-smp.c | 53 ++++++++++++++++++++++++----- hw/core/machine.c | 4 +++ hw/core/qdev-properties-system.c | 13 +++++++ hw/s390x/s390-virtio-ccw.c | 2 ++ softmmu/vl.c | 6 ++++ target/s390x/cpu.c | 7 ++++ qapi/meson.build | 1 + qemu-options.hx | 7 ++-- 14 files changed, 150 insertions(+), 14 deletions(-) create mode 100644 qapi/machine-common.json
qapi/machine-common.json new file +22 -0
@@ -0,0 +1,22 @@ +# -*- Mode: Python -*- +# vim: filetype=python +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. + +## +# = Machines S390 data types +## + +## +# @CpuS390Entitlement: +# +# An enumeration of cpu entitlements that can be assumed by a virtual +# S390 CPU +# +# Since: 8.1 +## +{ 'enum': 'CpuS390Entitlement', + 'prefix': 'S390_CPU_ENTITLEMENT', + 'data': [ 'auto', 'low', 'medium', 'high' ] } +
qapi/machine-target.json +12 -0
@@ -342,3 +342,15 @@ 'TARGET_S390X', 'TARGET_MIPS', 'TARGET_LOONGARCH64' ] } } + +## +# @CpuS390Polarization: +# +# An enumeration of cpu polarization that can be assumed by a virtual +# S390 CPU +# +# Since: 8.1 +## +{ 'enum': 'CpuS390Polarization', + 'prefix': 'S390_CPU_POLARIZATION', + 'data': [ 'horizontal', 'vertical' ] }
qapi/machine.json +14 -3
@@ -9,6 +9,7 @@ ## { 'include': 'common.json' } +{ 'include': 'machine-common.json' } ## # @SysEmuTarget:
@@ -70,7 +71,7 @@ # # @thread-id: ID of the underlying host thread # -# @props: properties describing to which node/socket/core/thread +# @props: properties describing to which node/drawer/book/socket/core/thread # virtual CPU belongs to, provided if supported by board # # @target: the QEMU system emulation target, which determines which
@@ -902,13 +903,15 @@ # a CPU is being hotplugged. # # @node-id: NUMA node ID the CPU belongs to -# @socket-id: socket number within node/board the CPU belongs to +# @drawer-id: drawer number within node/board the CPU belongs to (since 8.1) +# @book-id: book number within drawer/node/board the CPU belongs to (since 8.1) +# @socket-id: socket number within book/node/board the CPU belongs to # @die-id: die number within socket the CPU belongs to (since 4.1) # @cluster-id: cluster number within die the CPU belongs to (since 7.1) # @core-id: core number within cluster the CPU belongs to # @thread-id: thread number within core the CPU belongs to # -# Note: currently there are 6 properties that could be present +# Note: currently there are 8 properties that could be present # but management should be prepared to pass through other # properties with device_add command to allow for future # interface extension. This also requires the filed names to be kept in
@@ -918,6 +921,8 @@ ## { 'struct': 'CpuInstanceProperties', 'data': { '*node-id': 'int', + '*drawer-id': 'int', + '*book-id': 'int', '*socket-id': 'int', '*die-id': 'int', '*cluster-id': 'int',
@@ -1467,6 +1472,10 @@ # # @cpus: number of virtual CPUs in the virtual machine # +# @drawers: number of drawers in the CPU topology (since 8.1) +# +# @books: number of books in the CPU topology (since 8.1) +# # @sockets: number of sockets in the CPU topology # # @dies: number of dies per socket in the CPU topology
@@ -1483,6 +1492,8 @@ ## { 'struct': 'SMPConfiguration', 'data': { '*cpus': 'int', + '*drawers': 'int', + '*books': 'int', '*sockets': 'int', '*dies': 'int', '*clusters': 'int',
include/hw/boards.h +9 -1
@@ -131,12 +131,16 @@ typedef struct {* @clusters_supported - whether clusters are supported by the machine * @has_clusters - whether clusters are explicitly specified in the user * provided SMP configuration +* @books_supported - whether books are supported by the machine +* @drawers_supported - whether drawers are supported by the machine */ typedef struct {bool prefer_sockets;bool dies_supported;bool clusters_supported;bool has_clusters; +bool books_supported; +bool drawers_supported; }SMPCompatProps ;/**
@@ -301,7 +305,9 @@ typedef struct DeviceMemoryState {/** * CpuTopology: * @cpus: the number of present logical processors on the machine -* @sockets: the number of sockets on the machine +* @drawers: the number of drawers on the machine +* @books: the number of books in one drawer +* @sockets: the number of sockets in one book * @dies: the number of dies in one socket * @clusters: the number of clusters in one die * @cores: the number of cores in one cluster
@@ -310,6 +316,8 @@ typedef struct DeviceMemoryState {*/ typedef struct CpuTopology { unsigned int cpus; + unsigned int drawers; + unsigned int books; unsigned int sockets; unsigned int dies; unsigned int clusters;
include/hw/qdev-properties-system.h +4 -0
@@ -22,6 +22,7 @@ extern const PropertyInfo qdev_prop_audiodev;extern const PropertyInfo qdev_prop_off_auto_pcibar;extern const PropertyInfo qdev_prop_pcie_link_speed;extern const PropertyInfo qdev_prop_pcie_link_width; +extern const PropertyInfo qdev_prop_cpus390entitlement;#define DEFINE_PROP_PCI_DEVFN (_n, _s, _f, _d) \ DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_pci_devfn, int32_t)
@@ -73,5 +74,8 @@ extern const PropertyInfo qdev_prop_pcie_link_width;#define DEFINE_PROP_UUID_NODEFAULT (_name, _state, _field) \ DEFINE_PROP(_name, _state, _field, qdev_prop_uuid, QemuUUID) +#define DEFINE_PROP_CPUS390ENTITLEMENT (_n, _s, _f, _d) \ + DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_cpus390entitlement, \ + CpuS390Entitlement)#endif
target/s390x/cpu.h +6 -0
@@ -29,6 +29,7 @@#include "cpu_models.h" #include "exec/cpu-defs.h" #include "qemu/cpu-float.h" +#include "qapi/qapi-types-machine-common.h" #define ELF_MACHINE_UNAME "S390X"
@@ -131,6 +132,11 @@ struct CPUArchState {#if !defined(CONFIG_USER_ONLY )uint32_t core_id;/* PoP "CPU address", same as cpu_index */ +int32_t socket_id; +int32_t book_id; +int32_t drawer_id; +bool dedicated; +CpuS390Entitlement entitlement;/* Used only for vertical polarization */ uint64_t cpuid;#endif
hw/core/machine-smp.c +45 -8
111 lines not on this page · raw message
hw/core/machine.c +4 -0
@@ -831,6 +831,8 @@ static void machine_get_smp(Object *obj, Visitor *v, const char *name,MachineState *ms =MACHINE (obj);SMPConfiguration *config = &(SMPConfiguration ){ .has_cpus = true, .cpus = ms->smp.cpus, + .has_drawers = true, .drawers = ms->smp.drawers, + .has_books = true, .books = ms->smp.books, .has_sockets = true, .sockets = ms->smp.sockets, .has_dies = true, .dies = ms->smp.dies, .has_clusters = true, .clusters = ms->smp.clusters,
@@ -1096,6 +1098,8 @@ static void machine_initfn(Object *obj)/* default to mc->default_cpus */ ms->smp.cpus = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus; + ms->smp.drawers =1 ; + ms->smp.books =1 ; ms->smp.sockets =1 ; ms->smp.dies =1 ; ms->smp.clusters =1 ;
hw/core/qdev-properties-system.c +13 -0
@@ -1143,3 +1143,16 @@ const PropertyInfo qdev_prop_uuid = { .set = set_uuid, .set_default_value = set_default_uuid_auto, }; + +/* --- s390 cpu entitlement policy --- */ + +QEMU_BUILD_BUG_ON (sizeof (CpuS390Entitlement) !=sizeof (int )); + +const PropertyInfo qdev_prop_cpus390entitlement = { + .name ="CpuS390Entitlement" , + .description ="low/medium (default)/high" , + .enum_table = &CpuS390Entitlement_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +};
hw/s390x/s390-virtio-ccw.c +2 -0
@@ -736,6 +736,8 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_sdcard =1 ; mc->max_cpus =S390_MAX_CPUS ; mc->has_hotpluggable_cpus = true; + mc->smp_props.books_supported = true; + mc->smp_props.drawers_supported = true;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = s390_get_hotplug_handler; mc->cpu_index_to_instance_props = s390_cpu_index_to_props;
softmmu/vl.c +6 -0
@@ -724,6 +724,12 @@ static QemuOptsList qemu_smp_opts = { { .name = "cpus", .type = QEMU_OPT_NUMBER, + }, { + .name = "drawers", + .type = QEMU_OPT_NUMBER, + }, { + .name = "books", + .type = QEMU_OPT_NUMBER, }, { .name = "sockets", .type = QEMU_OPT_NUMBER,
target/s390x/cpu.c +7 -0
@@ -31,6 +31,7 @@#include "qapi/qapi-types-machine.h" #include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" #include "sysemu/tcg.h"
@@ -259,6 +260,12 @@ static gchar *s390_gdb_arch_name(CPUState *cs)static Property s390x_cpu_properties[] = { #if !defined(CONFIG_USER_ONLY)DEFINE_PROP_UINT32 ("core-id" ,S390CPU , env.core_id,0 ), +DEFINE_PROP_INT32 ("socket-id" ,S390CPU , env.socket_id,-1 ), +DEFINE_PROP_INT32 ("book-id" ,S390CPU , env.book_id,-1 ), +DEFINE_PROP_INT32 ("drawer-id" ,S390CPU , env.drawer_id,-1 ), +DEFINE_PROP_BOOL ("dedicated" ,S390CPU , env.dedicated, false), +DEFINE_PROP_CPUS390ENTITLEMENT ("entitlement" ,S390CPU , env.entitlement, +S390_CPU_ENTITLEMENT_AUTO ), #endifDEFINE_PROP_END_OF_LIST () };
qapi/meson.build +1 -0
@@ -35,6 +35,7 @@ qapi_all_modules = [ 'error', 'introspect', 'job', + 'machine-common', 'machine', 'machine-target', 'migration',
qemu-options.hx +5 -2
@@ -250,11 +250,14 @@ SRST ERST DEF("smp", HAS_ARG, QEMU_OPTION_smp, - "-smp [[cpus=]n][,maxcpus=maxcpus][,sockets=sockets][,dies=dies][,clusters=clusters][,cores=cores][,threads=threads]\n" + "-smp [[cpus=]n][,maxcpus=maxcpus][,drawers=drawers][,books=books][,sockets=sockets]\n" + " [,dies=dies][,clusters=clusters][,cores=cores][,threads=threads]\n" " set the number of initial CPUs to 'n' [default=1]\n" " maxcpus= maximum number of total CPUs, including\n" " offline CPUs for hotplug, etc\n" - " sockets= number of sockets on the machine board\n" + " drawers= number of drawers on the machine board\n" + " books= number of books in one drawer\n" + " sockets= number of sockets in one book\n" " dies= number of dies in one socket\n" " clusters= number of clusters in one die\n" " cores= number of cores in one cluster\n"
Signature · 1 line
2.31.1
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
Quoted 7 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.
Quoted 5 lines
Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
Signed-off-by Pierre Morel <[email protected]>---
...> diff --git a/qapi/machine-target.json b/qapi/machine-target.json
Quoted 9 lines
index
2e267fa458..42a6a40333100644qapi/machine-target.json +2
-0@@ -342,3 +342,15 @@ 'TARGET_S390X', 'TARGET_MIPS', 'TARGET_LOONGARCH64' ] } } + +##
qapi/machine-target.json line 356
Quoted 10 lines
qapi/machine-target.json +10
-0+# @CpuS390Polarization: +# +# An enumeration of cpu polarization that can be assumed by a virtual +# S390 CPU +# +# Since: 8.1 +## +{ 'enum': 'CpuS390Polarization', + 'prefix': 'S390_CPU_POLARIZATION', + 'data': [ 'horizontal', 'vertical' ] }
It seems like you don't need this here yet ... I think you likely could also introduce it in a later patch instead (patch 11 seems the first one that needs this?)
Also, would a " 'if': 'TARGET_S390X' " be possible here, too?
Quoted 5 lines
hw/core/machine-smp.c +0
-0
hw/core/machine-smp.c static char *cpu_hierarchy_to_string(MachineState *ms) · line 37
Quoted 9 lines
hw/core/machine-smp.c +4
-1@@ -30,8 +30,19 @@ static char *cpu_hierarchy_to_string(MachineState *ms) {MachineClass *mc =MACHINE_GET_CLASS (ms);GString *s =g_string_new (NULL ); +const char *multiply =" * " , *prefix ="" ; -g_string_append_printf (s,"sockets (%u)" , ms->smp.sockets); +if (mc->smp_props.drawers_supported) { +g_string_append_printf (s,"drawers (%u)" , ms->smp.drawers); + prefix = multiply;
That "prefix" stuff looks complicated ... why don't you simply add the "*" at the end of the strings:
g_string_append_printf(s, "drawers (%u) * ",
ms->smp.drawers);?
hw/core/machine-smp.c static char *cpu_hierarchy_to_string(MachineState *ms) · line 45
Quoted 8 lines
hw/core/machine-smp.c +8
-0+ } + +if (mc->smp_props.books_supported) { +g_string_append_printf (s,"%sbooks (%u)" , prefix, ms->smp.books); + prefix = multiply; + } + +g_string_append_printf (s,"%ssockets (%u)" , prefix, ms->smp.sockets);
... it's followed by "sockets" here anyway, so adding the " * " at the end of the strings above should be fine.
Quoted 18 lines
hw/core/machine-smp.c +4
-0{MachineClass *mc =MACHINE_GET_CLASS (ms);unsigned cpus = config->has_cpus ? config->cpus :0 ; +unsigned drawers = config->has_drawers ? config->drawers :0 ; +unsigned books = config->has_books ? config->books :0 ;unsigned sockets = config->has_sockets ? config->sockets :0 ;unsigned dies = config->has_dies ? config->dies :0 ;unsigned clusters = config->has_clusters ? config->clusters :0 ;@@ -85,6 +98,8 @@ void machine_parse_smp_config(MachineState *ms,* explicit configuration like "cpus=0" is not allowed. */ if ((config->has_cpus && config->cpus == 0) || + (config->has_drawers && config->drawers == 0) || + (config->has_books && config->books == 0) || (config->has_sockets && config->sockets == 0) || (config->has_dies && config->dies == 0) || (config->has_clusters && config->clusters == 0) ||
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 133
Quoted 8 lines
hw/core/machine-smp.c +5
-0@@ -111,6 +126,19 @@ void machine_parse_smp_config(MachineState *ms, dies = dies >0 ? dies :1 ; clusters = clusters >0 ? clusters :1 ; +if (!mc->smp_props.books_supported && books >1 ) { +error_setg (errp,"books not supported by this machine's CPU topology" ); +return ; + } + books = books >0 ? books :1 ;
Could be shortened to: book = books ?: 1;
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 140
Quoted 6 lines
hw/core/machine-smp.c +6
-0+if (!mc->smp_props.drawers_supported && drawers >1 ) { +error_setg (errp, +"drawers not supported by this machine's CPU topology" ); +return ; + } + drawers = drawers >0 ? drawers :1 ;
Could be shortened to: drawers = drawers ?: 1;
Quoted 6 lines
hw/core/machine-smp.c +0
-0/* compute missing values based on the provided ones */ if (cpus ==0 && maxcpus ==0 ) { sockets = sockets >0 ? sockets :1 ;@@ -124,33 +152,41 @@ void machine_parse_smp_config(MachineState *ms,if (sockets ==0 ) { cores = cores >0 ? cores :1 ;
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 161
Quoted 10 lines
hw/core/machine-smp.c +4
-2threads = threads >0 ? threads :1 ; - sockets = maxcpus / (dies * clusters * cores * threads); + sockets = maxcpus / + (drawers * books * dies * clusters * cores * threads); }else if (cores ==0 ) { threads = threads >0 ? threads :1 ; - cores = maxcpus / (sockets * dies * clusters * threads); + cores = maxcpus / + (drawers * books * sockets * dies * clusters * threads); }
(not very important, but I wonder whether we should maybe disallow "prefer_sockets" with drawers and books instead of updating the calculation here - since prefer_sockets should only occur on old machine types)
Quoted 5 lines
hw/core/machine-smp.c +0
-0}else {/* prefer cores over sockets since 6.2 */ if (cores ==0 ) { sockets = sockets >0 ? sockets :1 ; threads = threads >0 ? threads :1 ;
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 174
Quoted 10 lines
hw/core/machine-smp.c +4
-2- cores = maxcpus / (sockets * dies * clusters * threads); + cores = maxcpus / + (drawers * books * sockets * dies * clusters * threads); }else if (sockets ==0 ) { threads = threads >0 ? threads :1 ; - sockets = maxcpus / (dies * clusters * cores * threads); + sockets = maxcpus / + (drawers * books * dies * clusters * cores * threads); } }
Thomas
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
Quoted 36 lines · Thomas Huth
Quoted 7 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Quoted 5 lines
Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
Signed-off-by Pierre Morel <[email protected]>---
...> diff --git
a/qapi/machine-target.jsonb/qapi/machine-target.jsonQuoted 9 lines
index
2e267fa458..42a6a40333100644qapi/machine-target.json +2
-0@@ -342,3 +342,15 @@ 'TARGET_S390X', 'TARGET_MIPS', 'TARGET_LOONGARCH64' ] } } + +##qapi/machine-target.json line 356
Quoted 10 lines
qapi/machine-target.json +10
-0+# @CpuS390Polarization: +# +# An enumeration of cpu polarization that can be assumed by a virtual +# S390 CPU +# +# Since: 8.1 +## +{ 'enum': 'CpuS390Polarization', + 'prefix': 'S390_CPU_POLARIZATION', + 'data': [ 'horizontal', 'vertical' ] }It seems like you don't need this here yet ... I think you likely could also introduce it in a later patch instead (patch 11 seems the first one that needs this?)
Quoted 1 line
Also, would a " 'if': '
TARGET_S390X' " be possible here, too?
Yes, I will shift this to patch 11.
Quoted 18 lines
Quoted 6 lines
hw/core/machine-smp.c +0
-0hw/core/machine-smp.c static char *cpu_hierarchy_to_string(MachineState · line 38
Quoted 9 lines
hw/core/machine-smp.c +4
-0@@ -30,8 +30,19 @@ static char *cpu_hierarchy_to_string(MachineState *ms) { MachineClass *mc = MACHINE_GET_CLASS(ms); GString *s = g_string_new(NULL); + const char *multiply = " * ", *prefix = ""; - g_string_append_printf(s, "sockets (%u)", ms->smp.sockets); + if (mc->smp_props.drawers_supported) { + g_string_append_printf(s, "drawers (%u)", ms->smp.drawers); + prefix = multiply;That "prefix" stuff looks complicated ... why don't you simply add the "*" at the end of the strings:
Quoted 4 lines
g_string_append_printf(s, "drawers (%u) * ",
ms->smp.drawers);?
Right, I did not think enough when I made this change.
Quoted 13 lines
hw/core/machine-smp.c static char *cpu_hierarchy_to_string(MachineState *ms)
Quoted 11 lines
hw/core/machine-smp.c +8
-0+ } + + if (mc->smp_props.books_supported) { + g_string_append_printf(s, "%sbooks (%u)", prefix, ms->smp.books); + prefix = multiply; + } + + g_string_append_printf(s, "%ssockets (%u)", prefix, ms->smp.sockets);... it's followed by "sockets" here anyway, so adding the " * " at the end of the strings above should be fine.
yes
Quoted 21 lines
Quoted 21 lines
{
MachineClass *mc =MACHINE_GET_CLASS(ms);
unsigned cpus =config->has_cpus?config->cpus: 0; + unsigned drawers =config->has_drawers?config->drawers: 0; + unsigned books =config->has_books?config->books: 0; unsigned sockets =config->has_sockets?config->sockets: 0; unsigned dies =config->has_dies?config->dies: 0; unsigned clusters =config->has_clusters?config->clusters: 0;hw/core/machine-smp.c +0
-0@@ -85,6 +98,8 @@ void machine_parse_smp_config(MachineState *ms,* explicit configuration like "cpus=0" is not allowed. */ if ((
config->has_cpus&&config->cpus== 0) || + (config->has_drawers&&config->drawers== 0) || + (config->has_books&&config->books== 0) || (config->has_sockets&&config->sockets== 0) || (config->has_dies&&config->dies== 0) || (config->has_clusters&&config->clusters== 0) ||hw/core/machine-smp.c +0
-0@@ -111,6 +126,19 @@ void machine_parse_smp_config(MachineState *ms, dies = dies > 0 ? dies : 1; clusters = clusters > 0 ? clusters : 1;
Quoted 8 lines
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 133
Quoted 6 lines
hw/core/machine-smp.c +4
-0+ if (!mc->smp_props.books_supported && books > 1) { + error_setg(errp, "books not supported by this machine's CPU topology"); + return; + } + books = books > 0 ? books : 1;Could be shortened to: book = books ?: 1;
I always forgot that Elvis is not dead
Quoted 10 lines
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 140
Quoted 8 lines
hw/core/machine-smp.c +6
-0+ if (!mc->smp_props.drawers_supported && drawers > 1) { + error_setg(errp, + "drawers not supported by this machine's CPU topology"); + return; + } + drawers = drawers > 0 ? drawers : 1;Could be shortened to: drawers = drawers ?: 1;
yes
Quoted 15 lines
Quoted 15 lines
hw/core/machine-smp.c +0
-0/* compute missing values based on the provided ones */if (cpus == 0 && maxcpus == 0) {
sockets = sockets > 0 ? sockets : 1;hw/core/machine-smp.c +2
-1@@ -124,33 +152,41 @@ void machine_parse_smp_config(MachineState *ms, if (sockets == 0) { cores = cores > 0 ? cores : 1; threads = threads > 0 ? threads : 1; - sockets = maxcpus / (dies * clusters * cores * threads); + sockets = maxcpus / + (drawers * books * dies * clusters * cores * threads); } else if (cores == 0) { threads = threads > 0 ? threads : 1;
Quoted 8 lines
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 165
Quoted 6 lines
hw/core/machine-smp.c +2
-1- cores = maxcpus / (sockets * dies * clusters * threads); + cores = maxcpus / + (drawers * books * sockets * dies * clusters * threads); }(not very important, but I wonder whether we should maybe disallow "
prefer_sockets" with drawers and books instead of updating the calculation here - sinceprefer_socketsshould only occur on old machine types)
It is OK for me. The contra argument would be that for balancing it is nicer.
But as you like, it makes less code and we can add it later if we ever set prefer_socket = true again, which is very uncertain.
Quoted 21 lines
Quoted 10 lines
hw/core/machine-smp.c +2
-1} else { /* prefer cores over sockets since 6.2 */ if (cores == 0) { sockets = sockets > 0 ? sockets : 1; threads = threads > 0 ? threads : 1; - cores = maxcpus / (sockets * dies * clusters * threads); + cores = maxcpus / + (drawers * books * sockets * dies * clustershw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 174
Quoted 10 lines
hw/core/machine-smp.c +2
-1* threads); } else if (sockets == 0) { threads = threads > 0 ? threads : 1; - sockets = maxcpus / (dies * clusters * cores * threads); + sockets = maxcpus / + (drawers * books * dies * clusters * cores * threads); } }
Quoted 2 lines
Thomas
Thanks Thomas.
Regards,
Pierre
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
In reply to Thomas HuthQuoted 12 lines · Thomas Huth
Quoted 11 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
Signed-off-by Pierre Morel <[email protected]>
[...]
Quoted 20 lines
Quoted 20 lines
{
MachineClass *mc =MACHINE_GET_CLASS(ms);
unsigned cpus =config->has_cpus?config->cpus: 0; + unsigned drawers =config->has_drawers?config->drawers: 0; + unsigned books =config->has_books?config->books: 0; unsigned sockets =config->has_sockets?config->sockets: 0; unsigned dies =config->has_dies?config->dies: 0; unsigned clusters =config->has_clusters?config->clusters: 0;hw/core/machine-smp.c +0
-0@@ -85,6 +98,8 @@ void machine_parse_smp_config(MachineState *ms,* explicit configuration like "cpus=0" is not allowed. */ if ((
config->has_cpus&&config->cpus== 0) || + (config->has_drawers&&config->drawers== 0) || + (config->has_books&&config->books== 0) || (config->has_sockets&&config->sockets== 0) || (config->has_dies&&config->dies== 0) || (config->has_clusters&&config->clusters== 0) ||hw/core/machine-smp.c +0
-0@@ -111,6 +126,19 @@ void machine_parse_smp_config(MachineState *ms, dies = dies > 0 ? dies : 1; clusters = clusters > 0 ? clusters : 1;
Quoted 9 lines
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 133
Quoted 6 lines
hw/core/machine-smp.c +4
-0+ if (!mc->smp_props.books_supported && books > 1) { + error_setg(errp, "books not supported by this machine's CPU topology"); + return; + } + books = books > 0 ? books : 1;Could be shortened to: book = books ?: 1;
More thinking about this, all other existing assignments are done so, clusters, dies, sockets, cores and threads.
to keep the core consistent shouldn't we keep it the same way?
Regards,
Pierre
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
Quoted 48 lines · Pierre Morel
Quoted 12 lines · Thomas Huth
Quoted 11 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
Signed-off-by Pierre Morel <[email protected]>[...]
Quoted 20 lines
Quoted 20 lines
{
MachineClass *mc =MACHINE_GET_CLASS(ms);
unsigned cpus =config->has_cpus?config->cpus: 0; + unsigned drawers =config->has_drawers?config->drawers: 0; + unsigned books =config->has_books?config->books: 0; unsigned sockets =config->has_sockets?config->sockets: 0; unsigned dies =config->has_dies?config->dies: 0; unsigned clusters =config->has_clusters?config->clusters: 0;hw/core/machine-smp.c +0
-0@@ -85,6 +98,8 @@ void machine_parse_smp_config(MachineState *ms,* explicit configuration like "cpus=0" is not allowed. */ if ((
config->has_cpus&&config->cpus== 0) || + (config->has_drawers&&config->drawers== 0) || + (config->has_books&&config->books== 0) || (config->has_sockets&&config->sockets== 0) || (config->has_dies&&config->dies== 0) || (config->has_clusters&&config->clusters== 0) ||hw/core/machine-smp.c +0
-0@@ -111,6 +126,19 @@ void machine_parse_smp_config(MachineState *ms, dies = dies > 0 ? dies : 1; clusters = clusters > 0 ? clusters : 1;Quoted 9 lines
hw/core/machine-smp.c void machine_parse_smp_config(MachineState *ms, · line 133
Quoted 6 lines
hw/core/machine-smp.c +4
-0+ if (!mc->smp_props.books_supported && books > 1) { + error_setg(errp, "books not supported by this machine's CPU topology"); + return; + } + books = books > 0 ? books : 1;Could be shortened to: book = books ?: 1;
Quoted 3 lines
More thinking about this, all other existing assignments are done so, clusters, dies, sockets, cores and threads.
to keep the core consistent shouldn't we keep it the same way?
Fine for me, too. It just might happen that I forget about it and suggest it again in a future version of the patch ;-)
Thomas
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
In reply to Thomas HuthQuoted 27 lines · Thomas Huth
Quoted 7 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Quoted 5 lines
Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
Signed-off-by Pierre Morel <[email protected]>---
...> diff --git
a/qapi/machine-target.jsonb/qapi/machine-target.jsonQuoted 13 lines
index
2e267fa458..42a6a40333100644qapi/machine-target.json +6
-0@@ -342,3 +342,15 @@ 'TARGET_S390X', 'TARGET_MIPS', 'TARGET_LOONGARCH64' ] } } + +## +# @CpuS390Polarization: +# +# An enumeration of cpu polarization that can be assumed by a virtual +# S390 CPU
Quoted 8 lines
qapi/machine-target.json line 356
Quoted 6 lines
qapi/machine-target.json +6
-0+# +# Since: 8.1 +## +{ 'enum': 'CpuS390Polarization', + 'prefix': 'S390_CPU_POLARIZATION', + 'data': [ 'horizontal', 'vertical' ] }It seems like you don't need this here yet ... I think you likely could also introduce it in a later patch instead (patch 11 seems the first one that needs this?)
patch 6 on PTF interception in fact but yes you are right and I will shift it there.
Quoted 2 lines
Also, would a " 'if': '
TARGET_S390X' " be possible here, too?
yes.
Regards,
Pierre
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
In reply to Pierre MorelQuoted 9 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
I think CpuS390Entitlement should be introduced in a separate patch and only under target/s390x/cpu.c. It is machine specific and doesn't belong to the machine common definitions.
'books' and 'drawers' could also be considered z-specific but High End POWER systems (16s) have similar topology concepts, at least for drawers :
a group of 4 sockets. So let's keep it that way.
This problably means you will have to rework the get/set property handlers with strcmp() or simply copy the generated lookup struct :
const QEnumLookup CpuS390Entitlement_lookup = {
.array = (const char *const[]) {
[S390_CPU_ENTITLEMENT_AUTO] = "auto",
[S390_CPU_ENTITLEMENT_LOW] = "low",
[S390_CPU_ENTITLEMENT_MEDIUM] = "medium",
[S390_CPU_ENTITLEMENT_HIGH] = "high",
},
.size = S390_CPU_ENTITLEMENT__MAX
};It should be fine.
Thanks,
C.
Quoted 474 lines
Signed-off-by Pierre Morel <[email protected]>--- qapi/machine-common.json | 22 ++++++++++++ qapi/machine-target.json | 12 +++++++ qapi/machine.json | 17 +++++++-- include/hw/boards.h | 10 +++++- include/hw/qdev-properties-system.h | 4 +++ target/s390x/cpu.h | 6 ++++ hw/core/machine-smp.c | 53 ++++++++++++++++++++++++----- hw/core/machine.c | 4 +++ hw/core/qdev-properties-system.c | 13 +++++++ hw/s390x/s390-virtio-ccw.c | 2 ++ softmmu/vl.c | 6 ++++ target/s390x/cpu.c | 7 ++++ qapi/meson.build | 1 + qemu-options.hx | 7 ++-- 14 files changed, 150 insertions(+), 14 deletions(-)create mode 100644
qapi/machine-common.jsonqapi/machine-common.json new file +22
-0@@ -0,0 +1,22 @@ +# -*- Mode: Python -*- +# vim: filetype=python +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. + +## +# = Machines S390 data types +## + +## +# @CpuS390Entitlement: +# +# An enumeration of cpu entitlements that can be assumed by a virtual +# S390 CPU +# +# Since: 8.1 +## +{ 'enum': 'CpuS390Entitlement', + 'prefix': 'S390_CPU_ENTITLEMENT', + 'data': [ 'auto', 'low', 'medium', 'high' ] } +qapi/machine-target.json +12
-0@@ -342,3 +342,15 @@ 'TARGET_S390X', 'TARGET_MIPS', 'TARGET_LOONGARCH64' ] } } + +## +# @CpuS390Polarization: +# +# An enumeration of cpu polarization that can be assumed by a virtual +# S390 CPU +# +# Since: 8.1 +## +{ 'enum': 'CpuS390Polarization', + 'prefix': 'S390_CPU_POLARIZATION', + 'data': [ 'horizontal', 'vertical' ] }qapi/machine.json +14
-3@@ -9,6 +9,7 @@ ## { 'include': 'common.json' } +{ 'include': 'machine-common.json' } ## # @SysEmuTarget:@@ -70,7 +71,7 @@ # # @thread-id: ID of the underlying host thread # -# @props: properties describing to which node/socket/core/thread +# @props: properties describing to which node/drawer/book/socket/core/thread # virtual CPU belongs to, provided if supported by board # # @target: the QEMU system emulation target, which determines which@@ -902,13 +903,15 @@ # a CPU is being hotplugged. # # @node-id: NUMA node ID the CPU belongs to -# @socket-id: socket number within node/board the CPU belongs to +# @drawer-id: drawer number within node/board the CPU belongs to (since 8.1) +# @book-id: book number within drawer/node/board the CPU belongs to (since 8.1) +# @socket-id: socket number within book/node/board the CPU belongs to # @die-id: die number within socket the CPU belongs to (since 4.1) # @cluster-id: cluster number within die the CPU belongs to (since 7.1) # @core-id: core number within cluster the CPU belongs to # @thread-id: thread number within core the CPU belongs to # -# Note: currently there are 6 properties that could be present +# Note: currently there are 8 properties that could be present # but management should be prepared to pass through other # properties with device_add command to allow for future # interface extension. This also requires the filed names to be kept in@@ -918,6 +921,8 @@ ## { 'struct': 'CpuInstanceProperties', 'data': { '*node-id': 'int', + '*drawer-id': 'int', + '*book-id': 'int', '*socket-id': 'int', '*die-id': 'int', '*cluster-id': 'int',@@ -1467,6 +1472,10 @@ # # @cpus: number of virtual CPUs in the virtual machine # +# @drawers: number of drawers in the CPU topology (since 8.1) +# +# @books: number of books in the CPU topology (since 8.1) +# # @sockets: number of sockets in the CPU topology # # @dies: number of dies per socket in the CPU topology@@ -1483,6 +1492,8 @@ ## { 'struct': 'SMPConfiguration', 'data': { '*cpus': 'int', + '*drawers': 'int', + '*books': 'int', '*sockets': 'int', '*dies': 'int', '*clusters': 'int',include/hw/boards.h +9
-1@@ -131,12 +131,16 @@ typedef struct {* @clusters_supported - whether clusters are supported by the machine * @has_clusters - whether clusters are explicitly specified in the user * provided SMP configuration +* @books_supported - whether books are supported by the machine +* @drawers_supported - whether drawers are supported by the machine */ typedef struct {bool prefer_sockets;bool dies_supported;bool clusters_supported;bool has_clusters; +bool books_supported; +bool drawers_supported; }SMPCompatProps ;/** @@ -301,7 +305,9 @@ typedef struct DeviceMemoryState {/** * CpuTopology: * @cpus: the number of present logical processors on the machine -* @sockets: the number of sockets on the machine +* @drawers: the number of drawers on the machine +* @books: the number of books in one drawer +* @sockets: the number of sockets in one book * @dies: the number of dies in one socket * @clusters: the number of clusters in one die * @cores: the number of cores in one cluster @@ -310,6 +316,8 @@ typedef struct DeviceMemoryState {*/ typedef struct CpuTopology { unsigned int cpus; + unsigned int drawers; + unsigned int books; unsigned int sockets; unsigned int dies; unsigned int clusters;include/hw/qdev-properties-system.h +4
-0@@ -22,6 +22,7 @@ extern const PropertyInfo qdev_prop_audiodev;extern const PropertyInfo qdev_prop_off_auto_pcibar;extern const PropertyInfo qdev_prop_pcie_link_speed;extern const PropertyInfo qdev_prop_pcie_link_width; +extern const PropertyInfo qdev_prop_cpus390entitlement;#define DEFINE_PROP_PCI_DEVFN (_n, _s, _f, _d) \ DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_pci_devfn, int32_t)@@ -73,5 +74,8 @@ extern const PropertyInfo qdev_prop_pcie_link_width;#define DEFINE_PROP_UUID_NODEFAULT (_name, _state, _field) \ DEFINE_PROP(_name, _state, _field, qdev_prop_uuid, QemuUUID) +#define DEFINE_PROP_CPUS390ENTITLEMENT (_n, _s, _f, _d) \ + DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_cpus390entitlement, \ + CpuS390Entitlement)#endif target/s390x/cpu.h +6
-0@@ -29,6 +29,7 @@#include "cpu_models.h" #include "exec/cpu-defs.h" #include "qemu/cpu-float.h" +#include "qapi/qapi-types-machine-common.h" #define ELF_MACHINE_UNAME "S390X"@@ -131,6 +132,11 @@ struct CPUArchState {#if !defined(CONFIG_USER_ONLY )uint32_t core_id;/* PoP "CPU address", same as cpu_index */ +int32_t socket_id; +int32_t book_id; +int32_t drawer_id; +bool dedicated; +CpuS390Entitlement entitlement;/* Used only for vertical polarization */ uint64_t cpuid;#endif hw/core/machine-smp.c +45
-8@@ -30,8 +30,19 @@ static char *cpu_hierarchy_to_string(MachineState *ms) {MachineClass *mc =MACHINE_GET_CLASS (ms);GString *s =g_string_new (NULL ); +const char *multiply =" * " , *prefix ="" ; -g_string_append_printf (s,"sockets (%u)" , ms->smp.sockets); +if (mc->smp_props.drawers_supported) { +g_string_append_printf (s,"drawers (%u)" , ms->smp.drawers); + prefix = multiply; + } + +if (mc->smp_props.books_supported) { +g_string_append_printf (s,"%sbooks (%u)" , prefix, ms->smp.books); + prefix = multiply; + } + +g_string_append_printf (s,"%ssockets (%u)" , prefix, ms->smp.sockets);if (mc->smp_props.dies_supported) {g_string_append_printf (s," * dies (%u)" , ms->smp.dies);@@ -73,6 +84,8 @@ void machine_parse_smp_config(MachineState *ms, {MachineClass *mc =MACHINE_GET_CLASS (ms);unsigned cpus = config->has_cpus ? config->cpus :0 ; +unsigned drawers = config->has_drawers ? config->drawers :0 ; +unsigned books = config->has_books ? config->books :0 ;unsigned sockets = config->has_sockets ? config->sockets :0 ;unsigned dies = config->has_dies ? config->dies :0 ;unsigned clusters = config->has_clusters ? config->clusters :0 ;@@ -85,6 +98,8 @@ void machine_parse_smp_config(MachineState *ms,* explicit configuration like "cpus=0" is not allowed. */ if ((config->has_cpus && config->cpus == 0) || + (config->has_drawers && config->drawers == 0) || + (config->has_books && config->books == 0) || (config->has_sockets && config->sockets == 0) || (config->has_dies && config->dies == 0) || (config->has_clusters && config->clusters == 0) ||@@ -111,6 +126,19 @@ void machine_parse_smp_config(MachineState *ms, dies = dies >0 ? dies :1 ; clusters = clusters >0 ? clusters :1 ; +if (!mc->smp_props.books_supported && books >1 ) { +error_setg (errp,"books not supported by this machine's CPU topology" ); +return ; + } + books = books >0 ? books :1 ; + +if (!mc->smp_props.drawers_supported && drawers >1 ) { +error_setg (errp, +"drawers not supported by this machine's CPU topology" ); +return ; + } + drawers = drawers >0 ? drawers :1 ; +/* compute missing values based on the provided ones */ if (cpus ==0 && maxcpus ==0 ) { sockets = sockets >0 ? sockets :1 ;@@ -124,33 +152,41 @@ void machine_parse_smp_config(MachineState *ms,if (sockets ==0 ) { cores = cores >0 ? cores :1 ; threads = threads >0 ? threads :1 ; - sockets = maxcpus / (dies * clusters * cores * threads); + sockets = maxcpus / + (drawers * books * dies * clusters * cores * threads); }else if (cores ==0 ) { threads = threads >0 ? threads :1 ; - cores = maxcpus / (sockets * dies * clusters * threads); + cores = maxcpus / + (drawers * books * sockets * dies * clusters * threads); } }else {/* prefer cores over sockets since 6.2 */ if (cores ==0 ) { sockets = sockets >0 ? sockets :1 ; threads = threads >0 ? threads :1 ; - cores = maxcpus / (sockets * dies * clusters * threads); + cores = maxcpus / + (drawers * books * sockets * dies * clusters * threads); }else if (sockets ==0 ) { threads = threads >0 ? threads :1 ; - sockets = maxcpus / (dies * clusters * cores * threads); + sockets = maxcpus / + (drawers * books * dies * clusters * cores * threads); } }/* try to calculate omitted threads at last */ if (threads ==0 ) { - threads = maxcpus / (sockets * dies * clusters * cores); + threads = maxcpus / + (drawers * books * sockets * dies * clusters * cores); } } - maxcpus = maxcpus >0 ? maxcpus : sockets * dies * clusters * cores * threads; + maxcpus = maxcpus >0 ? maxcpus : drawers * books * sockets * dies * + clusters * cores * threads; cpus = cpus >0 ? cpus : maxcpus; ms->smp.cpus = cpus; + ms->smp.drawers = drawers; + ms->smp.books = books; ms->smp.sockets = sockets; ms->smp.dies = dies; ms->smp.clusters = clusters;@@ -161,7 +197,8 @@ void machine_parse_smp_config(MachineState *ms, mc->smp_props.has_clusters = config->has_clusters;/* sanity-check of the computed topology */ -if (sockets * dies * clusters * cores * threads != maxcpus) { +if (drawers * books * sockets * dies * clusters * cores * threads != + maxcpus) { g_autofree char *topo_msg = cpu_hierarchy_to_string(ms);error_setg (errp,"Invalid CPU topology: " "product of the hierarchy must match maxcpus: "hw/core/machine.c +4
-0@@ -831,6 +831,8 @@ static void machine_get_smp(Object *obj, Visitor *v, const char *name,MachineState *ms =MACHINE (obj);SMPConfiguration *config = &(SMPConfiguration ){ .has_cpus = true, .cpus = ms->smp.cpus, + .has_drawers = true, .drawers = ms->smp.drawers, + .has_books = true, .books = ms->smp.books, .has_sockets = true, .sockets = ms->smp.sockets, .has_dies = true, .dies = ms->smp.dies, .has_clusters = true, .clusters = ms->smp.clusters,@@ -1096,6 +1098,8 @@ static void machine_initfn(Object *obj)/* default to mc->default_cpus */ ms->smp.cpus = mc->default_cpus; ms->smp.max_cpus = mc->default_cpus; + ms->smp.drawers =1 ; + ms->smp.books =1 ; ms->smp.sockets =1 ; ms->smp.dies =1 ; ms->smp.clusters =1 ;hw/core/qdev-properties-system.c +13
-0@@ -1143,3 +1143,16 @@ const PropertyInfo qdev_prop_uuid = { .set = set_uuid, .set_default_value = set_default_uuid_auto, }; + +/* --- s390 cpu entitlement policy --- */ + +QEMU_BUILD_BUG_ON (sizeof (CpuS390Entitlement) !=sizeof (int )); + +const PropertyInfo qdev_prop_cpus390entitlement = { + .name ="CpuS390Entitlement" , + .description ="low/medium (default)/high" , + .enum_table = &CpuS390Entitlement_lookup, + .get = qdev_propinfo_get_enum, + .set = qdev_propinfo_set_enum, + .set_default_value = qdev_propinfo_set_default_value_enum, +};hw/s390x/s390-virtio-ccw.c +2
-0@@ -736,6 +736,8 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_sdcard =1 ; mc->max_cpus =S390_MAX_CPUS ; mc->has_hotpluggable_cpus = true; + mc->smp_props.books_supported = true; + mc->smp_props.drawers_supported = true;assert (!mc->get_hotplug_handler); mc->get_hotplug_handler = s390_get_hotplug_handler; mc->cpu_index_to_instance_props = s390_cpu_index_to_props;softmmu/vl.c +6
-0@@ -724,6 +724,12 @@ static QemuOptsList qemu_smp_opts = { { .name = "cpus", .type = QEMU_OPT_NUMBER, + }, { + .name = "drawers", + .type = QEMU_OPT_NUMBER, + }, { + .name = "books", + .type = QEMU_OPT_NUMBER, }, { .name = "sockets", .type = QEMU_OPT_NUMBER,target/s390x/cpu.c +7
-0@@ -31,6 +31,7 @@#include "qapi/qapi-types-machine.h" #include "sysemu/hw_accel.h" #include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" #include "sysemu/tcg.h" @@ -259,6 +260,12 @@ static gchar *s390_gdb_arch_name(CPUState *cs)static Property s390x_cpu_properties[] = { #if !defined(CONFIG_USER_ONLY)DEFINE_PROP_UINT32 ("core-id" ,S390CPU , env.core_id,0 ), +DEFINE_PROP_INT32 ("socket-id" ,S390CPU , env.socket_id,-1 ), +DEFINE_PROP_INT32 ("book-id" ,S390CPU , env.book_id,-1 ), +DEFINE_PROP_INT32 ("drawer-id" ,S390CPU , env.drawer_id,-1 ), +DEFINE_PROP_BOOL ("dedicated" ,S390CPU , env.dedicated, false), +DEFINE_PROP_CPUS390ENTITLEMENT ("entitlement" ,S390CPU , env.entitlement, +S390_CPU_ENTITLEMENT_AUTO ), #endifDEFINE_PROP_END_OF_LIST () };qapi/meson.build +1
-0@@ -35,6 +35,7 @@ qapi_all_modules = [ 'error', 'introspect', 'job', + 'machine-common', 'machine', 'machine-target', 'migration',qemu-options.hx +5
-2@@ -250,11 +250,14 @@ SRST ERST DEF("smp", HAS_ARG, QEMU_OPTION_smp, - "-smp [[cpus=]n][,maxcpus=maxcpus][,sockets=sockets][,dies=dies][,clusters=clusters][,cores=cores][,threads=threads]\n" + "-smp [[cpus=]n][,maxcpus=maxcpus][,drawers=drawers][,books=books][,sockets=sockets]\n" + " [,dies=dies][,clusters=clusters][,cores=cores][,threads=threads]\n" " set the number of initial CPUs to 'n' [default=1]\n" " maxcpus= maximum number of total CPUs, including\n" " offline CPUs for hotplug, etc\n" - " sockets= number of sockets on the machine board\n" + " drawers= number of drawers on the machine board\n" + " books= number of books in one drawer\n" + " sockets= number of sockets in one book\n" " dies= number of dies in one socket\n" " clusters= number of clusters in one die\n" " cores= number of cores in one cluster\n"
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
Quoted 33 lines · Cédric Le Goater
Quoted 9 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
I think CpuS390Entitlement should be introduced in a separate patch and only under
target/s390x/cpu.c. It is machine specific and doesn't belong to the machine common definitions.'books' and 'drawers' could also be considered z-specific but High End POWER systems (16s) have similar topology concepts, at least for drawers :
a group of 4 sockets. So let's keep it that way.This problably means you will have to rework the get/set property handlers with
strcmp()or simply copy the generated lookup struct :const QEnumLookup
CpuS390Entitlement_lookup= {
.array = (const char *const[]) { [S390_CPU_ENTITLEMENT_AUTO] = "auto", [S390_CPU_ENTITLEMENT_LOW] = "low", [S390_CPU_ENTITLEMENT_MEDIUM] = "medium", [S390_CPU_ENTITLEMENT_HIGH] = "high", },
.size =S390_CPU_ENTITLEMENT__MAX
};
Quoted 1 line
It should be fine.
The enum is required by the set-cpu-topology QMP command in patch 8. Forget my comment, it would require too much changes in your series to introduce CPU Entitlement independently.
C.
Re: [PATCH v20 01/21] s390x/cpu topology: add s390 specifics to CPU topology
Quoted 34 lines · Cédric Le Goater
Quoted 33 lines · Cédric Le Goater
Quoted 9 lines · Pierre Morel
S390 adds two new SMP levels, drawers and books to the CPU topology.
The S390 CPU have specific topology features like dedication and entitlement to give to the guest indications on the host vCPUs scheduling and help the guest take the best decisions on the scheduling of threads on the vCPUs.Let us provide the SMP properties with books and drawers levels and S390 CPU with dedication and entitlement,
I think CpuS390Entitlement should be introduced in a separate patch and only under
target/s390x/cpu.c. It is machine specific and doesn't belong to the machine common definitions.'books' and 'drawers' could also be considered z-specific but High End POWER systems (16s) have similar topology concepts, at least for drawers :
a group of 4 sockets. So let's keep it that way.This problably means you will have to rework the get/set property handlers with
strcmp()or simply copy the generated lookup struct :const QEnumLookup
CpuS390Entitlement_lookup= { .array = (const char *const[]) { [S390_CPU_ENTITLEMENT_AUTO] = "auto", [S390_CPU_ENTITLEMENT_LOW] = "low", [S390_CPU_ENTITLEMENT_MEDIUM] = "medium", [S390_CPU_ENTITLEMENT_HIGH] = "high", },
.size =S390_CPU_ENTITLEMENT__MAX
};
Quoted 8 lines
Quoted 1 line
It should be fine.
The enum is required by the set-cpu-topology QMP command in patch 8. Forget my comment, it would require too much changes in your series to introduce CPU Entitlement independently.
C.
OK, thanks,
Pierre
PATCH v20 2/21 s390x/cpu topology: add topology entries on CPU hotplug
In reply to Pierre MorelThe topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socket
The possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
--- MAINTAINERS | 6 + include/hw/s390x/cpu-topology.h | 55 +++++++ hw/s390x/cpu-topology.c | 259 ++++++++++++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 22 ++- hw/s390x/meson.build | 1 + 5 files changed, 341 insertions(+), 2 deletions(-) create mode 100644 include/hw/s390x/cpu-topology.h create mode 100644 hw/s390x/cpu-topology.c
MAINTAINERS +6 -0
@@ -1654,6 +1654,12 @@ F: hw/s390x/event-facility.c F: hw/s390x/sclp*.c L: [email protected] +S390 CPU topology +M: Pierre Morel <[email protected]> +S: Supported +F: include/hw/s390x/cpu-topology.h +F: hw/s390x/cpu-topology.c + X86 Machines ------------ PC
include/hw/s390x/cpu-topology.h new file +55 -0
55 lines not on this page · raw message
hw/s390x/cpu-topology.c new file +259 -0
259 lines not on this page · raw message
hw/s390x/s390-virtio-ccw.c +20 -2
@@ -45,6 +45,7 @@#include "hw/s390x/pv.h" #include "migration/blocker.h" #include "qapi/visitor.h" +#include "hw/s390x/cpu-topology.h" static Error *pv_mig_blocker;
@@ -311,10 +312,18 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev, {MachineState *ms =MACHINE (hotplug_dev);S390CPU *cpu =S390_CPU (dev); +ERRP_GUARD ();g_assert (!ms->possible_cpus->cpus[cpu->env.core_id].cpu); ms->possible_cpus->cpus[cpu->env.core_id].cpu =OBJECT (dev); +if (s390_has_topology ()) { +s390_topology_setup_cpu (ms, cpu, errp); +if (*errp) { +return ; + } + } +if (dev->hotplugged) {raise_irq_cpu_hotplug (); }
@@ -554,11 +563,20 @@ static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms) sizeof(CPUArchId) * max_cpus); ms->possible_cpus->len = max_cpus;for (i =0 ; i < ms->possible_cpus->len; i++) { +CpuInstanceProperties *props = &ms->possible_cpus->cpus[i].props; + ms->possible_cpus->cpus[i].type = ms->cpu_type; ms->possible_cpus->cpus[i].vcpus_count =1 ; ms->possible_cpus->cpus[i].arch_id = i; - ms->possible_cpus->cpus[i].props.has_core_id = true; - ms->possible_cpus->cpus[i].props.core_id = i; + + props->has_core_id = true; + props->core_id = i; + props->has_socket_id = true; + props->socket_id =s390_std_socket (i, &ms->smp); + props->has_book_id = true; + props->book_id =s390_std_book (i, &ms->smp); + props->has_drawer_id = true; + props->drawer_id =s390_std_drawer (i, &ms->smp); }return ms->possible_cpus;
hw/s390x/meson.build +1 -0
@@ -24,6 +24,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( 's390-stattrib-kvm.c', 'pv.c', 's390-pci-kvm.c', + 'cpu-topology.c', )) s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'tod-tcg.c',
Signature · 1 line
2.31.1
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Quoted 23 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socketThe possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
Signed-off-by Pierre Morel <[email protected]>---
...
hw/s390x/cpu-topology.c line 3
Quoted 9 lines
hw/s390x/cpu-topology.c new file +3
-0@@ -0,0 +1,259 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology
Since you later introduce a file with almost the same name in the target/s390x/ folder, it would be fine to have some more explanation here what this file is all about (especially with regards to the other file in target/s390x/).
hw/s390x/cpu-topology.c line 15
Quoted 12 lines
hw/s390x/cpu-topology.c new file +12
-0+* +* Copyright IBM Corp. 2022,2023 +* Author(s): Pierre Morel <[email protected]> +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "hw/qdev-properties.h" +#include "hw/boards.h" +#include "qemu/typedefs.h"
qemu/typedefs.h is already included by osdep.h by default, no need to re-include it here.
hw/s390x/cpu-topology.c line 18
Quoted 3 lines
hw/s390x/cpu-topology.c new file +3
-0+#include "target/s390x/cpu.h" +#include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/cpu-topology.h"
...> +
hw/s390x/cpu-topology.c line 215
Quoted 8 lines
hw/s390x/cpu-topology.c new file +8
-0+/** +* s390_topology_setup_cpu: +* @ms: MachineState used to initialize the topology structure on +* first call. +* @cpu: the new S390CPU to insert in the topology structure +* @errp: the error pointer +* +* Called from CPU Hotplug to check and setup the CPU attributes
s/Hotplug/hotplug/
hw/s390x/cpu-topology.c line 217
Quoted 2 lines
hw/s390x/cpu-topology.c new file +2
-0+* before the CPU is inserted in the topology. +* There is no need to update the MTCR explicitely here because it
s/explicitely/explicitly/
hw/s390x/cpu-topology.c line 220
Quoted 3 lines
hw/s390x/cpu-topology.c new file +3
-0+* will be updated by KVM on creation of the new CPU. +*/ +void s390_topology_setup_cpu (MachineState *ms,S390CPU *cpu,Error **errp)
...
Thomas
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Quoted 25 lines · Thomas Huth
Quoted 23 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socketThe possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
Signed-off-by Pierre Morel <[email protected]>---
...
Quoted 11 lines
hw/s390x/cpu-topology.c line 3
Quoted 9 lines
hw/s390x/cpu-topology.c new file +3
-0@@ -0,0 +1,259 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology Since you later introduce a file with almost the same name in the target/s390x/ folder, it would be fine to have some more explanation here what this file is all about (especially with regards to the other file in target/s390x/).
I first did put the interceptions in target/s390/ then moved them in target/s390x/kvm because it is KVM related then again only let STSI interception.
But to be honest I do not see any reason why not put everything in hw/s390x/ if CPU topology is implemented for TCG I think the code will call insert_stsi_15_1_x() too.
no?
Quoted 15 lines
hw/s390x/cpu-topology.c line 15
Quoted 13 lines
hw/s390x/cpu-topology.c new file +12
-0+* +* Copyright IBM Corp. 2022,2023 +* Author(s): Pierre Morel <[email protected]> +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "hw/qdev-properties.h" +#include "hw/boards.h" +#include "qemu/typedefs.h"
qemu/typedefs.his already included byosdep.hby default, no need to re-include it here.
OK , I remove it
Quoted 14 lines
hw/s390x/cpu-topology.c line 18
Quoted 4 lines
hw/s390x/cpu-topology.c new file +3
-0+#include "target/s390x/cpu.h" +#include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/cpu-topology.h" ...> +
hw/s390x/cpu-topology.c line 215
Quoted 8 lines
hw/s390x/cpu-topology.c new file +8
-0+/** +* s390_topology_setup_cpu: +* @ms: MachineState used to initialize the topology structure on +* first call. +* @cpu: the new S390CPU to insert in the topology structure +* @errp: the error pointer +* +* Called from CPU Hotplug to check and setup the CPU attributes
Quoted 1 line
s/Hotplug/hotplug/
yes
Quoted 5 lines
hw/s390x/cpu-topology.c line 217
Quoted 3 lines
hw/s390x/cpu-topology.c new file +2
-0+* before the CPU is inserted in the topology. +* There is no need to update the MTCR explicitely here because it s/explicitely/explicitly/
thanx
Quoted 10 lines
Quoted 5 lines
hw/s390x/cpu-topology.c new file +3
-0+* will be updated by KVM on creation of the new CPU. +*/ +void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error**errp)
...
Thomas
Regards,
Pierre
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Quoted 40 lines · Pierre Morel
Quoted 25 lines · Thomas Huth
Quoted 23 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socketThe possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
Signed-off-by Pierre Morel <[email protected]>---
...
Quoted 11 lines
hw/s390x/cpu-topology.c line 3
Quoted 9 lines
hw/s390x/cpu-topology.c new file +3
-0@@ -0,0 +1,259 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology Since you later introduce a file with almost the same name in the target/s390x/ folder, it would be fine to have some more explanation here what this file is all about (especially with regards to the other file in target/s390x/).
Quoted 5 lines
I first did put the interceptions in target/s390/ then moved them in target/s390x/kvm because it is KVM related then again only let STSI interception.
But to be honest I do not see any reason why not put everything in hw/s390x/ if CPU topology is implemented for TCG I think the code will call
insert_stsi_15_1_x()too.no?
Oh well, it's all so borderline ... whether you rather think of this as part of the CPU (like the STSI instruction) or rather part of the machine (drawers, books, ...).
I don't mind too much, as long as we don't have two files around with almost the same name (apart from "_" vs. "-"). So either keep the stsi part in target/s390x and use a better file name for that, or put everything together in one "cpu-topology.c" file. Or what do others think about it?
Thomas
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Hello,
Quoted 43 lines · Thomas Huth
Quoted 42 lines · Pierre Morel
Quoted 25 lines · Thomas Huth
Quoted 23 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socketThe possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
Signed-off-by Pierre Morel <[email protected]>---
...
Quoted 11 lines
hw/s390x/cpu-topology.c line 3
Quoted 9 lines
hw/s390x/cpu-topology.c new file +3
-0@@ -0,0 +1,259 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology Since you later introduce a file with almost the same name in the target/s390x/ folder, it would be fine to have some more explanation here what this file is all about (especially with regards to the other file in target/s390x/).
I first did put the interceptions in target/s390/ then moved them in target/s390x/kvm because it is KVM related then again only let STSI interception.
Quoted 7 lines
Quoted 3 lines
But to be honest I do not see any reason why not put everything in hw/s390x/ if CPU topology is implemented for TCG I think the code will call
insert_stsi_15_1_x()too.no?
Oh well, it's all so borderline ... whether you rather think of this as part of the CPU (like the STSI instruction) or rather part of the machine (drawers, books, ...).
I don't mind too much, as long as we don't have two files around with almost the same name (apart from "_" vs. "-"). So either keep the stsi part in target/s390x and use a better file name for that, or put everything together in one "cpu-topology.c" file. Or what do others think about it?
Would it make sense to have a target/s390x/stsi.c file with the stsi routines to be called from TCG insn helpers and from the KVM backend ? This suggestion is based on the services found in the ioinst.c file.
So, target/s390x/kvm/cpu_topology.c would become target/s390x/stsi.c and stsi services would be moved there, if that makes sense.
Or target/s390x/kvm/stsi.c to start with because services are only active for KVM targets.
Looking at hw/s390x/meson.build :
s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
'tod-kvm.c',
's390-skeys-kvm.c',
's390-stattrib-kvm.c',
'pv.c',
's390-pci-kvm.c',
'cpu-topology.c',))
It seems cpu-topology.c should be named cpu-topology-kvm.c to follow the same convention.
However, I don't see much reason for the KVM condition, apart from the new polarization definitions in machine-target.json which depend on KVM. cpu-topology.c could well be compiled without the KVM #ifdef, all seems in place to detect support at runtime.
In this file, we find a s390_handle_ptf() which is called from kvm_handle_ptf() in target/s390x/kvm/kvm.c. Is it the right place for it ? Shouldn't we move the service under target/s390x/kvm/kvm.c ?
Thanks,
C.
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Quoted 84 lines · Cédric Le Goater
Hello,
Quoted 43 lines · Thomas Huth
Quoted 42 lines · Pierre Morel
Quoted 25 lines · Thomas Huth
Quoted 23 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socketThe possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
Signed-off-by Pierre Morel <[email protected]>---
...
Quoted 11 lines
hw/s390x/cpu-topology.c line 3
Quoted 9 lines
hw/s390x/cpu-topology.c new file +3
-0@@ -0,0 +1,259 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology Since you later introduce a file with almost the same name in the target/s390x/ folder, it would be fine to have some more explanation here what this file is all about (especially with regards to the other file in target/s390x/).
I first did put the interceptions in target/s390/ then moved them in target/s390x/kvm because it is KVM related then again only let STSI interception.
Quoted 7 lines
Quoted 3 lines
But to be honest I do not see any reason why not put everything in hw/s390x/ if CPU topology is implemented for TCG I think the code will call
insert_stsi_15_1_x()too.no?
Oh well, it's all so borderline ... whether you rather think of this as part of the CPU (like the STSI instruction) or rather part of the machine (drawers, books, ...).
I don't mind too much, as long as we don't have two files around with almost the same name (apart from "_" vs. "-"). So either keep the stsi part in target/s390x and use a better file name for that, or put everything together in one "cpu-topology.c" file. Or what do others think about it?Would it make sense to have a
target/s390x/stsi.cfile with the stsi routines to be called from TCG insn helpers and from the KVM backend ? This suggestion is based on the services found in theioinst.cfile.So,
target/s390x/kvm/cpu_topology.cwould becometarget/s390x/stsi.cand stsi services would be moved there, if that makes sense.Or
target/s390x/kvm/stsi.cto start with because services are only active for KVM targets.Looking at hw/s390x/meson.build :
s390x_ss.add(when: '
CONFIG_KVM',if_true: files( 'tod-kvm.c',
's390-skeys-kvm.c', 's390-stattrib-kvm.c',
'pv.c',
's390-pci-kvm.c',
'cpu-topology.c',
))It seems
cpu-topology.cshould be namedcpu-topology-kvm.cto follow the same convention.However, I don't see much reason for the KVM condition, apart from the new polarization definitions in machine-target.json which depend on KVM.
cpu-topology.ccould well be compiled without the KVM #ifdef, all seems in place to detect support at runtime.
Quoted 9 lines
In this file, we find a
s390_handle_ptf()which is called fromkvm_handle_ptf()intarget/s390x/kvm/kvm.c. Is it the right place for it ? Shouldn't we move the service undertarget/s390x/kvm/kvm.c?Thanks,
C.
Hello Cédric,
The reason to have the s390_handle_ptf() here is to be ready for TCG.
We have the choice to let the cpu-topology.c file inside the KVM list of meson.build until TCG provides the CPU_TOPOLOGY facility and then move it to the general list or
to move it now to the general list inside meson.build and keep code that will only be useful when TCG provides the CPU_TOPOLOGY facility
The option taken here is to not let the code active if it is not in use.
Did I answered the question or forgot something?
Regards,
Pierre
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
In reply to Pierre MorelQuoted 189 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
On hot plug we:
- calculate the default values for the topology for drawers, books and sockets in the case they are not specified.
- verify the CPU attributes
- check that we have still room on the desired socketThe possibility to insert a CPU in a mask is dependent on the number of cores allowed in a socket, a book or a drawer, the checking is done during the hot plug of the CPU to have an immediate answer.
If the complete topology is not specified, the core is added in the physical topology based on its core ID and it gets defaults values for the modifier attributes.
This way, starting QEMU without specifying the topology can still get some advantage of the CPU topology.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 6 + include/hw/s390x/cpu-topology.h | 55 +++++++ hw/s390x/cpu-topology.c | 259 ++++++++++++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 22 ++- hw/s390x/meson.build | 1 + 5 files changed, 341 insertions(+), 2 deletions(-)create mode 100644
include/hw/s390x/cpu-topology.hcreate mode 100644hw/s390x/cpu-topology.cMAINTAINERS +6
-0@@ -1654,6 +1654,12 @@ F: hw/s390x/event-facility.c F: hw/s390x/sclp*.c L: [email protected] +S390 CPU topology +M: Pierre Morel <[email protected]> +S: Supported +F: include/hw/s390x/cpu-topology.h +F: hw/s390x/cpu-topology.c + X86 Machines ------------ PCinclude/hw/s390x/cpu-topology.h new file +55
-0@@ -0,0 +1,55 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology +* +* Copyright IBM Corp. 2022,2023 +* Author(s): Pierre Morel <[email protected]> +* +*/ +#ifndef HW_S390X_CPU_TOPOLOGY_H +#define HW_S390X_CPU_TOPOLOGY_H + +#ifndef CONFIG_USER_ONLY + +#include "qemu/queue.h" +#include "hw/boards.h" +#include "qapi/qapi-types-machine-target.h" + +typedef struct S390Topology { +uint8_t *cores_per_socket; +CpuTopology *smp; +}S390Topology ; + +#ifdef CONFIG_KVM +bool s390_has_topology (void ); +void s390_topology_setup_cpu (MachineState *ms,S390CPU *cpu,Error **errp); +#else +static inline bool s390_has_topology (void ) +{ +return false; +} +static inline void s390_topology_setup_cpu (MachineState *ms, +S390CPU *cpu, +Error **errp) {} +#endif + +extern S390Topology s390_topology; + +static inline int s390_std_socket (int n,CpuTopology *smp) +{ +return (n / smp->cores) % smp->sockets; +} + +static inline int s390_std_book (int n,CpuTopology *smp) +{ +return (n / (smp->cores * smp->sockets)) % smp->books; +} + +static inline int s390_std_drawer (int n,CpuTopology *smp) +{ +return (n / (smp->cores * smp->sockets * smp->books)) % smp->drawers; +} + +#endif /* CONFIG_USER_ONLY */ + +#endif hw/s390x/cpu-topology.c new file +73
-0@@ -0,0 +1,259 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* CPU Topology +* +* Copyright IBM Corp. 2022,2023 +* Author(s): Pierre Morel <[email protected]> +* +*/ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/error-report.h" +#include "hw/qdev-properties.h" +#include "hw/boards.h" +#include "qemu/typedefs.h" +#include "target/s390x/cpu.h" +#include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/cpu-topology.h" + +/* +* s390_topology is used to keep the topology information. +* .cores_per_socket: tracks information on the count of cores +* per socket. +* .smp: keeps track of the machine topology. +* +*/ +S390Topology s390_topology = { +/* will be initialized after the cpu model is realized */ + .cores_per_socket =NULL , + .smp =NULL , +}; + +/** +* s390_socket_nb: +* @cpu: s390x CPU +* +* Returns the socket number used inside the cores_per_socket array +* for a topology tree entry +*/ +static int __s390_socket_nb (int drawer_id,int book_id,int socket_id) +{ +return (drawer_id * s390_topology.smp->books + book_id) * + s390_topology.smp->sockets + socket_id; +} + +/** +* s390_socket_nb: +* @cpu: s390x CPU +* +* Returns the socket number used inside the cores_per_socket array +* for a cpu. +*/ +static int s390_socket_nb (S390CPU *cpu) +{ +return __s390_socket_nb (cpu->env.drawer_id, cpu->env.book_id, + cpu->env.socket_id); +} + +/** +* s390_has_topology: +* +* Return value: if the topology is supported by the machine. +*/ +bool s390_has_topology (void ) +{ +return false; +} + +/** +* s390_topology_init: +* @ms: the machine state where the machine topology is defined +* +* Keep track of the machine topology.
hw/s390x/cpu-topology.c line 83
Quoted 10 lines
hw/s390x/cpu-topology.c new file +10
-0+* +* Allocate an array to keep the count of cores per socket. +* The index of the array starts at socket 0 from book 0 and +* drawer 0 up to the maximum allowed by the machine topology. +*/ +static void s390_topology_init (MachineState *ms) +{ +CpuTopology *smp = &ms->smp; + + s390_topology.smp = smp;
I am not sure the 'smp' shortcut is necessary. 'MachineState *ms' is always available where 'CpuTopology *smp' is used. so it could be computed from a local variable AFAICT. It would reduce the risk of 'smp' being NULL in some (future) code path.
Thanks,
C.
Quoted 242 lines
hw/s390x/cpu-topology.c new file +176
-0+ s390_topology.cores_per_socket =g_new0 (uint8_t, smp->sockets * + smp->books * smp->drawers); +} + +/** +* s390_topology_cpu_default: +* @cpu: pointer to a S390CPU +* @errp: Error pointer +* +* Setup the default topology if no attributes are already set. +* Passing a CPU with some, but not all, attributes set is considered +* an error. +* +* The function calculates the (drawer_id, book_id, socket_id) +* topology by filling the cores starting from the first socket +* (0, 0, 0) up to the last (smp->drawers, smp->books, smp->sockets). +* +* CPU type and dedication have defaults values set in the +* s390x_cpu_properties, entitlement must be adjust depending on the +* dedication. +* +* Returns false if it is impossible to setup a default topology +* true otherwise. +*/ +static bool s390_topology_cpu_default (S390CPU *cpu,Error **errp) +{ +CpuTopology *smp = s390_topology.smp; +CPUS390XState *env = &cpu->env; + +/* All geometry topology attributes must be set or all unset */ +if ((env->socket_id <0 || env->book_id <0 || env->drawer_id <0 ) && + (env->socket_id >=0 || env->book_id >=0 || env->drawer_id >=0 )) { +error_setg (errp, +"Please define all or none of the topology geometry attributes" ); +return false; + } + +/* Check if one of the geometry topology is unset */ +if (env->socket_id <0 ) { +/* Calculate default geometry topology attributes */ + env->socket_id =s390_std_socket (env->core_id, smp); + env->book_id =s390_std_book (env->core_id, smp); + env->drawer_id =s390_std_drawer (env->core_id, smp); + } + +/* +* When the user specifies the entitlement as 'auto' on the command line, +* qemu will set the entitlement as: +* Medium when the CPU is not dedicated. +* High when dedicated is true. +*/ +if (env->entitlement ==S390_CPU_ENTITLEMENT_AUTO ) { +if (env->dedicated) { + env->entitlement =S390_CPU_ENTITLEMENT_HIGH ; + }else { + env->entitlement =S390_CPU_ENTITLEMENT_MEDIUM ; + } + } +return true; +} + +/** +* s390_topology_check: +* @socket_id: socket to check +* @book_id: book to check +* @drawer_id: drawer to check +* @entitlement: entitlement to check +* @dedicated: dedication to check +* @errp: Error pointer +* +* The function checks if the topology +* attributes fits inside the system topology. +* +* Returns false if the specified topology does not match with +* the machine topology. +*/ +static bool s390_topology_check (uint16_t socket_id,uint16_t book_id, +uint16_t drawer_id,uint16_t entitlement, +bool dedicated,Error **errp) +{ +CpuTopology *smp = s390_topology.smp; +ERRP_GUARD (); + +if (socket_id >= smp->sockets) { +error_setg (errp,"Unavailable socket: %d" , socket_id); +return false; + } +if (book_id >= smp->books) { +error_setg (errp,"Unavailable book: %d" , book_id); +return false; + } +if (drawer_id >= smp->drawers) { +error_setg (errp,"Unavailable drawer: %d" , drawer_id); +return false; + } +if (entitlement >=S390_CPU_ENTITLEMENT__MAX ) { +error_setg (errp,"Unknown entitlement: %d" , entitlement); +return false; + } +if (dedicated && (entitlement ==S390_CPU_ENTITLEMENT_LOW || + entitlement ==S390_CPU_ENTITLEMENT_MEDIUM )) { +error_setg (errp,"A dedicated cpu implies high entitlement" ); +return false; + } +return true; +} + +/** +* s390_update_cpu_props: +* @ms: the machine state +* @cpu: the CPU for which to update the properties from the environment. +* +*/ +static void s390_update_cpu_props (MachineState *ms,S390CPU *cpu) +{ +CpuInstanceProperties *props; + + props = &ms->possible_cpus->cpus[cpu->env.core_id].props; + + props->socket_id = cpu->env.socket_id; + props->book_id = cpu->env.book_id; + props->drawer_id = cpu->env.drawer_id; +} + +/** +* s390_topology_setup_cpu: +* @ms: MachineState used to initialize the topology structure on +* first call. +* @cpu: the new S390CPU to insert in the topology structure +* @errp: the error pointer +* +* Called from CPU Hotplug to check and setup the CPU attributes +* before the CPU is inserted in the topology. +* There is no need to update the MTCR explicitely here because it +* will be updated by KVM on creation of the new CPU. +*/ +void s390_topology_setup_cpu (MachineState *ms,S390CPU *cpu,Error **errp) +{ +ERRP_GUARD (); +int entry; + +/* +* We do not want to initialize the topology if the cpu model +* does not support topology, consequently, we have to wait for +* the first CPU to be realized, which realizes the CPU model +* to initialize the topology structures. +* +* s390_topology_setup_cpu() is called from the cpu hotplug. +*/ +if (!s390_topology.cores_per_socket) { +s390_topology_init (ms); + } + +if (!s390_topology_cpu_default (cpu, errp)) { +return ; + } + +if (!s390_topology_check (cpu->env.socket_id, cpu->env.book_id, + cpu->env.drawer_id, cpu->env.entitlement, + cpu->env.dedicated, errp)) { +return ; + } + +/* Do we still have space in the socket */ + entry =s390_socket_nb (cpu); +if (s390_topology.cores_per_socket[entry] >= s390_topology.smp->cores) { +error_setg (errp,"No more space on this socket" ); +return ; + } + +/* Update the count of cores in sockets */ + s390_topology.cores_per_socket[entry] +=1 ; + +/* topology tree is reflected in props */ +s390_update_cpu_props (ms, cpu); +}hw/s390x/s390-virtio-ccw.c +20
-2@@ -45,6 +45,7 @@#include "hw/s390x/pv.h" #include "migration/blocker.h" #include "qapi/visitor.h" +#include "hw/s390x/cpu-topology.h" static Error *pv_mig_blocker;@@ -311,10 +312,18 @@ static void s390_cpu_plug(HotplugHandler *hotplug_dev, {MachineState *ms =MACHINE (hotplug_dev);S390CPU *cpu =S390_CPU (dev); +ERRP_GUARD ();g_assert (!ms->possible_cpus->cpus[cpu->env.core_id].cpu); ms->possible_cpus->cpus[cpu->env.core_id].cpu =OBJECT (dev); +if (s390_has_topology ()) { +s390_topology_setup_cpu (ms, cpu, errp); +if (*errp) { +return ; + } + } +if (dev->hotplugged) {raise_irq_cpu_hotplug (); }@@ -554,11 +563,20 @@ static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms) sizeof(CPUArchId) * max_cpus); ms->possible_cpus->len = max_cpus;for (i =0 ; i < ms->possible_cpus->len; i++) { +CpuInstanceProperties *props = &ms->possible_cpus->cpus[i].props; + ms->possible_cpus->cpus[i].type = ms->cpu_type; ms->possible_cpus->cpus[i].vcpus_count =1 ; ms->possible_cpus->cpus[i].arch_id = i; - ms->possible_cpus->cpus[i].props.has_core_id = true; - ms->possible_cpus->cpus[i].props.core_id = i; + + props->has_core_id = true; + props->core_id = i; + props->has_socket_id = true; + props->socket_id =s390_std_socket (i, &ms->smp); + props->has_book_id = true; + props->book_id =s390_std_book (i, &ms->smp); + props->has_drawer_id = true; + props->drawer_id =s390_std_drawer (i, &ms->smp); }return ms->possible_cpus;hw/s390x/meson.build +1
-0@@ -24,6 +24,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( 's390-stattrib-kvm.c', 'pv.c', 's390-pci-kvm.c', + 'cpu-topology.c', )) s390x_ss.add(when: 'CONFIG_TCG', if_true: files( 'tod-tcg.c',
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Quoted 5 lines · Cédric Le Goater
Quoted 4 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
[...]
Quoted 22 lines
Quoted 6 lines
hw/s390x/cpu-topology.c new file +6
-0+ +/** +* s390_topology_init: +* @ms: the machine state where the machine topology is defined +* +* Keep track of the machine topology. hw/s390x/cpu-topology.c line 83
Quoted 10 lines
hw/s390x/cpu-topology.c new file +10
-0+* +* Allocate an array to keep the count of cores per socket. +* The index of the array starts at socket 0 from book 0 and +* drawer 0 up to the maximum allowed by the machine topology. +*/ +static void s390_topology_init (MachineState *ms) +{ + CpuTopology *smp = &ms->smp; + + s390_topology.smp = smp;I am not sure the 'smp' shortcut is necessary. 'MachineState *ms' is always available where 'CpuTopology *smp' is used. so it could be computed from a local variable AFAICT. It would reduce the risk of 'smp' being NULL in some (future) code path.
Quoted 3 lines
Thanks,
C.
So I will use directly current_machine->smp
You are right it is more homogeneous, there is no need to keep a pointer here.
Thanks
Pierre
[...]
Re: [PATCH v20 02/21] s390x/cpu topology: add topology entries on CPU hotplug
Quoted 30 lines · Pierre Morel
Quoted 5 lines · Cédric Le Goater
Quoted 4 lines · Pierre Morel
The topology information are attributes of the CPU and are specified during the CPU device creation.
[...]
Quoted 22 lines
Quoted 6 lines
hw/s390x/cpu-topology.c new file +6
-0+ +/** +* s390_topology_init: +* @ms: the machine state where the machine topology is defined +* +* Keep track of the machine topology. hw/s390x/cpu-topology.c line 83
Quoted 10 lines
hw/s390x/cpu-topology.c new file +10
-0+* +* Allocate an array to keep the count of cores per socket. +* The index of the array starts at socket 0 from book 0 and +* drawer 0 up to the maximum allowed by the machine topology. +*/ +static void s390_topology_init (MachineState *ms) +{ + CpuTopology *smp = &ms->smp; + + s390_topology.smp = smp;I am not sure the 'smp' shortcut is necessary. 'MachineState *ms' is always available where 'CpuTopology *smp' is used. so it could be computed from a local variable AFAICT. It would reduce the risk of 'smp' being NULL in some (future) code path.
Quoted 6 lines
Quoted 3 lines
Thanks,
C.
So I will use directly
current_machine->smp
There are a couple of place where 'MachineState *ms' can be used directly. In the other places, routines will need an extra 'CpuTopology *smp' parameter. If it gets too ugly, current_machine->smp might a better alternative.
Thanks,
C.
PATCH v20 3/21 target/s390x/cpu topology: handle STSI(15) and build the SYSIB
In reply to Pierre MorelOn interception of STSI(15.1.x) the System Information Block (SYSIB) is built from the list of pre-ordered topology entries.
--- MAINTAINERS | 1 + include/hw/s390x/cpu-topology.h | 24 +++ include/hw/s390x/sclp.h | 1 + target/s390x/cpu.h | 72 ++++++++ hw/s390x/cpu-topology.c | 13 +- target/s390x/kvm/cpu_topology.c | 308 ++++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 5 +- target/s390x/kvm/meson.build | 3 +- 8 files changed, 424 insertions(+), 3 deletions(-) create mode 100644 target/s390x/kvm/cpu_topology.c
MAINTAINERS +1 -0
@@ -1659,6 +1659,7 @@ M: Pierre Morel <[email protected]> S: Supported F: include/hw/s390x/cpu-topology.h F: hw/s390x/cpu-topology.c +F: target/s390x/kvm/cpu_topology.c X86 Machines ------------
include/hw/s390x/cpu-topology.h +24 -0
@@ -15,9 +15,33 @@#include "hw/boards.h" #include "qapi/qapi-types-machine-target.h" +#define S390_TOPOLOGY_CPU_IFL 0x03 + +typedef union s390_topology_id { +uint64_t id; +struct { +uint8_t sentinel; +uint8_t drawer; +uint8_t book; +uint8_t socket; +uint8_t dedicated; +uint8_t entitlement; +uint8_t type; +uint8_t origin; + }; +}s390_topology_id ; + +typedef struct S390TopologyEntry { +QTAILQ_ENTRY (S390TopologyEntry) next; +s390_topology_id id; +uint64_t mask; +}S390TopologyEntry ; +typedef struct S390Topology {uint8_t *cores_per_socket; + QTAILQ_HEAD(, S390TopologyEntry) list;CpuTopology *smp; +bool vertical_polarization; }S390Topology ;#ifdef CONFIG_KVM
include/hw/s390x/sclp.h +1 -0
@@ -112,6 +112,7 @@ typedef struct CPUEntry { }QEMU_PACKED CPUEntry;#define SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET 128 +#define SCLP_READ_SCP_INFO_MNEST 2 typedef struct ReadInfo { SCCBHeader h; uint16_t rnmax;
target/s390x/cpu.h +72 -0
87 lines not on this page · raw message
hw/s390x/cpu-topology.c +12 -1
@@ -22,12 +22,15 @@* .cores_per_socket: tracks information on the count of cores * per socket. * .smp: keeps track of the machine topology. -* +* .list: queue the topology entries inside which +* we keep the information on the CPU topology. */ S390Topology s390_topology = {/* will be initialized after the cpu model is realized */ .cores_per_socket =NULL , .smp =NULL , + .list =QTAILQ_HEAD_INITIALIZER (s390_topology.list), + .vertical_polarization = false, };/**
@@ -75,14 +78,22 @@ bool s390_has_topology(void)* Allocate an array to keep the count of cores per socket. * The index of the array starts at socket 0 from book 0 and * drawer 0 up to the maximum allowed by the machine topology. +* +* Insert a sentinel entry with a non null value. +* This entry will never be free. */ static void s390_topology_init (MachineState *ms) {CpuTopology *smp = &ms->smp; +S390TopologyEntry *entry; s390_topology.smp = smp; s390_topology.cores_per_socket =g_new0 (uint8_t, smp->sockets * smp->books * smp->drawers); + + entry =g_malloc0 (sizeof (S390TopologyEntry)); + entry->id.sentinel =0xff ; +QTAILQ_INSERT_HEAD (&s390_topology.list, entry, next); }/**
target/s390x/kvm/cpu_topology.c new file +308 -0
308 lines not on this page · raw message
target/s390x/kvm/kvm.c +4 -1
@@ -1919,9 +1919,12 @@ static int handle_stsi(S390CPU *cpu)if (run->s390_stsi.sel1 !=2 || run->s390_stsi.sel2 !=2 ) {return 0 ; } -/* Only sysib 3.2.2 needs post-handling for now. */ insert_stsi_3_2_2 (cpu, run->s390_stsi.addr, run->s390_stsi.ar);return 0 ; +case 15 : +insert_stsi_15_1_x (cpu, run->s390_stsi.sel2, run->s390_stsi.addr, + run->s390_stsi.ar); +return 0 ;default :return 0 ; }
target/s390x/kvm/meson.build +2 -1
@@ -1,6 +1,7 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( - 'kvm.c' + 'kvm.c', + 'cpu_topology.c' ), if_false: files( 'stubs.c' ))
Signature · 1 line
2.31.1
Re: [PATCH v20 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB
Quoted 21 lines · Pierre Morel
On interception of STSI(15.1.x) the System Information Block (SYSIB) is built from the list of pre-ordered topology entries.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 1 + include/hw/s390x/cpu-topology.h | 24 +++ include/hw/s390x/sclp.h | 1 + target/s390x/cpu.h | 72 ++++++++ hw/s390x/cpu-topology.c | 13 +- target/s390x/kvm/cpu_topology.c | 308 ++++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 5 +- target/s390x/kvm/meson.build | 3 +- 8 files changed, 424 insertions(+), 3 deletions(-)create mode 100644
target/s390x/kvm/cpu_topology.cMAINTAINERS +0
-0
MAINTAINERS M: Pierre Morel <[email protected]> · line 1662
Quoted 4 lines
MAINTAINERS +1
-0@@ -1659,6 +1659,7 @@ M: Pierre Morel <[email protected]> S: Supported F: include/hw/s390x/cpu-topology.h F: hw/s390x/cpu-topology.c +F: target/s390x/kvm/cpu_topology.c
It's somewhat weird to have one file "cpu-topology.c" (in hw/s390x, with a dash), and one file cpu_topology.c (in target/s390x, with an underscore) ... could you come up with a better naming? Maybe call the new file stsi-topology.c or so?
target/s390x/cpu.h typedef struct SysIB_322 { · line 562
Quoted 7 lines
target/s390x/cpu.h +0
-0@@ -561,6 +561,25 @@ typedef struct SysIB_322 { } SysIB_322;QEMU_BUILD_BUG_ON (sizeof (SysIB_322) !=4096 );
Maybe add a short comment here what MAG stands for (magnitude fields?)?
Quoted 18 lines
target/s390x/cpu.h +18
-0+#define S390_TOPOLOGY_MAG 6 +#define S390_TOPOLOGY_MAG6 0 +#define S390_TOPOLOGY_MAG5 1 +#define S390_TOPOLOGY_MAG4 2 +#define S390_TOPOLOGY_MAG3 3 +#define S390_TOPOLOGY_MAG2 4 +#define S390_TOPOLOGY_MAG1 5 +/* Configuration topology */ +typedef struct SysIB_151x { +uint8_t reserved0[2 ]; +uint16_t length; +uint8_t mag[S390_TOPOLOGY_MAG ]; +uint8_t reserved1; +uint8_t mnest; +uint32_t reserved2; +char tle[]; +}SysIB_151x ; +QEMU_BUILD_BUG_ON (sizeof (SysIB_151x) !=16 );
...
Quoted 16 lines
target/s390x/kvm/cpu_topology.c new file +10
-0@@ -0,0 +1,308 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU S390x CPU Topology +* +* Copyright IBM Corp. 2022,2023 +* Author(s): Pierre Morel <[email protected]> +* +*/ +#include "qemu/osdep.h" +#include "cpu.h"
target/s390x/kvm/cpu_topology.c line 20
Quoted 10 lines
target/s390x/kvm/cpu_topology.c new file +10
-0+#include "hw/s390x/pv.h" +#include "hw/sysbus.h" +#include "hw/s390x/sclp.h" +#include "hw/s390x/cpu-topology.h" + +/** +* fill_container: +* @p: The address of the container TLE to fill +* @level: The level of nesting for this container +* @id: The container receives a uniq ID inside its own container
s/uniq/unique/
Thomas
Re: [PATCH v20 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB
Quoted 17 lines · Thomas Huth
Quoted 16 lines · Pierre Morel
On interception of STSI(15.1.x) the System Information Block (SYSIB) is built from the list of pre-ordered topology entries.
Signed-off-by Pierre Morel <[email protected]>---
MAINTAINERS | 1 +include/hw/s390x/cpu-topology.h| 24 +++ include/hw/s390x/sclp.h | 1 +
target/s390x/cpu.h | 72 ++++++++ hw/s390x/cpu-topology.c | 13 +-target/s390x/kvm/cpu_topology.c| 308 ++++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 5 +- target/s390x/kvm/meson.build | 3 +-8 files changed, 424 insertions(+), 3 deletions(-)create mode 100644
target/s390x/kvm/cpu_topology.c
Quoted 11 lines
Quoted 9 lines
MAINTAINERS +0
-0@@ -1659,6 +1659,7 @@ M: Pierre Morel <[email protected]>S: Supported
F:include/hw/s390x/cpu-topology.h
F:hw/s390x/cpu-topology.c
+F:target/s390x/kvm/cpu_topology.cIt's somewhat weird to have one file "
cpu-topology.c" (in hw/s390x, with a dash), and one filecpu_topology.c(in target/s390x, with an underscore) ... could you come up with a better naming? Maybe call the new filestsi-topology.cor so?
If I keep the two files (see answer to your comments on patch 2) then yes I can change it to stsi-topology.c,
Quoted 11 lines
target/s390x/cpu.h typedef struct SysIB_322 { · line 562
Quoted 8 lines
target/s390x/cpu.h +0
-0@@ -561,6 +561,25 @@ typedef struct SysIB_322 { } SysIB_322; QEMU_BUILD_BUG_ON(sizeof(SysIB_322) != 4096);Maybe add a short comment here what MAG stands for (magnitude fields?)?
Yes, in fact Magnitude bytes.
Quoted 40 lines
Quoted 18 lines
target/s390x/cpu.h +18
-0+#define S390_TOPOLOGY_MAG 6 +#define S390_TOPOLOGY_MAG6 0 +#define S390_TOPOLOGY_MAG5 1 +#define S390_TOPOLOGY_MAG4 2 +#define S390_TOPOLOGY_MAG3 3 +#define S390_TOPOLOGY_MAG2 4 +#define S390_TOPOLOGY_MAG1 5 +/* Configuration topology */ +typedef struct SysIB_151x { + uint8_t reserved0[2]; + uint16_t length; + uint8_t mag[S390_TOPOLOGY_MAG]; + uint8_t reserved1; + uint8_t mnest; + uint32_t reserved2; + char tle[]; +}SysIB_151x ; +QEMU_BUILD_BUG_ON (sizeof (SysIB_151x) !=16 );...
Quoted 20 lines
target/s390x/kvm/cpu_topology.c new file +14
-0@@ -0,0 +1,308 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* QEMU S390x CPU Topology +* +* Copyright IBM Corp. 2022,2023 +* Author(s): Pierre Morel <[email protected]> +* +*/ +#include "qemu/osdep.h" +#include "cpu.h" +#include "hw/s390x/pv.h" +#include "hw/sysbus.h" +#include "hw/s390x/sclp.h" +#include "hw/s390x/cpu-topology.h"
Quoted 8 lines
target/s390x/kvm/cpu_topology.c line 20
Quoted 6 lines
target/s390x/kvm/cpu_topology.c new file +6
-0+ +/** +* fill_container: +* @p: The address of the container TLE to fill +* @level: The level of nesting for this container +* @id: The container receives a uniq ID inside its own container s/uniq/unique/
yes, thanks,
regards,
Pierre
Quoted 3 lines
Thomas
Re: [PATCH v20 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB
In reply to Pierre MorelQuoted 34 lines · Pierre Morel
On interception of STSI(15.1.x) the System Information Block (SYSIB) is built from the list of pre-ordered topology entries.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 1 + include/hw/s390x/cpu-topology.h | 24 +++ include/hw/s390x/sclp.h | 1 + target/s390x/cpu.h | 72 ++++++++ hw/s390x/cpu-topology.c | 13 +- target/s390x/kvm/cpu_topology.c | 308 ++++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 5 +- target/s390x/kvm/meson.build | 3 +- 8 files changed, 424 insertions(+), 3 deletions(-) create mode 100644 target/s390x/kvm/cpu_topology.cMAINTAINERS +1
-0@@ -1659,6 +1659,7 @@ M: Pierre Morel <[email protected]> S: Supported F: include/hw/s390x/cpu-topology.h F: hw/s390x/cpu-topology.c +F: target/s390x/kvm/cpu_topology.c X86 Machines ------------include/hw/s390x/cpu-topology.h +0
-0@@ -15,9 +15,33 @@
[...]
include/hw/s390x/cpu-topology.h line 42
Quoted 9 lines
include/hw/s390x/cpu-topology.h +7
-0+typedef struct S390TopologyEntry { +QTAILQ_ENTRY (S390TopologyEntry) next; +s390_topology_id id; +uint64_t mask; +}S390TopologyEntry ; + typedef struct S390Topology { uint8_t *cores_per_socket; + QTAILQ_HEAD(, S390TopologyEntry) list;
Since you recompute the list on every STSI, you no longer need this in here. You can create it in insert_stsi_15_1_x.
Quoted 3 lines
CpuTopology *smp;+ bool
vertical_polarization;
} S390Topology;
[...]
include/hw/s390x/cpu-topology.h
Quoted 7 lines
include/hw/s390x/cpu-topology.h +7
-0+/* +* Macro to check that the size of data after increment +* will not get bigger than the size of the SysIB. +*/ +#define SYSIB_GUARD (data, x) do { \ + data += x; \ + if (data > sizeof(SysIB)) { \
^ two spaces
Quoted 4 lines
include/hw/s390x/cpu-topology.h +4
-0+return 0 ; \ + } \ + }while (0 ) +
[...]
Quoted 12 lines
include/hw/s390x/cpu-topology.h +12
-0+/** +* s390_topology_from_cpu: +* @cpu: The S390CPU +* +* Initialize the topology id from the CPU environment. +*/ +static s390_topology_id s390_topology_from_cpu (S390CPU *cpu) +{ +s390_topology_id topology_id = {0 }; + + topology_id.drawer = cpu->env.drawer_id; + topology_id.book = cpu->env.book_id;
include/hw/s390x/cpu-topology.h
Quoted 10 lines
include/hw/s390x/cpu-topology.h +10
-0+ topology_id.socket = cpu->env.socket_id; + topology_id.origin = cpu->env.core_id /64 ; + topology_id.type =S390_TOPOLOGY_CPU_IFL ; + topology_id.dedicated = cpu->env.dedicated; + +if (s390_topology.vertical_polarization) { +/* +* Vertical polarization with dedicated CPU implies +* vertical high entitlement. +*/
This has already been adjusted or rejected when the entitlement was set.
include/hw/s390x/cpu-topology.h
Quoted 4 lines
include/hw/s390x/cpu-topology.h +4
-0+if (topology_id.dedicated) { + topology_id.entitlement =S390_CPU_ENTITLEMENT_HIGH ; + }else { + topology_id.entitlement = cpu->env.entitlement;
You only need this assignment.
Quoted 4 lines
include/hw/s390x/cpu-topology.h +4
-0+ } + } + +return topology_id;
[...]
Re: [PATCH v20 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB
Quoted 37 lines · Nina Schoetterl-Glausch
Quoted 34 lines · Pierre Morel
On interception of STSI(15.1.x) the System Information Block (SYSIB) is built from the list of pre-ordered topology entries.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 1 + include/hw/s390x/cpu-topology.h | 24 +++ include/hw/s390x/sclp.h | 1 + target/s390x/cpu.h | 72 ++++++++ hw/s390x/cpu-topology.c | 13 +- target/s390x/kvm/cpu_topology.c | 308 ++++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 5 +- target/s390x/kvm/meson.build | 3 +- 8 files changed, 424 insertions(+), 3 deletions(-)create mode 100644
target/s390x/kvm/cpu_topology.cMAINTAINERS +1
-0@@ -1659,6 +1659,7 @@ M: Pierre Morel <[email protected]> S: Supported F: include/hw/s390x/cpu-topology.h F: hw/s390x/cpu-topology.c +F: target/s390x/kvm/cpu_topology.c X86 Machines ------------include/hw/s390x/cpu-topology.h +0
-0@@ -15,9 +15,33 @@[...]
Quoted 11 lines
include/hw/s390x/cpu-topology.h line 42
Quoted 9 lines
include/hw/s390x/cpu-topology.h +7
-0+typedef struct S390TopologyEntry { +QTAILQ_ENTRY (S390TopologyEntry) next; +s390_topology_id id; +uint64_t mask; +}S390TopologyEntry ; + typedef struct S390Topology { uint8_t *cores_per_socket; + QTAILQ_HEAD(, S390TopologyEntry) list;Since you recompute the list on every STSI, you no longer need this in here. You can create it in
insert_stsi_15_1_x.
Sure but why should we do that?
It does not change functionality or performance and I do not find it makes the code clearer.
On the other hand it changes the implementation and the initialization of the list with the sentinel becomes tricky.
Quoted 5 lines
Quoted 3 lines
CpuTopology *smp;+ bool
vertical_polarization;
} S390Topology;[...]
Quoted 8 lines
include/hw/s390x/cpu-topology.h
Quoted 7 lines
include/hw/s390x/cpu-topology.h +7
-0+/* +* Macro to check that the size of data after increment +* will not get bigger than the size of the SysIB. +*/ +#define SYSIB_GUARD (data, x) do { \ + data += x; \ + if (data > sizeof(SysIB)) { \^ two spaces
right, thanks
Quoted 31 lines
Quoted 5 lines
include/hw/s390x/cpu-topology.h +4
-0+return 0 ; \ + } \ + }while (0 ) +[...]
Quoted 12 lines
include/hw/s390x/cpu-topology.h +12
-0+/** +* s390_topology_from_cpu: +* @cpu: The S390CPU +* +* Initialize the topology id from the CPU environment. +*/ +static s390_topology_id s390_topology_from_cpu (S390CPU *cpu) +{ +s390_topology_id topology_id = {0 }; + + topology_id.drawer = cpu->env.drawer_id; + topology_id.book = cpu->env.book_id;include/hw/s390x/cpu-topology.h
Quoted 10 lines
include/hw/s390x/cpu-topology.h +10
-0+ topology_id.socket = cpu->env.socket_id; + topology_id.origin = cpu->env.core_id /64 ; + topology_id.type =S390_TOPOLOGY_CPU_IFL ; + topology_id.dedicated = cpu->env.dedicated; + +if (s390_topology.vertical_polarization) { +/* +* Vertical polarization with dedicated CPU implies +* vertical high entitlement. +*/ This has already been adjusted or rejected when the entitlement was set.
Quoted 5 lines
include/hw/s390x/cpu-topology.h
Quoted 4 lines
include/hw/s390x/cpu-topology.h +4
-0+if (topology_id.dedicated) { + topology_id.entitlement =S390_CPU_ENTITLEMENT_HIGH ; + }else { + topology_id.entitlement = cpu->env.entitlement;You only need this assignment.
Right, thanks
Regards,
Pierre
Re: [PATCH v20 03/21] target/s390x/cpu topology: handle STSI(15) and build the SYSIB
Quoted 50 lines · Pierre Morel
Quoted 37 lines · Nina Schoetterl-Glausch
Quoted 34 lines · Pierre Morel
On interception of STSI(15.1.x) the System Information Block (SYSIB) is built from the list of pre-ordered topology entries.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 1 + include/hw/s390x/cpu-topology.h | 24 +++ include/hw/s390x/sclp.h | 1 + target/s390x/cpu.h | 72 ++++++++ hw/s390x/cpu-topology.c | 13 +- target/s390x/kvm/cpu_topology.c | 308 ++++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 5 +- target/s390x/kvm/meson.build | 3 +- 8 files changed, 424 insertions(+), 3 deletions(-)create mode 100644
target/s390x/kvm/cpu_topology.cMAINTAINERS +1
-0@@ -1659,6 +1659,7 @@ M: Pierre Morel <[email protected]> S: Supported F: include/hw/s390x/cpu-topology.h F: hw/s390x/cpu-topology.c +F: target/s390x/kvm/cpu_topology.c X86 Machines ------------include/hw/s390x/cpu-topology.h +0
-0@@ -15,9 +15,33 @@[...]
Quoted 11 lines
include/hw/s390x/cpu-topology.h line 42
Quoted 9 lines
include/hw/s390x/cpu-topology.h +7
-0+typedef struct S390TopologyEntry { +QTAILQ_ENTRY (S390TopologyEntry) next; +s390_topology_id id; +uint64_t mask; +}S390TopologyEntry ; + typedef struct S390Topology { uint8_t *cores_per_socket; + QTAILQ_HEAD(, S390TopologyEntry) list;Since you recompute the list on every STSI, you no longer need this in here. You can create it in
insert_stsi_15_1_x.
Quoted 6 lines
Sure but why should we do that?
It does not change functionality or performance and I do not find it makes the code clearer.
On the other hand it changes the implementation and the initialization of the list with the sentinel becomes tricky.
IMO, it's a local calculation, so it should be local.
It makes the question "how is this list calculated" when reading the code easier, because, instead of having to check where a global is accessed you just have to look at the call stack.
You can just move
+ entry = g_malloc0(sizeof(S390TopologyEntry)); + entry->id.sentinel = 0xff; + QTAILQ_INSERT_HEAD(&s390_topology.list, entry, next);
to s390_topology_fill_list_sorted. And completely free the list in s390_topology_empty_list.
Quoted 1 line
[...]
Quoted 1 line
PATCH v20 4/21 s390x/sclp: reporting the maximum nested topology entries
In reply to Pierre MorelThe maximum nested topology entries is used by the guest to know how many nested topology are available on the machine.
Let change the MNEST value from 2 to 4 in the SCLP READ INFO structure now that we support books and drawers.
--- include/hw/s390x/sclp.h | 5 +++-- hw/s390x/sclp.c | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-)
include/hw/s390x/sclp.h +3 -2
@@ -112,12 +112,13 @@ typedef struct CPUEntry { }QEMU_PACKED CPUEntry;#define SCLP_READ_SCP_INFO_FIXED_CPU_OFFSET 128 -#define SCLP_READ_SCP_INFO_MNEST 2 +#define SCLP_READ_SCP_INFO_MNEST 4 typedef struct ReadInfo { SCCBHeader h; uint16_t rnmax; uint8_t rnsize; - uint8_t _reserved1[16 - 11]; /* 11-15 */ + uint8_t _reserved1[15 - 11]; /* 11-14 */ + uint8_t stsi_parm; /* 15-15 */ uint16_t entries_cpu; /* 16-17 */ uint16_t offset_cpu; /* 18-19 */ uint8_t _reserved2[24 - 20]; /* 20-23 */
hw/s390x/sclp.c +5 -0
@@ -20,6 +20,7 @@#include "hw/s390x/event-facility.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/ipl.h" +#include "hw/s390x/cpu-topology.h" static inline SCLPDevice *get_sclp_device (void ) {
@@ -123,6 +124,10 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)return ; } +if (s390_has_topology ()) { + read_info->stsi_parm =SCLP_READ_SCP_INFO_MNEST ; + } +/* CPU information */ prepare_cpu_entries (machine, entries_start, &cpu_count); read_info->entries_cpu =cpu_to_be16 (cpu_count);
Signature · 1 line
2.31.1
PATCH v20 5/21 s390x/cpu topology: resetting the Topology-Change-Report
In reply to Pierre MorelDuring a subsystem reset the Topology-Change-Report is cleared by the machine.
Let's ask KVM to clear the Modified Topology Change Report (MTCR) bit of the SCA in the case of a subsystem reset.
--- include/hw/s390x/cpu-topology.h | 1 + target/s390x/cpu.h | 1 + target/s390x/kvm/kvm_s390x.h | 1 + hw/s390x/cpu-topology.c | 11 +++++++++++ hw/s390x/s390-virtio-ccw.c | 3 +++ target/s390x/cpu-sysemu.c | 13 +++++++++++++ target/s390x/kvm/kvm.c | 17 +++++++++++++++++ 7 files changed, 47 insertions(+)
include/hw/s390x/cpu-topology.h +1 -0
@@ -58,6 +58,7 @@ static inline void s390_topology_setup_cpu(MachineState *ms,#endif extern S390Topology s390_topology; +void s390_topology_reset (void );static inline int s390_std_socket (int n,CpuTopology *smp) {
target/s390x/cpu.h +1 -0
@@ -642,6 +642,7 @@ typedef struct SysIBTl_cpu {QEMU_BUILD_BUG_ON (sizeof (SysIBTl_cpu) !=16 );void insert_stsi_15_1_x (S390CPU *cpu,int sel2,uint64_t addr,uint8_t ar); +void s390_cpu_topology_set_changed (bool changed);/* MMU defines */ #define ASCE_ORIGIN (~0xfffULL)/* segment table origin */
target/s390x/kvm/kvm_s390x.h +1 -0
@@ -47,5 +47,6 @@ void kvm_s390_crypto_reset(void);void kvm_s390_restart_interrupt (S390CPU *cpu);void kvm_s390_stop_interrupt (S390CPU *cpu);void kvm_s390_set_diag318 (CPUState *cs,uint64_t diag318_info); +int kvm_s390_topology_set_mtcr (uint64_t attr);#endif /* KVM_S390X_H */
hw/s390x/cpu-topology.c +11 -0
@@ -96,6 +96,17 @@ static void s390_topology_init(MachineState *ms)QTAILQ_INSERT_HEAD (&s390_topology.list, entry, next); } +/** +* s390_topology_reset: +* +* Generic reset for CPU topology, calls s390_topology_reset() +* to reset the kernel Modified Topology Change Record. +*/ +void s390_topology_reset (void ) +{ +s390_cpu_topology_set_changed (false); +} +/** * s390_topology_cpu_default: * @cpu: pointer to a S390CPU
hw/s390x/s390-virtio-ccw.c +3 -0
@@ -123,6 +123,9 @@ static void subsystem_reset(void)device_cold_reset (dev); } } +if (s390_has_topology ()) { +s390_topology_reset (); + } }static int virtio_ccw_hcall_notify (const uint64_t *args)
target/s390x/cpu-sysemu.c +13 -0
@@ -306,3 +306,16 @@ void s390_do_cpu_set_diag318(CPUState *cs, run_on_cpu_data arg)kvm_s390_set_diag318 (cs, arg.host_ulong); } } + +void s390_cpu_topology_set_changed (bool changed) +{ +int ret; + +if (kvm_enabled ()) { + ret =kvm_s390_topology_set_mtcr (changed); +if (ret) { +error_report ("Failed to set Modified Topology Change Report: %s" , +strerror (-ret)); + } + } +}
target/s390x/kvm/kvm.c +17 -0
@@ -2592,6 +2592,23 @@ int kvm_s390_get_zpci_op(void)return cap_zpci_op; } +int kvm_s390_topology_set_mtcr (uint64_t attr) +{ +struct kvm_device_attr attribute = { + .group =KVM_S390_VM_CPU_TOPOLOGY , + .attr = attr, + }; + +if (!s390_has_feat (S390_FEAT_CONFIGURATION_TOPOLOGY )) { +return 0 ; + } +if (!kvm_vm_check_attr (kvm_state,KVM_S390_VM_CPU_TOPOLOGY , attr)) { +return -ENOTSUP ; + } + +return kvm_vm_ioctl (kvm_state,KVM_SET_DEVICE_ATTR , &attribute); +} +void kvm_arch_accel_class_init (ObjectClass *oc) { }
Signature · 1 line
2.31.1
PATCH v20 6/21 s390x/cpu topology: interception of PTF instruction
In reply to Pierre MorelWhen the host supports the CPU topology facility, the PTF instruction with function code 2 is interpreted by the SIE, provided that the userland hypervisor activates the interpretation by using the KVM_CAP_S390_CPU_TOPOLOGY KVM extension.
The PTF instructions with function code 0 and 1 are intercepted and must be emulated by the userland hypervisor.
During RESET all CPU of the configuration are placed in horizontal polarity.
--- include/hw/s390x/s390-virtio-ccw.h | 6 ++++ hw/s390x/cpu-topology.c | 51 ++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 11 +++++++ 3 files changed, 68 insertions(+)
include/hw/s390x/s390-virtio-ccw.h +6 -0
@@ -30,6 +30,12 @@ struct S390CcwMachineState {uint8_t loadparm[8 ]; }; +#define S390_PTF_REASON_NONE (0x00 << 8) +#define S390_PTF_REASON_DONE (0x01 << 8) +#define S390_PTF_REASON_BUSY (0x02 << 8) +#define S390_TOPO_FC_MASK 0xffUL +void s390_handle_ptf (S390CPU *cpu,uint8_t r1,uintptr_t ra); +struct S390CcwMachineClass {/*< private >*/ MachineClass parent_class;
hw/s390x/cpu-topology.c +51 -0
63 lines not on this page · raw message
target/s390x/kvm/kvm.c +11 -0
@@ -96,6 +96,7 @@#define PRIV_B9_EQBS 0x9c#define PRIV_B9_CLP 0xa0 +#define PRIV_B9_PTF 0xa2#define PRIV_B9_PCISTG 0xd0#define PRIV_B9_PCILG 0xd2#define PRIV_B9_RPCIT 0xd3
@@ -1464,6 +1465,13 @@ static int kvm_mpcifc_service_call(S390CPU *cpu, struct kvm_run *run) } } +static void kvm_handle_ptf (S390CPU *cpu,struct kvm_run *run) +{ +uint8_t r1 = (run->s390_sieic.ipb >>20 ) &0x0f ; + +s390_handle_ptf (cpu, r1,RA_IGNORED ); +} +static int handle_b9 (S390CPU *cpu,struct kvm_run *run,uint8_t ipa1) {int r =0 ;
@@ -1481,6 +1489,9 @@ static int handle_b9(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)case PRIV_B9_RPCIT : r =kvm_rpcit_service_call (cpu, run);break ; +case PRIV_B9_PTF : +kvm_handle_ptf (cpu, run); +break ;case PRIV_B9_EQBS :/* just inject exception */ r =-1 ;
Signature · 1 line
2.31.1
Re: [PATCH v20 06/21] s390x/cpu topology: interception of PTF instruction
Quoted 5 lines · Pierre Morel
When the host supports the CPU topology facility, the PTF instruction with function code 2 is interpreted by the SIE, provided that the userland hypervisor activates the interpretation by using the
KVM_CAP_S390_CPU_TOPOLOGYKVM extension.
Quoted 7 lines
The PTF instructions with function code 0 and 1 are intercepted and must be emulated by the userland hypervisor.
During RESET all CPU of the configuration are placed in horizontal polarity.
Signed-off-by Pierre Morel <[email protected]>
See nit below.
Quoted 56 lines
--- include/hw/s390x/s390-virtio-ccw.h | 6 ++++ hw/s390x/cpu-topology.c | 51 ++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 11 +++++++ 3 files changed, 68 insertions(+)include/hw/s390x/s390-virtio-ccw.h +6
-0@@ -30,6 +30,12 @@ struct S390CcwMachineState {uint8_t loadparm[8 ]; }; +#define S390_PTF_REASON_NONE (0x00 << 8) +#define S390_PTF_REASON_DONE (0x01 << 8) +#define S390_PTF_REASON_BUSY (0x02 << 8) +#define S390_TOPO_FC_MASK 0xffUL +void s390_handle_ptf (S390CPU *cpu,uint8_t r1,uintptr_t ra); +struct S390CcwMachineClass {/*< private >*/ MachineClass parent_class;hw/s390x/cpu-topology.c +25
-0@@ -96,6 +96,56 @@ static void s390_topology_init(MachineState *ms)QTAILQ_INSERT_HEAD (&s390_topology.list, entry, next); } +/* +* s390_handle_ptf: +* +* @register 1: contains the function code +* +* Function codes 0 (horizontal) and 1 (vertical) define the CPU +* polarization requested by the guest. +* +* Function code 2 is handling topology changes and is interpreted +* by the SIE. +*/ +void s390_handle_ptf (S390CPU *cpu,uint8_t r1,uintptr_t ra) +{ +CPUS390XState *env = &cpu->env; +uint64_t reg = env->regs[r1]; +int fc = reg &S390_TOPO_FC_MASK ; + +if (!s390_has_feat (S390_FEAT_CONFIGURATION_TOPOLOGY )) { +s390_program_interrupt (env,PGM_OPERATION , ra); +return ; + } + +if (env->psw.mask &PSW_MASK_PSTATE ) { +s390_program_interrupt (env,PGM_PRIVILEGED , ra); +return ;
hw/s390x/cpu-topology.c static void s390_topology_init(MachineState *ms) · line 133
Quoted 10 lines
hw/s390x/cpu-topology.c +10
-0+ } + +if (reg & ~S390_TOPO_FC_MASK ) { +s390_program_interrupt (env,PGM_SPECIFICATION , ra); +return ; + } + +switch (fc) { +case S390_CPU_POLARIZATION_VERTICAL : +case S390_CPU_POLARIZATION_HORIZONTAL :
I'd give this a name.
bool requested_vertical = !!fc;
Quoted 15 lines
hw/s390x/cpu-topology.c +15
-0+if (s390_topology.vertical_polarization == !!fc) { + env->regs[r1] |=S390_PTF_REASON_DONE ; +setcc (cpu,2 ); + }else { + s390_topology.vertical_polarization = !!fc; +s390_cpu_topology_set_changed (true); +setcc (cpu,0 ); + } +break ; +default : +/* Note that fc == 2 is interpreted by the SIE */ +s390_program_interrupt (env,PGM_SPECIFICATION , ra); + } +} +
[...]
Re: [PATCH v20 06/21] s390x/cpu topology: interception of PTF instruction
Quoted 6 lines · Nina Schoetterl-Glausch
Quoted 5 lines · Pierre Morel
When the host supports the CPU topology facility, the PTF instruction with function code 2 is interpreted by the SIE, provided that the userland hypervisor activates the interpretation by using the
KVM_CAP_S390_CPU_TOPOLOGYKVM extension.
Quoted 8 lines
Quoted 7 lines
The PTF instructions with function code 0 and 1 are intercepted and must be emulated by the userland hypervisor.
During RESET all CPU of the configuration are placed in horizontal polarity.
Signed-off-by Pierre Morel <[email protected]>Reviewed-by Nina Schoetterl-Glausch <[email protected]>
Thanks
Quoted 62 lines
See nit below.
Quoted 60 lines
--- include/hw/s390x/s390-virtio-ccw.h | 6 ++++ hw/s390x/cpu-topology.c | 51 ++++++++++++++++++++++++++++++ target/s390x/kvm/kvm.c | 11 +++++++ 3 files changed, 68 insertions(+)include/hw/s390x/s390-virtio-ccw.h +6
-0@@ -30,6 +30,12 @@ struct S390CcwMachineState {uint8_t loadparm[8 ]; }; +#define S390_PTF_REASON_NONE (0x00 << 8) +#define S390_PTF_REASON_DONE (0x01 << 8) +#define S390_PTF_REASON_BUSY (0x02 << 8) +#define S390_TOPO_FC_MASK 0xffUL +void s390_handle_ptf (S390CPU *cpu,uint8_t r1,uintptr_t ra); +struct S390CcwMachineClass {/*< private >*/ MachineClass parent_class;hw/s390x/cpu-topology.c +29
-0@@ -96,6 +96,56 @@ static void s390_topology_init(MachineState *ms)QTAILQ_INSERT_HEAD (&s390_topology.list, entry, next); } +/* +* s390_handle_ptf: +* +* @register 1: contains the function code +* +* Function codes 0 (horizontal) and 1 (vertical) define the CPU +* polarization requested by the guest. +* +* Function code 2 is handling topology changes and is interpreted +* by the SIE. +*/ +void s390_handle_ptf (S390CPU *cpu,uint8_t r1,uintptr_t ra) +{ +CPUS390XState *env = &cpu->env; +uint64_t reg = env->regs[r1]; +int fc = reg &S390_TOPO_FC_MASK ; + +if (!s390_has_feat (S390_FEAT_CONFIGURATION_TOPOLOGY )) { +s390_program_interrupt (env,PGM_OPERATION , ra); +return ; + } + +if (env->psw.mask &PSW_MASK_PSTATE ) { +s390_program_interrupt (env,PGM_PRIVILEGED , ra); +return ; + } + +if (reg & ~S390_TOPO_FC_MASK ) { +s390_program_interrupt (env,PGM_SPECIFICATION , ra);
Quoted 8 lines
hw/s390x/cpu-topology.c static void s390_topology_init(MachineState *ms) · line 133
Quoted 6 lines
hw/s390x/cpu-topology.c +6
-0+return ; + } + +switch (fc) { +case S390_CPU_POLARIZATION_VERTICAL : +case S390_CPU_POLARIZATION_HORIZONTAL :I'd give this a name.
boolrequested_vertical= !!fc;
OK, looks good, I change this
Thanks.
Regards,
Pierre
Quoted 18 lines
Quoted 16 lines
hw/s390x/cpu-topology.c +15
-0+if (s390_topology.vertical_polarization == !!fc) { + env->regs[r1] |=S390_PTF_REASON_DONE ; +setcc (cpu,2 ); + }else { + s390_topology.vertical_polarization = !!fc; +s390_cpu_topology_set_changed (true); +setcc (cpu,0 ); + } +break ; +default : +/* Note that fc == 2 is interpreted by the SIE */ +s390_program_interrupt (env,PGM_SPECIFICATION , ra); + } +} +[...]
PATCH v20 7/21 target/s390x/cpu topology: activate CPU topology
In reply to Pierre MorelThe KVM capability KVM_CAP_S390_CPU_TOPOLOGY is used to activate the S390_FEAT_CONFIGURATION_TOPOLOGY feature and the topology facility in the host CPU model for the guest in the case the topology is available in QEMU and in KVM.
The feature is disabled by default and fenced for SE (secure execution).
--- hw/s390x/cpu-topology.c | 2 +- target/s390x/cpu_models.c | 1 + target/s390x/kvm/kvm.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-)
hw/s390x/cpu-topology.c +1 -1
@@ -66,7 +66,7 @@ static int s390_socket_nb(S390CPU *cpu)*/ bool s390_has_topology (void ) { -return false; +return s390_has_feat (S390_FEAT_CONFIGURATION_TOPOLOGY ); }/**
target/s390x/cpu_models.c +1 -0
@@ -254,6 +254,7 @@ bool s390_has_feat(S390Feat feat)case S390_FEAT_SIE_CMMA :case S390_FEAT_SIE_PFMFI :case S390_FEAT_SIE_IBS : +case S390_FEAT_CONFIGURATION_TOPOLOGY :return false;break ;default :
target/s390x/kvm/kvm.c +9 -0
@@ -371,6 +371,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)kvm_vm_enable_cap (s,KVM_CAP_S390_USER_SIGP ,0 );kvm_vm_enable_cap (s,KVM_CAP_S390_VECTOR_REGISTERS ,0 );kvm_vm_enable_cap (s,KVM_CAP_S390_USER_STSI ,0 ); +kvm_vm_enable_cap (s,KVM_CAP_S390_CPU_TOPOLOGY ,0 );if (ri_allowed ()) {if (kvm_vm_enable_cap (s,KVM_CAP_S390_RI ,0 ) ==0 ) { cap_ri =1 ;
@@ -2470,6 +2471,14 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp)set_bit (S390_FEAT_UNPACK , model->features); } +/* +* If we have kernel support for CPU Topology indicate the +* configuration-topology facility. +*/ +if (kvm_check_extension (kvm_state,KVM_CAP_S390_CPU_TOPOLOGY )) { +set_bit (S390_FEAT_CONFIGURATION_TOPOLOGY , model->features); + } +/* We emulate a zPCI bus and AEN, therefore we don't need HW support */ set_bit (S390_FEAT_ZPCI , model->features);set_bit (S390_FEAT_ADAPTER_EVENT_NOTIFICATION , model->features);
Signature · 1 line
2.31.1
PATCH v20 8/21 qapi/s390x/cpu topology: set-cpu-topology qmp command
In reply to Pierre MorelThe modification of the CPU attributes are done through a monitor command.
It allows to move the core inside the topology tree to optimize the cache usage in the case the host's hypervisor previously moved the CPU.
The same command allows to modify the CPU attributes modifiers like polarization entitlement and the dedicated attribute to notify the guest if the host admin modified scheduling or dedication of a vCPU.
With this knowledge the guest has the possibility to optimize the usage of the vCPUs.
The command has a feature unstable for the moment.
--- qapi/machine-target.json | 37 +++++++++++ hw/s390x/cpu-topology.c | 136 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+)
qapi/machine-target.json +37 -0
@@ -4,6 +4,8 @@ # 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': 'machine-common.json' } + ## # @CpuModelInfo: #
@@ -354,3 +356,38 @@ { 'enum': 'CpuS390Polarization', 'prefix': 'S390_CPU_POLARIZATION', 'data': [ 'horizontal', 'vertical' ] } + +## +# @set-cpu-topology: +# +# @core-id: the vCPU ID to be moved +# @socket-id: optional destination socket where to move the vCPU +# @book-id: optional destination book where to move the vCPU +# @drawer-id: optional destination drawer where to move the vCPU +# @entitlement: optional entitlement +# @dedicated: optional, if the vCPU is dedicated to a real CPU +# +# Features: +# @unstable: This command may still be modified. +# +# Modifies the topology by moving the CPU inside the topology +# tree or by changing a modifier attribute of a CPU. +# Default value for optional parameter is the current value +# used by the CPU. +# +# Returns: Nothing on success, the reason on failure. +# +# Since: 8.1 +## +{ 'command': 'set-cpu-topology', + 'data': { + 'core-id': 'uint16', + '*socket-id': 'uint16', + '*book-id': 'uint16', + '*drawer-id': 'uint16', + '*entitlement': 'CpuS390Entitlement', + '*dedicated': 'bool' + }, + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] } +}
hw/s390x/cpu-topology.c +136 -0
151 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [PATCH v20 08/21] qapi/s390x/cpu topology: set-cpu-topology qmp command
Quoted 11 lines · Pierre Morel
The modification of the CPU attributes are done through a monitor command.
It allows to move the core inside the topology tree to optimize the cache usage in the case the host's hypervisor previously moved the CPU.
The same command allows to modify the CPU attributes modifiers like polarization entitlement and the dedicated attribute to notify the guest if the host admin modified scheduling or dedication of a vCPU.
Quoted 6 lines
With this knowledge the guest has the possibility to optimize the usage of the vCPUs.
The command has a feature unstable for the moment.
Signed-off-by Pierre Morel <[email protected]>
Logic is sound, minor stuff below.
Quoted 70 lines
--- qapi/machine-target.json | 37 +++++++++++ hw/s390x/cpu-topology.c | 136 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+)qapi/machine-target.json +37
-0@@ -4,6 +4,8 @@ # 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': 'machine-common.json' } + ## # @CpuModelInfo: #@@ -354,3 +356,38 @@ { 'enum': 'CpuS390Polarization', 'prefix': 'S390_CPU_POLARIZATION', 'data': [ 'horizontal', 'vertical' ] } + +## +# @set-cpu-topology: +# +# @core-id: the vCPU ID to be moved +# @socket-id: optional destination socket where to move the vCPU +# @book-id: optional destination book where to move the vCPU +# @drawer-id: optional destination drawer where to move the vCPU +# @entitlement: optional entitlement +# @dedicated: optional, if the vCPU is dedicated to a real CPU +# +# Features: +# @unstable: This command may still be modified. +# +# Modifies the topology by moving the CPU inside the topology +# tree or by changing a modifier attribute of a CPU. +# Default value for optional parameter is the current value +# used by the CPU. +# +# Returns: Nothing on success, the reason on failure. +# +# Since: 8.1 +## +{ 'command': 'set-cpu-topology', + 'data': { + 'core-id': 'uint16', + '*socket-id': 'uint16', + '*book-id': 'uint16', + '*drawer-id': 'uint16', + '*entitlement': 'CpuS390Entitlement', + '*dedicated': 'bool' + }, + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] } +}hw/s390x/cpu-topology.c +1
-0@@ -16,6 +16,7 @@#include "target/s390x/cpu.h" #include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/cpu-topology.h" +#include "qapi/qapi-commands-machine-target.h" /* * s390_topology is used to keep the topology information.
hw/s390x/cpu-topology.c static bool s390_topology_check(uint16_t socket_id, uint16_t book_id, · line 270
Quoted 9 lines
hw/s390x/cpu-topology.c +6
-0@@ -261,6 +262,27 @@ static bool s390_topology_check(uint16_t socket_id, uint16_t book_id,return true; } +/** +* s390_topology_need_report +* @cpu: Current cpu +* @drawer_id: future drawer ID +* @book_id: future book ID +* @socket_id: future socket ID
Entitlement and dedicated are missing here.
hw/s390x/cpu-topology.c static bool s390_topology_check(uint16_t socket_id, uint16_t book_id, · line 275
Quoted 5 lines
hw/s390x/cpu-topology.c +5
-0+* +* A modified topology change report is needed if the topology +* tree or the topology attributes change. +*/ +static int s390_topology_need_report(S390CPU *cpu, int drawer_id,
I'd prefer a bool return type.
Quoted 14 lines
hw/s390x/cpu-topology.c +10
-0+ int book_id, int socket_id, + uint16_t entitlement, bool dedicated) +{ + return cpu->env.drawer_id != drawer_id || + cpu->env.book_id != book_id || + cpu->env.socket_id != socket_id || + cpu->env.entitlement != entitlement || + cpu->env.dedicated != dedicated; +} +/** * s390_update_cpu_props: * @ms: the machine state
hw/s390x/cpu-topology.c void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp) · line 360
Quoted 9 lines
hw/s390x/cpu-topology.c +6
-0@@ -330,3 +352,117 @@ void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp)/* topology tree is reflected in props */ s390_update_cpu_props (ms, cpu); } + +static void s390_change_topology(uint16_t core_id, + bool has_socket_id, uint16_t socket_id, + bool has_book_id, uint16_t book_id, + bool has_drawer_id, uint16_t drawer_id, + bool has_entitlement, uint16_t entitlement,
I would keep the enum type for entitlement.
Quoted 6 lines
hw/s390x/cpu-topology.c +6
-0+ bool has_dedicated, bool dedicated, + Error **errp) +{ + MachineState *ms = current_machine; +int old_socket_entry; +int new_socket_entry;
hw/s390x/cpu-topology.c void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp) · line 376
Quoted 10 lines
hw/s390x/cpu-topology.c +10
-0+int report_needed; +S390CPU *cpu; +ERRP_GUARD (); + +if (core_id >= ms->smp.max_cpus) { +error_setg (errp,"Core-id %d out of range!" , core_id); +return ; + } + + cpu = (S390CPU *)ms->possible_cpus->cpus[core_id].cpu;
You can replace this with
cpu = s390_cpu_addr2state(core_id);
and get rid of the if above that checks for out of range.
Quoted 92 lines
hw/s390x/cpu-topology.c +92
-0+if (!cpu) { +error_setg (errp,"Core-id %d does not exist!" , core_id); +return ; + } + +/* Get attributes not provided from cpu and verify the new topology */ +if (!has_socket_id) { + socket_id = cpu->env.socket_id; + } +if (!has_book_id) { + book_id = cpu->env.book_id; + } +if (!has_drawer_id) { + drawer_id = cpu->env.drawer_id; + } +if (!has_dedicated) { + dedicated = cpu->env.dedicated; + } + +/* +* When the user specifies the entitlement as 'auto' on the command line, +* qemu will set the entitlement as: +* Medium when the CPU is not dedicated. +* High when dedicated is true. +*/ +if (!has_entitlement || (entitlement ==S390_CPU_ENTITLEMENT_AUTO )) { +if (dedicated) { + entitlement =S390_CPU_ENTITLEMENT_HIGH ; + }else { + entitlement =S390_CPU_ENTITLEMENT_MEDIUM ; + } + } + +if (!s390_topology_check (socket_id, book_id, drawer_id, + entitlement, dedicated, errp)) +return ; + +/* Check for space on new socket */ + old_socket_entry =s390_socket_nb (cpu); + new_socket_entry =__s390_socket_nb (drawer_id, book_id, socket_id); + +if (new_socket_entry != old_socket_entry) { +if (s390_topology.cores_per_socket[new_socket_entry] >= + s390_topology.smp->cores) { +error_setg (errp,"No more space on this socket" ); +return ; + } +/* Update the count of cores in sockets */ + s390_topology.cores_per_socket[new_socket_entry] +=1 ; + s390_topology.cores_per_socket[old_socket_entry] -=1 ; + } + +/* Check if we will need to report the modified topology */ + report_needed =s390_topology_need_report (cpu, drawer_id, book_id, + socket_id, entitlement, + dedicated); + +/* All checks done, report new topology into the vCPU */ + cpu->env.drawer_id = drawer_id; + cpu->env.book_id = book_id; + cpu->env.socket_id = socket_id; + cpu->env.dedicated = dedicated; + cpu->env.entitlement = entitlement; + +/* topology tree is reflected in props */ +s390_update_cpu_props (ms, cpu); + +/* Advertise the topology change */ +if (report_needed) { +s390_cpu_topology_set_changed (true); + } +} + +void qmp_set_cpu_topology (uint16_t core, +bool has_socket,uint16_t socket, +bool has_book,uint16_t book, +bool has_drawer,uint16_t drawer, +bool has_entitlement,CpuS390Entitlement entitlement, +bool has_dedicated,bool dedicated, +Error **errp) +{ +ERRP_GUARD (); + +if (!s390_has_topology ()) { +error_setg (errp,"This machine doesn't support topology" ); +return ; + } + +s390_change_topology (core, has_socket, socket, has_book, book, + has_drawer, drawer, has_entitlement, entitlement, + has_dedicated, dedicated, errp); +}
Re: [PATCH v20 08/21] qapi/s390x/cpu topology: set-cpu-topology qmp command
Quoted 93 lines · Nina Schoetterl-Glausch
Quoted 11 lines · Pierre Morel
The modification of the CPU attributes are done through a monitor command.
It allows to move the core inside the topology tree to optimize the cache usage in the case the host's hypervisor previously moved the CPU.
The same command allows to modify the CPU attributes modifiers like polarization entitlement and the dedicated attribute to notify the guest if the host admin modified scheduling or dedication of a vCPU.
Quoted 6 lines
With this knowledge the guest has the possibility to optimize the usage of the vCPUs.
The command has a feature unstable for the moment.
Signed-off-by Pierre Morel <[email protected]>Logic is sound, minor stuff below.
Quoted 73 lines
--- qapi/machine-target.json | 37 +++++++++++ hw/s390x/cpu-topology.c | 136 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+)qapi/machine-target.json +37
-0@@ -4,6 +4,8 @@ # 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': 'machine-common.json' } + ## # @CpuModelInfo: #@@ -354,3 +356,38 @@ { 'enum': 'CpuS390Polarization', 'prefix': 'S390_CPU_POLARIZATION', 'data': [ 'horizontal', 'vertical' ] } + +## +# @set-cpu-topology: +# +# @core-id: the vCPU ID to be moved +# @socket-id: optional destination socket where to move the vCPU +# @book-id: optional destination book where to move the vCPU +# @drawer-id: optional destination drawer where to move the vCPU +# @entitlement: optional entitlement +# @dedicated: optional, if the vCPU is dedicated to a real CPU +# +# Features: +# @unstable: This command may still be modified. +# +# Modifies the topology by moving the CPU inside the topology +# tree or by changing a modifier attribute of a CPU. +# Default value for optional parameter is the current value +# used by the CPU. +# +# Returns: Nothing on success, the reason on failure. +# +# Since: 8.1 +## +{ 'command': 'set-cpu-topology', + 'data': { + 'core-id': 'uint16', + '*socket-id': 'uint16', + '*book-id': 'uint16', + '*drawer-id': 'uint16', + '*entitlement': 'CpuS390Entitlement', + '*dedicated': 'bool' + }, + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] } +}hw/s390x/cpu-topology.c +1
-0@@ -16,6 +16,7 @@#include "target/s390x/cpu.h" #include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/cpu-topology.h" +#include "qapi/qapi-commands-machine-target.h" /* * s390_topology is used to keep the topology information. @@ -261,6 +262,27 @@ static bool s390_topology_check(uint16_t socket_id, uint16_t book_id,return true; }
Quoted 7 lines
hw/s390x/cpu-topology.c static bool s390_topology_check(uint16_t socket_id, uint16_t book_id, · line 270
Quoted 6 lines
hw/s390x/cpu-topology.c +6
-0+/** +* s390_topology_need_report +* @cpu: Current cpu +* @drawer_id: future drawer ID +* @book_id: future book ID +* @socket_id: future socket ID Entitlement and dedicated are missing here.
Yes, thx
Quoted 7 lines
hw/s390x/cpu-topology.c static bool s390_topology_check(uint16_t socket_id, uint16_t book_id, · line 275
Quoted 6 lines
hw/s390x/cpu-topology.c +5
-0+* +* A modified topology change report is needed if the topology +* tree or the topology attributes change. +*/ +static int s390_topology_need_report(S390CPU *cpu, int drawer_id,I'd prefer a bool return type.
ok
Quoted 17 lines
Quoted 17 lines
hw/s390x/cpu-topology.c +10
-0+ int book_id, int socket_id, + uint16_t entitlement, bool dedicated) +{ + return cpu->env.drawer_id != drawer_id || + cpu->env.book_id != book_id || + cpu->env.socket_id != socket_id || + cpu->env.entitlement != entitlement || + cpu->env.dedicated != dedicated; +} +/** * s390_update_cpu_props: * @ms: the machine state @@ -330,3 +352,117 @@ void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp)/* topology tree is reflected in props */ s390_update_cpu_props (ms, cpu);
Quoted 8 lines
hw/s390x/cpu-topology.c void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp) · line 360
Quoted 7 lines
hw/s390x/cpu-topology.c +6
-0} + +static void s390_change_topology(uint16_t core_id, + bool has_socket_id, uint16_t socket_id, + bool has_book_id, uint16_t book_id, + bool has_drawer_id, uint16_t drawer_id, + bool has_entitlement, uint16_t entitlement,I would keep the enum type for entitlement.
ok
Quoted 19 lines
Quoted 7 lines
hw/s390x/cpu-topology.c +6
-0+ bool has_dedicated, bool dedicated, + Error **errp) +{ + MachineState *ms = current_machine; +int old_socket_entry; +int new_socket_entry;hw/s390x/cpu-topology.c void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp) · line 376
Quoted 10 lines
hw/s390x/cpu-topology.c +10
-0+int report_needed; +S390CPU *cpu; +ERRP_GUARD (); + +if (core_id >= ms->smp.max_cpus) { +error_setg (errp,"Core-id %d out of range!" , core_id); +return ; + } + + cpu = (S390CPU *)ms->possible_cpus->cpus[core_id].cpu;You can replace this with
Quoted 3 lines
cpu = s390_cpu_addr2state(core_id);and get rid of the if above that checks for out of range.
yes, ok
Quoted 85 lines
Quoted 85 lines
hw/s390x/cpu-topology.c +84
-0+if (!cpu) { +error_setg (errp,"Core-id %d does not exist!" , core_id); +return ; + } + +/* Get attributes not provided from cpu and verify the new topology */ +if (!has_socket_id) { + socket_id = cpu->env.socket_id; + } +if (!has_book_id) { + book_id = cpu->env.book_id; + } +if (!has_drawer_id) { + drawer_id = cpu->env.drawer_id; + } +if (!has_dedicated) { + dedicated = cpu->env.dedicated; + } + +/* +* When the user specifies the entitlement as 'auto' on the command line, +* qemu will set the entitlement as: +* Medium when the CPU is not dedicated. +* High when dedicated is true. +*/ +if (!has_entitlement || (entitlement ==S390_CPU_ENTITLEMENT_AUTO )) { +if (dedicated) { + entitlement =S390_CPU_ENTITLEMENT_HIGH ; + }else { + entitlement =S390_CPU_ENTITLEMENT_MEDIUM ; + } + } + +if (!s390_topology_check (socket_id, book_id, drawer_id, + entitlement, dedicated, errp)) +return ; + +/* Check for space on new socket */ + old_socket_entry =s390_socket_nb (cpu); + new_socket_entry =__s390_socket_nb (drawer_id, book_id, socket_id); + +if (new_socket_entry != old_socket_entry) { +if (s390_topology.cores_per_socket[new_socket_entry] >= + s390_topology.smp->cores) { +error_setg (errp,"No more space on this socket" ); +return ; + } +/* Update the count of cores in sockets */ + s390_topology.cores_per_socket[new_socket_entry] +=1 ; + s390_topology.cores_per_socket[old_socket_entry] -=1 ; + } + +/* Check if we will need to report the modified topology */ + report_needed =s390_topology_need_report (cpu, drawer_id, book_id, + socket_id, entitlement, + dedicated); + +/* All checks done, report new topology into the vCPU */ + cpu->env.drawer_id = drawer_id; + cpu->env.book_id = book_id; + cpu->env.socket_id = socket_id; + cpu->env.dedicated = dedicated; + cpu->env.entitlement = entitlement; + +/* topology tree is reflected in props */ +s390_update_cpu_props (ms, cpu); + +/* Advertise the topology change */ +if (report_needed) { +s390_cpu_topology_set_changed (true); + } +} + +void qmp_set_cpu_topology (uint16_t core, +bool has_socket,uint16_t socket, +bool has_book,uint16_t book, +bool has_drawer,uint16_t drawer, +bool has_entitlement,CpuS390Entitlement entitlement, +bool has_dedicated,bool dedicated, +Error **errp) +{ +ERRP_GUARD (); + +if (!s390_has_topology ()) {
Quoted 8 lines
hw/s390x/cpu-topology.c void s390_topology_setup_cpu(MachineState *ms, S390CPU *cpu, Error **errp) · line 468
Quoted 8 lines
hw/s390x/cpu-topology.c +8
-0+error_setg (errp,"This machine doesn't support topology" ); +return ; + } + +s390_change_topology (core, has_socket, socket, has_book, book, + has_drawer, drawer, has_entitlement, entitlement, + has_dedicated, dedicated, errp); +}
Thanks I change this.
regards,
Pierre
PATCH v20 9/21 machine: adding s390 topology to query-cpu-fast
In reply to Pierre MorelS390x provides two more topology attributes, entitlement and dedication.
Let's add these CPU attributes to the QAPI command query-cpu-fast.
--- qapi/machine.json | 9 ++++++++- hw/core/machine-qmp-cmds.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)
qapi/machine.json +8 -1
@@ -55,10 +55,17 @@ # Additional information about a virtual S390 CPU # # @cpu-state: the virtual CPU's state +# @dedicated: the virtual CPU's dedication (since 8.1) +# @entitlement: the virtual CPU's entitlement (since 8.1) # # Since: 2.12 ## -{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } } +{ 'struct': 'CpuInfoS390', + 'data': { 'cpu-state': 'CpuS390State', + 'dedicated': 'bool', + 'entitlement': 'CpuS390Entitlement' + } +} ## # @CpuInfoFast:
hw/core/machine-qmp-cmds.c +2 -0
@@ -35,6 +35,8 @@ static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu)CPUS390XState *env = &s390_cpu->env; info->cpu_state = env->cpu_state; + info->dedicated = env->dedicated; + info->entitlement = env->entitlement;#else abort ();#endif
Signature · 1 line
2.31.1
Re: [PATCH v20 09/21] machine: adding s390 topology to query-cpu-fast
Hello Pierre,
Quoted 40 lines · Pierre Morel
S390x provides two more topology attributes, entitlement and dedication.
Let's add these CPU attributes to the QAPI command query-cpu-fast.
Signed-off-by Pierre Morel <[email protected]>Reviewed-by Nina Schoetterl-Glausch <[email protected]>Reviewed-by Thomas Huth <[email protected]>--- qapi/machine.json | 9 ++++++++- hw/core/machine-qmp-cmds.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)qapi/machine.json +8
-1@@ -55,10 +55,17 @@ # Additional information about a virtual S390 CPU # # @cpu-state: the virtual CPU's state +# @dedicated: the virtual CPU's dedication (since 8.1) +# @entitlement: the virtual CPU's entitlement (since 8.1) # # Since: 2.12 ## -{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } } +{ 'struct': 'CpuInfoS390', + 'data': { 'cpu-state': 'CpuS390State', + 'dedicated': 'bool', + 'entitlement': 'CpuS390Entitlement' + } +} ## # @CpuInfoFast:hw/core/machine-qmp-cmds.c +0
-0
hw/core/machine-qmp-cmds.c static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu) · line 39
Quoted 5 lines
hw/core/machine-qmp-cmds.c +2
-0@@ -35,6 +35,8 @@ static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu)CPUS390XState *env = &s390_cpu->env; info->cpu_state = env->cpu_state; + info->dedicated = env->dedicated; + info->entitlement = env->entitlement;
When you resend, please protect these assignments with :
#if !defined(CONFIG_USER_ONLY)
Thanks,
C.
Quoted 3 lines
hw/core/machine-qmp-cmds.c +0
-0#else abort ();#endif
Re: [PATCH v20 09/21] machine: adding s390 topology to query-cpu-fast
Quoted 50 lines · Cédric Le Goater
Hello Pierre,
Quoted 39 lines · Pierre Morel
S390x provides two more topology attributes, entitlement and dedication.
Let's add these CPU attributes to the QAPI command query-cpu-fast.
Signed-off-by Pierre Morel <[email protected]>Reviewed-by Nina Schoetterl-Glausch <[email protected]>Reviewed-by Thomas Huth <[email protected]>---
qapi/machine.json | 9 ++++++++-
hw/core/machine-qmp-cmds.c| 2 ++2 files changed, 10 insertions(+), 1 deletion(-)qapi/machine.json +8
-1@@ -55,10 +55,17 @@ # Additional information about a virtual S390 CPU # # @cpu-state: the virtual CPU's state +# @dedicated: the virtual CPU's dedication (since 8.1) +# @entitlement: the virtual CPU's entitlement (since 8.1) # # Since: 2.12 ## -{ 'struct': 'CpuInfoS390', 'data': { 'cpu-state': 'CpuS390State' } } +{ 'struct': 'CpuInfoS390', + 'data': { 'cpu-state': 'CpuS390State', + 'dedicated': 'bool', + 'entitlement': 'CpuS390Entitlement' + } +} ## # @CpuInfoFast:hw/core/machine-qmp-cmds.c +0
-0hw/core/machine-qmp-cmds.c static void cpustate_to_cpuinfo_s390(CpuInfoS390 · line 39
Quoted 5 lines
hw/core/machine-qmp-cmds.c +2
-0@@ -35,6 +35,8 @@ static void cpustate_to_cpuinfo_s390(CpuInfoS390 *info, const CPUState *cpu) CPUS390XState *env = &s390_cpu->env; info->cpu_state = env->cpu_state; + info->dedicated = env->dedicated; + info->entitlement = env->entitlement;When you resend, please protect these assignments with :
Quoted 5 lines
#if !defined(CONFIG_USER_ONLY)
Thanks,
C.
Hello Cedric,
Yes, thanks.
(I though I already answered but can not find a trace of it)
Regards,
Pierre
PATCH v20 10/21 machine: adding s390 topology to info hotpluggable-cpus
In reply to Pierre MorelS390 topology adds books and drawers topology containers. Let's add these to the HMP information for hotpluggable cpus.
--- hw/core/machine-hmp-cmds.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/core/machine-hmp-cmds.c +6 -0
@@ -71,6 +71,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)if (c->has_node_id) {monitor_printf (mon," node-id: \"%" PRIu64"\"\n" , c->node_id); } +if (c->has_drawer_id) { +monitor_printf (mon," drawer_id: \"%" PRIu64"\"\n" , c->drawer_id); + } +if (c->has_book_id) { +monitor_printf (mon," book_id: \"%" PRIu64"\"\n" , c->book_id); + }if (c->has_socket_id) {monitor_printf (mon," socket-id: \"%" PRIu64"\"\n" , c->socket_id); }
Signature · 1 line
2.31.1
Re: [PATCH v20 10/21] machine: adding s390 topology to info hotpluggable-cpus
Quoted 4 lines · Pierre Morel
S390 topology adds books and drawers topology containers. Let's add these to the HMP information for hotpluggable cpus.
Signed-off-by Pierre Morel <[email protected]>
if you fix the nits below.
Quoted 9 lines
--- hw/core/machine-hmp-cmds.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/core/machine-hmp-cmds.c +0
-0
hw/core/machine-hmp-cmds.c void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) · line 75
Quoted 5 lines
hw/core/machine-hmp-cmds.c +2
-0@@ -71,6 +71,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)if (c->has_node_id) {monitor_printf (mon," node-id: \"%" PRIu64"\"\n" , c->node_id); } +if (c->has_drawer_id) { +monitor_printf (mon," drawer_id: \"%" PRIu64"\"\n" , c->drawer_id);
use - instead here ^ unless there is some reason to be inconsistent.
hw/core/machine-hmp-cmds.c void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) · line 78
Quoted 3 lines
hw/core/machine-hmp-cmds.c +3
-0+ } +if (c->has_book_id) { +monitor_printf (mon," book_id: \"%" PRIu64"\"\n" , c->book_id);
Same here.
Quoted 4 lines
hw/core/machine-hmp-cmds.c +1
-0+ }if (c->has_socket_id) {monitor_printf (mon," socket-id: \"%" PRIu64"\"\n" , c->socket_id); }
Re: [PATCH v20 10/21] machine: adding s390 topology to info hotpluggable-cpus
Quoted 6 lines · Nina Schoetterl-Glausch
Quoted 4 lines · Pierre Morel
S390 topology adds books and drawers topology containers. Let's add these to the HMP information for hotpluggable cpus.
Signed-off-by Pierre Morel <[email protected]>Reviewed-by Nina Schoetterl-Glausch <[email protected]>
Thanks
Quoted 6 lines
if you fix the nits below.
Quoted 4 lines
--- hw/core/machine-hmp-cmds.c | 6 ++++++ 1 file changed, 6 insertions(+)
Quoted 11 lines
hw/core/machine-hmp-cmds.c void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) · line 75
Quoted 10 lines
hw/core/machine-hmp-cmds.c +2
-0@@ -71,6 +71,12 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)if (c->has_node_id) {monitor_printf (mon," node-id: \"%" PRIu64"\"\n" , c->node_id); } +if (c->has_drawer_id) { +monitor_printf (mon," drawer_id: \"%" PRIu64"\"\n" , c->drawer_id);use - instead here ^ unless there is some reason to be inconsistent.
Oh, yes, thanks.
Quoted 9 lines
hw/core/machine-hmp-cmds.c void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) · line 78
Quoted 3 lines
hw/core/machine-hmp-cmds.c +3
-0+ } +if (c->has_book_id) { +monitor_printf (mon," book_id: \"%" PRIu64"\"\n" , c->book_id);Same here.
Quoted 4 lines
hw/core/machine-hmp-cmds.c +1
-0+ }if (c->has_socket_id) {monitor_printf (mon," socket-id: \"%" PRIu64"\"\n" , c->socket_id); }
Regards,
Pierre
PATCH v20 11/21 qapi/s390x/cpu topology: CPU_POLARIZATION_CHANGE qapi event
In reply to Pierre MorelWhen the guest asks to change the polarization this change is forwarded to the upper layer using QAPI.
The upper layer is supposed to take according decisions concerning CPU provisioning.
--- qapi/machine-target.json | 33 +++++++++++++++++++++++++++++++++ hw/s390x/cpu-topology.c | 2 ++ 2 files changed, 35 insertions(+)
qapi/machine-target.json +33 -0
@@ -391,3 +391,36 @@ 'features': [ 'unstable' ], 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] } } + +## +# @CPU_POLARIZATION_CHANGE: +# +# Emitted when the guest asks to change the polarization. +# +# @polarization: polarization specified by the guest +# +# Features: +# @unstable: This command may still be modified. +# +# The guest can tell the host (via the PTF instruction) whether the +# CPUs should be provisioned using horizontal or vertical polarization. +# +# On horizontal polarization the host is expected to provision all vCPUs +# equally. +# On vertical polarization the host can provision each vCPU differently. +# The guest will get information on the details of the provisioning +# the next time it uses the STSI(15) instruction. +# +# Since: 8.1 +# +# Example: +# +# <- { "event": "CPU_POLARIZATION_CHANGE", +# "data": { "polarization": 0 }, +# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } } +## +{ 'event': 'CPU_POLARIZATION_CHANGE', + 'data': { 'polarization': 'CpuS390Polarization' }, + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +}
hw/s390x/cpu-topology.c +2 -0
@@ -17,6 +17,7 @@#include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/cpu-topology.h" #include "qapi/qapi-commands-machine-target.h" +#include "qapi/qapi-events-machine-target.h" /* * s390_topology is used to keep the topology information.
@@ -138,6 +139,7 @@ void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra) }else { s390_topology.vertical_polarization = !!fc;s390_cpu_topology_set_changed (true); +qapi_event_send_cpu_polarization_change (fc);setcc (cpu,0 ); }break ;
Signature · 1 line
2.31.1
Re: [PATCH v20 11/21] qapi/s390x/cpu topology: CPU_POLARIZATION_CHANGE qapi event
Quoted 35 lines · Pierre Morel
When the guest asks to change the polarization this change is forwarded to the upper layer using QAPI.
The upper layer is supposed to take according decisions concerning CPU provisioning.Signed-off-by Pierre Morel <[email protected]>--- qapi/machine-target.json | 33 +++++++++++++++++++++++++++++++++ hw/s390x/cpu-topology.c | 2 ++ 2 files changed, 35 insertions(+)qapi/machine-target.json +16
-0@@ -391,3 +391,36 @@ 'features': [ 'unstable' ], 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] } } + +## +# @CPU_POLARIZATION_CHANGE: +# +# Emitted when the guest asks to change the polarization. +# +# @polarization: polarization specified by the guest +# +# Features: +# @unstable: This command may still be modified. +# +# The guest can tell the host (via the PTF instruction) whether the +# CPUs should be provisioned using horizontal or vertical polarization. +# +# On horizontal polarization the host is expected to provision all vCPUs +# equally.
qapi/machine-target.json line 419
Quoted 10 lines
qapi/machine-target.json +10
-0+# On vertical polarization the host can provision each vCPU differently. +# The guest will get information on the details of the provisioning +# the next time it uses the STSI(15) instruction. +# +# Since: 8.1 +# +# Example: +# +# <- { "event": "CPU_POLARIZATION_CHANGE", +# "data": { "polarization": 0 },
I think you'd be getting "horizontal" instead of 0.
Quoted 20 lines
qapi/machine-target.json +7
-0+# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } } +## +{ 'event': 'CPU_POLARIZATION_CHANGE', + 'data': { 'polarization': 'CpuS390Polarization' }, + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +}hw/s390x/cpu-topology.c +1
-0@@ -17,6 +17,7 @@#include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/cpu-topology.h" #include "qapi/qapi-commands-machine-target.h" +#include "qapi/qapi-events-machine-target.h" /* * s390_topology is used to keep the topology information.
hw/s390x/cpu-topology.c void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra) · line 142
Quoted 4 lines
hw/s390x/cpu-topology.c +1
-0@@ -138,6 +139,7 @@ void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra) }else { s390_topology.vertical_polarization = !!fc;s390_cpu_topology_set_changed (true); +qapi_event_send_cpu_polarization_change (fc);
I'm not sure I like the implicit conversation of the function code to the enum value. How about you do qapi_event_send_cpu_polarization_change(s390_topology.polarization); and rename vertical_polarization and change it's type to the enum.
You can then also do
+ CpuS390Polarization polarization = S390_CPU_POLARIZATION_HORIZONTAL;
+ switch (fc) {
+ case S390_CPU_POLARIZATION_VERTICAL:+ polarization = S390_CPU_POLARIZATION_VERTICAL;
+ /* fallthrough */
+ case S390_CPU_POLARIZATION_HORIZONTAL:
+ if (s390_topology.polarization == polarization) {
and use the value for the assignment further down, too.
Quoted 3 lines
hw/s390x/cpu-topology.c +0
-0setcc (cpu,0 ); }break ;
Re: [PATCH v20 11/21] qapi/s390x/cpu topology: CPU_POLARIZATION_CHANGE qapi event
Quoted 39 lines · Nina Schoetterl-Glausch
Quoted 38 lines · Pierre Morel
When the guest asks to change the polarization this change is forwarded to the upper layer using QAPI.
The upper layer is supposed to take according decisions concerning CPU provisioning.Signed-off-by Pierre Morel <[email protected]>--- qapi/machine-target.json | 33 +++++++++++++++++++++++++++++++++ hw/s390x/cpu-topology.c | 2 ++ 2 files changed, 35 insertions(+)qapi/machine-target.json +19
-0@@ -391,3 +391,36 @@ 'features': [ 'unstable' ], 'if': { 'all': [ 'TARGET_S390X' , 'CONFIG_KVM' ] } } + +## +# @CPU_POLARIZATION_CHANGE: +# +# Emitted when the guest asks to change the polarization. +# +# @polarization: polarization specified by the guest +# +# Features: +# @unstable: This command may still be modified. +# +# The guest can tell the host (via the PTF instruction) whether the +# CPUs should be provisioned using horizontal or vertical polarization. +# +# On horizontal polarization the host is expected to provision all vCPUs +# equally. +# On vertical polarization the host can provision each vCPU differently. +# The guest will get information on the details of the provisioning +# the next time it uses the STSI(15) instruction.
Quoted 8 lines
qapi/machine-target.json line 419
Quoted 7 lines
qapi/machine-target.json +7
-0+# +# Since: 8.1 +# +# Example: +# +# <- { "event": "CPU_POLARIZATION_CHANGE", +# "data": { "polarization": 0 },I think you'd be getting "horizontal" instead of 0.
you are right.
Quoted 38 lines
Quoted 21 lines
qapi/machine-target.json +7
-0+# "timestamp": { "seconds": 1401385907, "microseconds": 422329 } } +## +{ 'event': 'CPU_POLARIZATION_CHANGE', + 'data': { 'polarization': 'CpuS390Polarization' }, + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +}hw/s390x/cpu-topology.c +1
-0@@ -17,6 +17,7 @@#include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/cpu-topology.h" #include "qapi/qapi-commands-machine-target.h" +#include "qapi/qapi-events-machine-target.h" /* * s390_topology is used to keep the topology information. hw/s390x/cpu-topology.c void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra) · line 142
Quoted 4 lines
hw/s390x/cpu-topology.c +1
-0@@ -138,6 +139,7 @@ void s390_handle_ptf(S390CPU *cpu, uint8_t r1, uintptr_t ra) }else { s390_topology.vertical_polarization = !!fc;s390_cpu_topology_set_changed (true); +qapi_event_send_cpu_polarization_change (fc);I'm not sure I like the implicit conversation of the function code to the enum value. How about you do
qapi_event_send_cpu_polarization_change(s390_topology.polarization); and renamevertical_polarizationand change it's type to the enum.
You can then also do(quoted diff) +7
-0+ CpuS390Polarization polarization = S390_CPU_POLARIZATION_HORIZONTAL; + switch (fc) { + case S390_CPU_POLARIZATION_VERTICAL: + polarization = S390_CPU_POLARIZATION_VERTICAL; + /* fallthrough */ + case S390_CPU_POLARIZATION_HORIZONTAL: + if (s390_topology.polarization == polarization) {
Quoted 1 line
and use the value for the assignment further down, too.
OK, that look good.
I guess I have to modify the patch 8 on handle_ptf ,
Quoted 3 lines
Quoted 3 lines
hw/s390x/cpu-topology.c +0
-0setcc (cpu,0 ); }break ;
PATCH v20 12/21 qapi/s390x/cpu topology: query-cpu-polarization qmp command
In reply to Pierre MorelThe query-cpu-polarization qmp command returns the current CPU polarization of the machine.
--- qapi/machine-target.json | 30 ++++++++++++++++++++++++++++++ hw/s390x/cpu-topology.c | 14 ++++++++++++++ 2 files changed, 44 insertions(+)
qapi/machine-target.json +30 -0
@@ -4,6 +4,7 @@ # 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': 'common.json' } { 'include': 'machine-common.json' } ##
@@ -424,3 +425,32 @@ 'features': [ 'unstable' ], 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } } + +## +# @CpuPolarizationInfo: +# +# The result of a cpu polarization +# +# @polarization: the CPU polarization +# +# Since: 2.8 +## +{ 'struct': 'CpuPolarizationInfo', + 'data': { 'polarization': 'CpuS390Polarization' }, + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +} + +## +# @query-cpu-polarization: +# +# Features: +# @unstable: This command may still be modified. +# +# Returns: the machine polarization +# +# Since: 8.1 +## +{ 'command': 'query-cpu-polarization', 'returns': 'CpuPolarizationInfo', + 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +}
hw/s390x/cpu-topology.c +14 -0
@@ -18,6 +18,7 @@#include "hw/s390x/cpu-topology.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/qapi-events-machine-target.h" +#include "qapi/type-helpers.h" /* * s390_topology is used to keep the topology information.
@@ -468,3 +469,16 @@ void qmp_set_cpu_topology(uint16_t core, has_drawer, drawer, has_entitlement, entitlement, has_dedicated, dedicated, errp); } + +CpuPolarizationInfo *qmp_query_cpu_polarization (Error **errp) +{ +CpuPolarizationInfo *info =g_new0 (CpuPolarizationInfo,1 ); + +if (s390_topology.vertical_polarization) { + info->polarization =S390_CPU_POLARIZATION_VERTICAL ; + }else { + info->polarization =S390_CPU_POLARIZATION_HORIZONTAL ; + } + +return info; +}
Signature · 1 line
2.31.1
Re: [PATCH v20 12/21] qapi/s390x/cpu topology: query-cpu-polarization qmp command
Quoted 14 lines · Pierre Morel
The query-cpu-polarization qmp command returns the current CPU polarization of the machine.
Signed-off-by Pierre Morel <[email protected]>--- qapi/machine-target.json | 30 ++++++++++++++++++++++++++++++ hw/s390x/cpu-topology.c | 14 ++++++++++++++ 2 files changed, 44 insertions(+)qapi/machine-target.json +0
-0
qapi/machine-target.json line 7
Quoted 4 lines
qapi/machine-target.json +1
-0@@ -4,6 +4,7 @@ # 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': 'common.json' }
Why do you need this?
Quoted 6 lines
qapi/machine-target.json +0
-0{ 'include': 'machine-common.json' } ##@@ -424,3 +425,32 @@ 'features': [ 'unstable' ], 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }
qapi/machine-target.json line 436
Quoted 10 lines
qapi/machine-target.json +9
-0} + +## +# @CpuPolarizationInfo: +# +# The result of a cpu polarization +# +# @polarization: the CPU polarization +# +# Since: 2.8
2.8?
Quoted 7 lines
qapi/machine-target.json +7
-0+## +{ 'struct': 'CpuPolarizationInfo', + 'data': { 'polarization': 'CpuS390Polarization' }, + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +} + +##
qapi/machine-target.json line 453
Quoted 10 lines
qapi/machine-target.json +10
-0+# @query-cpu-polarization: +# +# Features: +# @unstable: This command may still be modified. +# +# Returns: the machine polarization +# +# Since: 8.1 +## +{ 'command': 'query-cpu-polarization', 'returns': 'CpuPolarizationInfo',
Do you need the struct or could you use CpuS390Polarization directly here? The struct allows for more flexibility in the future, I can't imagine a reason why it'd be necessary, but I'm not opposed.
hw/s390x/cpu-topology.c line 21
Quoted 12 lines
qapi/machine-target.json +3
-0+ 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +}hw/s390x/cpu-topology.c +1
-0@@ -18,6 +18,7 @@#include "hw/s390x/cpu-topology.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/qapi-events-machine-target.h" +#include "qapi/type-helpers.h"
What do you need this include for?
Quoted 20 lines
hw/s390x/cpu-topology.c +13
-0/* * s390_topology is used to keep the topology information. @@ -468,3 +469,16 @@ void qmp_set_cpu_topology(uint16_t core, has_drawer, drawer, has_entitlement, entitlement, has_dedicated, dedicated, errp); } + +CpuPolarizationInfo *qmp_query_cpu_polarization (Error **errp) +{ +CpuPolarizationInfo *info =g_new0 (CpuPolarizationInfo,1 ); + +if (s390_topology.vertical_polarization) { + info->polarization =S390_CPU_POLARIZATION_VERTICAL ; + }else { + info->polarization =S390_CPU_POLARIZATION_HORIZONTAL ; + } + +return info; +}
Re: [PATCH v20 12/21] qapi/s390x/cpu topology: query-cpu-polarization qmp command
Quoted 18 lines · Nina Schoetterl-Glausch
Quoted 17 lines · Pierre Morel
The query-cpu-polarization qmp command returns the current CPU polarization of the machine.
Signed-off-by Pierre Morel <[email protected]>--- qapi/machine-target.json | 30 ++++++++++++++++++++++++++++++ hw/s390x/cpu-topology.c | 14 ++++++++++++++ 2 files changed, 44 insertions(+)qapi/machine-target.json +0
-0@@ -4,6 +4,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or later. # See the COPYING file in the top-level directory.
Quoted 2 lines
qapi/machine-target.json line 7
Quoted 1 line
qapi/machine-target.json +1
-0+{ 'include': 'common.json' }Why do you need this?
exact, I do not need it.
Quoted 18 lines
Quoted 7 lines
qapi/machine-target.json +0
-0{ 'include': 'machine-common.json' } ##@@ -424,3 +425,32 @@ 'features': [ 'unstable' ], 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] }qapi/machine-target.json line 436
Quoted 10 lines
qapi/machine-target.json +9
-0} + +## +# @CpuPolarizationInfo: +# +# The result of a cpu polarization +# +# @polarization: the CPU polarization +# +# Since: 2.82.8?
yes, 8.1
Quoted 13 lines
Quoted 13 lines
qapi/machine-target.json +12
-0+## +{ 'struct': 'CpuPolarizationInfo', + 'data': { 'polarization': 'CpuS390Polarization' }, + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +} + +## +# @query-cpu-polarization: +# +# Features: +# @unstable: This command may still be modified. +#
Quoted 8 lines
qapi/machine-target.json line 453
Quoted 5 lines
qapi/machine-target.json +5
-0+# Returns: the machine polarization +# +# Since: 8.1 +## +{ 'command': 'query-cpu-polarization', 'returns': 'CpuPolarizationInfo',Do you need the struct or could you use CpuS390Polarization directly here? The struct allows for more flexibility in the future, I can't imagine a reason why it'd be necessary, but I'm not opposed.
That is what I thought, keeping flexibility.
Quoted 15 lines
Quoted 10 lines
qapi/machine-target.json +3
-0+ 'features': [ 'unstable' ], + 'if': { 'all': [ 'TARGET_S390X', 'CONFIG_KVM' ] } +}hw/s390x/cpu-topology.c +0
-0hw/s390x/cpu-topology.c line 21
Quoted 4 lines
hw/s390x/cpu-topology.c +1
-0@@ -18,6 +18,7 @@#include "hw/s390x/cpu-topology.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/qapi-events-machine-target.h" +#include "qapi/type-helpers.h" What do you need this include for?
I do not need it.
Quoted 13 lines
Quoted 13 lines
hw/s390x/cpu-topology.c +5
-0/* * s390_topology is used to keep the topology information. @@ -468,3 +469,16 @@ void qmp_set_cpu_topology(uint16_t core, has_drawer, drawer, has_entitlement, entitlement, has_dedicated, dedicated, errp); } + +CpuPolarizationInfo *qmp_query_cpu_polarization (Error **errp) +{ +CpuPolarizationInfo *info =g_new0 (CpuPolarizationInfo,1 ); +
Quoted 8 lines
hw/s390x/cpu-topology.c void qmp_set_cpu_topology(uint16_t core, · line 484
Quoted 8 lines
hw/s390x/cpu-topology.c +8
-0+if (s390_topology.vertical_polarization) { + info->polarization =S390_CPU_POLARIZATION_VERTICAL ; + }else { + info->polarization =S390_CPU_POLARIZATION_HORIZONTAL ; + } + +return info; +}
Thanks,
I will clean this leftovers from the first draw.
Regards
Pierre
PATCH v20 13/21 docs/s390x/cpu topology: document s390x cpu topology
In reply to Pierre MorelAdd some basic examples for the definition of cpu topology in s390x.
--- MAINTAINERS | 2 + docs/devel/index-internals.rst | 1 + docs/devel/s390-cpu-topology.rst | 162 +++++++++++++++++++ docs/system/s390x/cpu-topology.rst | 240 +++++++++++++++++++++++++++++ docs/system/target-s390x.rst | 1 + 5 files changed, 406 insertions(+) create mode 100644 docs/devel/s390-cpu-topology.rst create mode 100644 docs/system/s390x/cpu-topology.rst
MAINTAINERS +2 -0
@@ -1660,6 +1660,8 @@ S: Supported F: include/hw/s390x/cpu-topology.h F: hw/s390x/cpu-topology.c F: target/s390x/kvm/cpu_topology.c +F: docs/devel/s390-cpu-topology.rst +F: docs/system/s390x/cpu-topology.rst X86 Machines ------------
docs/devel/index-internals.rst +1 -0
@@ -14,6 +14,7 @@ Details about QEMU's various subsystems including how to add features to them. migration multi-process reset + s390-cpu-topology s390-dasd-ipl tracing vfio-migration
docs/devel/s390-cpu-topology.rst new file +162 -0
162 lines not on this page · raw message
docs/system/s390x/cpu-topology.rst new file +240 -0
240 lines not on this page · raw message
docs/system/target-s390x.rst +1 -0
@@ -34,3 +34,4 @@ Architectural features .. toctree:: s390x/bootdevices s390x/protvirt + s390x/cpu-topology
Signature · 1 line
2.31.1
PATCH v20 14/21 tests/avocado: s390x cpu topology core
In reply to Pierre MorelIntroduction of the s390x cpu topology core functions and basic tests.
We test the corelation between the command line and the QMP results in query-cpus-fast for various CPU topology.
--- MAINTAINERS | 1 + tests/avocado/s390_topology.py | 208 +++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 tests/avocado/s390_topology.py
MAINTAINERS +1 -0
@@ -1662,6 +1662,7 @@ F: hw/s390x/cpu-topology.c F: target/s390x/kvm/cpu_topology.c F: docs/devel/s390-cpu-topology.rst F: docs/system/s390x/cpu-topology.rst +F: tests/avocado/s390_topology.py X86 Machines ------------
tests/avocado/s390_topology.py new file +208 -0
208 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [PATCH v20 14/21] tests/avocado: s390x cpu topology core
Quoted 45 lines · Pierre Morel
Introduction of the s390x cpu topology core functions and basic tests.
We test the corelation between the command line and the QMP results in query-cpus-fast for various CPU topology.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 1 + tests/avocado/s390_topology.py | 208 +++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 tests/avocado/s390_topology.pyMAINTAINERS +1
-0@@ -1662,6 +1662,7 @@ F: hw/s390x/cpu-topology.c F: target/s390x/kvm/cpu_topology.c F: docs/devel/s390-cpu-topology.rst F: docs/system/s390x/cpu-topology.rst +F: tests/avocado/s390_topology.py X86 Machines ------------tests/avocado/s390_topology.py new file +14
-0@@ -0,0 +1,208 @@ +# Functional test that boots a Linux kernel and checks the console +# +# Copyright IBM Corp. 2023 +# +# Author: +# Pierre Morel <[email protected]> +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import os +import shutil +import time +
tests/avocado/s390_topology.py line 24
Quoted 10 lines
tests/avocado/s390_topology.py new file +10
-0+from avocado_qemu import QemuSystemTest +from avocado_qemu import exec_command +from avocado_qemu import exec_command_and_wait_for_pattern +from avocado_qemu import interrupt_interactive_console_until_pattern +from avocado_qemu import wait_for_console_pattern +from avocado.utils import process +from avocado.utils import archive + + +class LinuxKernelTest(QemuSystemTest):
I'd get rid of this class, unless you plan to use it for more children.
tests/avocado/s390_topology.py line 27
Quoted 3 lines
tests/avocado/s390_topology.py new file +3
-0+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + + def wait_for_console_pattern(self, success_message, vm=None):
You always use the same args for this function, I'd refactor it into def wait_until_booted(self):
Quoted 20 lines
tests/avocado/s390_topology.py new file +20
-0+ wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + +class S390CPUTopology(LinuxKernelTest): + """ + S390x CPU topology consist of 4 topology layers, from bottom to top, + the cores, sockets, books and drawers and 2 modifiers attributes, + the entitlement and the dedication. + See: docs/system/s390x/cpu-topology.rst. + + S390x CPU topology is setup in different ways: + - implicitely from the '-smp' argument by completing each topology + level one after the other begining with drawer 0, book 0 and socket 0. + - explicitely from the '-device' argument on the QEMU command line + - explicitely by hotplug of a new CPU using QMP or HMP + - it is modified by using QMP 'set-cpu-topology' + + The S390x modifier attribute entitlement depends on the machine
tests/avocado/s390_topology.py line 57
Quoted 10 lines
tests/avocado/s390_topology.py new file +10
-0+ polarization, which can be horizontal or vertical. + The polarization is changed on a request from the guest. + """ + timeout = 90 + + + def check_topology(self, c, s, b, d, e, t): + res = self.vm.qmp('query-cpus-fast') + line = res['return'] + for x in line:
for cpu in cpus
Quoted 35 lines
tests/avocado/s390_topology.py new file +35
-0+ core = x['props']['core-id'] + socket = x['props']['socket-id'] + book = x['props']['book-id'] + drawer = x['props']['drawer-id'] + entitlement = x['entitlement'] + dedicated = x['dedicated'] + if core == c: + self.assertEqual(drawer, d) + self.assertEqual(book, b) + self.assertEqual(socket, s) + self.assertEqual(entitlement, e) + self.assertEqual(dedicated, t) + + def kernel_init(self): + """ + We need a kernel supporting the CPU topology. + We need a minimal root filesystem with a shell. + """ + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/35/Server/s390x/os' + '/images/kernel.img') + kernel_hash = '0d1aaaf303f07cf0160c8c48e56fe638' + kernel_path = self.fetch_asset(kernel_url, algorithm='md5', + asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/35/Server/s390x/os' + '/images/initrd.img') + initrd_hash = 'a122057d95725ac030e2ec51df46e172' + initrd_path_xz = self.fetch_asset(initrd_url, algorithm='md5', + asset_hash=initrd_hash) + initrd_path = os.path.join(self.workdir, 'initrd-raw.img') + archive.lzma_uncompress(initrd_path_xz, initrd_path) + + self.vm.set_console()
tests/avocado/s390_topology.py line 102
Quoted 10 lines
tests/avocado/s390_topology.py new file +10
-0+ kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'root=/dev/ram ' + 'selinux=0 ' + 'rdinit=/bin/sh') + self.vm.add_args('-nographic', + '-enable-kvm', + '-cpu', 'z14,ctop=on', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa',
What is the meaning of those flags (name & uuid), do you need them? Where does the value for the uuid come from?
tests/avocado/s390_topology.py line 107
Quoted 5 lines
tests/avocado/s390_topology.py new file +5
-0+ '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line) + + def test_single(self):
Why no comment and avocado tags here?
tests/avocado/s390_topology.py line 115
Quoted 8 lines
tests/avocado/s390_topology.py new file +8
-0+ self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_default(self): + """ + This test checks the implicite topology.
s/implicite/implicit/
Quoted 51 lines
tests/avocado/s390_topology.py new file +51
-0+ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.launch() + self.wait_for_console_pattern('no job control') + self.check_topology(0, 0, 0, 0, 'medium', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'medium', False) + self.check_topology(3, 1, 0, 0, 'medium', False) + self.check_topology(4, 2, 0, 0, 'medium', False) + self.check_topology(5, 2, 0, 0, 'medium', False) + self.check_topology(6, 0, 1, 0, 'medium', False) + self.check_topology(7, 0, 1, 0, 'medium', False) + self.check_topology(8, 1, 1, 0, 'medium', False) + self.check_topology(9, 1, 1, 0, 'medium', False) + self.check_topology(10, 2, 1, 0, 'medium', False) + self.check_topology(11, 2, 1, 0, 'medium', False) + self.check_topology(12, 0, 0, 1, 'medium', False) + + def test_move(self): + """ + This test checks the topology modification by moving a CPU + to another socket: CPU 0 is moved from socket 0 to socket 2. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.check_topology(0, 0, 0, 0, 'medium', False) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'socket-id': 2, 'entitlement': 'low'}) + self.assertEqual(res['return'], {}) + self.check_topology(0, 2, 0, 0, 'low', False) + + def test_hotplug(self): + """ + This test verifies that a CPU defined with '-device' command line + argument finds its right place inside the topology. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """
tests/avocado/s390_topology.py line 176
Quoted 10 lines
tests/avocado/s390_topology.py new file +10
-0+ self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=10') + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.check_topology(10, 2, 1, 0, 'medium', False) + + def test_hotplug_full(self):
I would unite this test with the previous one.
Both test -device with some values missing.
Quoted 22 lines
tests/avocado/s390_topology.py new file +22
-0+ """ + This test verifies that a hotplugged fully defined with '-device' + command line argument finds its right place inside the topology. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=1,socket-id=0,book-id=1,drawer-id=1,entitlement=low') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=2,socket-id=0,book-id=1,drawer-id=1,entitlement=medium') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=3,socket-id=1,book-id=1,drawer-id=1,entitlement=high') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=4,socket-id=1,book-id=1,drawer-id=1')
tests/avocado/s390_topology.py line 208
Quoted 10 lines
tests/avocado/s390_topology.py new file +10
-0+ self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=5,socket-id=2,book-id=1,drawer-id=1,dedicated=true') + self.vm.launch() + self.wait_for_console_pattern('no job control') + self.check_topology(1, 0, 1, 1, 'low', False) + self.check_topology(2, 0, 1, 1, 'medium', False) + self.check_topology(3, 1, 1, 1, 'high', False) + self.check_topology(4, 1, 1, 1, 'medium', False) + self.check_topology(5, 2, 1, 1, 'high', True)
Looks good all in all.
Re: [PATCH v20 14/21] tests/avocado: s390x cpu topology core
Quoted 49 lines · Nina Schoetterl-Glausch
Quoted 48 lines · Pierre Morel
Introduction of the s390x cpu topology core functions and basic tests.
We test the corelation between the command line and the QMP results in query-cpus-fast for various CPU topology.
Signed-off-by Pierre Morel <[email protected]>--- MAINTAINERS | 1 + tests/avocado/s390_topology.py | 208 +++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+)create mode 100644
tests/avocado/s390_topology.pyMAINTAINERS +1
-0@@ -1662,6 +1662,7 @@ F: hw/s390x/cpu-topology.c F: target/s390x/kvm/cpu_topology.c F: docs/devel/s390-cpu-topology.rst F: docs/system/s390x/cpu-topology.rst +F: tests/avocado/s390_topology.py X86 Machines ------------tests/avocado/s390_topology.py new file +17
-0@@ -0,0 +1,208 @@ +# Functional test that boots a Linux kernel and checks the console +# +# Copyright IBM Corp. 2023 +# +# Author: +# Pierre Morel <[email protected]> +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import os +import shutil +import time + +from avocado_qemu import QemuSystemTest +from avocado_qemu import exec_command +from avocado_qemu import exec_command_and_wait_for_pattern
Quoted 8 lines
tests/avocado/s390_topology.py line 24
Quoted 7 lines
tests/avocado/s390_topology.py new file +7
-0+from avocado_qemu import interrupt_interactive_console_until_pattern +from avocado_qemu import wait_for_console_pattern +from avocado.utils import process +from avocado.utils import archive + + +class LinuxKernelTest(QemuSystemTest):I'd get rid of this class, unless you plan to use it for more children.
OK
Quoted 6 lines
tests/avocado/s390_topology.py line 27
Quoted 4 lines
tests/avocado/s390_topology.py new file +3
-0+ KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' + + def wait_for_console_pattern(self, success_message, vm=None):You always use the same args for this function, I'd refactor it into def
wait_until_booted(self):
OK
Quoted 24 lines
Quoted 24 lines
tests/avocado/s390_topology.py new file +23
-0+ wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + +class S390CPUTopology(LinuxKernelTest): + """ + S390x CPU topology consist of 4 topology layers, from bottom to top, + the cores, sockets, books and drawers and 2 modifiers attributes, + the entitlement and the dedication. + See: docs/system/s390x/cpu-topology.rst. + + S390x CPU topology is setup in different ways: + - implicitely from the '-smp' argument by completing each topology + level one after the other begining with drawer 0, book 0 and socket 0. + - explicitely from the '-device' argument on the QEMU command line + - explicitely by hotplug of a new CPU using QMP or HMP + - it is modified by using QMP 'set-cpu-topology' + + The S390x modifier attribute entitlement depends on the machine + polarization, which can be horizontal or vertical. + The polarization is changed on a request from the guest. + """
Quoted 8 lines
tests/avocado/s390_topology.py line 57
Quoted 7 lines
tests/avocado/s390_topology.py new file +7
-0+ timeout = 90 + + + def check_topology(self, c, s, b, d, e, t): + res = self.vm.qmp('query-cpus-fast') + line = res['return'] + for x in line:for cpu in cpus
Yes indeed we are working with CPU so it is better
Quoted 40 lines
Quoted 40 lines
tests/avocado/s390_topology.py new file +39
-0+ core = x['props']['core-id'] + socket = x['props']['socket-id'] + book = x['props']['book-id'] + drawer = x['props']['drawer-id'] + entitlement = x['entitlement'] + dedicated = x['dedicated'] + if core == c: + self.assertEqual(drawer, d) + self.assertEqual(book, b) + self.assertEqual(socket, s) + self.assertEqual(entitlement, e) + self.assertEqual(dedicated, t) + + def kernel_init(self): + """ + We need a kernel supporting the CPU topology. + We need a minimal root filesystem with a shell. + """ + kernel_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/35/Server/s390x/os' + '/images/kernel.img') + kernel_hash = '0d1aaaf303f07cf0160c8c48e56fe638' + kernel_path = self.fetch_asset(kernel_url, algorithm='md5', + asset_hash=kernel_hash) + + initrd_url = ('https://archives.fedoraproject.org/pub/archive' + '/fedora-secondary/releases/35/Server/s390x/os' + '/images/initrd.img') + initrd_hash = 'a122057d95725ac030e2ec51df46e172' + initrd_path_xz = self.fetch_asset(initrd_url, algorithm='md5', + asset_hash=initrd_hash) + initrd_path = os.path.join(self.workdir, 'initrd-raw.img') + archive.lzma_uncompress(initrd_path_xz, initrd_path) + + self.vm.set_console() + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + + 'root=/dev/ram ' + 'selinux=0 ' + 'rdinit=/bin/sh')
Quoted 8 lines
tests/avocado/s390_topology.py line 102
Quoted 6 lines
tests/avocado/s390_topology.py new file +6
-0+ self.vm.add_args('-nographic', + '-enable-kvm', + '-cpu', 'z14,ctop=on', + '-m', '512', + '-name', 'Some Guest Name', + '-uuid', '30de4fd9-b4d5-409e-86a5-09b387f70bfa',What is the meaning of those flags (name & uuid), do you need them? Where does the value for the uuid come from?
I do not need them
Quoted 7 lines
tests/avocado/s390_topology.py line 107
Quoted 6 lines
tests/avocado/s390_topology.py new file +5
-0+ '-kernel', kernel_path, + '-initrd', initrd_path, + '-append', kernel_command_line) + + def test_single(self):Why no comment and avocado tags here?
just forgot
thanks for the catch
Quoted 10 lines
tests/avocado/s390_topology.py line 115
Quoted 9 lines
tests/avocado/s390_topology.py new file +8
-0+ self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_default(self): + """ + This test checks the implicite topology.s/implicite/implicit/
thx
Quoted 56 lines
Quoted 56 lines
tests/avocado/s390_topology.py new file +55
-0+ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.launch() + self.wait_for_console_pattern('no job control') + self.check_topology(0, 0, 0, 0, 'medium', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'medium', False) + self.check_topology(3, 1, 0, 0, 'medium', False) + self.check_topology(4, 2, 0, 0, 'medium', False) + self.check_topology(5, 2, 0, 0, 'medium', False) + self.check_topology(6, 0, 1, 0, 'medium', False) + self.check_topology(7, 0, 1, 0, 'medium', False) + self.check_topology(8, 1, 1, 0, 'medium', False) + self.check_topology(9, 1, 1, 0, 'medium', False) + self.check_topology(10, 2, 1, 0, 'medium', False) + self.check_topology(11, 2, 1, 0, 'medium', False) + self.check_topology(12, 0, 0, 1, 'medium', False) + + def test_move(self): + """ + This test checks the topology modification by moving a CPU + to another socket: CPU 0 is moved from socket 0 to socket 2. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.check_topology(0, 0, 0, 0, 'medium', False) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'socket-id': 2, 'entitlement': 'low'}) + self.assertEqual(res['return'], {}) + self.check_topology(0, 2, 0, 0, 'low', False) + + def test_hotplug(self): + """ + This test verifies that a CPU defined with '-device' command line + argument finds its right place inside the topology. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=10')
Quoted 8 lines
tests/avocado/s390_topology.py line 176
Quoted 6 lines
tests/avocado/s390_topology.py new file +6
-0+ self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.check_topology(10, 2, 1, 0, 'medium', False) + + def test_hotplug_full(self):I would unite this test with the previous one.
Both test -device with some values missing.
OK
Quoted 33 lines
Quoted 23 lines
tests/avocado/s390_topology.py new file +22
-0+ """ + This test verifies that a hotplugged fully defined with '-device' + command line argument finds its right place inside the topology. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=1,socket-id=0,book-id=1,drawer-id=1,entitlement=low') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=2,socket-id=0,book-id=1,drawer-id=1,entitlement=medium') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=3,socket-id=1,book-id=1,drawer-id=1,entitlement=high') + self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=4,socket-id=1,book-id=1,drawer-id=1')tests/avocado/s390_topology.py line 208
Quoted 10 lines
tests/avocado/s390_topology.py new file +10
-0+ self.vm.add_args('-device', + 'z14-s390x-cpu,' + 'core-id=5,socket-id=2,book-id=1,drawer-id=1,dedicated=true') + self.vm.launch() + self.wait_for_console_pattern('no job control') + self.check_topology(1, 0, 1, 1, 'low', False) + self.check_topology(2, 0, 1, 1, 'medium', False) + self.check_topology(3, 1, 1, 1, 'high', False) + self.check_topology(4, 1, 1, 1, 'medium', False) + self.check_topology(5, 2, 1, 1, 'high', True)
Quoted 1 line
Looks good all in all.
Thanks for the comment, I update all.
Regards,
Pierre
PATCH v20 15/21 tests/avocado: s390x cpu topology polarisation
In reply to Pierre MorelPolarization is changed on a request from the guest. Let's verify the polarization is accordingly set by QEMU.
--- tests/avocado/s390_topology.py | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
tests/avocado/s390_topology.py +38 -0
@@ -104,6 +104,15 @@ def kernel_init(self): '-initrd', initrd_path, '-append', kernel_command_line) + def system_init(self): + self.log.info("System init") + exec_command(self, 'mount proc -t proc /proc') + time.sleep(0.2) + exec_command(self, 'mount sys -t sysfs /sys') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + def test_single(self): self.kernel_init() self.vm.launch()
@@ -206,3 +215,32 @@ def test_hotplug_full(self): self.check_topology(3, 1, 1, 1, 'high', False) self.check_topology(4, 1, 1, 1, 'medium', False) self.check_topology(5, 2, 1, 1, 'high', True) + + def test_polarisation(self): + """ + This test verifies that QEMU modifies the entitlement change after + several guest polarization change requests. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + self.check_topology(0, 0, 0, 0, 'medium', False) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + self.check_topology(0, 0, 0, 0, 'medium', False) + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + self.check_topology(0, 0, 0, 0, 'medium', False)
Signature · 1 line
2.31.1
Re: [PATCH v20 15/21] tests/avocado: s390x cpu topology polarisation
Try to be consistent in the spelling of polarization. You use an s in the title and in the test name below.
Quoted 29 lines · Pierre Morel
Polarization is changed on a request from the guest. Let's verify the polarization is accordingly set by QEMU.
Signed-off-by Pierre Morel <[email protected]>--- tests/avocado/s390_topology.py | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)tests/avocado/s390_topology.py +9
-0@@ -104,6 +104,15 @@ def kernel_init(self): '-initrd', initrd_path, '-append', kernel_command_line) + def system_init(self): + self.log.info("System init") + exec_command(self, 'mount proc -t proc /proc') + time.sleep(0.2) + exec_command(self, 'mount sys -t sysfs /sys') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + def test_single(self): self.kernel_init() self.vm.launch()
tests/avocado/s390_topology.py def test_hotplug_full(self): · line 219
Quoted 5 lines
tests/avocado/s390_topology.py +2
-0@@ -206,3 +215,32 @@ def test_hotplug_full(self): self.check_topology(3, 1, 1, 1, 'high', False) self.check_topology(4, 1, 1, 1, 'medium', False) self.check_topology(5, 2, 1, 1, 'high', True) + + def test_polarisation(self):
I would unite this test with test_query_polarization, they are very similar.
Quoted 6 lines
tests/avocado/s390_topology.py +6
-0+ """ + This test verifies that QEMU modifies the entitlement change after + several guest polarization change requests. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio
tests/avocado/s390_topology.py def test_hotplug_full(self): · line 235
Quoted 10 lines
tests/avocado/s390_topology.py +10
-0+ """ + self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + self.check_topology(0, 0, 0, 0, 'medium', False) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2)
Can you find a way to wait for the event here?
tests/avocado/s390_topology.py def test_hotplug_full(self): · line 237
Quoted 2 lines
tests/avocado/s390_topology.py +2
-0+ exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1')
I think it would be good to refactor this snippet into a function.
def guest_set_dispatching(self, dispatching):
exec_command(self, f'echo {dispatching} > /sys/devices/system/cpu/dispatching') #TODO wait
exec_command_and_wait_for_pattern(self,
'/bin/cat /sys/devices/system/cpu/dispatching', dispatching)
or similar, you could also put the path into a variable.
Quoted 9 lines
tests/avocado/s390_topology.py +9
-0+ + self.check_topology(0, 0, 0, 0, 'medium', False) + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + self.check_topology(0, 0, 0, 0, 'medium', False)
Re: [PATCH v20 15/21] tests/avocado: s390x cpu topology polarisation
Quoted 31 lines · Nina Schoetterl-Glausch
Try to be consistent in the spelling of polarization. You use an s in the title and in the test name below.
Quoted 27 lines · Pierre Morel
Polarization is changed on a request from the guest. Let's verify the polarization is accordingly set by QEMU.
Signed-off-by Pierre Morel <[email protected]>--- tests/avocado/s390_topology.py | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)tests/avocado/s390_topology.py +9
-0@@ -104,6 +104,15 @@ def kernel_init(self): '-initrd', initrd_path, '-append', kernel_command_line) + def system_init(self): + self.log.info("System init") + exec_command(self, 'mount proc -t proc /proc') + time.sleep(0.2) + exec_command(self, 'mount sys -t sysfs /sys') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + def test_single(self): self.kernel_init()
Quoted 8 lines
tests/avocado/s390_topology.py def test_hotplug_full(self): · line 219
Quoted 7 lines
tests/avocado/s390_topology.py +2
-0self.vm.launch()@@ -206,3 +215,32 @@ def test_hotplug_full(self): self.check_topology(3, 1, 1, 1, 'high', False) self.check_topology(4, 1, 1, 1, 'medium', False) self.check_topology(5, 2, 1, 1, 'high', True) + + def test_polarisation(self):I would unite this test with
test_query_polarization, they are very similar.
Yes I find now that this test is of little interest.
I will merge it with test_query_polarization as you propose.
it is much better as man can see that the
Quoted 10 lines
Quoted 10 lines
tests/avocado/s390_topology.py +9
-0+ """ + This test verifies that QEMU modifies the entitlement change after + several guest polarization change requests. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.launch()
Quoted 8 lines
tests/avocado/s390_topology.py def test_hotplug_full(self): · line 235
Quoted 7 lines
tests/avocado/s390_topology.py +7
-0+ self.wait_for_console_pattern('no job control') + + self.system_init() + self.check_topology(0, 0, 0, 0, 'medium', False) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2)Can you find a way to wait for the event here?
Right, I can wait for CPU_POLARIZATION_CHANGE
Quoted 5 lines
tests/avocado/s390_topology.py def test_hotplug_full(self): · line 237
Quoted 3 lines
tests/avocado/s390_topology.py +2
-0+ exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1')I think it would be good to refactor this snippet into a function.
Quoted 7 lines
def
guest_set_dispatching(self, dispatching):
exec_command(self, f'echo {dispatching} > /sys/devices/system/cpu/dispatching')#TODO wait
exec_command_and_wait_for_pattern(self,
'/bin/cat/sys/devices/system/cpu/dispatching', dispatching)or similar, you could also put the path into a variable.
Yes good, I do this
Thanks Nina.
Regards,
Pierre
PATCH v20 16/21 tests/avocado: s390x cpu topology entitlement tests
In reply to Pierre MorelThis test takes care to check the changes on different entitlements when the guest requests a polarization change.
--- tests/avocado/s390_topology.py | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)
tests/avocado/s390_topology.py +56 -0
@@ -244,3 +244,59 @@ def test_polarisation(self): '/bin/cat /sys/devices/system/cpu/dispatching', '0') self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_entitlement(self): + """ + This test verifies that QEMU modifies the polarization + after a guest request. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=3') + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'low'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 1, 'entitlement': 'medium'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 2, 'entitlement': 'high'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 3, 'entitlement': 'high'}) + self.assertEqual(res['return'], {}) + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False) + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False)
Signature · 1 line
2.31.1
Re: [PATCH v20 16/21] tests/avocado: s390x cpu topology entitlement tests
Quoted 21 lines · Pierre Morel
This test takes care to check the changes on different entitlements when the guest requests a polarization change.
Signed-off-by Pierre Morel <[email protected]>--- tests/avocado/s390_topology.py | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)tests/avocado/s390_topology.py +5
-0@@ -244,3 +244,59 @@ def test_polarisation(self): '/bin/cat /sys/devices/system/cpu/dispatching', '0') self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_entitlement(self): + """ + This test verifies that QEMU modifies the polarization + after a guest request.
tests/avocado/s390_topology.py def test_polarisation(self): · line 261
Quoted 10 lines
tests/avocado/s390_topology.py +10
-0+ + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=3')
Why the -device statements? Won't they result in the same as specifying -smp 4,...? Same for patch 17.
Quoted 41 lines
tests/avocado/s390_topology.py +41
-0+ self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'low'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 1, 'entitlement': 'medium'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 2, 'entitlement': 'high'}) + self.assertEqual(res['return'], {}) + res = self.vm.qmp('set-cpu-topology', + {'core-id': 3, 'entitlement': 'high'}) + self.assertEqual(res['return'], {}) + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False) + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + self.check_topology(0, 0, 0, 0, 'low', False) + self.check_topology(1, 0, 0, 0, 'medium', False) + self.check_topology(2, 1, 0, 0, 'high', False) + self.check_topology(3, 1, 0, 0, 'high', False)
Re: [PATCH v20 16/21] tests/avocado: s390x cpu topology entitlement tests
Quoted 26 lines · Nina Schoetterl-Glausch
Quoted 25 lines · Pierre Morel
This test takes care to check the changes on different entitlements when the guest requests a polarization change.
Signed-off-by Pierre Morel <[email protected]>--- tests/avocado/s390_topology.py | 56 ++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+)tests/avocado/s390_topology.py +9
-0@@ -244,3 +244,59 @@ def test_polarisation(self): '/bin/cat /sys/devices/system/cpu/dispatching', '0') self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_entitlement(self): + """ + This test verifies that QEMU modifies the polarization + after a guest request. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """
Quoted 8 lines
tests/avocado/s390_topology.py def test_polarisation(self): · line 261
Quoted 6 lines
tests/avocado/s390_topology.py +6
-0+ self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=3')Why the -device statements? Won't they result in the same as specifying -smp 4,...? Same for patch 17.
A left over.
You are right it is the same.
thanks,
Pierre
PATCH v20 17/21 tests/avocado: s390x cpu topology test dedicated CPU
In reply to Pierre MorelA dedicated CPU in vertical polarization can only have a high entitlement.
Let's check this.
--- tests/avocado/s390_topology.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
tests/avocado/s390_topology.py +34 -0
@@ -300,3 +300,37 @@ def test_entitlement(self): self.check_topology(1, 0, 0, 0, 'medium', False) self.check_topology(2, 1, 0, 0, 'high', False) self.check_topology(3, 1, 0, 0, 'high', False) + + def test_dedicated(self): + """ + This test verifies that QEMU modifies the entitlement change correctly + for a dedicated CPU after several guest polarization change requests. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'dedicated': True}) + self.assertEqual(res['return'], {}) + + self.check_topology(0, 0, 0, 0, 'high', True) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + self.check_topology(0, 0, 0, 0, 'high', True) + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + self.check_topology(0, 0, 0, 0, 'high', True)
Signature · 1 line
2.31.1
PATCH v20 18/21 tests/avocado: s390x cpu topology test socket full
In reply to Pierre MorelThis test verifies that QMP set-cpu-topology does not accept to overload a socket.
--- tests/avocado/s390_topology.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
tests/avocado/s390_topology.py +27 -0
@@ -334,3 +334,30 @@ def test_dedicated(self): '/bin/cat /sys/devices/system/cpu/dispatching', '0') self.check_topology(0, 0, 0, 0, 'high', True) + + def test_socket_full(self): + """ + This test verifies that QEMU does not accept to overload a socket. + The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can + not accept any new CPU while socket-id 0 on book-id 1 is free. + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.add_args('-smp', + '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=1') + self.vm.add_args('-device', 'z14-s390x-cpu,core-id=2') + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 2, 'socket-id': 0, 'book-id': 0}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 2, 'socket-id': 0, 'book-id': 1}) + self.assertEqual(res['return'], {})
Signature · 1 line
2.31.1
PATCH v20 19/21 tests/avocado: s390x cpu topology dedicated errors
In reply to Pierre MorelLet's test that QEMU refuses to setup a dedicated CPU with low or medium entitlement.
--- tests/avocado/s390_topology.py | 51 ++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
tests/avocado/s390_topology.py +51 -0
@@ -361,3 +361,54 @@ def test_socket_full(self): res = self.vm.qmp('set-cpu-topology', {'core-id': 2, 'socket-id': 0, 'book-id': 1}) self.assertEqual(res['return'], {}) + + def test_dedicated_error(self): + """ + This test verifies that QEMU refuses to lower the entitlement + of a dedicated CPU + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'dedicated': True}) + self.assertEqual(res['return'], {}) + + self.check_topology(0, 0, 0, 0, 'high', True) + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + self.check_topology(0, 0, 0, 0, 'high', True) + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'low', 'dedicated': True}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'low'}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'medium', 'dedicated': True}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'medium'}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'low', 'dedicated': False}) + self.assertEqual(res['return'], {}) + + res = self.vm.qmp('set-cpu-topology', + {'core-id': 0, 'entitlement': 'medium', 'dedicated': False}) + self.assertEqual(res['return'], {})
Signature · 1 line
2.31.1
PATCH v20 20/21 tests/avocado: s390x cpu topology bad move
In reply to Pierre MorelThis test verifies that QEMU refuses to move a CPU to an unexistant location.
--- tests/avocado/s390_topology.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
tests/avocado/s390_topology.py +25 -0
@@ -412,3 +412,28 @@ def test_dedicated_error(self): res = self.vm.qmp('set-cpu-topology', {'core-id': 0, 'entitlement': 'medium', 'dedicated': False}) self.assertEqual(res['return'], {}) + + def test_move_error(self): + """ + This test verifies that QEMU refuses to move a CPU to an + unexistant location + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('set-cpu-topology', {'core-id': 0, 'drawer-id': 1}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', {'core-id': 0, 'book-id': 1}) + self.assertEqual(res['error']['class'], 'GenericError') + + res = self.vm.qmp('set-cpu-topology', {'core-id': 0, 'socket-id': 1}) + self.assertEqual(res['error']['class'], 'GenericError') + + self.check_topology(0, 0, 0, 0, 'medium', False)
Signature · 1 line
2.31.1
PATCH v20 21/21 tests/avocado: s390x cpu topology query-cpu-polarization
In reply to Pierre MorelThis test verifies that the qmp query query-cpu-polarization reports correctly the polarization when the guest requests a polarization change.
--- tests/avocado/s390_topology.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
tests/avocado/s390_topology.py +33 -0
@@ -437,3 +437,36 @@ def test_move_error(self): self.assertEqual(res['error']['class'], 'GenericError') self.check_topology(0, 0, 0, 0, 'medium', False) + + def test_query_polarization(self): + """ + This test verifies that query-cpu-polarization gives the right + answer + + :avocado: tags=arch:s390x + :avocado: tags=machine:s390-ccw-virtio + """ + self.kernel_init() + self.vm.launch() + self.wait_for_console_pattern('no job control') + + self.system_init() + + res = self.vm.qmp('query-cpu-polarization') + self.assertEqual(res['return']['polarization'], 'horizontal') + + exec_command(self, 'echo 1 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '1') + + res = self.vm.qmp('query-cpu-polarization') + self.assertEqual(res['return']['polarization'], 'vertical') + + exec_command(self, 'echo 0 > /sys/devices/system/cpu/dispatching') + time.sleep(0.2) + exec_command_and_wait_for_pattern(self, + '/bin/cat /sys/devices/system/cpu/dispatching', '0') + + res = self.vm.qmp('query-cpu-polarization') + self.assertEqual(res['return']['polarization'], 'horizontal')
Signature · 1 line
2.31.1