From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQ8wm-0006k7-V1 for qemu-devel@nongnu.org; Tue, 24 Feb 2015 01:26:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YQ8wl-0008Ng-DC for qemu-devel@nongnu.org; Tue, 24 Feb 2015 01:26:20 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:53644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YQ8wk-0008Hk-Oy for qemu-devel@nongnu.org; Tue, 24 Feb 2015 01:26:19 -0500 Date: Tue, 24 Feb 2015 17:26:12 +1100 From: David Gibson Message-ID: <20150224062612.GM4536@voom.redhat.com> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> <1420697420-16053-14-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="um2V5WpqCyd73IVb" Content-Disposition: inline In-Reply-To: <1420697420-16053-14-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v1 13/13] spapr: Memory hotplug support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: imammedo@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com --um2V5WpqCyd73IVb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 08, 2015 at 11:40:20AM +0530, Bharata B Rao wrote: > Make use of pc-dimm infrastructure to support memory hotplug > for PowerPC. >=20 > Modelled on i386 memory hotplug. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/spapr.c | 107 ++++++++++++++++++++++++++++++++++++++++++++= +++++- > hw/ppc/spapr_events.c | 3 ++ > 2 files changed, 108 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 6964b06..1ffff39 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -58,7 +58,8 @@ > #include "hw/nmi.h" > =20 > #include "hw/compat.h" > - > +#include "hw/mem/pc-dimm.h" > +#include "qapi/qmp/qerror.h" > #include > =20 > /* SLOF memory layout: > @@ -2165,6 +2166,103 @@ static void spapr_cpu_unplug(HotplugHandler *hotp= lug_dev, DeviceState *dev, > return; > } > =20 > +static int spapr_dimms_capacity(Object *obj, void *opaque) > +{ > + Error *local_err =3D NULL; > + uint64_t *size =3D opaque; > + > + if (object_dynamic_cast(obj, TYPE_PC_DIMM)) { > + (*size) +=3D object_property_get_int(obj, PC_DIMM_SIZE_PROP, &lo= cal_err); > + > + if (local_err) { > + qerror_report_err(local_err); > + error_free(local_err); > + return 1; > + } > + } > + > + object_child_foreach(obj, spapr_dimms_capacity, opaque); > + return 0; > +} I don't see any reason you can't use pc_existing_dimms_capacity() rather than duplicating it. > +static void spapr_memory_plug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > + int slot; > + Error *local_err =3D NULL; > + sPAPRMachineState *ms =3D SPAPR_MACHINE(hotplug_dev); > + MachineState *machine =3D MACHINE(hotplug_dev); > + PCDIMMDevice *dimm =3D PC_DIMM(dev); > + PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); > + MemoryRegion *mr =3D ddc->get_memory_region(dimm); > + uint64_t dimms_capacity =3D 0; > + uint64_t align =3D TARGET_PAGE_SIZE; /* TODO: enforce alignment */ > + uint64_t addr; > + sPAPRDRConnector *drc; > + > + addr =3D object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP, &l= ocal_err); > + if (local_err) { > + goto out; > + } > + > + addr =3D 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; > + } > + > + if (spapr_dimms_capacity(OBJECT(machine), &dimms_capacity)) { > + error_setg(&local_err, "failed to get total size of existing DIM= Ms"); > + goto out; > + } > + > + if (dimms_capacity > machine->maxram_size - machine->ram_size) { > + error_setg(&local_err, "not enough space, proposed use of 0x%" P= RIx64 > + " from total of 0x" RAM_ADDR_FMT, > + dimms_capacity, machine->maxram_size); > + goto out; > + } > + > + object_property_set_int(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local= _err); > + if (local_err) { > + goto out; > + } > + > + slot =3D object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, &lo= cal_err); > + if (local_err) { > + goto out; > + } > + > + slot =3D pc_dimm_get_free_slot(slot =3D=3D 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; > + } > + > + 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); > + > + drc =3D spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_LMB, > + addr/SPAPR_MIN_MEMORY_BLOCK_SIZE); > + g_assert(drc); > + spapr_hotplug_req_add_event(drc); > + > +out: > + error_propagate(errp, local_err); > +} It looks like this is basically the same as pc_dimm_plug() except for a couple of checks and the last section which actually notifies the guest. Could this be made into common code in pc-dimm.c with hooks for the platform specific notification? Maybe PC and sPAPR subclasses of a common dimm object? --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --um2V5WpqCyd73IVb Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJU7BmEAAoJEGw4ysog2bOSqEwP/RP635Jk2idVDEWKBnwzvnop TFfv53YZOBCKN+7z7vzqK/6AhhpGtE9oOUCIs+krcdfLSQOYolf0/AanpinYJaCL eFTSYaaN/E9+hxz7BF4JWWpgjkqvOkgO069kioOlm3t65FEBRJyjzvAyiavT9oX3 trMOWMlV4pA2lb0Oe74gl4WDGPwCQuHJNz3nT+k2m7TI4GmcXDeagJK1W+MrSq58 9EZ1cqUhPdANEZWJwrZALEiN60r8t3trO+SSLphH1T7ErDHFRyjOXeFiBgSpZEV9 lJn8lwgXIdJIYCBY/hHcV4NEoyuY7y410Mba9HbO+MZm53/U9FxVzSy+/iWkWXaK CLzu2LlbL76JR3X+zeZX2aVVf1caDSLmdN+xFom+8f+ZBVW7ZT4n+JJs6DqkrwfW xrVkEdvWlK0F/syu/v0U6cl0p6zWQiimgqJqp7oVc6ZgnjNqzJUDmEOdzppYZTsp /S7ksF7brg9Vkcm/3nC+xtgILF6mfeMREXZ1YmrRNOmmPJKCF7HLWiqi68rkJ2AC AVCD8DJcF5IgeeLoGdq6L6WmwWHT1nQS4H4L6gPRFK5qMGZIr7ATgymJlAKY7ABO h48Oe8uqbJOPVoRdJme4BR1rHvzwBDAmfwSnJ4CG3FcdNcNUny83Jjq17QnK/vYy I5gvtfiKpxvZ+UEA1IVT =49Lm -----END PGP SIGNATURE----- --um2V5WpqCyd73IVb--