lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

memblock: Add arch function to control coalescing of memblock memory regions

Browse Source 
Some archs such as ARM want to avoid coalescing accross things such
as the lowmem/highmem boundary or similar. This provides the option
to control it via an arch callback for which a weak default is provided
which always allows coalescing.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt
2010-07-06 15:39:14 -07:00
parent 142b45a72e
commit d2cd563ba8
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/memblock.h
View File

@@ -72,6 +72,8 @@ extern void memblock_dump_all(void);
/* Provided by the architecture */ /* Provided by the architecture */
extern phys_addr_t memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid); extern phys_addr_t memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid);
extern int memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
phys_addr_t addr2, phys_addr_t size2);
/** /**
* memblock_set_current_limit - Set the current allocation limit to allow * memblock_set_current_limit - Set the current allocation limit to allow

19
mm/memblock.c
View File

@@ -241,6 +241,12 @@ static int memblock_double_array(struct memblock_type *type)
return 0; return 0;
} }
extern int __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
phys_addr_t addr2, phys_addr_t size2)
{
return 1;
}
static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size) static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{ {
unsigned long coalesced = 0; unsigned long coalesced = 0;
@@ -262,6 +268,10 @@ static long memblock_add_region(struct memblock_type *type, phys_addr_t base, ph
return 0; return 0;
adjacent = memblock_addrs_adjacent(base, size, rgnbase, rgnsize); adjacent = memblock_addrs_adjacent(base, size, rgnbase, rgnsize);
/* Check if arch allows coalescing */
if (adjacent != 0 && type == &memblock.memory &&
!memblock_memory_can_coalesce(base, size, rgnbase, rgnsize))
break;
if (adjacent > 0) { if (adjacent > 0) {
type->regions[i].base -= size; type->regions[i].base -= size;
type->regions[i].size += size; type->regions[i].size += size;
@@ -274,7 +284,14 @@ static long memblock_add_region(struct memblock_type *type, phys_addr_t base, ph
} }
} }
if ((i < type->cnt - 1) && memblock_regions_adjacent(type, i, i+1)) { /* If we plugged a hole, we may want to also coalesce with the
* next region
*/
if ((i < type->cnt - 1) && memblock_regions_adjacent(type, i, i+1) &&
((type != &memblock.memory || memblock_memory_can_coalesce(type->regions[i].base,
type->regions[i].size,
type->regions[i+1].base,
type->regions[i+1].size)))) {
memblock_coalesce_regions(type, i, i+1); memblock_coalesce_regions(type, i, i+1);
coalesced++; coalesced++;
} }