From patchwork Tue Jul 16 15:38:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 169065 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1024906ilk; Tue, 16 Jul 2019 08:41:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3a2zy38Cn9lPu9LKuxhmDOfmkYR1Fh3DsEs6/QhTzO1GFurddl6R29hkh700jNZh9Y09n X-Received: by 2002:a17:907:2114:: with SMTP id qn20mr26406050ejb.138.1563291698734; Tue, 16 Jul 2019 08:41:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563291698; cv=none; d=google.com; s=arc-20160816; b=fKZdQJ2ULgoi5Z7zEtNmtyfLzdPRp0vM2OxJX5Lpxyk8D6a24BiTasSitbQQKWH1Kg omp/x6SqUKpd3VZoXaSchp6DGG54ne1fGJNFHGA2lwaZg82q3vqcyAoZxRvYTvFIDi8v xkf8yEhEFHYMiy/26Zht5qjOpk5M+VjAxcoUjRbgjJ9k9HNfCn3//CscAskDcUyJO4bP lFjuU/gi30KPm4BBgHHhIdhWjYwiQO4Vlaf1x/fKsxhOxmtMuVKsP2KLqBbN3HXwTs5x dBwhMTO8wWkG/TnHA7ZPScu8GpRSEx9TyesHfFSP962VcVkGe4yiLOdSURbB8P3QB4u6 HLhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:mime-version:references :in-reply-to:message-id:date:to:from; bh=EZlzML/HEtJNX+0GVs2Gr8RyePyeJ60hRlRZDqkbd9I=; b=AftFQsjyiMLaXt9A/0Ynk6Mtrt0lm+Wa4TkLMdI8aC/XdGCvDgj9QdhXS0CNJUuS7Y eE6ysd9p9C9CMqYat8Sxxw/h2BKxsOIuhAFMM8uApDmlw+7Qv2zWsoMWlGVKLvpK3fW8 5y+91EePhuH5e4KdeEJIb0EEU0yQy3oyHUmsFloI5/0dd8WNyzjHMYvxqwq5s+8n4J3O WxTtCboFeln7WjI5SRZmJx5trBjB4MQfTO0TTNiARbgealNCjzvrgfH6sAK0kn1KCuh6 Z4KGTqQYOLfo02C9QOyBJR9BQG+jan68RgMgiXH8WtQGWJge1jxYG81lbipAhoucfNrG RPUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ce13si11089484ejb.305.2019.07.16.08.41.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jul 2019 08:41:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:50198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnPaD-0007gt-38 for patch@linaro.org; Tue, 16 Jul 2019 11:41:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36599) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnPZq-0007Se-6L for qemu-devel@nongnu.org; Tue, 16 Jul 2019 11:41:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnPZp-0004Oh-06 for qemu-devel@nongnu.org; Tue, 16 Jul 2019 11:41:14 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2175 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnPZl-0004ES-Pc; Tue, 16 Jul 2019 11:41:10 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 3BA8317A01BE4BF1A2A8; Tue, 16 Jul 2019 23:40:59 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.439.0; Tue, 16 Jul 2019 23:40:50 +0800 From: Shameer Kolothum To: , , , Date: Tue, 16 Jul 2019 16:38:10 +0100 Message-ID: <20190716153816.17676-5-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190716153816.17676-1-shameerali.kolothum.thodi@huawei.com> References: <20190716153816.17676-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.190 Subject: [Qemu-devel] [PATCH-for-4.2 v7 04/10] 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Peter Maydell --- hw/arm/Kconfig | 2 ++ hw/arm/virt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Igor Mammedov diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index ab65ecd216..84961c17ab 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -20,6 +20,8 @@ config ARM_VIRT select SMBIOS select VIRTIO_MMIO select ACPI_PCI + select MEM_DEVICE + select DIMM config CHEETAH bool diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d9496c9363..907fb64bb9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -64,6 +64,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, \ @@ -1871,6 +1873,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) { @@ -1882,12 +1918,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); } @@ -1951,7 +1998,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; }