From patchwork Fri Apr 24 06:47:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 464141 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BF2A21400A0 for ; Fri, 24 Apr 2015 17:04:42 +1000 (AEST) Received: from localhost ([::1]:43243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlXfE-0002ss-7P for incoming@patchwork.ozlabs.org; Fri, 24 Apr 2015 03:04:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlXVd-0003C9-1c for qemu-devel@nongnu.org; Fri, 24 Apr 2015 02:54:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YlXVY-0006FM-S7 for qemu-devel@nongnu.org; Fri, 24 Apr 2015 02:54:44 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:53212) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlXVX-0006EJ-VN for qemu-devel@nongnu.org; Fri, 24 Apr 2015 02:54:40 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 24 Apr 2015 16:54:37 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 24 Apr 2015 16:54:34 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 44A1A2BB0051; Fri, 24 Apr 2015 16:54:34 +1000 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t3O6sQ8e43122714; Fri, 24 Apr 2015 16:54:34 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t3O6s0YR000892; Fri, 24 Apr 2015 16:54:00 +1000 Received: from bharata.in.ibm.com ([9.79.216.71]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id t3O6m5R2023890; Fri, 24 Apr 2015 16:53:53 +1000 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Fri, 24 Apr 2015 12:17:46 +0530 Message-Id: <1429858066-12088-25-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1429858066-12088-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1429858066-12088-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15042406-0017-0000-0000-00000123DC5F X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.147 Cc: aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [RFC PATCH v3 24/24] spapr: Memory hotplug support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make use of pc-dimm infrastructure to support memory hotplug for PowerPC. Modelled on i386 memory hotplug. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson --- hw/ppc/spapr.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++- hw/ppc/spapr_events.c | 3 + 2 files changed, 158 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 73f947b..9f72890 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -61,7 +61,8 @@ #include "hw/nmi.h" #include "hw/compat.h" - +#include "hw/mem/pc-dimm.h" +#include "qapi/qmp/qerror.h" #include /* SLOF memory layout: @@ -877,6 +878,10 @@ int spapr_h_cas_compose_response(target_ulong addr, target_ulong size, _FDT((spapr_populate_memory(spapr, fdt))); } + if (spapr->dr_lmb_enabled) { + _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE_LMB)); + } + /* Pack resulting tree */ _FDT((fdt_pack(fdt))); @@ -2193,6 +2198,133 @@ static void spapr_cpu_socket_unplug(HotplugHandler *hotplug_dev, object_child_foreach(OBJECT(dev), spapr_cpu_core_unplug, errp); } +static void spapr_add_lmbs(DeviceState *dev, uint64_t addr, uint64_t size, + Error **errp) +{ + sPAPRDRConnector *drc; + uint32_t nr_lmbs = size/SPAPR_MEMORY_BLOCK_SIZE; + int i; + + if (size % SPAPR_MEMORY_BLOCK_SIZE) { + error_setg(errp, "Hotplugged memory size must be a multiple of " + "%d MB", SPAPR_MEMORY_BLOCK_SIZE/(1024 * 1024)); + return; + } + + /* + * Check for DRC connectors and send hotplug notification to the + * guest only in case of hotplugged memory. This allows cold plugged + * memory to be specified at boot time. + */ + if (!dev->hotplugged) { + return; + } + + for (i = 0; i < nr_lmbs; i++) { + drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, + addr/SPAPR_MEMORY_BLOCK_SIZE); + g_assert(drc); + + /* + * TODO: Not doing drc->attach() since it is currently not + * needed. When pseries guest kernel implements configure-connector + * RTAS for memory hotplug, we will have to pass a DT node at + * which time we can use ->attach(). + */ + spapr_hotplug_req_add_event(drc); + addr += SPAPR_MEMORY_BLOCK_SIZE; + } +} + +/* + * TODO: Share code with pc_dimm_plug. + */ +static void spapr_memory_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + int slot; + Error *local_err = NULL; + sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev); + MachineState *machine = MACHINE(hotplug_dev); + PCDIMMDevice *dimm = PC_DIMM(dev); + PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); + MemoryRegion *mr = ddc->get_memory_region(dimm); + uint64_t existing_dimms_capacity = 0; + uint64_t align = TARGET_PAGE_SIZE; + uint64_t addr; + + addr = object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP, &local_err); + if (local_err) { + goto out; + } + + if (memory_region_get_alignment(mr) && ms->enforce_aligned_dimm) { + align = memory_region_get_alignment(mr); + } + + addr = pc_dimm_get_free_addr(ms->hotplug_memory_base, + memory_region_size(&ms->hotplug_memory), + !addr ? NULL : &addr, align, + memory_region_size(mr), &local_err); + if (local_err) { + goto out; + } + + existing_dimms_capacity = pc_existing_dimms_capacity(&local_err); + if (local_err) { + goto out; + } + + if (existing_dimms_capacity + memory_region_size(mr) > + machine->maxram_size - machine->ram_size) { + error_setg(&local_err, "not enough space, currently 0x%" PRIx64 + " in use of total hot pluggable 0x" RAM_ADDR_FMT, + existing_dimms_capacity, + machine->maxram_size - machine->ram_size); + goto out; + } + + object_property_set_int(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local_err); + if (local_err) { + goto out; + } + trace_mhp_pc_dimm_assigned_address(addr); + + slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, &local_err); + if (local_err) { + goto out; + } + + slot = pc_dimm_get_free_slot(slot == PC_DIMM_UNASSIGNED_SLOT ? NULL : &slot, + machine->ram_slots, &local_err); + if (local_err) { + goto out; + } + object_property_set_int(OBJECT(dev), slot, PC_DIMM_SLOT_PROP, &local_err); + if (local_err) { + goto out; + } + trace_mhp_pc_dimm_assigned_slot(slot); + + if (kvm_enabled() && !kvm_has_free_slot(machine)) { + error_setg(&local_err, "hypervisor has no free memory slots left"); + goto out; + } + + memory_region_add_subregion(&ms->hotplug_memory, + addr - ms->hotplug_memory_base, mr); + vmstate_register_ram(mr, dev); + + spapr_add_lmbs(dev, addr, memory_region_size(mr), &local_err); + if (local_err) { + vmstate_unregister_ram(mr, dev); + memory_region_del_subregion(&ms->hotplug_memory, mr); + } + +out: + error_propagate(errp, local_err); +} + static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { @@ -2217,6 +2349,24 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, return; } spapr_cpu_plug(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + uint32_t node; + + if (!spapr->dr_lmb_enabled) { + error_setg(errp, "Memory hotplug not supported for this machine"); + return; + } + node = object_property_get_int(OBJECT(dev), PC_DIMM_NODE_PROP, errp); + if (*errp) { + return; + } + + if (node != 0) { + error_setg(errp, "Currently hot adding memory to only node 0" + " is supported for sPAPR"); + return; + } + spapr_memory_plug(hotplug_dev, dev, errp); } } @@ -2229,6 +2379,8 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, return; } spapr_cpu_socket_unplug(hotplug_dev, dev, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + error_setg(errp, "Memory hot unplug not supported by sPAPR"); } } @@ -2236,7 +2388,8 @@ static HotplugHandler *spapr_get_hotpug_handler(MachineState *machine, DeviceState *dev) { if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) || - object_dynamic_cast(OBJECT(dev), TYPE_CPU_SOCKET)) { + object_dynamic_cast(OBJECT(dev), TYPE_CPU_SOCKET) || + object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { return HOTPLUG_HANDLER(machine); } return NULL; diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 4ae818a..e2a22d2 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -431,6 +431,9 @@ static void spapr_hotplug_req_event(sPAPRDRConnector *drc, uint8_t hp_action) case SPAPR_DR_CONNECTOR_TYPE_CPU: hp->hotplug_type = RTAS_LOG_V6_HP_TYPE_CPU; break; + case SPAPR_DR_CONNECTOR_TYPE_LMB: + hp->hotplug_type = RTAS_LOG_V6_HP_TYPE_MEMORY; + break; default: /* we shouldn't be signaling hotplug events for resources * that don't support them