From: Vasilis Liaskovitis <vasilis.liaskovi...@profitbricks.com> Each hotplug-able memory slot is a DimmDevice. All DimmDevices are attached to a new bus called DimmBus.
A hot-add operation for a DIMM: - creates a new DimmDevice and attaches it to the DimmBus Hotplug operations are done through normal device_add commands. For migration case, all hotplugged DIMMs on source should be specified on target's command line using '-device' option with properties set to the same values as on target. To simplify review, patch introduces only DimmDevice and DimmBus basic QOM skeleton that will be extended by following patches to implement actual memory hotplug and related functions. Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovi...@profitbricks.com> Signed-off-by: Igor Mammedov <imamm...@redhat.com> --- default-configs/x86_64-softmmu.mak | 1 + hw/Makefile.objs | 1 + hw/mem-hotplug/Makefile.objs | 1 + hw/mem-hotplug/dimm.c | 97 ++++++++++++++++++++++++++++++++++++ include/hw/mem-hotplug/dimm.h | 66 ++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 0 deletions(-) create mode 100644 hw/mem-hotplug/Makefile.objs create mode 100644 hw/mem-hotplug/dimm.c create mode 100644 include/hw/mem-hotplug/dimm.h diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 10bb0c6..59229ea 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -45,3 +45,4 @@ CONFIG_APIC=y CONFIG_IOAPIC=y CONFIG_ICC_BUS=y CONFIG_PVPANIC=y +CONFIG_MEM_HOTPLUG=y diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 0243d6a..6d3dc73 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -27,6 +27,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += usb/ devices-dirs-$(CONFIG_VIRTIO) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/ +devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem-hotplug/ devices-dirs-y += core/ common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) diff --git a/hw/mem-hotplug/Makefile.objs b/hw/mem-hotplug/Makefile.objs new file mode 100644 index 0000000..7563ef5 --- /dev/null +++ b/hw/mem-hotplug/Makefile.objs @@ -0,0 +1 @@ +common-obj-$(CONFIG_MEM_HOTPLUG) += dimm.o diff --git a/hw/mem-hotplug/dimm.c b/hw/mem-hotplug/dimm.c new file mode 100644 index 0000000..0a337a5 --- /dev/null +++ b/hw/mem-hotplug/dimm.c @@ -0,0 +1,97 @@ +/* + * Dimm device for Memory Hotplug + * + * Copyright ProfitBricks GmbH 2012 + * Copyright (C) 2013 Red Hat Inc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see <http://www.gnu.org/licenses/> + */ + +#include "hw/mem-hotplug/dimm.h" +#include "qemu/config-file.h" + +static void dimm_bus_initfn(Object *obj) +{ + BusState *b = BUS(obj); + + b->allow_hotplug = true; +} +static void dimm_bus_class_init(ObjectClass *klass, void *data) +{ + BusClass *bc = BUS_CLASS(klass); + QemuOpts *opts = qemu_opts_find(qemu_find_opts("memory-opts"), NULL); + + if (opts) { + bc->max_dev = qemu_opt_get_number(opts, "slots", 0); + } +} + +static const TypeInfo dimm_bus_info = { + .name = TYPE_DIMM_BUS, + .parent = TYPE_BUS, + .instance_init = dimm_bus_initfn, + .instance_size = sizeof(DimmBus), + .class_init = dimm_bus_class_init, +}; + +static Property dimm_properties[] = { + DEFINE_PROP_UINT64("start", DimmDevice, start, 0), + DEFINE_PROP_SIZE("size", DimmDevice, size, DEFAULT_DIMMSIZE), + DEFINE_PROP_UINT32("node", DimmDevice, node, 0), + DEFINE_PROP_INT32("slot", DimmDevice, slot, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void dimm_realize(DeviceState *dev, Error **errp) +{ + DimmDevice *dimm = DIMM(dev); + DimmBus *bus = DIMM_BUS(qdev_get_parent_bus(dev)); + BusClass *bc = BUS_GET_CLASS(bus); + + if (!dev->id) { + error_setg(errp, "missing 'id' property"); + return; + } + + if (dimm->slot >= bc->max_dev) { + error_setg(errp, "maximum allowed slot is: %d", bc->max_dev - 1); + return; + } + + memory_region_init_ram(&dimm->mr, dev->id, dimm->size); +} + +static void dimm_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->realize = dimm_realize; + dc->props = dimm_properties; + dc->bus_type = TYPE_DIMM_BUS; +} + +static TypeInfo dimm_info = { + .name = TYPE_DIMM, + .parent = TYPE_DEVICE, + .instance_size = sizeof(DimmDevice), + .class_init = dimm_class_init, +}; + +static void dimm_register_types(void) +{ + type_register_static(&dimm_bus_info); + type_register_static(&dimm_info); +} + +type_init(dimm_register_types) diff --git a/include/hw/mem-hotplug/dimm.h b/include/hw/mem-hotplug/dimm.h new file mode 100644 index 0000000..c83ad26 --- /dev/null +++ b/include/hw/mem-hotplug/dimm.h @@ -0,0 +1,66 @@ +/* + * DIMM device + * + * Copyright ProfitBricks GmbH 2012 + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Vasilis Liaskovitis <vasilis.liaskovi...@profitbricks.com> + * Igor Mammedov <imamm...@redhat.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef QEMU_DIMM_H +#define QEMU_DIMM_H + +#include "exec/memory.h" +#include "hw/qdev.h" + +#define DEFAULT_DIMMSIZE (1024*1024*1024) + +#define TYPE_DIMM "dimm" +#define DIMM(obj) \ + OBJECT_CHECK(DimmDevice, (obj), TYPE_DIMM) +#define DIMM_CLASS(klass) \ + OBJECT_CLASS_CHECK(DimmDeviceClass, (klass), TYPE_DIMM) +#define DIMM_GET_CLASS(obj) \ + OBJECT_GET_CLASS(DimmDeviceClass, (obj), TYPE_DIMM) + +/** + * DimmBus: + * @start: starting physical address, where @DimmDevice is mapped. + * @size: amount of memory mapped at @start. + * @node: numa node to which @DimmDevice is attached. + * @slot: slot number into which @DimmDevice is plugged in. + */ +typedef struct DimmDevice { + DeviceState qdev; + ram_addr_t start; + ram_addr_t size; + uint32_t node; + int32_t slot; + MemoryRegion mr; +} DimmDevice; + +typedef struct DimmDeviceClass { + DeviceClass parent_class; +} DimmDeviceClass; + +#define TYPE_DIMM_BUS "dimmbus" +#define DIMM_BUS(obj) OBJECT_CHECK(DimmBus, (obj), TYPE_DIMM_BUS) +#define DIMM_BUS_CLASS(klass) \ + OBJECT_CLASS_CHECK(DimmBusClass, (klass), TYPE_DIMM_BUS) +#define DIMM_BUS_GET_CLASS(obj) \ + OBJECT_GET_CLASS(DimmBusClass, (obj), TYPE_DIMM_BUS) + +/** + * DimmBus: + */ +typedef struct DimmBus { + BusState qbus; +} DimmBus; + +#endif -- 1.7.1
