iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, memblock: Add memblock_x86_memory_in_range()

Browse Source 
It will return memory size in specified range according to memblock.memory.region

Try to share some code with memblock_x86_free_memory_in_range() by passing get_free to
__memblock_x86_memory_in_range().

-v2: Ben want _in_range in the name instead of size

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Yinghai Lu 2010-08-25 13:39:17 -07:00 committed by H. Peter Anvin
parent b52c17ce85
commit e82d42be24
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/memblock.h
View File

@ -16,5 +16,6 @@ void memblock_x86_register_active_regions(int nid, unsigned long start_pfn,
u64 memblock_x86_hole_size(u64 start, u64 end); u64 memblock_x86_hole_size(u64 start, u64 end);
u64 memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align); u64 memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align);
u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit); u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit);
u64 memblock_x86_memory_in_range(u64 addr, u64 limit);
#endif #endif

18
arch/x86/mm/memblock.c
View File

@ -211,7 +211,7 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end)
} }
#endif #endif
u64 __init memblock_x86_free_memory_in_range(u64 addr, u64 limit) static u64 __init __memblock_x86_memory_in_range(u64 addr, u64 limit, bool get_free)
{ {
int i, count; int i, count;
struct range *range; struct range *range;
@ -240,6 +240,10 @@ u64 __init memblock_x86_free_memory_in_range(u64 addr, u64 limit)
} }
subtract_range(range, count, 0, addr); subtract_range(range, count, 0, addr);
subtract_range(range, count, limit, -1ULL); subtract_range(range, count, limit, -1ULL);
/* Subtract memblock.reserved.region in range ? */
if (!get_free)
goto sort_and_count_them;
for_each_memblock(reserved, r) { for_each_memblock(reserved, r) {
final_start = PFN_DOWN(r->base); final_start = PFN_DOWN(r->base);
final_end = PFN_UP(r->base + r->size); final_end = PFN_UP(r->base + r->size);
@ -250,6 +254,8 @@ u64 __init memblock_x86_free_memory_in_range(u64 addr, u64 limit)
subtract_range(range, count, final_start, final_end); subtract_range(range, count, final_start, final_end);
} }
sort_and_count_them:
nr_range = clean_sort_range(range, count); nr_range = clean_sort_range(range, count);
free_size = 0; free_size = 0;
@ -259,6 +265,16 @@ u64 __init memblock_x86_free_memory_in_range(u64 addr, u64 limit)
return free_size << PAGE_SHIFT; return free_size << PAGE_SHIFT;
} }
u64 __init memblock_x86_free_memory_in_range(u64 addr, u64 limit)
{
return __memblock_x86_memory_in_range(addr, limit, true);
}
u64 __init memblock_x86_memory_in_range(u64 addr, u64 limit)
{
return __memblock_x86_memory_in_range(addr, limit, false);
}
void __init memblock_x86_reserve_range(u64 start, u64 end, char *name) void __init memblock_x86_reserve_range(u64 start, u64 end, char *name)
{ {
if (start == end) if (start == end)