[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH-for-4.2 v8 6/9] hw/arm/virt: Enable device memor
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PATCH-for-4.2 v8 6/9] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot |
Date: |
Wed, 7 Aug 2019 11:15:20 +0200 |
On Wed, 7 Aug 2019 08:19:16 +0000
Shameerali Kolothum Thodi <address@hidden> wrote:
> Hi Igor,
>
> > -----Original Message-----
> > From: Igor Mammedov [mailto:address@hidden]
> > Sent: 06 August 2019 14:09
> > To: Shameerali Kolothum Thodi <address@hidden>
> > Cc: address@hidden; address@hidden;
> > address@hidden; address@hidden; address@hidden;
> > address@hidden; Linuxarm <address@hidden>; xuwei (O)
> > <address@hidden>; address@hidden;
> > address@hidden; address@hidden
> > Subject: Re: [Qemu-devel] [PATCH-for-4.2 v8 6/9] hw/arm/virt: Enable device
> > memory cold/hot plug with ACPI boot
>
> [...]
>
> > > +static inline DeviceState *create_acpi_ged(VirtMachineState *vms,
> > qemu_irq *pic)
> > > +{
> > > + DeviceState *dev;
> > > + int irq = vms->irqmap[VIRT_ACPI_GED];
> > > + uint32_t event = ACPI_GED_MEM_HOTPLUG_EVT;
> > > +
> > > + dev = DEVICE(object_new(TYPE_ACPI_GED));
> > > + qdev_prop_set_uint64(dev, "memhp-base",
> > > + vms->memmap[VIRT_PCDIMM_ACPI].base);
> > > + qdev_prop_set_uint64(dev, "ged-base",
> > vms->memmap[VIRT_ACPI_GED].base);
> > > + qdev_prop_set_uint32(dev, "ged-event", event);
> > > + object_property_add_child(qdev_get_machine(), "acpi-ged",
> > > + OBJECT(dev), NULL);
> > > + qdev_init_nofail(dev);
> > > + qdev_connect_gpio_out_named(dev, "ged-irq", 0, pic[irq]);
> > > +
> > > + object_unref(OBJECT(dev));
> > > +
> > > + return dev;
> > > +}
> >
> > this function will need changes to accommodate for sysbus device
> > init sequence [3/9].
>
> Yes. I think we are proposing to use sysbus_mmio_map() here for "ged-base".
> But what about " memhp-base"? Is it ok to invoke
> acpi_memory_hotplug_init(get_system_memoty(), ...) from ged device?
no it's not ok.
One could expose container memory region as sysbus mmio and then put
ged-io and AcpiGedState::memhp_state::io within it.
something like:
board:
sysbus_mmio_map(ged, 0 /* io_contaner number */, ged-base)
ged_initfn()
register io_container as sysbus mmio region
ged_realize()
memory_region_add_subregion(&ged->io_container, 0, &ged_st->io);
acpi_memory_hotplug_init(&ged->io_container,,
&ged->acpi_memory_hotplug, AFTER_GED_IO_OFFSET)
that would make GED's MMIO available to guest at ged-base and memhp IO
will be available at address after it.
You can go even further (more flexible) and register ged_st->io as separate
sysbus mmio and use a container exclusively for memhp, in this case you'd be
able to map memhp io from board independently from ged-base.
> Or go with _set_link() function to pass the address space ?
>
> Thanks,
> Shameer
>
>
> > > +
> > > static void create_its(VirtMachineState *vms, DeviceState *gicdev)
> > > {
> > > const char *itsclass = its_class_name();
> > > @@ -1483,6 +1508,7 @@ static void machvirt_init(MachineState *machine)
> > > MemoryRegion *ram = g_new(MemoryRegion, 1);
> > > bool firmware_loaded;
> > > bool aarch64 = true;
> > > + bool has_ged = !vmc->no_ged;
> > > unsigned int smp_cpus = machine->smp.cpus;
> > > unsigned int max_cpus = machine->smp.max_cpus;
> > >
> > > @@ -1697,6 +1723,10 @@ static void machvirt_init(MachineState
> > *machine)
> > >
> > > create_gpio(vms, pic);
> > >
> > > + if (has_ged && aarch64 && firmware_loaded && acpi_enabled) {
> > > + vms->acpi_dev = create_acpi_ged(vms, pic);
> > > + }
> > > +
> > > /* Create mmio transports, so the user can create virtio backends
> > > * (which will be automatically plugged in to the transports). If
> > > * no backend is created the transport will just sit harmlessly idle.
> > > @@ -1876,27 +1906,34 @@ static const CPUArchIdList
> > *virt_possible_cpu_arch_ids(MachineState *ms)
> > > static void virt_memory_pre_plug(HotplugHandler *hotplug_dev,
> > DeviceState *dev,
> > > Error **errp)
> > > {
> > > + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> > > + const bool is_nvdimm = object_dynamic_cast(OBJECT(dev),
> > TYPE_NVDIMM);
> > >
> > > - /*
> > > - * The device memory is not yet exposed to the Guest either through
> > > - * DT or ACPI and hence both cold/hot plug of memory is explicitly
> > > - * disabled for now.
> > > - */
> > > - if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > > - error_setg(errp, "memory cold/hot plug is not yet supported");
> > > + if (is_nvdimm) {
> > > + error_setg(errp, "nvdimm is not yet supported");
> > > return;
> > > }
> > >
> > > + if (!vms->acpi_dev) {
> > > + error_setg(errp, "memory hotplug is not enabled: missing acpi
> > device");
> > > + return;
> > > + }
> > > +
> > > + hotplug_handler_pre_plug(HOTPLUG_HANDLER(vms->acpi_dev), dev,
> > errp);
> > use local_error and check for error condition here. see pc_memory_pre_plug()
> >
> > > +
> > > pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL,
> > errp);
> > > }
> > >
> > > static void virt_memory_plug(HotplugHandler *hotplug_dev,
> > > DeviceState *dev, Error **errp)
> > > {
> > > + HotplugHandlerClass *hhc;
> > > VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> > >
> > > pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL);
> > ^^^^
> > >
> > > + hhc = HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev);
> > > + hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, NULL);
> > ^^^^
> > why errors are ignored here, pls check for errors and propagate
> > them to the caller.
> >
> > > }
> > >
> > > static void virt_machine_device_pre_plug_cb(HotplugHandler
> > *hotplug_dev,
> > > @@ -2102,8 +2139,11 @@ DEFINE_VIRT_MACHINE_AS_LATEST(4, 2)
> > >
> > > static void virt_machine_4_1_options(MachineClass *mc)
> > > {
> > > + VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
> > > +
> > > virt_machine_4_2_options(mc);
> > > compat_props_add(mc->compat_props, hw_compat_4_1,
> > hw_compat_4_1_len);
> > > + vmc->no_ged = true;
> > > }
> > > DEFINE_VIRT_MACHINE(4, 1)
> > >
> > > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
> > > index a72094204e..577ee49b4b 100644
> > > --- a/include/hw/arm/virt.h
> > > +++ b/include/hw/arm/virt.h
> > > @@ -77,6 +77,8 @@ enum {
> > > VIRT_GPIO,
> > > VIRT_SECURE_UART,
> > > VIRT_SECURE_MEM,
> > > + VIRT_PCDIMM_ACPI,
> > > + VIRT_ACPI_GED,
> > > VIRT_LOWMEMMAP_LAST,
> > > };
> > >
> > > @@ -106,6 +108,7 @@ typedef struct {
> > > bool claim_edge_triggered_timers;
> > > bool smbios_old_sys_ver;
> > > bool no_highmem_ecam;
> > > + bool no_ged; /* Machines < 4.2 has no support for ACPI GED device
> > */
> > > } VirtMachineClass;
> > >
> > > typedef struct {
> > > @@ -133,6 +136,7 @@ typedef struct {
> > > uint32_t iommu_phandle;
> > > int psci_conduit;
> > > hwaddr highest_gpa;
> > > + DeviceState *acpi_dev;
> > > } VirtMachineState;
> > >
> > > #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM :
> > VIRT_PCIE_ECAM)
> > > diff --git a/tests/bios-tables-test-allowed-diff.h
> > b/tests/bios-tables-test-allowed-diff.h
> > > index dfb8523c8b..7b4adbc822 100644
> > > --- a/tests/bios-tables-test-allowed-diff.h
> > > +++ b/tests/bios-tables-test-allowed-diff.h
> > > @@ -1 +1,2 @@
> > > /* List of comma-separated changed AML files to ignore */
> > > +"tests/data/acpi/virt/DSDT",
>