Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751196AbdGYLCr (ORCPT ); Tue, 25 Jul 2017 07:02:47 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:10262 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839AbdGYLCq (ORCPT ); Tue, 25 Jul 2017 07:02:46 -0400 Subject: Re: [PATCH v2] irqchip/gic-v3-its: Allow GIC ITS number more than MAX_NUMNODES To: Hanjun Guo , Thomas Gleixner , Marc Zyngier References: <1500695652-27025-1-git-send-email-guohanjun@huawei.com> CC: Lorenzo Pieralisi , , , , Hanjun Guo , "Ganapatrao Kulkarni" , From: John Garry Message-ID: Date: Tue, 25 Jul 2017 12:02:19 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1500695652-27025-1-git-send-email-guohanjun@huawei.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.203.181.160] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090201.5977254C.0030,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 1455d743ff31f3d621b1e1f34cd49c21 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4895 Lines: 149 On 22/07/2017 04:54, Hanjun Guo wrote: > From: Hanjun Guo > > When running 4.13-rc1 on top of D05, I got the boot log: > > [ 0.000000] SRAT: PXM 0 -> ITS 0 -> Node 0 > [ 0.000000] SRAT: PXM 0 -> ITS 1 -> Node 0 > [ 0.000000] SRAT: PXM 0 -> ITS 2 -> Node 0 > [ 0.000000] SRAT: PXM 1 -> ITS 3 -> Node 1 > [ 0.000000] SRAT: ITS affinity exceeding max count[4] > > This is wrong on D05 as we have 8 ITSes with 4 NUMA nodes. > > So dynamically alloc the memory needed instead of using > its_srat_maps[MAX_NUMNODES], which count the number of > ITS entry(ies) in SRAT and alloc its_srat_maps as needed, > then build the mapping of numa node to ITS ID. Of course, > its_srat_maps will be freed after ITS probing because > we don't need that after boot. > > After doing this, I got what I wanted: > > [ 0.000000] SRAT: PXM 0 -> ITS 0 -> Node 0 > [ 0.000000] SRAT: PXM 0 -> ITS 1 -> Node 0 > [ 0.000000] SRAT: PXM 0 -> ITS 2 -> Node 0 > [ 0.000000] SRAT: PXM 1 -> ITS 3 -> Node 1 > [ 0.000000] SRAT: PXM 2 -> ITS 4 -> Node 2 > [ 0.000000] SRAT: PXM 2 -> ITS 5 -> Node 2 > [ 0.000000] SRAT: PXM 2 -> ITS 6 -> Node 2 > [ 0.000000] SRAT: PXM 3 -> ITS 7 -> Node 3 > > Fixes: dbd2b8267233 ("irqchip/gic-v3-its: Add ACPI NUMA node mapping") > Signed-off-by: Hanjun Guo > Cc: Ganapatrao Kulkarni > Cc: Lorenzo Pieralisi > Cc: Marc Zyngier > --- > > v1->v2: > - Add NULL check in acpi_get_its_numa_node() for no ITS affinity case; > - Free the its_srat_maps after ITS probing. > > drivers/irqchip/irq-gic-v3-its.c | 39 ++++++++++++++++++++++++++++++++------- > 1 file changed, 32 insertions(+), 7 deletions(-) > > diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c > index 3ccdf76..1d692aa 100644 > --- a/drivers/irqchip/irq-gic-v3-its.c > +++ b/drivers/irqchip/irq-gic-v3-its.c > @@ -1847,13 +1847,16 @@ struct its_srat_map { > u32 its_id; > }; > > -static struct its_srat_map its_srat_maps[MAX_NUMNODES] __initdata; > +static struct its_srat_map *its_srat_maps __initdata; > static int its_in_srat __initdata; > > static int __init acpi_get_its_numa_node(u32 its_id) > { > int i; > > + if (!its_srat_maps) > + return NUMA_NO_NODE; Question: Does !its_srat_maps always imply its_in_srat == 0, so we could just fall through the for loop and return NUMA_NO_NODE without this check? Or should we be safe/explicit/or falling through loops is a bad coding style? Cheers, John > + > for (i = 0; i < its_in_srat; i++) { > if (its_id == its_srat_maps[i].its_id) > return its_srat_maps[i].numa_node; > @@ -1861,6 +1864,12 @@ static int __init acpi_get_its_numa_node(u32 its_id) > return NUMA_NO_NODE; > } > > +static int __init gic_acpi_match_srat_its(struct acpi_subtable_header *header, > + const unsigned long end) > +{ > + return 0; > +} > + > static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header, > const unsigned long end) > { > @@ -1877,12 +1886,6 @@ static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header, > return -EINVAL; > } > > - if (its_in_srat >= MAX_NUMNODES) { > - pr_err("SRAT: ITS affinity exceeding max count[%d]\n", > - MAX_NUMNODES); > - return -EINVAL; > - } > - > node = acpi_map_pxm_to_node(its_affinity->proximity_domain); > > if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) { > @@ -1901,14 +1904,35 @@ static int __init gic_acpi_parse_srat_its(struct acpi_subtable_header *header, > > static void __init acpi_table_parse_srat_its(void) > { > + int count; > + > + count = acpi_table_parse_entries(ACPI_SIG_SRAT, > + sizeof(struct acpi_table_srat), > + ACPI_SRAT_TYPE_GIC_ITS_AFFINITY, > + gic_acpi_match_srat_its, 0); > + if (count <= 0) > + return; > + > + its_srat_maps = kmalloc(count * sizeof(struct its_srat_map), > + GFP_KERNEL); > + if (!its_srat_maps) > + return; > + > acpi_table_parse_entries(ACPI_SIG_SRAT, > sizeof(struct acpi_table_srat), > ACPI_SRAT_TYPE_GIC_ITS_AFFINITY, > gic_acpi_parse_srat_its, 0); > } > + > +/* free the its_srat_maps after ITS probing */ > +static void __init acpi_its_srat_maps_free(void) > +{ > + kfree(its_srat_maps); > +} > #else > static void __init acpi_table_parse_srat_its(void) { } > static int __init acpi_get_its_numa_node(u32 its_id) { return NUMA_NO_NODE; } > +static void __init acpi_its_srat_maps_free(void) { } > #endif > > static int __init gic_acpi_parse_madt_its(struct acpi_subtable_header *header, > @@ -1955,6 +1979,7 @@ static void __init its_acpi_probe(void) > acpi_table_parse_srat_its(); > acpi_table_parse_madt(ACPI_MADT_TYPE_GENERIC_TRANSLATOR, > gic_acpi_parse_madt_its, 0); > + acpi_its_srat_maps_free(); > } > #else > static void __init its_acpi_probe(void) { } >