From bb0831bdf45a61c83fa1def44ae391260ce2662d Mon Sep 17 00:00:00 2001
From: David Hildenbrand <david@redhat.com>
Date: Mon, 23 Apr 2018 18:51:20 +0200
Subject: pc-dimm: factor out address search into MemoryDevice code
This mainly moves code, but does a handfull of optimizations:
- We pass the machine instead of the address space properties
- We check the hinted address directly and handle fragmented memory
better
- We make the search independent of pc-dimm
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20180423165126.15441-6-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/mem/pc-dimm.c | 109 +------------------------------------------------------
1 file changed, 2 insertions(+), 107 deletions(-)
(limited to 'hw/mem/pc-dimm.c')
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 37b8be80a1..9b70174fd9 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -23,9 +23,7 @@
#include "hw/mem/nvdimm.h"
#include "hw/mem/memory-device.h"
#include "qapi/error.h"
-#include "qemu/config-file.h"
#include "qapi/visitor.h"
-#include "qemu/range.h"
#include "sysemu/numa.h"
#include "sysemu/kvm.h"
#include "trace.h"
@@ -60,10 +58,8 @@ void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine,
goto out;
}
- addr = pc_dimm_get_free_addr(hpms->base,
- memory_region_size(&hpms->mr),
- !addr ? NULL : &addr, align,
- memory_region_size(mr), &local_err);
+ addr = memory_device_get_free_addr(machine, !addr ? NULL : &addr, align,
+ memory_region_size(mr), &local_err);
if (local_err) {
goto out;
}
@@ -211,107 +207,6 @@ out:
return slot;
}
-static gint pc_dimm_addr_sort(gconstpointer a, gconstpointer b)
-{
- PCDIMMDevice *x = PC_DIMM(a);
- PCDIMMDevice *y = PC_DIMM(b);
- Int128 diff = int128_sub(int128_make64(x->addr), int128_make64(y->addr));
-
- if (int128_lt(diff, int128_zero())) {
- return -1;
- } else if (int128_gt(diff, int128_zero())) {
- return 1;
- }
- return 0;
-}
-
-static int pc_dimm_built_list(Object *obj, void *opaque)
-{
- GSList **list = opaque;
-
- if (object_dynamic_cast(obj, TYPE_PC_DIMM)) {
- DeviceState *dev = DEVICE(obj);
- if (dev->realized) { /* only realized DIMMs matter */
- *list = g_slist_insert_sorted(*list, dev, pc_dimm_addr_sort);
- }
- }
-
- object_child_foreach(obj, pc_dimm_built_list, opaque);
- return 0;
-}
-
-uint64_t pc_dimm_get_free_addr(uint64_t address_space_start,
- uint64_t address_space_size,
- uint64_t *hint, uint64_t align, 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;
-
- g_assert(QEMU_ALIGN_UP(address_space_start, align) == address_space_start);
-
- if (!address_space_size) {
- error_setg(errp, "memory hotplug is not enabled, "
- "please add maxmem option");
- goto out;
- }
-
- if (hint && QEMU_ALIGN_UP(*hint, align) != *hint) {
- error_setg(errp, "address must be aligned to 0x%" PRIx64 " bytes",
- align);
- goto out;
- }
-
- if (QEMU_ALIGN_UP(size, align) != size) {
- error_setg(errp, "backend memory size must be multiple of 0x%"
- PRIx64, align);
- goto out;
- }
-
- assert(address_space_end > address_space_start);
- object_child_foreach(qdev_get_machine(), pc_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)) {
- PCDIMMDevice *dimm = item->data;
- uint64_t dimm_size = object_property_get_uint(OBJECT(dimm),
- PC_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 = QEMU_ALIGN_UP(dimm->addr + dimm_size, align);
- }
- }
- 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 pc_dimm_properties[] = {
DEFINE_PROP_UINT64(PC_DIMM_ADDR_PROP, PCDIMMDevice, addr, 0),
DEFINE_PROP_UINT32(PC_DIMM_NODE_PROP, PCDIMMDevice, node, 0),
--
cgit v1.2.3