From patchwork Thu Feb 25 16:22:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 8424871 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3B439C0553 for ; Thu, 25 Feb 2016 16:24:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E5842034E for ; Thu, 25 Feb 2016 16:24:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 981AC202D1 for ; Thu, 25 Feb 2016 16:24:20 +0000 (UTC) Received: from localhost ([::1]:44244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYyiB-00067S-Sk for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Feb 2016 11:24:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYyh5-0004YA-VU for qemu-devel@nongnu.org; Thu, 25 Feb 2016 11:23:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYygz-0004Qu-UL for qemu-devel@nongnu.org; Thu, 25 Feb 2016 11:23:11 -0500 Received: from e28smtp08.in.ibm.com ([125.16.236.8]:50358) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYygz-0004Q7-7y for qemu-devel@nongnu.org; Thu, 25 Feb 2016 11:23:05 -0500 Received: from localhost by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 25 Feb 2016 21:53:02 +0530 Received: from d28relay05.in.ibm.com (9.184.220.62) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 25 Feb 2016 21:52:59 +0530 X-IBM-Helo: d28relay05.in.ibm.com X-IBM-MailFrom: bharata@linux.vnet.ibm.com X-IBM-RcptTo: qemu-ppc@nongnu.org;qemu-devel@nongnu.org Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u1PGMnS720643922; Thu, 25 Feb 2016 21:52:49 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u1PGMrf6029219; Thu, 25 Feb 2016 21:52:56 +0530 Received: from bharata.in.ibm.com ([9.79.221.223]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u1PGMi8G028692; Thu, 25 Feb 2016 21:52:51 +0530 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Thu, 25 Feb 2016 21:52:39 +0530 Message-Id: <1456417362-20652-4-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1456417362-20652-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1456417362-20652-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 16022516-0029-0000-0000-00000B1E9F6E X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 125.16.236.8 Cc: mjrosato@linux.vnet.ibm.com, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, aik@ozlabs.ru, Bharata B Rao , 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 Subject: [Qemu-devel] [RFC PATCH v0 3/6] spapr: Represent boot CPUs as spapr-cpu-core devices 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Initialize boot CPUs as spapr-cpu-core devices and create links from machine object to these core devices. These links can be considered as CPU slots in which core devices will get hot-plugged. spapr-cpu-core device's slot property indicates the slot where it is plugged. Information about all the CPU slots can be obtained by walking these links. Signed-off-by: Bharata B Rao --- hw/ppc/spapr.c | 65 +++++++++++++++++++++++++++++++++++++++++++------- include/hw/ppc/spapr.h | 3 +++ 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e214a34..1f0d232 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -64,6 +64,7 @@ #include "hw/compat.h" #include "qemu-common.h" +#include "hw/ppc/spapr_cpu_core.h" #include @@ -1720,6 +1721,21 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp) } } +/* + * Check to see if core is being hot-plugged into an already populated slot. + */ +static void spapr_cpu_core_allow_set_link(Object *obj, const char *name, + Object *val, Error **errp) +{ + Object *core = object_property_get_link(qdev_get_machine(), name, NULL); + + if (core) { + char *path = object_get_canonical_path(core); + error_setg(errp, "Slot %s already populated with %s", name, path); + g_free(path); + } +} + /* pSeries LPAR / sPAPR hardware init */ static void ppc_spapr_init(MachineState *machine) { @@ -1728,7 +1744,6 @@ static void ppc_spapr_init(MachineState *machine) const char *kernel_filename = machine->kernel_filename; const char *kernel_cmdline = machine->kernel_cmdline; const char *initrd_filename = machine->initrd_filename; - PowerPCCPU *cpu; PCIHostState *phb; int i; MemoryRegion *sysmem = get_system_memory(); @@ -1742,6 +1757,8 @@ static void ppc_spapr_init(MachineState *machine) long load_limit, fw_size; bool kernel_le = false; char *filename; + int spapr_cores = smp_cpus / smp_threads; + int spapr_max_cores = max_cpus / smp_threads; msi_supported = true; @@ -1800,13 +1817,38 @@ static void ppc_spapr_init(MachineState *machine) if (machine->cpu_model == NULL) { machine->cpu_model = kvm_enabled() ? "host" : "POWER7"; } - for (i = 0; i < smp_cpus; i++) { - cpu = cpu_ppc_init(machine->cpu_model); - if (cpu == NULL) { - error_report("Unable to find PowerPC CPU definition"); - exit(1); + + spapr->cores = g_malloc0(spapr_max_cores * sizeof(Object)); + + for (i = 0; i < spapr_max_cores; i++) { + Object *spapr_cpu_core = object_new(TYPE_SPAPR_CPU_CORE); + char name[32]; + + object_property_set_str(spapr_cpu_core, machine->cpu_model, "cpu_model", + &error_fatal); + object_property_set_int(spapr_cpu_core, smp_threads, "nr_threads", + &error_fatal); + /* + * Create links from machine objects to all possible cores. + */ + snprintf(name, sizeof(name), "%s[%d]", SPAPR_MACHINE_CPU_CORE_PROP, i); + object_property_add_link(OBJECT(spapr), name, TYPE_SPAPR_CPU_CORE, + (Object **)&spapr->cores[i], + spapr_cpu_core_allow_set_link, 0, + &error_fatal); + + /* + * Set the link from machine object to core object for all + * boot time CPUs specified with -smp and realize them. + * For rest of the hotpluggable cores this is happens from + * the core hotplug/realization path. + */ + if (i < spapr_cores) { + object_property_set_str(spapr_cpu_core, name, + SPAPR_CPU_CORE_SLOT_PROP, &error_fatal); + object_property_set_bool(spapr_cpu_core, true, "realized", + &error_fatal); } - spapr_cpu_init(spapr, cpu, &error_fatal); } if (kvm_enabled()) { @@ -2209,6 +2251,7 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(qdev_get_machine()); + sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev); if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { int node; @@ -2245,6 +2288,11 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, } spapr_memory_plug(hotplug_dev, dev, node, errp); + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + CPUState *cs = CPU(dev); + PowerPCCPU *cpu = POWERPC_CPU(cs); + + spapr_cpu_init(ms, cpu, errp); } } @@ -2259,7 +2307,8 @@ static void spapr_machine_device_unplug(HotplugHandler *hotplug_dev, static HotplugHandler *spapr_get_hotpug_handler(MachineState *machine, DeviceState *dev) { - if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { + if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) || + object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { return HOTPLUG_HANDLER(machine); } return NULL; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 098d85d..20b3417 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -79,8 +79,11 @@ struct sPAPRMachineState { /*< public >*/ char *kvm_type; MemoryHotplugState hotplug_memory; + Object *cores; }; +#define SPAPR_MACHINE_CPU_CORE_PROP "core" + #define H_SUCCESS 0 #define H_BUSY 1 /* Hardware busy -- retry later */ #define H_CLOSED 2 /* Resource closed */