[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v1 09/10] hw/i386/xen: Add a Xen PVH x86 machine
On Mon, Aug 12, 2024 at 06:48:52PM -0700, Stefano Stabellini wrote: > On Mon, 12 Aug 2024, Edgar E. Iglesias wrote: > > From: "Edgar E. Iglesias" <edgar.iglesias@xxxxxxx> > > > > This adds a Xen PVH x86 machine based on the PVH Common > > module used by the ARM PVH machine. > > > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xxxxxxx> > > --- > > hw/i386/xen/meson.build | 1 + > > hw/i386/xen/xen-pvh.c | 196 ++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 197 insertions(+) > > create mode 100644 hw/i386/xen/xen-pvh.c > > > > diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build > > index 3f0df8bc07..c73c62b8e3 100644 > > --- a/hw/i386/xen/meson.build > > +++ b/hw/i386/xen/meson.build > > @@ -4,6 +4,7 @@ i386_ss.add(when: 'CONFIG_XEN', if_true: files( > > )) > > i386_ss.add(when: ['CONFIG_XEN', xen], if_true: files( > > 'xen-hvm.c', > > + 'xen-pvh.c', > > )) > > > > i386_ss.add(when: 'CONFIG_XEN_BUS', if_true: files( > > diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c > > new file mode 100644 > > index 0000000000..9c3d3fc58d > > --- /dev/null > > +++ b/hw/i386/xen/xen-pvh.c > > @@ -0,0 +1,196 @@ > > +/* > > + * QEMU Xen PVH x86 Machine > > + * > > + * Copyright (c) 2024 Advanced Micro Devices, Inc. > > + * Written by Edgar E. Iglesias <edgar.iglesias@xxxxxxx> > > + * > > + * SPDX-License-Identifier: GPL-2.0-or-later > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/error.h" > > +#include "qapi/visitor.h" > > +#include "qemu/error-report.h" > > +#include "hw/boards.h" > > +#include "sysemu/sysemu.h" > > +#include "hw/xen/arch_hvm.h" > > +#include "hw/xen/xen.h" > > +#include "hw/xen/xen-pvh-common.h" > > + > > +#define TYPE_XEN_PVH_X86 MACHINE_TYPE_NAME("xenpvh") > > +OBJECT_DECLARE_SIMPLE_TYPE(XenPVHx86State, XEN_PVH_X86) > > + > > +#define PVH_MAX_CPUS 128 > > + > > +struct XenPVHx86State { > > + /*< private >*/ > > + MachineState parent; > > + > > + DeviceState *cpu[PVH_MAX_CPUS]; > > + XenPVHCommonState pvh; > > + > > + /* > > + * We provide these properties to allow Xen to move things to other > > + * addresses for example when users need to accomodate the memory-map > > + * for 1:1 mapped devices/memory. > > + */ > > + struct { > > + MemMapEntry ram_low, ram_high; > > + MemMapEntry pci_ecam, pci_mmio, pci_mmio_high; > > Can we use the same properties already present under XenPVHCommonState? > > > > > + } cfg; > > +}; > > + > > +static void xenpvh_cpu_new(MachineState *ms, > > + XenPVHx86State *xp, > > + int cpu_idx, > > + int64_t apic_id) > > +{ > > + Object *cpu = object_new(ms->cpu_type); > > + > > + object_property_add_child(OBJECT(ms), "cpu[*]", cpu); > > + object_property_set_uint(cpu, "apic-id", apic_id, &error_fatal); > > + qdev_realize(DEVICE(cpu), NULL, &error_fatal); > > + object_unref(cpu); > > + > > + xp->cpu[cpu_idx] = DEVICE(cpu); > > > Why do we need to create CPU devices in QEMU given that we are only > doing device emulation? I guess it is because .... > > > > > +} > > + > > +static void xenpvh_init(MachineState *ms) > > +{ > > + XenPVHx86State *xp = XEN_PVH_X86(ms); > > + const struct { > > + const char *name; > > + MemMapEntry *map; > > + } map[] = { > > + { "ram-low", &xp->cfg.ram_low }, > > + { "ram-high", &xp->cfg.ram_high }, > > + { "pci-ecam", &xp->cfg.pci_ecam }, > > + { "pci-mmio", &xp->cfg.pci_mmio }, > > + { "pci-mmio-high", &xp->cfg.pci_mmio_high }, > > + }; > > + int i; > > + > > + object_initialize_child(OBJECT(ms), "pvh", &xp->pvh, > > TYPE_XEN_PVH_COMMON); > > + object_property_set_int(OBJECT(&xp->pvh), "max-cpus", ms->smp.max_cpus, > > + &error_abort); > > + object_property_set_int(OBJECT(&xp->pvh), "ram-size", ms->ram_size, > > + &error_abort); > > + > > + for (i = 0; i < ARRAY_SIZE(map); i++) { > > + g_autofree char *base_name = g_strdup_printf("%s-base", > > map[i].name); > > + g_autofree char *size_name = g_strdup_printf("%s-size", > > map[i].name); > > + > > + object_property_set_int(OBJECT(&xp->pvh), base_name, > > map[i].map->base, > > + &error_abort); > > + object_property_set_int(OBJECT(&xp->pvh), size_name, > > map[i].map->size, > > + &error_abort); > > + } > > + > > + /* GSI's 16 - 20 are used for legacy PCIe INTX IRQs. */ > > + object_property_set_int(OBJECT(&xp->pvh), "pci-intx-irq-base", 16, > > + &error_abort); > > + > > + sysbus_realize(SYS_BUS_DEVICE(&xp->pvh), &error_abort); > > + > > + /* Create dummy cores. This will indirectly create the APIC MSI > > window. */ > > ... of the APIC MSI window ? Yes, exactly. I did have a first version without the CPUs that only had the MSI window but there was a bit of disentanglement needed and some other issue that I forgot. Note that with TCG disabled, this doesn't have the any CPU emulation so it doesn't affect our small PVH config very much. I could look into the MSI windows again though. > > > > > + for (i = 0; i < ms->smp.cpus; i++) { > > + xenpvh_cpu_new(ms, xp, i, i); > > + } > > +} > > + > > +#define XENPVH_PROP_MEMMAP_SETTER(n, f) > > \ > > +static void xenpvh_set_ ## n ## _ ## f(Object *obj, Visitor *v, > > \ > > + const char *name, void *opaque, > > \ > > + Error **errp) > > \ > > +{ > > \ > > + XenPVHx86State *xp = XEN_PVH_X86(obj); > > \ > > + uint64_t value; > > \ > > + > > \ > > + if (!visit_type_size(v, name, &value, errp)) { > > \ > > + return; > > \ > > + } > > \ > > + xp->cfg.n.f = value; > > \ > > +} > > + > > +#define XENPVH_PROP_MEMMAP_GETTER(n, f) > > \ > > +static void xenpvh_get_ ## n ## _ ## f(Object *obj, Visitor *v, > > \ > > + const char *name, void *opaque, > > \ > > + Error **errp) > > \ > > +{ > > \ > > + XenPVHx86State *xp = XEN_PVH_X86(obj); > > \ > > + uint64_t value = xp->cfg.n.f; > > \ > > + > > \ > > + visit_type_uint64(v, name, &value, errp); > > \ > > +} > > + > > +#define XENPVH_PROP_MEMMAP(n) \ > > + XENPVH_PROP_MEMMAP_SETTER(n, base) \ > > + XENPVH_PROP_MEMMAP_SETTER(n, size) \ > > + XENPVH_PROP_MEMMAP_GETTER(n, base) \ > > + XENPVH_PROP_MEMMAP_GETTER(n, size) > > + > > + > > +XENPVH_PROP_MEMMAP(ram_low) > > +XENPVH_PROP_MEMMAP(ram_high) > > +XENPVH_PROP_MEMMAP(pci_ecam) > > +XENPVH_PROP_MEMMAP(pci_mmio) > > +XENPVH_PROP_MEMMAP(pci_mmio_high) > > I would make all of these common with ARM. It wouldn't hurt to make them > configurable on ARM too, in fact we might need it for 1:1 mapped guests > Yes, that was the plan in future patches. > > > > +static void xenpvh_instance_init(Object *obj) > > +{ > > + XenPVHx86State *xp = XEN_PVH_X86(obj); > > + > > + /* Default memmap. */ > > + xp->cfg.ram_low.base = 0x0; > > + xp->cfg.ram_low.size = 0x80000000U; > > + xp->cfg.ram_high.base = 0xC000000000ULL; > > + xp->cfg.ram_high.size = 0x4000000000ULL; > > +} > > + > > +static void xenpvh_machine_class_init(ObjectClass *oc, void *data) > > +{ > > + MachineClass *mc = MACHINE_CLASS(oc); > > + > > + mc->desc = "Xen PVH x86 machine"; > > + mc->init = xenpvh_init; > > + mc->max_cpus = PVH_MAX_CPUS; > > + mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE; > > + mc->default_machine_opts = "accel=xen"; > > + /* Set explicitly here to make sure that real ram_size is passed */ > > + mc->default_ram_size = 0; > > + > > +#define OC_MEMMAP_PROP(c, prop_name, name) \ > > +do { \ > > + object_class_property_add(c, prop_name "-base", "uint64_t", \ > > + xenpvh_get_ ## name ## _base, \ > > + xenpvh_set_ ## name ## _base, NULL, NULL); \ > > + object_class_property_set_description(oc, prop_name "-base", \ > > + prop_name " base address"); \ > > + object_class_property_add(c, prop_name "-size", "uint64_t", \ > > + xenpvh_get_ ## name ## _size, \ > > + xenpvh_set_ ## name ## _size, NULL, NULL); \ > > + object_class_property_set_description(oc, prop_name "-size", \ > > + prop_name " size of memory region"); \ > > +} while (0) > > + > > + OC_MEMMAP_PROP(oc, "ram-low", ram_low); > > + OC_MEMMAP_PROP(oc, "ram-high", ram_high); > > + OC_MEMMAP_PROP(oc, "pci-ecam", pci_ecam); > > + OC_MEMMAP_PROP(oc, "pci-mmio", pci_mmio); > > + OC_MEMMAP_PROP(oc, "pci-mmio-high", pci_mmio_high); > > +} > > + > > +static const TypeInfo xenpvh_machine_type = { > > + .name = TYPE_XEN_PVH_X86, > > + .parent = TYPE_MACHINE, > > + .class_init = xenpvh_machine_class_init, > > + .instance_init = xenpvh_instance_init, > > + .instance_size = sizeof(XenPVHx86State), > > +}; > > + > > +static void xenpvh_machine_register_types(void) > > +{ > > + type_register_static(&xenpvh_machine_type); > > +} > > + > > +type_init(xenpvh_machine_register_types) > > -- > > 2.43.0 > >
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |