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

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

memblock: Add find_memory_core_early() 



According to node range in early_node_map[] with __memblock_find_in_range
to find free range.

Will be used by memblock_x86_find_in_range_node()

memblock_x86_find_in_range_node will be used to find right buffer for NODE_DATA

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

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,8 @@ extern void free_bootmem_with_active_regions(int nid, 
						unsigned long max_low_pfn);

int add_from_early_node_map(struct range *range, int az,

				   int nr_range, int nid);

u64 __init find_memory_core_early(int nid, u64 size, u64 align,

					u64 goal, u64 limit);

void *__alloc_memory_core_early(int nodeid, u64 size, u64 align,

				 u64 goal, u64 limit);

typedef int (*work_fn_t)(unsigned long, unsigned long, void *);

mm/page_alloc.c

+36 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/pagemap.h>

#include <linux/jiffies.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/compiler.h>

#include <linux/kernel.h>

#include <linux/kmemcheck.h>
@@ -3612,6 +3613,41 @@ void __init free_bootmem_with_active_regions(int nid, 
	}

}



#ifdef CONFIG_HAVE_MEMBLOCK

u64 __init find_memory_core_early(int nid, u64 size, u64 align,

					u64 goal, u64 limit)

{

	int i;



	/* Need to go over early_node_map to find out good range for node */

	for_each_active_range_index_in_nid(i, nid) {

		u64 addr;

		u64 ei_start, ei_last;

		u64 final_start, final_end;



		ei_last = early_node_map[i].end_pfn;

		ei_last <<= PAGE_SHIFT;

		ei_start = early_node_map[i].start_pfn;

		ei_start <<= PAGE_SHIFT;



		final_start = max(ei_start, goal);

		final_end = min(ei_last, limit);



		if (final_start >= final_end)

			continue;



		addr = memblock_find_in_range(final_start, final_end, size, align);



		if (addr == MEMBLOCK_ERROR)

			continue;



		return addr;

	}



	return MEMBLOCK_ERROR;

}

#endif



int __init add_from_early_node_map(struct range *range, int az,

				   int nr_range, int nid)

{