From patchwork Thu Sep 1 06:55:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen (ThunderTown)" X-Patchwork-Id: 9308431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D27B7607D2 for ; Thu, 1 Sep 2016 07:04:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA960291F2 for ; Thu, 1 Sep 2016 07:04:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A863A291F6; Thu, 1 Sep 2016 07:04:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D8CCC291F2 for ; Thu, 1 Sep 2016 07:04:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bfM1V-0004xP-Vr; Thu, 01 Sep 2016 07:02:54 +0000 Received: from szxga01-in.huawei.com ([58.251.152.64]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bfLwL-0007ZE-Qv for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2016 06:57:36 +0000 Received: from 172.24.1.136 (EHLO szxeml430-hub.china.huawei.com) ([172.24.1.136]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DQL43247; Thu, 01 Sep 2016 14:56:26 +0800 (CST) Received: from localhost (10.177.23.164) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.235.1; Thu, 1 Sep 2016 14:56:17 +0800 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , linux-kernel , Rob Herring , "Frank Rowand" , devicetree , Andrew Morton , linux-mm Subject: [PATCH v8 14/16] of/numa: remove the constraint on the distances of node pairs Date: Thu, 1 Sep 2016 14:55:05 +0800 Message-ID: <1472712907-12700-15-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1472712907-12700-1-git-send-email-thunder.leizhen@huawei.com> References: <1472712907-12700-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.57C7D11C.0098, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 078e4b213aae4cc4b36398c0e22ba14f X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160831_235734_526228_D5700DB1 X-CRM114-Status: GOOD ( 13.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xinwei Hu , Zhen Lei , Zefan Li , Hanjun Guo , Tianhong Ding Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP At present, the distances must equal in both direction for each node pairs. For example: the distance of node B->A must the same to A->B. But we really don't have to do this. End up fill default distances as below: 1. If both direction specified, keep no change. 2. If only one direction specified, assign it to the other direction. 3. If none of the two direction specified, both are assigned to REMOTE_DISTANCE. Signed-off-by: Zhen Lei Acked-by: Rob Herring --- drivers/of/of_numa.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) -- 2.5.0 diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index f63d4b0d..1840045 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -127,15 +127,25 @@ static int __init of_numa_parse_distance_map_v1(struct device_node *map) numa_set_distance(nodea, nodeb, distance); pr_debug("distance[node%d -> node%d] = %d\n", nodea, nodeb, distance); - - /* Set default distance of node B->A same as A->B */ - if (nodeb > nodea) - numa_set_distance(nodeb, nodea, distance); } return 0; } +static void __init fill_default_distances(void) +{ + int i, j; + + for (i = 0; i < nr_node_ids; i++) + for (j = 0; j < nr_node_ids; j++) + if (i == j) + numa_set_distance(i, j, LOCAL_DISTANCE); + else if (!node_distance(i, j)) + numa_set_distance(i, j, + node_distance(j, i) ? : REMOTE_DISTANCE); + +} + static int __init of_numa_parse_distance_map(void) { int ret = 0; @@ -145,8 +155,10 @@ static int __init of_numa_parse_distance_map(void) "numa-distance-map-v1"); if (np) ret = of_numa_parse_distance_map_v1(np); - of_node_put(np); + + fill_default_distances(); + return ret; }