From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yinghai Lu Subject: [PATCH 15/49] memblock: Make memblock_find_region() out of memblock_alloc_region() Date: Tue, 6 Jul 2010 15:39:08 -0700 Message-ID: <1278455982-24621-16-git-send-email-yinghai@kernel.org> References: <1278455982-24621-1-git-send-email-yinghai@kernel.org> Return-path: In-Reply-To: <1278455982-24621-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Benjamin Herrenschmidt List-Id: linux-arch.vger.kernel.org From: Benjamin Herrenschmidt This function will be used to locate a free area to put the new memblock arrays when attempting to resize them. memblock_alloc_region() is gone, the two callsites now call memblock_add_region(). Signed-off-by: Benjamin Herrenschmidt --- mm/memblock.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 21ba089..6577da6 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -309,8 +309,8 @@ static phys_addr_t memblock_align_up(phys_addr_t addr, phys_addr_t size) return (addr + (size - 1)) & ~(size - 1); } -static phys_addr_t __init memblock_alloc_region(phys_addr_t start, phys_addr_t end, - phys_addr_t size, phys_addr_t align) +static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end, + phys_addr_t size, phys_addr_t align) { phys_addr_t base, res_base; long j; @@ -318,12 +318,8 @@ static phys_addr_t __init memblock_alloc_region(phys_addr_t start, phys_addr_t e base = memblock_align_down((end - size), align); while (start <= base) { j = memblock_overlaps_region(&memblock.reserved, base, size); - if (j < 0) { - /* this area isn't reserved, take it */ - if (memblock_add_region(&memblock.reserved, base, size) < 0) - base = ~(phys_addr_t)0; + if (j < 0) return base; - } res_base = memblock.reserved.regions[j].base; if (res_base < size) break; @@ -356,8 +352,9 @@ static phys_addr_t __init memblock_alloc_nid_region(struct memblock_region *mp, this_end = memblock_nid_range(start, end, &this_nid); if (this_nid == nid) { - phys_addr_t ret = memblock_alloc_region(start, this_end, size, align); - if (ret != ~(phys_addr_t)0) + phys_addr_t ret = memblock_find_region(start, this_end, size, align); + if (ret != ~(phys_addr_t)0 && + memblock_add_region(&memblock.reserved, start, size) >= 0) return ret; } start = this_end; @@ -432,8 +429,9 @@ phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, ph if (memblocksize < size) continue; base = min(memblockbase + memblocksize, max_addr); - res_base = memblock_alloc_region(memblockbase, base, size, align); - if (res_base != ~(phys_addr_t)0) + res_base = memblock_find_region(memblockbase, base, size, align); + if (res_base != ~(phys_addr_t)0 && + memblock_add_region(&memblock.reserved, res_base, size) >= 0) return res_base; } return 0; -- 1.6.4.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcsinet10.oracle.com ([148.87.113.121]:31516 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756613Ab0GFWnX (ORCPT ); Tue, 6 Jul 2010 18:43:23 -0400 From: Yinghai Lu Subject: [PATCH 15/49] memblock: Make memblock_find_region() out of memblock_alloc_region() Date: Tue, 6 Jul 2010 15:39:08 -0700 Message-ID: <1278455982-24621-16-git-send-email-yinghai@kernel.org> In-Reply-To: <1278455982-24621-1-git-send-email-yinghai@kernel.org> References: <1278455982-24621-1-git-send-email-yinghai@kernel.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , David Miller , Benjamin Herrenschmidt Cc: Linus Torvalds , Johannes Weiner , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Message-ID: <20100706223908.qq000O36wB6dgAQo26ONxWUCXn8tQt_MtojPdIZo5JE@z> From: Benjamin Herrenschmidt This function will be used to locate a free area to put the new memblock arrays when attempting to resize them. memblock_alloc_region() is gone, the two callsites now call memblock_add_region(). Signed-off-by: Benjamin Herrenschmidt --- mm/memblock.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 21ba089..6577da6 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -309,8 +309,8 @@ static phys_addr_t memblock_align_up(phys_addr_t addr, phys_addr_t size) return (addr + (size - 1)) & ~(size - 1); } -static phys_addr_t __init memblock_alloc_region(phys_addr_t start, phys_addr_t end, - phys_addr_t size, phys_addr_t align) +static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t end, + phys_addr_t size, phys_addr_t align) { phys_addr_t base, res_base; long j; @@ -318,12 +318,8 @@ static phys_addr_t __init memblock_alloc_region(phys_addr_t start, phys_addr_t e base = memblock_align_down((end - size), align); while (start <= base) { j = memblock_overlaps_region(&memblock.reserved, base, size); - if (j < 0) { - /* this area isn't reserved, take it */ - if (memblock_add_region(&memblock.reserved, base, size) < 0) - base = ~(phys_addr_t)0; + if (j < 0) return base; - } res_base = memblock.reserved.regions[j].base; if (res_base < size) break; @@ -356,8 +352,9 @@ static phys_addr_t __init memblock_alloc_nid_region(struct memblock_region *mp, this_end = memblock_nid_range(start, end, &this_nid); if (this_nid == nid) { - phys_addr_t ret = memblock_alloc_region(start, this_end, size, align); - if (ret != ~(phys_addr_t)0) + phys_addr_t ret = memblock_find_region(start, this_end, size, align); + if (ret != ~(phys_addr_t)0 && + memblock_add_region(&memblock.reserved, start, size) >= 0) return ret; } start = this_end; @@ -432,8 +429,9 @@ phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, ph if (memblocksize < size) continue; base = min(memblockbase + memblocksize, max_addr); - res_base = memblock_alloc_region(memblockbase, base, size, align); - if (res_base != ~(phys_addr_t)0) + res_base = memblock_find_region(memblockbase, base, size, align); + if (res_base != ~(phys_addr_t)0 && + memblock_add_region(&memblock.reserved, res_base, size) >= 0) return res_base; } return 0; -- 1.6.4.2