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

Commit d0ec2c6f authored by Huang, Ying's avatar Huang, Ying Committed by Thomas Gleixner
Browse files

x86: reserve highmem pages via reserve_early 



This patch makes early reserved highmem pages become reserved
pages. This can be used for highmem pages allocated by bootloader such
as EFI memory map, linked list of setup_data, etc.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Cc: andi@firstfloor.org
Cc: mingo@redhat.com
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d3fbe5ea

arch/x86/kernel/e820.c

+11 −0
Original line number Diff line number Diff line
@@ -612,6 +612,17 @@ void __init free_early(u64 start, u64 end) 
	early_res[j - 1].end = 0;

}



int __init page_is_reserved_early(unsigned long pagenr)

{

	u64 start = (u64)pagenr << PAGE_SHIFT;

	int i;

	struct early_res *r;



	i = find_overlapped_early(start, start + PAGE_SIZE);

	r = &early_res[i];

	return (i < MAX_EARLY_RES && r->end);

}



void __init early_res_to_bootmem(u64 start, u64 end)

{

	int i;

arch/x86/mm/init_32.c

+2 −1
Original line number Diff line number Diff line
@@ -289,7 +289,8 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base) 


void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro)

{

	if (page_is_ram(pfn) && !(bad_ppro && page_kills_ppro(pfn))) {

	if (page_is_ram(pfn) && !(bad_ppro && page_kills_ppro(pfn)) &&

	    !page_is_reserved_early(pfn)) {

		ClearPageReserved(page);

		init_page_count(page);

		__free_page(page);

include/asm-x86/e820.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align); 
extern void reserve_early(u64 start, u64 end, char *name);

extern void free_early(u64 start, u64 end);

extern void early_res_to_bootmem(u64 start, u64 end);

extern int page_is_reserved_early(unsigned long pagenr);

extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);



extern unsigned long e820_end_of_ram(void);