From patchwork Mon Oct 1 16:42:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 147923 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4131236lji; Mon, 1 Oct 2018 09:44:55 -0700 (PDT) X-Google-Smtp-Source: ACcGV60+dZepg5GKZrCE5H7Vc8SX0l+3eRgZC8HfcbIAMtAEr5opUjb+vCQ8aLDKMyAM+2LZoUYa X-Received: by 2002:a6b:9895:: with SMTP id a143-v6mr8341221ioe.290.1538412295338; Mon, 01 Oct 2018 09:44:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538412295; cv=none; d=google.com; s=arc-20160816; b=dkMfgbdCfWrWJKd6qJY4B1mM98wAbC5egN4tzs2urbHhMItHeGmFXevob8yBlBPt7I 7uiIQqiCK0ikseqfw8zgoSRlc4xmzE+oPM9LnqVYmEjAadBlZKxYd86ebHh9A0eDpqo8 /0dyRmhabvccpcfaM5ZX8N/BOYaG2AWlVtsrxXhWetTQiBP6VUrrv7FkLk11CHUPoR7r Ba/c8V9MLehIOo0d3CFVT4/imIZWjiTdxXC2Ch9DS+xfl8sLa/EnLvtE014w69IJnrP3 5J+BJjYnlhaN3pBAENle82F0Q068sfdcOQtfhOnp6KB0yLM+AidGomKeXH9AkFs0hurH W2kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=8SKfmQaae6tzSFdymomArYibdVI+haBOOsaxzKagKiY=; b=gxhrixv1ZoFCiHKFZxrOfaH7boMVt9QUWAc4bSL9eR9ngzjqS8q8uAbMW0CUTaO04r 2DPkAakHc1mLBATT3XgNZrXGuCwOyWOxqIjHF5xY8Shacqh3bbxuZvUn9UL26AHH1sMV sxlaXQY6oDqZeF2evWPi1M1Bz7guP6YlivkZ2NVLMe5TXPZsV7P+ThWRyu0B/NVx3uwZ sUBE8cQKEva/WOmcnMqsBlwejkHlJhwSXMIpOejE+qs9PBbar/ARvzaeXmvGH7eputRD S+AbH195YiKww7SayEvZYtBazrkqZk0B19F6qrQlFs+4VxNTASU11RumQG05PlqqC3Px PzlA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id b8-v6si7889789iog.37.2018.10.01.09.44.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Oct 2018 09:44:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g71HL-0007VA-LJ; Mon, 01 Oct 2018 16:42:39 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g71HJ-0007V0-RG for xen-devel@lists.xenproject.org; Mon, 01 Oct 2018 16:42:37 +0000 X-Inumbo-ID: 2acf69ef-c599-11e8-a6a9-d7ebe60f679a Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 2acf69ef-c599-11e8-a6a9-d7ebe60f679a; Mon, 01 Oct 2018 16:43:47 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 26A911596; Mon, 1 Oct 2018 09:42:36 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.emea.arm.com [10.4.12.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DDF203F5D3; Mon, 1 Oct 2018 09:42:34 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 1 Oct 2018 17:42:26 +0100 Message-Id: <20181001164227.6562-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181001164227.6562-1-julien.grall@arm.com> References: <20181001164227.6562-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 1/2] xen/arm: vgic-v3: Delay the initialization of the domain information X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, shameerali.kolothum.thodi@huawei.com, Andrew Cooper MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" A follow-up patch will require to know the number of vCPUs when initializating the vGICv3 domain structure. However this information is not available at domain creation. This is only known once XEN_DOMCTL_max_vpus is called for that domain. In order to get the max vCPUs around, delay the domain part of the vGIC v3 initialization until the first vCPU of the domain is initialized. Signed-off-by: Julien Grall Tested-by: Shameer Kolothum Acked-but-disliked-by: Stefano Stabellini --- Cc: Andrew Cooper This is nasty but I can't find a better way for Xen 4.11 and older. We still need it for unstable because the number of vCPUs is not known in arch_domain_init. There are discussion to rework the domain creation a bit further but I would hope to fix the bug first. Andrew, I have CCed you to know whether you have a better idea where to place this call on Xen 4.11 and older. Changes in v2: - The patch is also needed for the time being on unstable - Add Stefano's recently invented tag - Add Shameer's tested tag --- xen/arch/arm/vgic-v3.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 4b42739a52..df1bab3a35 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1573,9 +1573,11 @@ static const struct mmio_handler_ops vgic_distr_mmio_handler = { .write = vgic_v3_distr_mmio_write, }; +static int vgic_v3_real_domain_init(struct domain *d); + static int vgic_v3_vcpu_init(struct vcpu *v) { - int i; + int i, rc; paddr_t rdist_base; struct vgic_rdist_region *region; unsigned int last_cpu; @@ -1584,6 +1586,19 @@ static int vgic_v3_vcpu_init(struct vcpu *v) struct domain *d = v->domain; /* + * This is the earliest place where the number of vCPUs is + * known. This is required to initialize correctly the vGIC v3 + * domain structure. We only to do that when vCPU 0 is + * initilialized. + */ + if ( v->vcpu_id == 0 ) + { + rc = vgic_v3_real_domain_init(d); + if ( rc ) + return rc; + } + + /* * Find the region where the re-distributor lives. For this purpose, * we look one region ahead as we have only the first CPU in hand. */ @@ -1641,7 +1656,7 @@ static inline unsigned int vgic_v3_rdist_count(struct domain *d) GUEST_GICV3_RDIST_REGIONS; } -static int vgic_v3_domain_init(struct domain *d) +static int vgic_v3_real_domain_init(struct domain *d) { struct vgic_rdist_region *rdist_regions; int rdist_count, i, ret; @@ -1733,6 +1748,16 @@ static int vgic_v3_domain_init(struct domain *d) return 0; } +static int vgic_v3_domain_init(struct domain *d) +{ + /* + * The domain initialization for vGIC v3 is delayed until the first vCPU + * is created. This because the initialization may require to know the + * number of vCPUs that is not known when creating the domain. + */ + return 0; +} + static void vgic_v3_domain_free(struct domain *d) { vgic_v3_its_free_domain(d); From patchwork Mon Oct 1 16:42:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 147921 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp4131078lji; Mon, 1 Oct 2018 09:44:47 -0700 (PDT) X-Google-Smtp-Source: ACcGV63DWKXPL+HM2vKtyrK+Ym/i0co3kz8bbdmWyfc5q8mzk3LbXkiLd1+VlyKZU0gYIRE66bUN X-Received: by 2002:a6b:b7d5:: with SMTP id h204-v6mr8422771iof.164.1538412287338; Mon, 01 Oct 2018 09:44:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538412287; cv=none; d=google.com; s=arc-20160816; b=GlpimfKVnBIGhp0jpfSGLisJvIUsnuCE4frPmliw3y9J2HdDdWrYGZFrhSR3sMkkrp zmGSu7EUVxlyCouh6X3f+zPe/zD+A2Yr9Cu3CgorsNasR+eNJqfc7YYT3M3D0nFCtGe9 QJlZ1QrjgQgC5G+JHEc+LBEhA4xT9mk2fJ6fS0cdiTTKb1/OZp0Jk9LReRfRSdGq3nNl AfKCcbOdCgVbttLnPfuzB/5EAJPk5hdcD4uNYxHKBdQf7HQ9580eF++fTPlPX8YheYt+ aCpK0kAZRgPnptmv/KF3z1LhV7JG3nxMGma5VZnRnPHN3kEC+abjEbYe7/ofPH8nTDdk +VoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=Tyrazoy1zeFyOV+gpOi1ePZQ8Va2MNFVlvDNGvJDRGc=; b=Ved3dioFwrI0otgmqSgIUK4iH5cA3IFxFyjcdBqcNR4zUL7Ao+1UanlrHzo72FAtpl SMa6KnOe00mplqhOL7EKh2Hnl+DqUa39Qy3mnYJMjwPFmxFO4soAyDYdq7m/hzCqU8yv 6+BYGe2kyDAr3nLl4dxwA8oXTvmZb63n398PnoViVSNuda2khGCyWRd12ahCigSLG7ty 2sS6BC6nVZHbVzegC7LS0oTvd/QYEGcS1UM09FYGFEVDQBGGgbGV4AeOUO0bxErjOoQO mszXf2XcnXQkTqsveeyYi9wlG/dLBCAAFktuJRXNnc8P9GE7MiJQMWNVX7ElNdt58ltD a25g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id p205-v6si7030140itc.136.2018.10.01.09.44.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Oct 2018 09:44:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g71HM-0007VN-Ux; Mon, 01 Oct 2018 16:42:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1g71HL-0007V5-1q for xen-devel@lists.xenproject.org; Mon, 01 Oct 2018 16:42:39 +0000 X-Inumbo-ID: 2b9e27fc-c599-11e8-a6a9-d7ebe60f679a Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 2b9e27fc-c599-11e8-a6a9-d7ebe60f679a; Mon, 01 Oct 2018 16:43:48 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7FD9215AD; Mon, 1 Oct 2018 09:42:37 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.emea.arm.com [10.4.12.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 67F573F5D3; Mon, 1 Oct 2018 09:42:36 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 1 Oct 2018 17:42:27 +0100 Message-Id: <20181001164227.6562-3-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181001164227.6562-1-julien.grall@arm.com> References: <20181001164227.6562-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 2/2] xen/arm: vgic-v3: Don't create empty re-distributor regions X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, shameerali.kolothum.thodi@huawei.com MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" At the moment, Xen is assuming the hardware domain will have the same number of re-distributor regions as the host. However, as the number of CPUs or the stride (e.g on GICv4) may be different we end up exposing regions which does not contain any re-distributors. When booting, Linux will go through all the re-distributor region to check whether a property (e.g vPLIs) is available accross all the re-distributors. This will result to a data abort on empty regions because there are no underlying re-distributor. So we need to limit the number of regions exposed to the hardware domain. The code reworked to only expose the minimun number of regions required by the hardware domain. It is assumed the regions will be populated starting from the first one. Lastly, rename vgic_v3_rdist_count to reflect the value return by the helper. Reported-by: Shameerali Kolothum Thodi Signed-off-by: Julien Grall Tested-by: Shameer Kolothum Reviewed-by: Stefano Stabellini --- Changes in v2: - Rename vgic_v3_rdist_count to vgic_v3_max_rdist_count - Fixup #re-distributors - Fix typoes - Add Shameer's tested tag --- xen/arch/arm/gic-v3.c | 14 +++++++++++--- xen/arch/arm/vgic-v3.c | 21 ++++++++++++++++++--- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index c98a163ee7..2c1454f425 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1265,7 +1265,8 @@ static int gicv3_make_hwdom_dt_node(const struct domain *d, if ( res ) return res; - res = fdt_property_cell(fdt, "#redistributor-regions", gicv3.rdist_count); + res = fdt_property_cell(fdt, "#redistributor-regions", + d->arch.vgic.nr_regions); if ( res ) return res; @@ -1274,8 +1275,10 @@ static int gicv3_make_hwdom_dt_node(const struct domain *d, * GIC has two memory regions: Distributor + rdist regions * CPU interface and virtual cpu interfaces accessesed as System registers * So cells are created only for Distributor and rdist regions + * The hardware domain may not use all the regions. So only copy + * what is necessary. */ - new_len = new_len * (gicv3.rdist_count + 1); + new_len = new_len * (d->arch.vgic.nr_regions + 1); hw_reg = dt_get_property(gic, "reg", &len); if ( !hw_reg ) @@ -1466,6 +1469,7 @@ static inline bool gic_dist_supports_dvis(void) } static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset) + { struct acpi_subtable_header *header; struct acpi_madt_generic_interrupt *host_gicc, *gicc; @@ -1503,7 +1507,11 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset) /* Add Generic Redistributor */ size = sizeof(struct acpi_madt_generic_redistributor); - for ( i = 0; i < gicv3.rdist_count; i++ ) + /* + * The hardware domain may not used all the regions. So only copy + * what is necessary. + */ + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) { gicr = (struct acpi_madt_generic_redistributor *)(base_ptr + table_len); gicr->header.type = ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR; diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index df1bab3a35..efe824c6fb 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -1640,7 +1640,11 @@ static int vgic_v3_vcpu_init(struct vcpu *v) return 0; } -static inline unsigned int vgic_v3_rdist_count(struct domain *d) +/* + * Return the maximum number possible of re-distributor regions for + * a given domain. + */ +static inline unsigned int vgic_v3_max_rdist_count(struct domain *d) { /* * Normally there is only one GICv3 redistributor region. @@ -1662,7 +1666,7 @@ static int vgic_v3_real_domain_init(struct domain *d) int rdist_count, i, ret; /* Allocate memory for Re-distributor regions */ - rdist_count = vgic_v3_rdist_count(d); + rdist_count = vgic_v3_max_rdist_count(d); rdist_regions = xzalloc_array(struct vgic_rdist_region, rdist_count); if ( !rdist_regions ) @@ -1695,8 +1699,19 @@ static int vgic_v3_real_domain_init(struct domain *d) d->arch.vgic.rdist_regions[i].first_cpu = first_cpu; first_cpu += size / GICV3_GICR_SIZE; + + if ( first_cpu >= d->max_vcpus ) + break; } + /* + * The hardware domain may not use all the re-distributors + * regions (e.g when the number of vCPUs does not match the + * number of pCPUs). Update the number of regions to avoid + * exposing unused region as they will not get emulated. + */ + d->arch.vgic.nr_regions = i + 1; + d->arch.vgic.intid_bits = vgic_v3_hw.intid_bits; } else @@ -1825,7 +1840,7 @@ int vgic_v3_init(struct domain *d, int *mmio_count) } /* GICD region + number of Redistributors */ - *mmio_count = vgic_v3_rdist_count(d) + 1; + *mmio_count = vgic_v3_max_rdist_count(d) + 1; /* one region per ITS */ *mmio_count += vgic_v3_its_count(d);