[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 18/34] dimm: add busy address check and address a
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v3 18/34] dimm: add busy address check and address auto-allocation |
Date: |
Tue, 27 May 2014 15:01:15 +0200 |
- if 'addr' property is not specified on -device/device_add command,
treat default value as request for assigning DimmDevice to
the first free memory region.
- if 'addr' is provided with -device/device_add command, attempt to
use it or fail command if it's already occupied or falls inside
of an existing DimmDevice memory region.
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Tang Chen <address@hidden>
---
v2:
* abort if hotplug address-space size is too big,
reported by Hu Tao
* do not reset previous error in dimm_get_free_addr(),
fixed by Tang Chen
---
hw/i386/pc.c | 9 ++++++
hw/mem/dimm.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/mem/dimm.h | 5 +++
3 files changed, 90 insertions(+), 0 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ba83a59..430a7c7 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1562,6 +1562,15 @@ static void pc_dimm_plug(HotplugHandler *hotplug_dev,
goto out;
}
+ addr = dimm_get_free_addr(pcms->hotplug_memory_base,
+ memory_region_size(&pcms->hotplug_memory),
+ !addr ? NULL : &addr,
+ memory_region_size(mr), &local_err);
+ if (local_err) {
+ goto out;
+ }
+ object_property_set_int(OBJECT(dev), addr, DIMM_ADDR_PROP, &local_err);
+
memory_region_add_subregion(&pcms->hotplug_memory,
addr - pcms->hotplug_memory_base, mr);
vmstate_register_ram(mr, dev);
diff --git a/hw/mem/dimm.c b/hw/mem/dimm.c
index 713ded5..1c726c6 100644
--- a/hw/mem/dimm.c
+++ b/hw/mem/dimm.c
@@ -21,6 +21,82 @@
#include "hw/mem/dimm.h"
#include "qemu/config-file.h"
#include "qapi/visitor.h"
+#include "qemu/range.h"
+
+static gint dimm_addr_sort(gconstpointer a, gconstpointer b)
+{
+ DimmDevice *x = DIMM(a);
+ DimmDevice *y = DIMM(b);
+
+ return x->addr - y->addr;
+}
+
+static int dimm_built_list(Object *obj, void *opaque)
+{
+ GSList **list = opaque;
+
+ if (object_dynamic_cast(obj, TYPE_DIMM)) {
+ DeviceState *dev = DEVICE(obj);
+ if (dev->realized) { /* only realized DIMMs matter */
+ *list = g_slist_insert_sorted(*list, dev, dimm_addr_sort);
+ }
+ }
+
+ object_child_foreach(obj, dimm_built_list, opaque);
+ return 0;
+}
+
+uint64_t dimm_get_free_addr(uint64_t address_space_start,
+ uint64_t address_space_size,
+ uint64_t *hint, uint64_t size,
+ Error **errp)
+{
+ GSList *list = NULL, *item;
+ uint64_t new_addr, ret = 0;
+ uint64_t address_space_end = address_space_start + address_space_size;
+
+ assert(address_space_end > address_space_size);
+ object_child_foreach(qdev_get_machine(), dimm_built_list, &list);
+
+ if (hint) {
+ new_addr = *hint;
+ } else {
+ new_addr = address_space_start;
+ }
+
+ /* find address range that will fit new DIMM */
+ for (item = list; item; item = g_slist_next(item)) {
+ DimmDevice *dimm = item->data;
+ uint64_t dimm_size = object_property_get_int(OBJECT(dimm),
+ DIMM_SIZE_PROP,
+ errp);
+ if (errp && *errp) {
+ goto out;
+ }
+
+ if (ranges_overlap(dimm->addr, dimm_size, new_addr, size)) {
+ if (hint) {
+ DeviceState *d = DEVICE(dimm);
+ error_setg(errp, "address range conflicts with '%s'", d->id);
+ goto out;
+ }
+ new_addr = dimm->addr + dimm_size;
+ }
+ }
+ ret = new_addr;
+
+ if (new_addr < address_space_start) {
+ error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64
+ "] at 0x%" PRIx64, new_addr, size, address_space_start);
+ } else if ((new_addr + size) > address_space_end) {
+ error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64
+ "] beyond 0x%" PRIx64, new_addr, size, address_space_end);
+ }
+
+out:
+ g_slist_free(list);
+ return ret;
+}
static Property dimm_properties[] = {
DEFINE_PROP_UINT64(DIMM_ADDR_PROP, DimmDevice, addr, 0),
diff --git a/include/hw/mem/dimm.h b/include/hw/mem/dimm.h
index 8839fb9..55bdfb2 100644
--- a/include/hw/mem/dimm.h
+++ b/include/hw/mem/dimm.h
@@ -70,4 +70,9 @@ typedef struct DimmDeviceClass {
MemoryRegion *(*get_memory_region)(DimmDevice *dimm);
} DimmDeviceClass;
+
+uint64_t dimm_get_free_addr(uint64_t address_space_start,
+ uint64_t address_space_size,
+ uint64_t *hint, uint64_t size,
+ Error **errp);
#endif
--
1.7.1
- [Qemu-devel] [PATCH v3 06/34] vl.c: extend -m option to support options for memory hotplug, (continued)
- [Qemu-devel] [PATCH v3 06/34] vl.c: extend -m option to support options for memory hotplug, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 01/34] machine: Conversion of QEMUMachineInitArgs to MachineState, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 07/34] pc: create custom generic PC machine type, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 09/34] qdev: expose DeviceState.hotplugged field as a property, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 08/34] qdev: hotplug for buss-less devices, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 10/34] dimm: implement dimm device abstraction, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 11/34] memory: add memory_region_is_mapped() API, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 13/34] pc: initialize memory hotplug address space, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 14/34] pc: exit QEMU if number of slots more than supported 256, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 17/34] pc: add memory hotplug handler to PC_MACHINE, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 18/34] dimm: add busy address check and address auto-allocation,
Igor Mammedov <=
- [Qemu-devel] [PATCH v3 22/34] trace: add acpi memory hotplug IO region events, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 21/34] acpi: memory hotplug ACPI hardware implementation, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 23/34] trace: pc: add DIMM slot & address allocation, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 24/34] acpi:piix4: allow plug/unlug callbacks handle not only PCI devices, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 25/34] acpi:piix4: add memory hotplug handling, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 28/34] pc: migrate piix4 & ich9 MemHotplugState, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 30/34] pc: propagate memory hotplug event to ACPI device, Igor Mammedov, 2014/05/27
- [Qemu-devel] [PATCH v3 31/34] pc: ACPI BIOS: implement memory hotplug interface, Igor Mammedov, 2014/05/27