From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex@alex.org.uk, mst@redhat.com,
aik@ozlabs.ru, hutao@cn.fujitsu.com, mjt@tls.msk.ru,
tangchen@cn.fujitsu.com, kraxel@redhat.com, pasteka@kabsi.at,
s.priebe@profihost.ag, agarcia@igalia.com, armbru@redhat.com,
aliguori@amazon.com, david@gibson.dropbear.id.au,
lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com,
stefanha@redhat.com, cornelia.huck@de.ibm.com, rth@twiddle.net,
agraf@suse.de, andrey@xdel.ru,
vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com,
afaerber@suse.de, aurelien@aurel32.net
Subject: [Qemu-devel] [PATCH v2 16/31] dimm: add busy address check and address auto-allocation
Date: Tue, 20 May 2014 17:15:19 +0200 [thread overview]
Message-ID: <1400598934-31921-17-git-send-email-imammedo@redhat.com> (raw)
In-Reply-To: <1400598934-31921-1-git-send-email-imammedo@redhat.com>
- 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 <imammedo@redhat.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
---
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 868af17..42f41df 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1552,6 +1552,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
next prev parent reply other threads:[~2014-05-20 15:19 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 15:15 [Qemu-devel] [PATCH v2 00/31] pc: ACPI memory hotplug Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 01/31] pc: ACPI BIOS: use enum for defining memory affinity flags Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 02/31] object_add: allow completion handler to get canonical path Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 03/31] vl.c: daemonize before guest memory allocation Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 04/31] add memdev backend infrastructure Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 05/31] vl.c: extend -m option to support options for memory hotplug Igor Mammedov
2014-05-21 8:10 ` Michael S. Tsirkin
2014-05-21 8:26 ` Igor Mammedov
2014-05-21 8:27 ` Andrey Korolyov
2014-05-21 8:55 ` Igor Mammedov
2014-05-21 9:12 ` Andrey Korolyov
2014-05-21 9:52 ` Igor Mammedov
2014-05-21 10:04 ` Andrey Korolyov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 06/31] pc: create custom generic PC machine type Igor Mammedov
2014-05-20 15:55 ` Marcel Apfelbaum
2014-05-21 7:30 ` Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 07/31] qdev: hotplug for buss-less devices Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 08/31] qdev: expose DeviceState.hotplugged field as a property Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 09/31] dimm: implement dimm device abstraction Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 10/31] memory: add memory_region_is_mapped() API Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 11/31] dimm: do not allow to set already used memdev Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 12/31] pc: initialize memory hotplug address space Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 13/31] pc: exit QEMU if number of slots more than supported 256 Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 14/31] pc: add 'etc/reserved-memory-end' fw_cfg interface for SeaBIOS Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 15/31] pc: add memory hotplug handler to PC_MACHINE Igor Mammedov
2014-05-20 15:15 ` Igor Mammedov [this message]
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 17/31] dimm: add busy slot check and slot auto-allocation Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 18/31] acpi: rename cpu_hotplug_defs.h to acpi_defs.h Igor Mammedov
2014-05-20 15:35 ` Michael S. Tsirkin
2014-05-20 16:03 ` Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 19/31] acpi: memory hotplug ACPI hardware implementation Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 20/31] trace: add acpi memory hotplug IO region events Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 21/31] trace: pc: add DIMM slot & address allocation Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 24/31] pc: ich9 lpc: make it work with global/compat properties Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 29/31] pc: ACPI BIOS: implement memory hotplug interface Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 30/31] pc: ACPI BIOS: reserve SRAT entry for hotplug mem hole Igor Mammedov
2014-05-20 15:38 ` Michael S. Tsirkin
2014-05-21 7:56 ` Igor Mammedov
2014-05-21 8:02 ` Michael S. Tsirkin
2014-05-21 8:05 ` Michael S. Tsirkin
2014-05-21 11:22 ` Igor Mammedov
2014-05-21 12:44 ` Michael S. Tsirkin
2014-05-21 13:56 ` Igor Mammedov
2014-05-21 15:01 ` Michael S. Tsirkin
2014-05-21 15:17 ` Igor Mammedov
2014-05-20 15:15 ` [Qemu-devel] [PATCH v2 31/31] pc: ACPI BIOS: make GPE.3 handle memory hotplug event on PIIX and Q35 machines Igor Mammedov
2014-05-21 11:29 ` [Qemu-devel] [PATCH v2 22/31] acpi:piix4: allow plug/unlug callbacks handle not only PCI devices Igor Mammedov
2014-05-21 11:29 ` [Qemu-devel] [PATCH v2 23/31] acpi:piix4: add memory hotplug handling Igor Mammedov
2014-05-21 11:29 ` [Qemu-devel] [PATCH v2 25/31] acpi:ich9: " Igor Mammedov
2014-05-21 11:29 ` [Qemu-devel] [PATCH v2 26/31] pc: migrate piix4 & ich9 MemHotplugState Igor Mammedov
2014-05-23 15:11 ` Andrey Korolyov
2014-05-23 15:41 ` Igor Mammedov
2014-05-21 11:29 ` [Qemu-devel] [PATCH v2 27/31] pc: add acpi-device link to PCMachineState Igor Mammedov
2014-05-21 11:29 ` [Qemu-devel] [PATCH v2 28/31] pc: propagate memory hotplug event to ACPI device Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400598934-31921-17-git-send-email-imammedo@redhat.com \
--to=imammedo@redhat.com \
--cc=afaerber@suse.de \
--cc=agarcia@igalia.com \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=alex@alex.org.uk \
--cc=aliguori@amazon.com \
--cc=andrey@xdel.ru \
--cc=armbru@redhat.com \
--cc=aurelien@aurel32.net \
--cc=cornelia.huck@de.ibm.com \
--cc=david@gibson.dropbear.id.au \
--cc=ehabkost@redhat.com \
--cc=hutao@cn.fujitsu.com \
--cc=kraxel@redhat.com \
--cc=lersek@redhat.com \
--cc=marcel.a@redhat.com \
--cc=mjt@tls.msk.ru \
--cc=mst@redhat.com \
--cc=pasteka@kabsi.at \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=s.priebe@profihost.ag \
--cc=stefanha@redhat.com \
--cc=tangchen@cn.fujitsu.com \
--cc=vasilis.liaskovitis@profitbricks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).