[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v5 11/18] hw/arm/virt: Add memory hotplug framework
From: |
Eric Auger |
Subject: |
[Qemu-arm] [PATCH v5 11/18] hw/arm/virt: Add memory hotplug framework |
Date: |
Wed, 23 Jan 2019 11:14:51 +0100 |
This patch adds the the memory hot-plug/hot-unplug infrastructure
in machvirt. It is still not enabled as no device memory is allocated.
Signed-off-by: Eric Auger <address@hidden>
Signed-off-by: Shameer Kolothum <address@hidden>
Signed-off-by: Kwangwoo Lee <address@hidden>
---
v4 -> v5:
- change in pc_dimm_pre_plug signature
- CONFIG_MEM_HOTPLUG replaced by CONFIG_MEM_DEVICE and CONFIG_DIMM
v3 -> v4:
- check the memory device is not hotplugged
v2 -> v3:
- change in pc_dimm_plug()'s signature
- add pc_dimm_pre_plug call
v1 -> v2:
- s/virt_dimm_plug|unplug/virt_memory_plug|unplug
- s/pc_dimm_memory_plug/pc_dimm_plug
- reworded title and commit message
- added pre_plug cb
- don't handle get_memory_region failure anymore
---
default-configs/arm-softmmu.mak | 2 ++
hw/arm/virt.c | 64 ++++++++++++++++++++++++++++++++-
2 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2420491aac..3c5928aae0 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -159,3 +159,5 @@ CONFIG_PCI_DESIGNWARE=y
CONFIG_STRONGARM=y
CONFIG_HIGHBANK=y
CONFIG_MUSICPAL=y
+CONFIG_MEM_DEVICE=y
+CONFIG_DIMM=y
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 61c3bb1cef..aad7e0f095 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -59,6 +59,8 @@
#include "qapi/visitor.h"
#include "standard-headers/linux/input.h"
#include "hw/arm/smmuv3.h"
+#include "hw/mem/pc-dimm.h"
+#include "hw/mem/nvdimm.h"
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -1736,6 +1738,49 @@ static const CPUArchIdList
*virt_possible_cpu_arch_ids(MachineState *ms)
return ms->possible_cpus;
}
+static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
+ Error **errp)
+{
+ const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
+
+ if (dev->hotplugged) {
+ error_setg(errp, "memory hotplug is not supported");
+ }
+
+ if (is_nvdimm) {
+ error_setg(errp, "nvdimm is not yet supported");
+ return;
+ }
+
+ pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp);
+}
+
+static void virt_memory_plug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
+ Error *local_err = NULL;
+
+ pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err);
+
+ error_propagate(errp, local_err);
+}
+
+static void virt_memory_unplug(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ pc_dimm_unplug(PC_DIMM(dev), MACHINE(hotplug_dev));
+ object_unparent(OBJECT(dev));
+}
+
+static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ virt_memory_pre_plug(hotplug_dev, dev, errp);
+ }
+}
+
static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
@@ -1747,12 +1792,27 @@ static void virt_machine_device_plug_cb(HotplugHandler
*hotplug_dev,
SYS_BUS_DEVICE(dev));
}
}
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ virt_memory_plug(hotplug_dev, dev, errp);
+ }
+}
+
+static void virt_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
+ DeviceState *dev, Error **errp)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
+ virt_memory_unplug(hotplug_dev, dev, errp);
+ } else {
+ error_setg(errp, "device unplug request for unsupported device"
+ " type: %s", object_get_typename(OBJECT(dev)));
+ }
}
static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,
DeviceState *dev)
{
- if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE)) {
+ if (object_dynamic_cast(OBJECT(dev), TYPE_SYS_BUS_DEVICE) ||
+ (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM))) {
return HOTPLUG_HANDLER(machine);
}
@@ -1812,7 +1872,9 @@ static void virt_machine_class_init(ObjectClass *oc, void
*data)
mc->kvm_type = virt_kvm_type;
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
+ hc->pre_plug = virt_machine_device_pre_plug_cb;
hc->plug = virt_machine_device_plug_cb;
+ hc->unplug = virt_machine_device_unplug_cb;
}
static void virt_instance_init(Object *obj)
--
2.20.1
- [Qemu-arm] [PATCH v5 00/18] ARM virt: Initial RAM expansion and PCDIMM/NVDIMM support, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 06/18] hw/boards: Add a MachineState parameter to kvm_type callback, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 03/18] hw/arm/boot: introduce fdt_add_memory_node helper, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 05/18] hw/arm/virt: Move memory map initialization into machvirt_init, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 04/18] hw/arm/virt: Split the memory map description, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 07/18] kvm: add kvm_arm_get_max_vm_phys_shift, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 08/18] vl: Set machine ram_size, maxram_size and ram_slots earlier, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 09/18] hw/arm/virt: Implement kvm_type function for 4.0 machine, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 10/18] hw/arm/virt: Bump the 255GB initial RAM limit, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 11/18] hw/arm/virt: Add memory hotplug framework,
Eric Auger <=
- [Qemu-arm] [PATCH v5 12/18] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 13/18] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 15/18] nvdimm: use configurable ACPI IO base and size, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 14/18] hw/arm/virt: Allocate device_memory, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 16/18] hw/arm/virt: Add nvdimm hot-plug infrastructure, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 17/18] hw/arm/boot: Expose the pmem nodes in the DT, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 18/18] hw/arm/virt: Add nvdimm and nvdimm-persistence options, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 02/18] linux-headers: Update to v5.0-rc2, Eric Auger, 2019/01/23
- [Qemu-arm] [PATCH v5 01/18] update-linux-headers.sh: Copy new headers, Eric Auger, 2019/01/23