From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZI40-00036H-8x for qemu-devel@nongnu.org; Fri, 26 Feb 2016 08:04:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZI3x-0001Nh-27 for qemu-devel@nongnu.org; Fri, 26 Feb 2016 08:04:08 -0500 References: <1456417362-20652-1-git-send-email-bharata@linux.vnet.ibm.com> <1456417362-20652-5-git-send-email-bharata@linux.vnet.ibm.com> From: Thomas Huth Message-ID: <56D04D3D.2080908@redhat.com> Date: Fri, 26 Feb 2016 14:03:57 +0100 MIME-Version: 1.0 In-Reply-To: <1456417362-20652-5-git-send-email-bharata@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC PATCH v0 4/6] spapr: CPU hotplug support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao , qemu-devel@nongnu.org Cc: mjrosato@linux.vnet.ibm.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, armbru@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, qemu-ppc@nongnu.org, pbonzini@redhat.com, imammedo@redhat.com, mdroth@linux.vnet.ibm.com, afaerber@suse.de, david@gibson.dropbear.id.au On 25.02.2016 17:22, Bharata B Rao wrote: > Set up device tree entries for the hotplugged CPU core and use the > exising EPOW event infrastructure to send CPU hotplug notification to > the guest. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/spapr.c | 136 +++++++++++++++++++++++++++++++++++++++++= +++++++- > hw/ppc/spapr_events.c | 3 ++ > hw/ppc/spapr_rtas.c | 24 +++++++++ > include/hw/ppc/spapr.h | 1 + > 4 files changed, 163 insertions(+), 1 deletion(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1f0d232..780cd00 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -603,6 +603,18 @@ static void spapr_populate_cpu_dt(CPUState *cs, vo= id *fdt, int offset, > size_t page_sizes_prop_size; > uint32_t vcpus_per_socket =3D smp_threads * smp_cores; > uint32_t pft_size_prop[] =3D {0, cpu_to_be32(spapr->htab_shift)}; > + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(qdev_get_machin= e()); > + sPAPRDRConnector *drc; > + sPAPRDRConnectorClass *drck; > + int drc_index; > + > + if (smc->dr_cpu_enabled) { > + drc =3D spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, = index); > + g_assert(drc); > + drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); > + drc_index =3D drck->get_index(drc); > + _FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc_in= dex))); > + } > =20 > /* Note: we keep CI large pages off for now because a 64K capable = guest > * provisioned with large pages might otherwise try to map a qemu > @@ -987,6 +999,16 @@ static void spapr_finalize_fdt(sPAPRMachineState *= spapr, > _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TY= PE_LMB)); > } > =20 > + if (smc->dr_cpu_enabled) { > + int offset =3D fdt_path_offset(fdt, "/cpus"); > + ret =3D spapr_drc_populate_dt(fdt, offset, NULL, > + SPAPR_DR_CONNECTOR_TYPE_CPU); > + if (ret < 0) { > + fprintf(stderr, "Couldn't set up CPU DR device tree proper= ties\n"); I think it's better to use error_report() nowadays instead. > + exit(1); > + } > + } > + > _FDT((fdt_pack(fdt))); > =20 > if (fdt_totalsize(fdt) > FDT_MAX_SIZE) { > @@ -1759,6 +1781,7 @@ static void ppc_spapr_init(MachineState *machine) > char *filename; > int spapr_cores =3D smp_cpus / smp_threads; > int spapr_max_cores =3D max_cpus / smp_threads; > + int smt =3D kvmppc_smt_threads(); > =20 > msi_supported =3D true; > =20 > @@ -1813,6 +1836,15 @@ static void ppc_spapr_init(MachineState *machine= ) > spapr_validate_node_memory(machine, &error_fatal); > } > =20 > + if (smc->dr_cpu_enabled) { > + for (i =3D 0; i < spapr_max_cores; i++) { > + sPAPRDRConnector *drc =3D > + spapr_dr_connector_new(OBJECT(spapr), > + SPAPR_DR_CONNECTOR_TYPE_CPU, i = * smt); > + qemu_register_reset(spapr_drc_reset, drc); > + } > + } > + > /* init CPUs */ > if (machine->cpu_model =3D=3D NULL) { > machine->cpu_model =3D kvm_enabled() ? "host" : "POWER7"; > @@ -2247,6 +2279,88 @@ out: > error_propagate(errp, local_err); > } > =20 > +static void *spapr_populate_hotplug_cpu_dt(DeviceState *dev, CPUState = *cs, > + int *fdt_offset, > + sPAPRMachineState *spapr) > +{ > + PowerPCCPU *cpu =3D POWERPC_CPU(cs); > + DeviceClass *dc =3D DEVICE_GET_CLASS(cs); > + int id =3D ppc_get_vcpu_dt_id(cpu); > + void *fdt; > + int offset, fdt_size; > + char *nodename; > + > + fdt =3D create_device_tree(&fdt_size); > + nodename =3D g_strdup_printf("%s@%x", dc->fw_name, id); > + offset =3D fdt_add_subnode(fdt, 0, nodename); > + > + spapr_populate_cpu_dt(cs, fdt, offset, spapr); > + g_free(nodename); > + > + *fdt_offset =3D offset; > + return fdt; > +} > + > +static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *= dev, > + Error **errp) > +{ > + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(qdev_get_machin= e()); > + sPAPRMachineState *ms =3D SPAPR_MACHINE(qdev_get_machine()); > + sPAPRCPUCore *core =3D SPAPR_CPU_CORE(OBJECT(dev)); > + PowerPCCPU *cpu =3D &core->threads[0]; > + CPUState *cs =3D CPU(cpu); > + int id =3D ppc_get_vcpu_dt_id(cpu); > + sPAPRDRConnector *drc =3D > + spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, id); > + sPAPRDRConnectorClass *drck; > + Error *local_err =3D NULL; > + void *fdt =3D NULL; > + int fdt_offset =3D 0; > + > + if (!smc->dr_cpu_enabled) { > + /* > + * This is a cold plugged CPU core but the machine doesn't sup= port > + * DR. So skip the hotplug path ensuring that the core is brou= ght > + * up online with out an associated DR connector. > + */ > + return; > + } > + > + g_assert(drc); > + > + /* > + * Setup CPU DT entries only for hotplugged CPUs. For boot time or > + * coldplugged CPUs DT entries are setup in spapr_finalize_fdt(). > + */ > + if (dev->hotplugged) { > + fdt =3D spapr_populate_hotplug_cpu_dt(dev, cs, &fdt_offset, ms= ); > + dev->hotplugged =3D true; That looks strange ... why "dev->hotplugged =3D true" after you've alread= y checked that with the above if-statement? > + } > + > + drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); > + drck->attach(drc, dev, fdt, fdt_offset, !dev->hotplugged, &local_e= rr); > + if (local_err) { > + g_free(fdt); > + error_propagate(errp, local_err); > + return; > + } > + > + if (dev->hotplugged) { > + /* > + * Send hotplug notification interrupt to the guest only in ca= se > + * of hotplugged CPUs. > + */ > + spapr_hotplug_req_add_by_index(drc); > + } else { > + /* > + * Set the right DRC states for cold plugged CPU. > + */ > + drck->set_allocation_state(drc, SPAPR_DR_ALLOCATION_STATE_USAB= LE); > + drck->set_isolation_state(drc, SPAPR_DR_ISOLATION_STATE_UNISOL= ATED); > + } > + return; Superfluous return statement. > +} > + > static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > @@ -2291,8 +2405,25 @@ static void spapr_machine_device_plug(HotplugHan= dler *hotplug_dev, > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > CPUState *cs =3D CPU(dev); > PowerPCCPU *cpu =3D POWERPC_CPU(cs); > + int i; > + > + if (!smc->dr_cpu_enabled && dev->hotplugged) { > + error_setg(errp, "CPU hotplug not supported for this machi= ne"); > + return; > + } > + > + /* Set NUMA node for the added CPUs */ > + for (i =3D 0; i < nb_numa_nodes; i++) { > + if (test_bit(cs->cpu_index, numa_info[i].node_cpu)) { > + cs->numa_node =3D i; > + break; > + } > + } > =20 > spapr_cpu_init(ms, cpu, errp); > + spapr_cpu_reset(cpu); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) = { > + spapr_core_plug(hotplug_dev, dev, errp); > } > } > =20 > @@ -2308,7 +2439,8 @@ static HotplugHandler *spapr_get_hotpug_handler(M= achineState *machine, > DeviceState *dev) > { > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) || > - object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > + object_dynamic_cast(OBJECT(dev), TYPE_CPU) || > + object_dynamic_cast(OBJECT(dev), TYPE_SPAPR_CPU_CORE)) { > return HOTPLUG_HANDLER(machine); > } > return NULL; > @@ -2352,6 +2484,7 @@ static void spapr_machine_class_init(ObjectClass = *oc, void *data) > mc->cpu_index_to_socket_id =3D spapr_cpu_index_to_socket_id; > =20 > smc->dr_lmb_enabled =3D true; > + smc->dr_cpu_enabled =3D true; > fwc->get_dev_path =3D spapr_get_fw_dev_path; > nc->nmi_monitor_handler =3D spapr_nmi; > } > @@ -2431,6 +2564,7 @@ static void spapr_machine_2_5_class_options(Machi= neClass *mc) > =20 > spapr_machine_2_6_class_options(mc); > smc->use_ohci_by_default =3D true; > + smc->dr_cpu_enabled =3D false; > SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); > } > Thomas