From nobody Fri Nov 14 19:27:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1589972831; cv=none; d=zohomail.com; s=zohoarc; b=LWPFS/CJcQx+HJWaKP7zl4USl8e9LR+pGro9HT8HWihxRPO/g0xhGAlSopGprG9pa0Ry299RKSJJBSUENfH1IpPfBt6RgCdxeLs3X6HBeVN1UH9c9iBMofzX/Pjv1DMyFtzMyUQGcjFvzU5wAwtssgaKN5+Kz+BWlgrQtcGscm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589972831; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=EPz+0kdVtW5q8N+2z/Wh5x38FOKcb3/jyNq+Nneaz2E=; b=jxfE3smyyZsGWEx/iSWqKToJYB9SY/khCHnWcJK14A787FDHVaf/RQKq89nIgHVjsWDiidJvZbzP195q3V+nKsHdFROP1wGYzWOs5ddAYM2ik9RmsPOL/DIQB045M77Jqw53esZY1wTKfGDymSWuw9GTjyqjf/AAiL9/h7HhVWI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589972831711768.042544914778; Wed, 20 May 2020 04:07:11 -0700 (PDT) Received: from localhost ([::1]:45218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbMZ4-0001ao-Bd for importer@patchew.org; Wed, 20 May 2020 07:07:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbMYI-0000NI-00; Wed, 20 May 2020 07:06:22 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3766 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbMYG-0007zY-BS; Wed, 20 May 2020 07:06:21 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id E867F647BB5BB2D5ABED; Wed, 20 May 2020 19:06:09 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.47.27.193) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.487.0; Wed, 20 May 2020 19:06:01 +0800 From: Shameer Kolothum To: , Subject: [PATCH v2] arm/virt: Add memory hot remove support Date: Wed, 20 May 2020 12:03:54 +0100 Message-ID: <20200520110354.14352-1-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.47.27.193] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.191; envelope-from=shameerali.kolothum.thodi@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 05:37:42 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, mst@redhat.com, linuxarm@huawei.com, xuwei5@hisilicon.com, eric.auger@redhat.com, prime.zeng@hisilicon.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This adds support for memory hot remove on arm/virt that uses acpi ged device. Signed-off-by: Shameer Kolothum --- 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 *ho= tplug_dev, } } =20 +static void acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + AcpiGedState *s =3D ACPI_GED(hotplug_dev); + + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + acpi_memory_unplug_request_cb(hotplug_dev, &s->memhp_state, dev, e= rrp); + } else { + error_setg(errp, "acpi: device unplug request for unsupported devi= ce" + " type: %s", object_get_typename(OBJECT(dev))); + } +} + +static void acpi_ged_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + AcpiGedState *s =3D 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 =3D ACPI_GED(adev); @@ -318,6 +344,8 @@ static void acpi_ged_class_init(ObjectClass *class, voi= d *data) dc->vmsd =3D &vmstate_acpi_ged; =20 hc->plug =3D acpi_ged_device_plug_cb; + hc->unplug_request =3D acpi_ged_unplug_request_cb; + hc->unplug =3D acpi_ged_unplug_cb; =20 adevc->send_event =3D 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(HotplugHand= ler *hotplug_dev, } } =20 +static void virt_dimm_unplug_request(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); + Error *local_err =3D 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 =3D VIRT_MACHINE(hotplug_dev); + Error *local_err =3D 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)) { + 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))); + } } =20 static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *mach= ine, @@ -2262,6 +2313,7 @@ static void virt_machine_class_init(ObjectClass *oc, = void *data) hc->pre_plug =3D virt_machine_device_pre_plug_cb; hc->plug =3D virt_machine_device_plug_cb; hc->unplug_request =3D virt_machine_device_unplug_request_cb; + hc->unplug =3D virt_machine_device_unplug_cb; mc->numa_mem_supported =3D true; mc->nvdimm_supported =3D true; mc->auto_enable_numa_with_memhp =3D true; --=20 2.17.1