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

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

x86, memblock: Add memblock_x86_find_in_range_node() 



It can be used to find NODE_DATA for numa.

Need to make sure early_node_map[] is filled before it is called, otherwise
it will fallback to memblock_find_in_range(), with node range.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent edbe7d23

arch/x86/include/asm/memblock.h

+1 −0
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ int get_free_all_memory_range(struct range **rangep, int nodeid); 
void memblock_x86_register_active_regions(int nid, unsigned long start_pfn,

					 unsigned long last_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);



#endif

arch/x86/mm/memblock.c

+15 −0
Original line number Diff line number Diff line
@@ -233,6 +233,21 @@ void __init memblock_x86_free_range(u64 start, u64 end) 
	memblock_free(start, end - start);

}



/*

 * Need to call this function after memblock_x86_register_active_regions,

 * so early_node_map[] is filled already.

 */

u64 __init memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align)

{

	u64 addr;

	addr = find_memory_core_early(nid, size, align, start, end);

	if (addr != MEMBLOCK_ERROR)

		return addr;



	/* Fallback, should already have start end within node range */

	return memblock_find_in_range(start, end, size, align);

}



/*

 * Finds an active region in the address range from start_pfn to last_pfn and

 * returns its range in ei_startpfn and ei_endpfn for the memblock entry.