From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDB1DC31E51 for ; Tue, 18 Jun 2019 12:45:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B12A920679 for ; Tue, 18 Jun 2019 12:45:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B12A920679 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdDU3-0006gK-Vg for qemu-devel@archiver.kernel.org; Tue, 18 Jun 2019 08:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34549) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdDRZ-0005Nn-4C for qemu-devel@nongnu.org; Tue, 18 Jun 2019 08:42:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdDRR-000461-9J for qemu-devel@nongnu.org; Tue, 18 Jun 2019 08:42:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37334) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdDRK-0003sd-3C; Tue, 18 Jun 2019 08:42:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D68A9356CA; Tue, 18 Jun 2019 12:42:14 +0000 (UTC) Received: from [10.36.117.84] (ovpn-117-84.ams2.redhat.com [10.36.117.84]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 454BF3793; Tue, 18 Jun 2019 12:42:12 +0000 (UTC) To: Shameer Kolothum , qemu-devel@nongnu.org, qemu-arm@nongnu.org, imammedo@redhat.com References: <20190522162252.28568-1-shameerali.kolothum.thodi@huawei.com> <20190522162252.28568-5-shameerali.kolothum.thodi@huawei.com> From: Auger Eric Message-ID: <5e59ade1-91ab-e9c8-2c41-97217355c612@redhat.com> Date: Tue, 18 Jun 2019 14:42:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190522162252.28568-5-shameerali.kolothum.thodi@huawei.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 18 Jun 2019 12:42:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v5 4/8] hw/arm/virt: Add memory hotplug framework 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, sameo@linux.intel.com, ard.biesheuvel@linaro.org, linuxarm@huawei.com, xuwei5@hisilicon.com, shannon.zhaosl@gmail.com, sebastien.boeuf@intel.com, lersek@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Shameer, On 5/22/19 6:22 PM, Shameer Kolothum wrote: > From: Eric Auger > > 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: Eric Auger > Signed-off-by: Kwangwoo Lee > Signed-off-by: Shameer Kolothum > --- > hw/arm/Kconfig | 2 ++ > hw/arm/virt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 52 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index af8cffde9c..6ef22439b5 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -19,6 +19,8 @@ config ARM_VIRT > select PLATFORM_BUS > select SMBIOS > select VIRTIO_MMIO small conflict to be resolved here after addition of "select ACPI_PCI". > + select MEM_DEVICE > + select DIMM > > config CHEETAH > bool > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 5331ab71e2..3df8c389ff 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -62,6 +62,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, \ > @@ -1862,6 +1864,40 @@ 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); > + > + pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), NULL); > + > +} > + > +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) > { > @@ -1873,12 +1909,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); > } > > @@ -1942,7 +1989,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; > } > > static void virt_instance_init(Object *obj) > Thanks Eric