| Message ID | 20221208094432.9732-2-pmorel@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: CPU Topology | expand |
On 08/12/2022 10.44, Pierre Morel wrote: > We will need a Topology device to transfer the topology > during migration and to implement machine reset. > > The device creation is fenced by s390_has_topology(). > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- [...] > diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c > new file mode 100644 > index 0000000000..b3e59873f6 > --- /dev/null > +++ b/hw/s390x/cpu-topology.c > @@ -0,0 +1,149 @@ > +/* > + * CPU Topology > + * > + * Copyright IBM Corp. 2022 > + * Author(s): Pierre Morel <pmorel@linux.ibm.com> > + > + * This work is licensed under the terms of the GNU GPL, version 2 or (at > + * your option) any later version. See the COPYING file in the top-level > + * directory. > + */ > + > +#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_has_topology > + * > + * Return false until the commit activating the topology is > + * commited. > + */ > +bool s390_has_topology(void) > +{ > + return false; > +} > + > +/** > + * s390_get_topology > + * > + * Returns a pointer to the topology. > + * > + * This function is called when we know the topology exist. > + * Testing if the topology exist is done with s390_has_topology() > + */ > +S390Topology *s390_get_topology(void) > +{ > + static S390Topology *s390Topology; > + > + if (!s390Topology) { > + s390Topology = S390_CPU_TOPOLOGY( > + object_resolve_path(TYPE_S390_CPU_TOPOLOGY, NULL)); > + } > + > + assert(s390Topology); I think you can move the assert() into the body of the if-statement. > + return s390Topology; > +} > + > +/** > + * s390_init_topology > + * @machine: The Machine state, used to retrieve the SMP parameters > + * @errp: the error pointer in case of problem > + * > + * This function creates and initialize the S390Topology with > + * the QEMU -smp parameters we will use during adding cores to the > + * topology. > + */ > +void s390_init_topology(MachineState *machine, Error **errp) > +{ > + DeviceState *dev; > + > + if (machine->smp.threads > 1) { > + error_setg(errp, "CPU Topology do not support multithreading"); s/CPU Toplogy do/CPU topology does/ > + return; > + } > + > + dev = qdev_new(TYPE_S390_CPU_TOPOLOGY); > + > + object_property_add_child(&machine->parent_obj, > + TYPE_S390_CPU_TOPOLOGY, OBJECT(dev)); > + object_property_set_int(OBJECT(dev), "num-cores", > + machine->smp.cores, errp); > + object_property_set_int(OBJECT(dev), "num-sockets", > + machine->smp.sockets, errp); > + > + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp); > +} Thomas
On 12/8/22 10:44, Pierre Morel wrote: > We will need a Topology device to transfer the topology > during migration and to implement machine reset. > > The device creation is fenced by s390_has_topology(). Some of the info you gave in the cover letter would help the reader of this commit log. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > --- > include/hw/s390x/cpu-topology.h | 44 ++++++++++ > hw/s390x/cpu-topology.c | 149 ++++++++++++++++++++++++++++++++ > hw/s390x/s390-virtio-ccw.c | 6 ++ > hw/s390x/meson.build | 1 + > 4 files changed, 200 insertions(+) > create mode 100644 include/hw/s390x/cpu-topology.h > create mode 100644 hw/s390x/cpu-topology.c > > diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h > new file mode 100644 > index 0000000000..6c3d2d080f > --- /dev/null > +++ b/include/hw/s390x/cpu-topology.h > @@ -0,0 +1,44 @@ > +/* > + * CPU Topology > + * > + * Copyright IBM Corp. 2022 > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or (at > + * your option) any later version. See the COPYING file in the top-level > + * directory. > + */ > +#ifndef HW_S390X_CPU_TOPOLOGY_H > +#define HW_S390X_CPU_TOPOLOGY_H > + > +#include "hw/sysbus.h" > +#include "hw/qdev-core.h" > +#include "qom/object.h" > + > +#define S390_TOPOLOGY_CPU_IFL 0x03 > +#define S390_TOPOLOGY_MAX_ORIGIN ((63 + S390_MAX_CPUS) / 64) > + > +#define S390_TOPOLOGY_POLARITY_HORIZONTAL 0x00 > +#define S390_TOPOLOGY_POLARITY_VERTICAL_LOW 0x01 > +#define S390_TOPOLOGY_POLARITY_VERTICAL_MEDIUM 0x02 > +#define S390_TOPOLOGY_POLARITY_VERTICAL_HIGH 0x03 > + > +typedef struct S390TopoSocket { > + int active_count; > + uint64_t mask[S390_TOPOLOGY_MAX_ORIGIN]; > +} S390TopoSocket; > + > +struct S390Topology { > + SysBusDevice parent_obj; hmm, I think a Device should be enough. There are no interrupts or memory regions associated to it and the reset is handled independently of any bus. This object is simply a place older for computed state. > + uint32_t num_cores; > + uint32_t num_sockets; > + S390TopoSocket *socket; > +}; > + > +#define TYPE_S390_CPU_TOPOLOGY "s390-topology" > +OBJECT_DECLARE_SIMPLE_TYPE(S390Topology, S390_CPU_TOPOLOGY) > + > +void s390_init_topology(MachineState *machine, Error **errp); > +bool s390_has_topology(void); > +S390Topology *s390_get_topology(void); > + > +#endif > diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c > new file mode 100644 > index 0000000000..b3e59873f6 > --- /dev/null > +++ b/hw/s390x/cpu-topology.c > @@ -0,0 +1,149 @@ > +/* > + * CPU Topology > + * > + * Copyright IBM Corp. 2022 > + * Author(s): Pierre Morel <pmorel@linux.ibm.com> > + > + * This work is licensed under the terms of the GNU GPL, version 2 or (at > + * your option) any later version. See the COPYING file in the top-level > + * directory. > + */ > + > +#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_has_topology > + * > + * Return false until the commit activating the topology is > + * commited. > + */ > +bool s390_has_topology(void) > +{ > + return false; > +} > + > +/** > + * s390_get_topology > + * > + * Returns a pointer to the topology. > + * > + * This function is called when we know the topology exist. > + * Testing if the topology exist is done with s390_has_topology() > + */ > +S390Topology *s390_get_topology(void) > +{ > + static S390Topology *s390Topology; > + > + if (!s390Topology) { > + s390Topology = S390_CPU_TOPOLOGY( > + object_resolve_path(TYPE_S390_CPU_TOPOLOGY, NULL)); > + } This is back. Too bad. I guess the compilation issues on all platforms made it difficult to avoid. > + assert(s390Topology); > + > + return s390Topology; > +} > + > +/** > + * s390_init_topology > + * @machine: The Machine state, used to retrieve the SMP parameters > + * @errp: the error pointer in case of problem > + * > + * This function creates and initialize the S390Topology with > + * the QEMU -smp parameters we will use during adding cores to the > + * topology. > + */ > +void s390_init_topology(MachineState *machine, Error **errp) > +{ > + DeviceState *dev; > + > + if (machine->smp.threads > 1) { > + error_setg(errp, "CPU Topology do not support multithreading"); > + return; > + } Isn't SMT already tested at the machine level ? > + > + dev = qdev_new(TYPE_S390_CPU_TOPOLOGY); > + > + object_property_add_child(&machine->parent_obj, > + TYPE_S390_CPU_TOPOLOGY, OBJECT(dev)); > + object_property_set_int(OBJECT(dev), "num-cores", > + machine->smp.cores, errp); > + object_property_set_int(OBJECT(dev), "num-sockets", > + machine->smp.sockets, errp); > + > + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp); > +} > + > +/** > + * s390_topology_realize: > + * @dev: the device state > + * > + * We free the socket array allocated in realize. > + */ > +static void s390_topology_unrealize(DeviceState *dev) > +{ > + S390Topology *topo = S390_CPU_TOPOLOGY(dev); > + > + g_free(topo->socket); > +} > + > +/** > + * s390_topology_realize: > + * @dev: the device state > + * @errp: the error pointer (not used) > + * > + * During realize the machine CPU topology is initialized with the > + * QEMU -smp parameters. > + * The maximum count of CPU TLE in the all Topology can not be greater > + * than the maximum CPUs. > + */ > +static void s390_topology_realize(DeviceState *dev, Error **errp) > +{ > + S390Topology *topo = S390_CPU_TOPOLOGY(dev); > + > + topo->socket = g_new0(S390TopoSocket, topo->num_sockets); > +} > + > +static Property s390_topology_properties[] = { > + DEFINE_PROP_UINT32("num-cores", S390Topology, num_cores, 1), > + DEFINE_PROP_UINT32("num-sockets", S390Topology, num_sockets, 1), > + DEFINE_PROP_END_OF_LIST(), > +}; > + > +/** > + * topology_class_init: > + * @oc: Object class > + * @data: (not used) > + * > + * A very simple object we will need for reset and migration. > + */ > +static void topology_class_init(ObjectClass *oc, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(oc); > + > + dc->realize = s390_topology_realize; > + dc->unrealize = s390_topology_unrealize; > + device_class_set_props(dc, s390_topology_properties); > + set_bit(DEVICE_CATEGORY_MISC, dc->categories); > +} > + > +static const TypeInfo cpu_topology_info = { > + .name = TYPE_S390_CPU_TOPOLOGY, > + .parent = TYPE_SYS_BUS_DEVICE, > + .instance_size = sizeof(S390Topology), > + .class_init = topology_class_init, > +}; > + > +static void topology_register(void) > +{ > + type_register_static(&cpu_topology_info); > +} > +type_init(topology_register); > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 2e64ffab45..8971ffb871 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -44,6 +44,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; > > @@ -255,6 +256,11 @@ static void ccw_init(MachineState *machine) > /* init CPUs (incl. CPU model) early so s390_has_feature() works */ > s390_init_cpus(machine); > > + /* Need CPU model to be determined before we can set up topology */ > + if (s390_has_topology()) { > + s390_init_topology(machine, &error_fatal); > + } > + > /* Need CPU model to be determined before we can set up PV */ > s390_pv_init(machine->cgs, &error_fatal); > > diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build > index f291016fee..58dfbdff4f 100644 > --- a/hw/s390x/meson.build > +++ b/hw/s390x/meson.build > @@ -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',
On 12/9/22 14:50, Thomas Huth wrote: > On 08/12/2022 10.44, Pierre Morel wrote: >> We will need a Topology device to transfer the topology >> during migration and to implement machine reset. >> >> The device creation is fenced by s390_has_topology(). >> >> Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> >> --- > [...] >> diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c >> new file mode 100644 >> index 0000000000..b3e59873f6 >> --- /dev/null >> +++ b/hw/s390x/cpu-topology.c >> @@ -0,0 +1,149 @@ >> +/* >> + * CPU Topology >> + * >> + * Copyright IBM Corp. 2022 >> + * Author(s): Pierre Morel <pmorel@linux.ibm.com> >> + >> + * This work is licensed under the terms of the GNU GPL, version 2 or >> (at >> + * your option) any later version. See the COPYING file in the top-level >> + * directory. >> + */ >> + >> +#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_has_topology >> + * >> + * Return false until the commit activating the topology is >> + * commited. >> + */ >> +bool s390_has_topology(void) >> +{ >> + return false; >> +} >> + >> +/** >> + * s390_get_topology >> + * >> + * Returns a pointer to the topology. >> + * >> + * This function is called when we know the topology exist. >> + * Testing if the topology exist is done with s390_has_topology() >> + */ >> +S390Topology *s390_get_topology(void) >> +{ >> + static S390Topology *s390Topology; >> + >> + if (!s390Topology) { >> + s390Topology = S390_CPU_TOPOLOGY( >> + object_resolve_path(TYPE_S390_CPU_TOPOLOGY, NULL)); >> + } >> + >> + assert(s390Topology); > > I think you can move the assert() into the body of the if-statement. Yes, clearly. > >> + return s390Topology; >> +} >> + >> +/** >> + * s390_init_topology >> + * @machine: The Machine state, used to retrieve the SMP parameters >> + * @errp: the error pointer in case of problem >> + * >> + * This function creates and initialize the S390Topology with >> + * the QEMU -smp parameters we will use during adding cores to the >> + * topology. >> + */ >> +void s390_init_topology(MachineState *machine, Error **errp) >> +{ >> + DeviceState *dev; >> + >> + if (machine->smp.threads > 1) { >> + error_setg(errp, "CPU Topology do not support multithreading"); > > s/CPU Toplogy do/CPU topology does/ Yes, thanks. Regards, Pierre
diff --git a/include/hw/s390x/cpu-topology.h b/include/hw/s390x/cpu-topology.h new file mode 100644 index 0000000000..6c3d2d080f --- /dev/null +++ b/include/hw/s390x/cpu-topology.h @@ -0,0 +1,44 @@ +/* + * CPU Topology + * + * Copyright IBM Corp. 2022 + * + * This work is licensed under the terms of the GNU GPL, version 2 or (at + * your option) any later version. See the COPYING file in the top-level + * directory. + */ +#ifndef HW_S390X_CPU_TOPOLOGY_H +#define HW_S390X_CPU_TOPOLOGY_H + +#include "hw/sysbus.h" +#include "hw/qdev-core.h" +#include "qom/object.h" + +#define S390_TOPOLOGY_CPU_IFL 0x03 +#define S390_TOPOLOGY_MAX_ORIGIN ((63 + S390_MAX_CPUS) / 64) + +#define S390_TOPOLOGY_POLARITY_HORIZONTAL 0x00 +#define S390_TOPOLOGY_POLARITY_VERTICAL_LOW 0x01 +#define S390_TOPOLOGY_POLARITY_VERTICAL_MEDIUM 0x02 +#define S390_TOPOLOGY_POLARITY_VERTICAL_HIGH 0x03 + +typedef struct S390TopoSocket { + int active_count; + uint64_t mask[S390_TOPOLOGY_MAX_ORIGIN]; +} S390TopoSocket; + +struct S390Topology { + SysBusDevice parent_obj; + uint32_t num_cores; + uint32_t num_sockets; + S390TopoSocket *socket; +}; + +#define TYPE_S390_CPU_TOPOLOGY "s390-topology" +OBJECT_DECLARE_SIMPLE_TYPE(S390Topology, S390_CPU_TOPOLOGY) + +void s390_init_topology(MachineState *machine, Error **errp); +bool s390_has_topology(void); +S390Topology *s390_get_topology(void); + +#endif diff --git a/hw/s390x/cpu-topology.c b/hw/s390x/cpu-topology.c new file mode 100644 index 0000000000..b3e59873f6 --- /dev/null +++ b/hw/s390x/cpu-topology.c @@ -0,0 +1,149 @@ +/* + * CPU Topology + * + * Copyright IBM Corp. 2022 + * Author(s): Pierre Morel <pmorel@linux.ibm.com> + + * This work is licensed under the terms of the GNU GPL, version 2 or (at + * your option) any later version. See the COPYING file in the top-level + * directory. + */ + +#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_has_topology + * + * Return false until the commit activating the topology is + * commited. + */ +bool s390_has_topology(void) +{ + return false; +} + +/** + * s390_get_topology + * + * Returns a pointer to the topology. + * + * This function is called when we know the topology exist. + * Testing if the topology exist is done with s390_has_topology() + */ +S390Topology *s390_get_topology(void) +{ + static S390Topology *s390Topology; + + if (!s390Topology) { + s390Topology = S390_CPU_TOPOLOGY( + object_resolve_path(TYPE_S390_CPU_TOPOLOGY, NULL)); + } + + assert(s390Topology); + + return s390Topology; +} + +/** + * s390_init_topology + * @machine: The Machine state, used to retrieve the SMP parameters + * @errp: the error pointer in case of problem + * + * This function creates and initialize the S390Topology with + * the QEMU -smp parameters we will use during adding cores to the + * topology. + */ +void s390_init_topology(MachineState *machine, Error **errp) +{ + DeviceState *dev; + + if (machine->smp.threads > 1) { + error_setg(errp, "CPU Topology do not support multithreading"); + return; + } + + dev = qdev_new(TYPE_S390_CPU_TOPOLOGY); + + object_property_add_child(&machine->parent_obj, + TYPE_S390_CPU_TOPOLOGY, OBJECT(dev)); + object_property_set_int(OBJECT(dev), "num-cores", + machine->smp.cores, errp); + object_property_set_int(OBJECT(dev), "num-sockets", + machine->smp.sockets, errp); + + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp); +} + +/** + * s390_topology_realize: + * @dev: the device state + * + * We free the socket array allocated in realize. + */ +static void s390_topology_unrealize(DeviceState *dev) +{ + S390Topology *topo = S390_CPU_TOPOLOGY(dev); + + g_free(topo->socket); +} + +/** + * s390_topology_realize: + * @dev: the device state + * @errp: the error pointer (not used) + * + * During realize the machine CPU topology is initialized with the + * QEMU -smp parameters. + * The maximum count of CPU TLE in the all Topology can not be greater + * than the maximum CPUs. + */ +static void s390_topology_realize(DeviceState *dev, Error **errp) +{ + S390Topology *topo = S390_CPU_TOPOLOGY(dev); + + topo->socket = g_new0(S390TopoSocket, topo->num_sockets); +} + +static Property s390_topology_properties[] = { + DEFINE_PROP_UINT32("num-cores", S390Topology, num_cores, 1), + DEFINE_PROP_UINT32("num-sockets", S390Topology, num_sockets, 1), + DEFINE_PROP_END_OF_LIST(), +}; + +/** + * topology_class_init: + * @oc: Object class + * @data: (not used) + * + * A very simple object we will need for reset and migration. + */ +static void topology_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = s390_topology_realize; + dc->unrealize = s390_topology_unrealize; + device_class_set_props(dc, s390_topology_properties); + set_bit(DEVICE_CATEGORY_MISC, dc->categories); +} + +static const TypeInfo cpu_topology_info = { + .name = TYPE_S390_CPU_TOPOLOGY, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(S390Topology), + .class_init = topology_class_init, +}; + +static void topology_register(void) +{ + type_register_static(&cpu_topology_info); +} +type_init(topology_register); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 2e64ffab45..8971ffb871 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -44,6 +44,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; @@ -255,6 +256,11 @@ static void ccw_init(MachineState *machine) /* init CPUs (incl. CPU model) early so s390_has_feature() works */ s390_init_cpus(machine); + /* Need CPU model to be determined before we can set up topology */ + if (s390_has_topology()) { + s390_init_topology(machine, &error_fatal); + } + /* Need CPU model to be determined before we can set up PV */ s390_pv_init(machine->cgs, &error_fatal); diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build index f291016fee..58dfbdff4f 100644 --- a/hw/s390x/meson.build +++ b/hw/s390x/meson.build @@ -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',
We will need a Topology device to transfer the topology during migration and to implement machine reset. The device creation is fenced by s390_has_topology(). Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> --- include/hw/s390x/cpu-topology.h | 44 ++++++++++ hw/s390x/cpu-topology.c | 149 ++++++++++++++++++++++++++++++++ hw/s390x/s390-virtio-ccw.c | 6 ++ hw/s390x/meson.build | 1 + 4 files changed, 200 insertions(+) create mode 100644 include/hw/s390x/cpu-topology.h create mode 100644 hw/s390x/cpu-topology.c