Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82d42be authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

x86, memblock: Add memblock_x86_memory_in_range() 



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: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent b52c17ce

arch/x86/include/asm/memblock.h

+1 −0
Original line number Diff line number Diff line
@@ -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_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_memory_in_range(u64 addr, u64 limit);



#endif

arch/x86/mm/memblock.c

+17 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end) 
}

#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;

	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, limit, -1ULL);



	/* Subtract memblock.reserved.region in range ? */

	if (!get_free)

		goto sort_and_count_them;

	for_each_memblock(reserved, r) {

		final_start = PFN_DOWN(r->base);

		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);

	}



sort_and_count_them:

	nr_range = clean_sort_range(range, count);



	free_size = 0;
@@ -259,6 +265,16 @@ u64 __init memblock_x86_free_memory_in_range(u64 addr, u64 limit) 
	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)

{

	if (start == end)