From patchwork Tue Oct 25 02:59:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 79115 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp2895981qge; Mon, 24 Oct 2016 20:00:50 -0700 (PDT) X-Received: by 10.98.11.147 with SMTP id 19mr34840295pfl.90.1477364450434; Mon, 24 Oct 2016 20:00:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q62si18484305pfg.47.2016.10.24.20.00.50; Mon, 24 Oct 2016 20:00:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758351AbcJYDAr (ORCPT + 27 others); Mon, 24 Oct 2016 23:00:47 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:29410 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758140AbcJYDAn (ORCPT ); Mon, 24 Oct 2016 23:00:43 -0400 Received: from 172.24.1.137 (EHLO szxeml433-hub.china.huawei.com) ([172.24.1.137]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DPN80591; Tue, 25 Oct 2016 11:00:24 +0800 (CST) Received: from localhost (10.177.23.164) by szxeml433-hub.china.huawei.com (10.82.67.210) with Microsoft SMTP Server id 14.3.235.1; Tue, 25 Oct 2016 11:00:17 +0800 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , linux-kernel , Andrew Morton , linux-mm CC: Zefan Li , Xinwei Hu , Hanjun Guo , Zhen Lei Subject: [PATCH 1/2] mm/memblock: prepare a capability to support memblock near alloc Date: Tue, 25 Oct 2016 10:59:17 +0800 Message-ID: <1477364358-10620-2-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1477364358-10620-1-git-send-email-thunder.leizhen@huawei.com> References: <1477364358-10620-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If HAVE_MEMORYLESS_NODES is selected, and some memoryless numa nodes are actually exist. The percpu variable areas and numa control blocks of that memoryless numa nodes need to be allocated from the nearest available node to improve performance. Although memblock_alloc_try_nid and memblock_virt_alloc_try_nid try the specified nid at the first time, but if that allocation failed it will directly drop to use NUMA_NO_NODE. This mean any nodes maybe possible at the second time. To compatible the above old scene, I use a marco node_distance_ready to control it. By default, the marco node_distance_ready is not defined in any platforms, the above mentioned functions will work as normal as before. Otherwise, they will try the nearest node first. Signed-off-by: Zhen Lei --- mm/memblock.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 11 deletions(-) -- 2.5.0 diff --git a/mm/memblock.c b/mm/memblock.c index 7608bc3..556bbd2 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1213,9 +1213,71 @@ phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align) return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE); } +#ifndef node_distance_ready +#define node_distance_ready() 0 +#endif + +static phys_addr_t __init memblock_alloc_near_nid(phys_addr_t size, + phys_addr_t align, phys_addr_t start, + phys_addr_t end, int nid, ulong flags, + int alloc_func_type) +{ + int nnid, round = 0; + u64 pa; + DECLARE_BITMAP(nodes_map, MAX_NUMNODES); + + bitmap_zero(nodes_map, MAX_NUMNODES); + +again: + /* + * There are total 4 cases: + * + * 1)2) node_distance_ready || !node_distance_ready + * Round 1, nnid = nid = NUMA_NO_NODE; + * + * 3) !node_distance_ready + * Round 1, nnid = nid; + * ::Round 2, currently only applicable for alloc_func_type = <0> + * Round 2, nnid = NUMA_NO_NODE; + * 4) node_distance_ready + * Round 1, LOCAL_DISTANCE, nnid = nid; + * Round ?, nnid = nearest nid; + */ + if (!node_distance_ready() || (nid == NUMA_NO_NODE)) { + nnid = (++round == 1) ? nid : NUMA_NO_NODE; + } else { + int i, distance = INT_MAX; + + for_each_clear_bit(i, nodes_map, MAX_NUMNODES) + if (node_distance(nid, i) < distance) { + nnid = i; + distance = node_distance(nid, i); + } + } + + switch (alloc_func_type) { + case 0: + pa = memblock_find_in_range_node(size, align, start, end, nnid, flags); + break; + + case 1: + default: + pa = memblock_alloc_nid(size, align, nnid); + if (!node_distance_ready()) + return pa; + } + + if (!pa && (nnid != NUMA_NO_NODE)) { + bitmap_set(nodes_map, nnid, 1); + goto again; + } + + return pa; +} + phys_addr_t __init memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid) { - phys_addr_t res = memblock_alloc_nid(size, align, nid); + phys_addr_t res = memblock_alloc_near_nid(size, align, 0, 0, nid, 0, 1); if (res) return res; @@ -1276,19 +1338,11 @@ static void * __init memblock_virt_alloc_internal( max_addr = memblock.current_limit; again: - alloc = memblock_find_in_range_node(size, align, min_addr, max_addr, - nid, flags); + alloc = memblock_alloc_near_nid(size, align, min_addr, max_addr, + nid, flags, 0); if (alloc) goto done; - if (nid != NUMA_NO_NODE) { - alloc = memblock_find_in_range_node(size, align, min_addr, - max_addr, NUMA_NO_NODE, - flags); - if (alloc) - goto done; - } - if (min_addr) { min_addr = 0; goto again;