From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adYws-0005P9-AK for qemu-devel@nongnu.org; Wed, 09 Mar 2016 02:54:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adYwp-0005Ja-3Y for qemu-devel@nongnu.org; Wed, 09 Mar 2016 02:54:26 -0500 Received: from e28smtp03.in.ibm.com ([125.16.236.3]:58220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adYwo-0005JU-D4 for qemu-devel@nongnu.org; Wed, 09 Mar 2016 02:54:23 -0500 Received: from localhost by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 9 Mar 2016 13:24:19 +0530 Date: Wed, 9 Mar 2016 13:23:59 +0530 From: Bharata B Rao Message-ID: <20160309075359.GD29692@in.ibm.com> References: <1457074461-14285-1-git-send-email-bharata@linux.vnet.ibm.com> <1457074461-14285-9-git-send-email-bharata@linux.vnet.ibm.com> <20160307034906.GF22546@voom.fritz.box> <20160307062942.GF5054@in.ibm.com> <20160308042739.GW22546@voom.fritz.box> <20160308103708.718a1d69@nial.brq.redhat.com> <20160309025853.GJ22546@voom.fritz.box> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160309025853.GJ22546@voom.fritz.box> Subject: Re: [Qemu-devel] [RFC PATCH v1 08/10] spapr: CPU hotplug support Reply-To: bharata@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: mjrosato@linux.vnet.ibm.com, agraf@suse.de, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, armbru@redhat.com, borntraeger@de.ibm.com, qemu-ppc@nongnu.org, pbonzini@redhat.com, Igor Mammedov , afaerber@suse.de, mdroth@linux.vnet.ibm.com On Wed, Mar 09, 2016 at 01:58:53PM +1100, David Gibson wrote: > On Tue, Mar 08, 2016 at 10:37:08AM +0100, Igor Mammedov wrote: > > On Tue, 8 Mar 2016 15:27:39 +1100 > > David Gibson wrote: > > > > > On Mon, Mar 07, 2016 at 11:59:42AM +0530, Bharata B Rao wrote: > > > > On Mon, Mar 07, 2016 at 02:49:06PM +1100, David Gibson wrote: > > > > > On Fri, Mar 04, 2016 at 12:24:19PM +0530, 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. > > > > > > > > > > > > Signed-off-by: Bharata B Rao > > > > > > --- > > > > > > hw/ppc/spapr.c | 73 ++++++++++++++++++++++++++++++++++++++++- > > > > > > hw/ppc/spapr_cpu_core.c | 60 +++++++++++++++++++++++++++++++++ > > > > > > hw/ppc/spapr_events.c | 3 ++ > > > > > > hw/ppc/spapr_rtas.c | 24 ++++++++++++++ > > > > > > include/hw/ppc/spapr.h | 4 +++ > > > > > > include/hw/ppc/spapr_cpu_core.h | 2 ++ > > > > > > 6 files changed, 165 insertions(+), 1 deletion(-) > > > > > > > > > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > > > > > index 5acb612..6c4ac50 100644 > > > > > > --- a/hw/ppc/spapr.c > > > > > > +++ b/hw/ppc/spapr.c > > > > > > @@ -603,6 +603,18 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, > > > > > > size_t page_sizes_prop_size; > > > > > > uint32_t vcpus_per_socket = smp_threads * smp_cores; > > > > > > uint32_t pft_size_prop[] = {0, cpu_to_be32(spapr->htab_shift)}; > > > > > > + sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(qdev_get_machine()); > > > > > > + sPAPRDRConnector *drc; > > > > > > + sPAPRDRConnectorClass *drck; > > > > > > + int drc_index; > > > > > > + > > > > > > + if (smc->dr_cpu_enabled) { > > > > > > + drc = spapr_dr_connector_by_id(SPAPR_DR_CONNECTOR_TYPE_CPU, index); > > > > > > + g_assert(drc); > > > > > > + drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); > > > > > > + drc_index = drck->get_index(drc); > > > > > > + _FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc_index))); > > > > > > + } > > > > > > > > > > > > /* 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_TYPE_LMB)); > > > > > > } > > > > > > > > > > > > + if (smc->dr_cpu_enabled) { > > > > > > + int offset = fdt_path_offset(fdt, "/cpus"); > > > > > > + ret = spapr_drc_populate_dt(fdt, offset, NULL, > > > > > > + SPAPR_DR_CONNECTOR_TYPE_CPU); > > > > > > + if (ret < 0) { > > > > > > + error_report("Couldn't set up CPU DR device tree properties"); > > > > > > + exit(1); > > > > > > + } > > > > > > + } > > > > > > + > > > > > > _FDT((fdt_pack(fdt))); > > > > > > > > > > > > if (fdt_totalsize(fdt) > FDT_MAX_SIZE) { > > > > > > @@ -1181,7 +1203,7 @@ static void ppc_spapr_reset(void) > > > > > > > > > > > > } > > > > > > > > > > > > -static void spapr_cpu_reset(void *opaque) > > > > > > +void spapr_cpu_reset(void *opaque) > > > > > > { > > > > > > sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); > > > > > > PowerPCCPU *cpu = opaque; > > > > > > @@ -1622,6 +1644,8 @@ static void spapr_boot_set(void *opaque, const char *boot_device, > > > > > > void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu, Error **errp) > > > > > > { > > > > > > CPUPPCState *env = &cpu->env; > > > > > > + CPUState *cs = CPU(cpu); > > > > > > + int i; > > > > > > > > > > > > /* Set time-base frequency to 512 MHz */ > > > > > > cpu_ppc_tb_init(env, TIMEBASE_FREQ); > > > > > > @@ -1646,6 +1670,14 @@ void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu, Error **errp) > > > > > > } > > > > > > } > > > > > > > > > > > > + /* Set NUMA node for the added CPUs */ > > > > > > + for (i = 0; i < nb_numa_nodes; i++) { > > > > > > + if (test_bit(cs->cpu_index, numa_info[i].node_cpu)) { > > > > > > + cs->numa_node = i; > > > > > > + break; > > > > > > + } > > > > > > + } > > > > > > + > > > > > > > > > > This hunk seems like it belongs in a different patch. > > > > > > > > It appears that this would be needed by other archs also to set the > > > > NUMA node for the hot-plugged CPU. How about make an API out of this > > > > and use this something like below ? Igor ? > > > > > > Is there a way we could put this in the the CPU thread initialization > > > itself? Rather than requiring every platform to call a helper. > > I'd suggest hotplugable CPU entity to have 'node' property, like we have > > in pc-dimm. > > Ok. Do you think that makes sense for the base core type (which will > sometimes be a hotpluggable CPU entity and sometimes might not be)? > > > However machine owns numa mapping, so setting it from thread > > initialization seems to be wrong. > > Ah.. good point. > > > Could that be done from machine's plug() handler (spapr_core_plug)? > > Yes, I think so. The core might need a "set node" method, but we > should be able to control this from the plug() handler. I am inclined to leave it wherever it is right now which is in the thread realization path as it is setting a field in CPUState. When we have node property for core and when other issues with NUMA cli get addressed we can move this to core plug handler, ok ? Regards, Bharata.