From patchwork Mon Jan 14 11:56:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 155456 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3572767jaa; Mon, 14 Jan 2019 03:59:50 -0800 (PST) X-Google-Smtp-Source: ALg8bN7XWbJz60sFwmj+O2b++O7faqGX83wqTL0oCB506f89Lm+j7RuKKMZmBCh9EypTbPauTS9x X-Received: by 2002:a1c:2007:: with SMTP id g7mr11315783wmg.79.1547467190096; Mon, 14 Jan 2019 03:59:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547467190; cv=none; d=google.com; s=arc-20160816; b=Bp9LGupd77EDlia7lSwZAOmSB09vDJq8hRYt4ieYwyryHgi2L5brRDFtHqd+mYwJPP 16uVcw68nTzk8g9mgJuiABxWaIsx7NGKHli7NIAHWg1TiT76zsvIiGESMmT/ewx759jC /S4dQZM4lZB1ONMNcd2JUGcM+WMHrmcE0n3N4rSCsTzrkf/f8qFtPQTEH7roVjclHU+P EvSq96Zmf9YAd1sZG5yPf2UQKws4p0qV7IoV2jmyfqkiHeVj9AXJTiXQYsxJ+F+dXXSp ElQXVZr/p7CInL5nrXV0WuoArnGR7rFRt0rtWAZBv/gYbGmMCQGvktIfYm7TfDY7TcqR 3KMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=kBvSXrDaVNbHgyLrktW8tQ0AJ0MM4jIMZHDOYQRgy5w=; b=BeJagTmsCZUyQ6/y3UkMIHHdhTeFwAtyjv8Lela7IU+fo7cli2q0ILsZ5voQKlyz4D N/gnCcGbXWv4wk6qsMjXQ65TP4gXvhB8A90AK6NXV3jZ7nb59hlWs1OhWvhiYxwBSx0G EiF/bnkxsv27yPxCk0Hw8io4z9j9yKVPnzbGqv9PBaszr2SUlYkDWUnSmIstEKxEy/dq ciWXR5WtJ7QLI8iKpAfwtLWBFahLE3rwjWcBvwvBQlh7oRPMkBld0UnlafBY70MkEDsD BocnrnkByYVjD8ZjLg3Jn6TFswrbTrpxXwMARx2kJ6ic7w5m0jjjwmEef8nE0TMg/4fl MmPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eDzbeB6J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g185si19004984wmd.156.2019.01.14.03.59.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 Jan 2019 03:59:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eDzbeB6J; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:58210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj0uD-0000N7-2K for patch@linaro.org; Mon, 14 Jan 2019 06:59:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj0rI-0006Y7-L4 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:56:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj0rG-0005rk-Q8 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:56:48 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37366) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj0rE-0005pz-Oa for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:56:46 -0500 Received: by mail-wr1-x444.google.com with SMTP id s12so22515650wrt.4 for ; Mon, 14 Jan 2019 03:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kBvSXrDaVNbHgyLrktW8tQ0AJ0MM4jIMZHDOYQRgy5w=; b=eDzbeB6JKcos+axA+8vYHVV+EpMCB7bksyYAQsEGYe/PewNzDGdlTZidxoT1ezC+Kr SEFoMgDjUecJjdkst2dBSuWgfNhEla4nQzOuvNE/kyksxOKB4iOPleRmXpfAnBfXMnfz 8dzq2ohI/MbggbWpbRsfFNFcMo14uRu0xZkOE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kBvSXrDaVNbHgyLrktW8tQ0AJ0MM4jIMZHDOYQRgy5w=; b=HMSd+63m72RLG8FnGhMsjoJgkxafqmMdxR5u9xAOeMNzHL0ZIUCLolYhAOQrDXUBlW t9ZOF+eOGD1OVtD5C9/4SNOj98ygVrfojV6Rffb/TQbcBXTWHckiMQYfwbGXaM+w/Y0a GTrWZipS/uKC5Qc8fvs0yoD/Jn2ERnlZJzJrCfFYuX38TT3R3M+xhfO4IRSqYTeN5Q1X wxaqOVlm+Pp/rGicNhouBz/r9GcKejP9CxWfK2Gkrz0njAnv5o6Hj+KqEyR52CQU6ZMW hFcEcsFm5ieMfAFe3sgWvuYbSwfHBOgafm3pBYLkIFlwNdPi/eLrGPNlpKZ1Bqt4Uc29 w57g== X-Gm-Message-State: AJcUukcWbGMM/w6CkyL0/PxkcK66QdglvWJDbp9sHJ2rWoGQh+53WbO/ XYtVeqBRmBhSVHsYBkbsyQZZuGOiPehTmg== X-Received: by 2002:adf:f149:: with SMTP id y9mr25684348wro.284.1547467003494; Mon, 14 Jan 2019 03:56:43 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 125sm47835842wmm.26.2019.01.14.03.56.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Jan 2019 03:56:42 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 11:56:35 +0000 Message-Id: <20190114115637.6335-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190114115637.6335-1-peter.maydell@linaro.org> References: <20190114115637.6335-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 2/4] qom/cpu: Add cluster_index to CPUState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Peter Crosthwaite , Alistair Francis , Richard Henderson , "Emilio G . Cota" , "Edgar E. Iglesias" , Paolo Bonzini , Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For TCG we want to distinguish which cluster a CPU is in, and we need to do it quickly. Cache the cluster index in the CPUState struct, by having the cluster object set cpu->cluster_index for each CPU child when it is realized. This means that board/SoC code must add all CPUs to the cluster before realizing the cluster object. Regrettably QOM provides no way to prevent adding children to a realized object and no way for the parent to be notified when a new child is added to it, so we don't have any way to enforce/assert this constraint; all we can do is document it in a comment. The restriction on how many clusters can exist in the system is imposed by TCG code which will be added in a subsequent commit, but the check to enforce it in cluster.c fits better in this one. Signed-off-by: Peter Maydell Reviewed-by: Luc Michel --- include/hw/cpu/cluster.h | 19 +++++++++++++++++++ include/qom/cpu.h | 7 +++++++ hw/cpu/cluster.c | 33 +++++++++++++++++++++++++++++++++ qom/cpu.c | 1 + 4 files changed, 60 insertions(+) -- 2.20.1 diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h index 73818232437..d1bef315d10 100644 --- a/include/hw/cpu/cluster.h +++ b/include/hw/cpu/cluster.h @@ -34,12 +34,31 @@ * Arm big.LITTLE system) they should be in different clusters. If the CPUs do * not have the same view of memory (for example the main CPU and a management * controller processor) they should be in different clusters. + * + * A cluster is created by creating an object of TYPE_CPU_CLUSTER, and then + * adding the CPUs to it as QOM child objects (e.g. using the + * object_initialize_child() or object_property_add_child() functions). + * All CPUs must be added as children before the cluster is realized. + * (Regrettably QOM provides no way to prevent adding children to a realized + * object and no way for the parent to be notified when a new child is added + * to it, so this restriction is not checked for, but the system will not + * behave correctly if it is not adhered to.) + * + * A CPU which is not put into any cluster will be considered implicitly + * to be in a cluster with all the other "loose" CPUs, so all CPUs that are + * not assigned to clusters must be identical. */ #define TYPE_CPU_CLUSTER "cpu-cluster" #define CPU_CLUSTER(obj) \ OBJECT_CHECK(CPUClusterState, (obj), TYPE_CPU_CLUSTER) +/* + * This limit is imposed by TCG, which puts the cluster ID into an + * 8 bit field (and uses all-1s for the default "not in any cluster"). + */ +#define MAX_CLUSTERS 255 + /** * CPUClusterState: * @cluster_id: The cluster ID. This value is for internal use only and should diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 1396f53e5b5..844becbcedc 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -279,6 +279,11 @@ struct qemu_work_item; /** * CPUState: * @cpu_index: CPU index (informative). + * @cluster_index: Identifies which cluster this CPU is in. + * For boards which don't define clusters or for "loose" CPUs not assigned + * to a cluster this will be UNASSIGNED_CLUSTER_INDEX; otherwise it will + * be the same as the cluster-id property of the CPU object's TYPE_CPU_CLUSTER + * QOM parent. * @nr_cores: Number of cores within this CPU package. * @nr_threads: Number of threads within this CPU. * @running: #true if CPU is currently running (lockless). @@ -404,6 +409,7 @@ struct CPUState { /* TODO Move common fields from CPUArchState here. */ int cpu_index; + int cluster_index; uint32_t halted; uint32_t can_do_io; int32_t exception_index; @@ -1109,5 +1115,6 @@ extern const struct VMStateDescription vmstate_cpu_common; #endif /* NEED_CPU_H */ #define UNASSIGNED_CPU_INDEX -1 +#define UNASSIGNED_CLUSTER_INDEX -1 #endif diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c index 9d50a235d5c..d672f54a620 100644 --- a/hw/cpu/cluster.c +++ b/hw/cpu/cluster.c @@ -20,19 +20,52 @@ #include "qemu/osdep.h" #include "hw/cpu/cluster.h" +#include "qom/cpu.h" #include "qapi/error.h" #include "qemu/module.h" +#include "qemu/cutils.h" static Property cpu_cluster_properties[] = { DEFINE_PROP_UINT32("cluster-id", CPUClusterState, cluster_id, 0), DEFINE_PROP_END_OF_LIST() }; +static void cpu_cluster_realize(DeviceState *dev, Error **errp) +{ + /* Iterate through all our CPU children and set their cluster_index */ + CPUClusterState *cluster = CPU_CLUSTER(dev); + ObjectPropertyIterator iter; + ObjectProperty *prop; + Object *cluster_obj = OBJECT(dev); + + if (cluster->cluster_id >= MAX_CLUSTERS) { + error_setg(errp, "cluster-id must be less than %d", MAX_CLUSTERS); + return; + } + + object_property_iter_init(&iter, cluster_obj); + while ((prop = object_property_iter_next(&iter))) { + Object *cpu_obj; + CPUState *cpu; + + if (!strstart(prop->type, "child<", NULL)) { + continue; + } + cpu_obj = object_property_get_link(cluster_obj, prop->name, NULL); + cpu = (CPUState *)object_dynamic_cast(cpu_obj, TYPE_CPU); + if (!cpu) { + continue; + } + cpu->cluster_index = cluster->cluster_id; + } +} + static void cpu_cluster_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->props = cpu_cluster_properties; + dc->realize = cpu_cluster_realize; } static const TypeInfo cpu_cluster_type_info = { diff --git a/qom/cpu.c b/qom/cpu.c index 5442a7323be..f5579b1cd50 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -364,6 +364,7 @@ static void cpu_common_initfn(Object *obj) CPUClass *cc = CPU_GET_CLASS(obj); cpu->cpu_index = UNASSIGNED_CPU_INDEX; + cpu->cluster_index = UNASSIGNED_CLUSTER_INDEX; cpu->gdb_num_regs = cpu->gdb_num_g_regs = cc->gdb_num_core_regs; /* *-user doesn't have configurable SMP topology */ /* the default value is changed by qemu_init_vcpu() for softmmu */