Commit 1f283ae1 authored by Eric Auger's avatar Eric Auger Committed by Michael S. Tsirkin
Browse files

hw/arm/virt: Add memory hotplug framework 



This patch adds the memory hot-plug/hot-unplug infrastructure
in machvirt. The device memory is not yet exposed to the Guest
either through DT or ACPI and hence both cold/hot plug of memory
is explicitly disabled for now.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarKwangwoo Lee <kwangwoo.lee@sk.com>
Signed-off-by: default avatarShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <20190918130633.4872-5-shameerali.kolothum.thodi@huawei.com>
Acked-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ebb62075

hw/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ config ARM_VIRT 
    select SMBIOS

    select VIRTIO_MMIO

    select ACPI_PCI

    select MEM_DEVICE

    select DIMM



config CHEETAH

    bool

hw/arm/virt.c

+52 −1
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#include "hw/arm/smmuv3.h"

#include "hw/acpi/acpi.h"

#include "target/arm/internals.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, \
@@ -1876,6 +1878,42 @@ 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)

{



    /*

     * The device memory is not yet exposed to the Guest either through

     * DT or ACPI and hence both cold/hot plug of memory is explicitly

     * disabled for now.

     */

    if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {

        error_setg(errp, "memory cold/hot plug 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_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)

{
@@ -1887,12 +1925,23 @@ 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_request_cb(HotplugHandler *hotplug_dev,

                                          DeviceState *dev, Error **errp)

{

    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);

    }
@@ -1956,7 +2005,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_request = virt_machine_device_unplug_request_cb;

    mc->numa_mem_supported = true;

}