From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xbnLL3YSCzDrLT for ; Tue, 22 Aug 2017 07:45:46 +1000 (AEST) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v7LLjex4023660 for ; Mon, 21 Aug 2017 17:45:44 -0400 Received: from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158]) by mx0a-001b2d01.pphosted.com with ESMTP id 2cg70shpvf-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 21 Aug 2017 17:45:41 -0400 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Aug 2017 15:44:50 -0600 To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: Michael Ellerman , Michael Bringmann , John Allen , Nathan Fontenot , 9e5050e1-e0cc-0e0e-7b31-5dcb38b307f4@linux.vnet.ibm.com From: Michael Bringmann Subject: [PATCH V9 2/2] powerpc/nodes: Ensure enough nodes avail for operations Date: Mon, 21 Aug 2017 16:44:47 -0500 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Message-Id: <83b05ed2-8d18-3d5c-2003-b022d0d55eb2@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: linuxppc-dev@lists.ozlabs.org From: Michael Bringmann To: linux-kernel@vger.kernel.org Cc: Michael Ellerman Cc: Michael Bringmann Cc: John Allen Cc: Nathan Fontenot Subject: [PATCH V9 2/2] powerpc/nodes: Ensure enough nodes avail for operations powerpc/nodes: On systems like PowerPC which allow 'hot-add' of CPU or memory resources, it may occur that the new resources are to be inserted into nodes that were not used for these resources at bootup. In the kernel, any node that is used must be defined and initialized at boot. This patch extracts the value of the lowest domain level (number of allocable resources) from the "rtas" device tree property "ibm,max-associativity-domains" to use as the maximum number of nodes to setup as possibly available in the system. This new setting will override the instruction, nodes_and(node_possible_map, node_possible_map, node_online_map); presently seen in the function arch/powerpc/mm/numa.c:initmem_init(). If the property is not present at boot, no operation will be performed to define or enable additional nodes. Signed-off-by: Michael Bringmann --- arch/powerpc/mm/numa.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 3fd4536..3ae6510 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -893,6 +893,48 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn) NODE_DATA(nid)->node_spanned_pages = spanned_pages; } +static void __init node_associativity_setup(void) +{ + struct device_node *rtas; + printk(KERN_INFO "%s:%d\n", __FUNCTION__, __LINE__); + + rtas = of_find_node_by_path("/rtas"); + if (rtas) { + const __be32 *prop; + u32 len, entries, levelval, i; + printk(KERN_INFO "%s:%d\n", __FUNCTION__, __LINE__); + + prop = of_get_property(rtas, "ibm,max-associativity-domains", &len); + if (!prop || len < sizeof(unsigned int)) { + printk(KERN_INFO "%s:%d\n", __FUNCTION__, __LINE__); + goto endit; + } + + entries = of_read_number(prop++, 1); + + if (len < (entries * sizeof(unsigned int))) { + printk(KERN_INFO "%s:%d\n", __FUNCTION__, __LINE__); + goto endit; + } + + for (i = 0; i < entries; i++) + levelval = of_read_number(prop++, 1); + + printk(KERN_INFO "Numa nodes avail: %d (%d) \n", (int) levelval, (int) entries); + + for (i = 0; i < levelval; i++) { + if (!node_possible(i)) { + setup_node_data(i, 0, 0); + node_set(i, node_possible_map); + } + } + } + +endit: + if (rtas) + of_node_put(rtas); +} + void __init initmem_init(void) { int nid, cpu; @@ -912,6 +954,8 @@ void __init initmem_init(void) */ nodes_and(node_possible_map, node_possible_map, node_online_map); + node_associativity_setup(); + for_each_online_node(nid) { unsigned long start_pfn, end_pfn;