[PATCH 20/25] lmb: Add arch function to control coalescing of lmb memory regions
in [Kernel]
|
Prev: [PATCH] Staging: comedi: Fixed long line lengths in comedi.h
Next: [PATCH 14/25] lmb: Make lmb_find_region() out of lmb_alloc_region()
From: Benjamin Herrenschmidt on 10 May 2010 06:00 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(a)kernel.crashing.org> --- include/linux/lmb.h | 2 ++ lib/lmb.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/include/linux/lmb.h b/include/linux/lmb.h index e575801..404b49c 100644 --- a/include/linux/lmb.h +++ b/include/linux/lmb.h @@ -70,6 +70,8 @@ extern void lmb_dump_all(void); /* Provided by the architecture */ extern phys_addr_t lmb_nid_range(phys_addr_t start, phys_addr_t end, int *nid); +extern int lmb_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1, + phys_addr_t addr2, phys_addr_t size2); /** * lmb_set_current_limit - Set the current allocation limit to allow diff --git a/lib/lmb.c b/lib/lmb.c index 2602683..84ac3a9 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -235,6 +235,12 @@ static int lmb_double_array(struct lmb_type *type) return 0; } +extern int __weak lmb_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1, + phys_addr_t addr2, phys_addr_t size2) +{ + return 1; +} + static long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t size) { unsigned long coalesced = 0; @@ -256,6 +262,10 @@ static long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t return 0; adjacent = lmb_addrs_adjacent(base, size, rgnbase, rgnsize); + /* Check if arch allows coalescing */ + if (adjacent != 0 && type == &lmb.memory && + !lmb_memory_can_coalesce(base, size, rgnbase, rgnsize)) + break; if (adjacent > 0) { type->regions[i].base -= size; type->regions[i].size += size; @@ -268,7 +278,14 @@ static long lmb_add_region(struct lmb_type *type, phys_addr_t base, phys_addr_t } } - if ((i < type->cnt - 1) && lmb_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) && lmb_regions_adjacent(type, i, i+1) && + ((type != &lmb.memory || lmb_memory_can_coalesce(type->regions[i].base, + type->regions[i].size, + type->regions[i+1].base, + type->regions[i+1].size)))) { lmb_coalesce_regions(type, i, i+1); coalesced++; } -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |