From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754000AbdHXWIO (ORCPT ); Thu, 24 Aug 2017 18:08:14 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40025 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753423AbdHXWIN (ORCPT ); Thu, 24 Aug 2017 18:08:13 -0400 To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: Michael Ellerman , Michael Bringmann , John Allen , Nathan Fontenot From: Michael Bringmann Subject: [PATCH V10 2/2] powerpc/nodes: Ensure enough nodes avail for operations Organization: IBM Linux Technology Center In-Reply-To: Date: Thu, 24 Aug 2017 17:07:56 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 17082422-8235-0000-0000-00000C2B7A1E X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007605; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000225; SDB=6.00907146; UDB=6.00454739; IPR=6.00687343; BA=6.00005552; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016853; XFM=3.00000015; UTC=2017-08-24 22:08:11 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17082422-8236-0000-0000-00003D5EEA46 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-08-24_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1708240340 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Bringmann To: linuxppc-dev@lists.ozlabs.org To: linux-kernel@vger.kernel.org Cc: Michael Ellerman Cc: Michael Bringmann Cc: John Allen Cc: Nathan Fontenot Subject: [PATCH V10 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 'min_common_depth' element 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. [The 'min_common_depth' element is calculated from memory associations found while loading all of the configured memory into the system data structures at boot.] 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 --- Changes in V10: -- Try to use 'min_common_depth' from NUMA initialization to select domain level to use for maximum nodes. --- 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 73427e290..841d3b6 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -896,6 +896,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; + + rtas = of_find_node_by_path("/rtas"); + if (rtas) { + const __be32 *prop; + u32 len, entries, numnodes, i; + + prop = of_get_property(rtas, "ibm,max-associativity-domains", &len); + if (!prop || len < sizeof(unsigned int)) + goto endit; + + entries = of_read_number(prop++, 1); + + if (len < (entries * sizeof(unsigned int))) + goto endit; + + dbg("numa: Debug: Entries = %d MCD = %d\n", entries, min_common_depth); + + if ((0 <= min_common_depth) && (min_common_depth <= (entries-1))) + entries = min_common_depth; + else + entries -= 1; + + numnodes = of_read_number(&prop[entries], 1); + + printk(KERN_INFO "numa: Nodes = %d\n", numnodes); + + for (i = 0; i < numnodes; 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; @@ -915,6 +957,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;