From: Auger Eric <eric.auger@redhat.com>
To: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>,
qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org, mst@redhat.com, linuxarm@huawei.com,
xuwei5@hisilicon.com, prime.zeng@hisilicon.com,
imammedo@redhat.com
Subject: Re: [PATCH v2] arm/virt: Add memory hot remove support
Date: Wed, 17 Jun 2020 15:53:46 +0200 [thread overview]
Message-ID: <96e2efe0-0fda-6d73-4164-12ee9837a679@redhat.com> (raw)
In-Reply-To: <20200520110354.14352-1-shameerali.kolothum.thodi@huawei.com>
Hi Shameer,
On 5/20/20 1:03 PM, Shameer Kolothum wrote:
> This adds support for memory hot remove on arm/virt that
> uses acpi ged device.
>
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
> RFC v1 --> v2
> -Rebased on top of latest Qemu master.
> -Dropped "RFC" and tested with kernel 5.7-rc6
> ---
> hw/acpi/generic_event_device.c | 28 +++++++++++++++++
> hw/arm/virt.c | 56 ++++++++++++++++++++++++++++++++--
> 2 files changed, 82 insertions(+), 2 deletions(-)
>
> diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c
> index b1cbdd86b6..2b3bedcd2f 100644
> --- a/hw/acpi/generic_event_device.c
> +++ b/hw/acpi/generic_event_device.c
> @@ -193,6 +193,32 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,
> }
> }
>
> +static void acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + AcpiGedState *s = ACPI_GED(hotplug_dev);
> +
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + acpi_memory_unplug_request_cb(hotplug_dev, &s->memhp_state, dev, errp);
is it allowed to unplug NVDIMM? As NVDIMM inherits from PCDIMM, I wonder
if we have to handle the case differently (as done in hotplug part).
> + } else {
> + error_setg(errp, "acpi: device unplug request for unsupported device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> + }
> +}
> +
> +static void acpi_ged_unplug_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + AcpiGedState *s = ACPI_GED(hotplug_dev);
> +
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + acpi_memory_unplug_cb(&s->memhp_state, dev, errp);
> + } else {
> + error_setg(errp, "acpi: device unplug for unsupported device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> + }
> +}
> +
> static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
> {
> AcpiGedState *s = ACPI_GED(adev);
> @@ -318,6 +344,8 @@ static void acpi_ged_class_init(ObjectClass *class, void *data)
> dc->vmsd = &vmstate_acpi_ged;
>
> hc->plug = acpi_ged_device_plug_cb;
> + hc->unplug_request = acpi_ged_unplug_request_cb;
> + hc->unplug = acpi_ged_unplug_cb;
>
> adevc->send_event = acpi_ged_send_event;
> }
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 37462a6f78..110fa73990 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -2177,11 +2177,62 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,
> }
> }
>
> +static void virt_dimm_unplug_request(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> + Error *local_err = NULL;
> +
> + if (!vms->acpi_dev) {
> + error_setg(errp,
> + "memory hotplug is not enabled: missing acpi-ged device");
> + goto out;
> + }
> +
> + hotplug_handler_unplug_request(HOTPLUG_HANDLER(vms->acpi_dev), dev,
> + &local_err);
> +out:
> + error_propagate(errp, local_err);
> +}
> +
> +static void virt_dimm_unplug(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);
> + Error *local_err = NULL;
> +
> + hotplug_handler_unplug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &local_err);
> + if (local_err) {
> + goto out;
> + }
> +
> + pc_dimm_unplug(PC_DIMM(dev), MACHINE(vms));
> + object_property_set_bool(OBJECT(dev), false, "realized", NULL);
> +
> + out:
> + error_propagate(errp, local_err);
> +}
> +
> 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)));
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
same here. By comparison, in hw/i386/pc.c, it is said
"nvdimm device hot unplug is not supported yet."
what is the situation on ARM?
Thanks
Eric
> + virt_dimm_unplug_request(hotplug_dev, dev, errp);
> + } else {
> + error_setg(errp, "device unplug request for unsupported device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> + }
> +}
> +
> +static void virt_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> +{
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> + virt_dimm_unplug(hotplug_dev, dev, errp);
> + } else {
> + error_setg(errp, "virt: device unplug for unsupported device"
> + " type: %s", object_get_typename(OBJECT(dev)));
> + }
> }
>
> static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,
> @@ -2262,6 +2313,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
> 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;
> + hc->unplug = virt_machine_device_unplug_cb;
> mc->numa_mem_supported = true;
> mc->nvdimm_supported = true;
> mc->auto_enable_numa_with_memhp = true;
>
next prev parent reply other threads:[~2020-06-17 13:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 11:03 [PATCH v2] arm/virt: Add memory hot remove support Shameer Kolothum
2020-06-17 11:27 ` Shameerali Kolothum Thodi
2020-06-17 13:53 ` Auger Eric [this message]
2020-06-17 16:40 ` Shameerali Kolothum Thodi
2020-06-18 9:19 ` Auger Eric
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=96e2efe0-0fda-6d73-4164-12ee9837a679@redhat.com \
--to=eric.auger@redhat.com \
--cc=imammedo@redhat.com \
--cc=linuxarm@huawei.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=prime.zeng@hisilicon.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=xuwei5@hisilicon.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.