From patchwork Tue Aug 27 09:37:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tangchen X-Patchwork-Id: 2850087 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2BFAD9F313 for ; Tue, 27 Aug 2013 09:41:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED81B2055C for ; Tue, 27 Aug 2013 09:41:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B6EE220534 for ; Tue, 27 Aug 2013 09:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320Ab3H0JlH (ORCPT ); Tue, 27 Aug 2013 05:41:07 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:18207 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753300Ab3H0JjP (ORCPT ); Tue, 27 Aug 2013 05:39:15 -0400 X-IronPort-AV: E=Sophos;i="4.89,967,1367942400"; d="scan'208";a="8317105" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 27 Aug 2013 17:36:03 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r7R9d4FN008013; Tue, 27 Aug 2013 17:39:08 +0800 Received: from G08FNSTD090432.fnst.cn.fujitsu.com ([10.167.226.99]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013082717370935-987572 ; Tue, 27 Aug 2013 17:37:09 +0800 From: Tang Chen To: rjw@sisk.pl, lenb@kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com, zhangyanfei@cn.fujitsu.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org Subject: [PATCH 06/11] memblock: Improve memblock to support allocation from lower address. Date: Tue, 27 Aug 2013 17:37:43 +0800 Message-Id: <1377596268-31552-7-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1377596268-31552-1-git-send-email-tangchen@cn.fujitsu.com> References: <1377596268-31552-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/27 17:37:09, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/27 17:37:14, Serialize complete at 2013/08/27 17:37:14 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch modifies the memblock_find_in_range_node() to support two different allocation orders. After this patch, memblock will check memblock.current_order, and decide in which order to allocate memory. Signed-off-by: Tang Chen Reviewed-by: Zhang Yanfei --- mm/memblock.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 75 insertions(+), 15 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 8f1e2d4..961d4a5 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -85,6 +85,77 @@ static long __init_memblock memblock_overlaps_region(struct memblock_type *type, } /** + * __memblock_find_range - find free area utility + * @start: start of candidate range, can be %MEMBLOCK_ALLOC_ACCESSIBLE + * @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE} + * @size: size of free area to find + * @align: alignment of free area to find + * @nid: nid of the free area to find, %MAX_NUMNODES for any node + * + * Utility called from memblock_find_in_range_node(), find free area from + * lower address to higher address. + * + * RETURNS: + * Found address on success, %0 on failure. + */ +phys_addr_t __init_memblock +__memblock_find_range(phys_addr_t start, phys_addr_t end, + phys_addr_t size, phys_addr_t align, int nid) +{ + phys_addr_t this_start, this_end, cand; + u64 i; + + for_each_free_mem_range(i, nid, &this_start, &this_end, NULL) { + this_start = clamp(this_start, start, end); + this_end = clamp(this_end, start, end); + + cand = round_up(this_start, align); + if (cand < this_end && this_end - cand >= size) + return cand; + } + return 0; +} + +/** + * __memblock_find_range_rev - find free area utility, in reverse order + * @start: start of candidate range, can be %MEMBLOCK_ALLOC_ACCESSIBLE + * @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE} + * @size: size of free area to find + * @align: alignment of free area to find + * @nid: nid of the free area to find, %MAX_NUMNODES for any node + * + * Utility called from memblock_find_in_range_node(), find free area from + * higher address to lower address. + * + * RETURNS: + * Found address on success, %0 on failure. + */ +phys_addr_t __init_memblock +__memblock_find_range_rev(phys_addr_t start, phys_addr_t end, + phys_addr_t size, phys_addr_t align, int nid) +{ + phys_addr_t this_start, this_end, cand; + u64 i; + + for_each_free_mem_range_reverse(i, nid, &this_start, &this_end, NULL) { + this_start = clamp(this_start, start, end); + this_end = clamp(this_end, start, end); + + /* + * Just in case that (this_end - size) underflows and cause + * (cand >= this_start) to be true incorrectly. + */ + if (this_end < size) + break; + + cand = round_down(this_end - size, align); + if (cand >= this_start) + return cand; + } + return 0; +} + +/** * memblock_find_in_range_node - find free area in given range and node * @start: start of candidate range, can be %MEMBLOCK_ALLOC_ACCESSIBLE * @end: end of candidate range, can be %MEMBLOCK_ALLOC_{ANYWHERE|ACCESSIBLE} @@ -110,9 +181,6 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start, phys_addr_t end, phys_addr_t size, phys_addr_t align, int nid) { - phys_addr_t this_start, this_end, cand; - u64 i; - /* pump up @start and @end */ if (start == MEMBLOCK_ALLOC_ACCESSIBLE) start = memblock.current_limit_low; @@ -123,18 +191,10 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start, start = max_t(phys_addr_t, start, PAGE_SIZE); end = max(start, end); - for_each_free_mem_range_reverse(i, nid, &this_start, &this_end, NULL) { - this_start = clamp(this_start, start, end); - this_end = clamp(this_end, start, end); - - if (this_end < size) - continue; - - cand = round_down(this_end - size, align); - if (cand >= this_start) - return cand; - } - return 0; + if (memblock.current_order == MEMBLOCK_ORDER_DEFAULT) + return __memblock_find_range_rev(start, end, size, align, nid); + else + return __memblock_find_range(start, end, size, align, nid); } /**