From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6uXI-0002gf-AU for qemu-devel@nongnu.org; Thu, 10 Dec 2015 01:17:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6uXG-00037h-D0 for qemu-devel@nongnu.org; Thu, 10 Dec 2015 01:17:04 -0500 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:52762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6uXF-00037O-Rv for qemu-devel@nongnu.org; Thu, 10 Dec 2015 01:17:02 -0500 Received: from localhost by e23smtp06.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 10 Dec 2015 16:17:00 +1000 Received: from d23relay08.au.ibm.com (d23relay08.au.ibm.com [9.185.71.33]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 3A1342BB0052 for ; Thu, 10 Dec 2015 17:16:58 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay08.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tBA6GWT919071002 for ; Thu, 10 Dec 2015 17:16:40 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tBA6GONR030374 for ; Thu, 10 Dec 2015 17:16:26 +1100 From: Bharata B Rao Date: Thu, 10 Dec 2015 11:45:41 +0530 Message-Id: <1449728144-6223-7-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1449728144-6223-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1449728144-6223-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v0 6/9] cpu: Introduce CPU core device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, ehabkost@redhat.com, Bharata B Rao , agraf@suse.de, borntraeger@de.ibm.com, imammedo@redhat.com, pbonzini@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au CPU core device is a container of CPU thread devices. Core device links to the backend socket object. All the cores within a socket defined in the topology specification will link to the same socket object. CPU hotplug is performed in the granularity of CPU core device. When hotplugged, CPU core creates CPU thread devices. Signed-off-by: Bharata B Rao --- hw/cpu/Makefile.objs | 2 +- hw/cpu/core.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/cpu/core.h | 28 +++++++++++++++ 3 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 hw/cpu/core.c create mode 100644 include/hw/cpu/core.h diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs index 93d1226..de5c313 100644 --- a/hw/cpu/Makefile.objs +++ b/hw/cpu/Makefile.objs @@ -2,5 +2,5 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o obj-$(CONFIG_REALVIEW) += realview_mpcore.o obj-$(CONFIG_A9MPCORE) += a9mpcore.o obj-$(CONFIG_A15MPCORE) += a15mpcore.o -obj-y += socket.o +obj-y += socket.o core.o diff --git a/hw/cpu/core.c b/hw/cpu/core.c new file mode 100644 index 0000000..d14bd77 --- /dev/null +++ b/hw/cpu/core.c @@ -0,0 +1,98 @@ +/* + * CPU core device, acts as container of CPU thread devices. + * + * Copyright (C) 2015 Bharata B Rao + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "hw/cpu/core.h" +#include "hw/boards.h" +#include +#include "qemu/error-report.h" + +static int cpu_core_realize_child(Object *child, void *opaque) +{ + Error **errp = opaque; + + object_property_set_bool(child, true, "realized", errp); + if (*errp) { + return 1; + } + + return 0; +} + +static void cpu_core_realize(DeviceState *dev, Error **errp) +{ + CPUCore *core = CPU_CORE(OBJECT(dev)); + + if (!core->socket) { + error_setg(errp, "'" CPU_CORE_SOCKET_PROP "' property is not set"); + return; + } + object_child_foreach(OBJECT(dev), cpu_core_realize_child, errp); +} + +static void cpu_core_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = cpu_core_realize; +} + +static void cpu_core_check_socket_is_full(Object *obj, const char *name, + Object *val, Error **errp) +{ + CPUSocket *socket = CPU_SOCKET(val); + + if (socket->nr_cores == smp_cores) { + char *path = object_get_canonical_path_component(val); + error_setg(errp, "Socket already full: %s", path); + g_free(path); + } else { + socket->nr_cores++; + qdev_prop_allow_set_link_before_realize(obj, name, val, errp); + } +} + +static void cpu_core_instance_init(Object *obj) +{ + int i; + CPUState *cpu; + MachineState *machine = MACHINE(qdev_get_machine()); + CPUCore *core = CPU_CORE(obj); + + object_property_add_link(obj, CPU_CORE_SOCKET_PROP, TYPE_CPU_SOCKET, + (Object **)&core->socket, + cpu_core_check_socket_is_full, + OBJ_PROP_LINK_UNREF_ON_RELEASE, + &error_abort); + + /* Create as many CPU threads as specified in the topology */ + for (i = 0; i < smp_threads; i++) { + cpu = cpu_generic_init(machine->cpu_type, machine->cpu_model); + if (!cpu) { + error_report("Unable to find CPU definition: %s\n", + machine->cpu_model); + exit(EXIT_FAILURE); + } + object_property_add_child(obj, "thread[*]", OBJECT(cpu), &error_abort); + object_unref(OBJECT(cpu)); + } +} + +static const TypeInfo cpu_core_type_info = { + .name = TYPE_CPU_CORE, + .parent = TYPE_DEVICE, + .class_init = cpu_core_class_init, + .instance_init = cpu_core_instance_init, + .instance_size = sizeof(CPUCore), +}; + +static void cpu_core_register_types(void) +{ + type_register_static(&cpu_core_type_info); +} + +type_init(cpu_core_register_types) diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h new file mode 100644 index 0000000..0314098 --- /dev/null +++ b/include/hw/cpu/core.h @@ -0,0 +1,28 @@ +/* + * CPU core device. + * + * Copyright (C) 2015 Bharata B Rao + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef HW_CPU_CORE_H +#define HW_CPU_CORE_H + +#include "hw/qdev.h" +#include "hw/cpu/socket.h" + +#define TYPE_CPU_CORE "cpu-core" +#define CPU_CORE(obj) \ + OBJECT_CHECK(CPUCore, (obj), TYPE_CPU_CORE) + +#define CPU_CORE_SOCKET_PROP "socket" + +typedef struct CPUCore { + /*< private >*/ + DeviceState parent_obj; + /*< public >*/ + CPUSocket *socket; +} CPUCore; + +#endif -- 2.1.0