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

Commit b5bc6c0e authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86, mm: use add_highpages_with_active_regions() for high pages init v2 



use early_node_map to init high pages, so we can remove page_is_ram() and
page_is_reserved_early() in the big loop with add_one_highpage

also remove page_is_reserved_early(), it is not needed anymore.

v2: fix the build of other platforms

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d0be6bde

arch/x86/kernel/e820.c

+0 −11
Original line number Diff line number Diff line
@@ -612,17 +612,6 @@ 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/discontig_32.c

+7 −12
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn, 
#endif



extern unsigned long find_max_low_pfn(void);

extern void add_one_highpage_init(struct page *, int, int);

extern unsigned long highend_pfn, highstart_pfn;



#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
@@ -432,10 +431,10 @@ void __init set_highmem_pages_init(int bad_ppro) 
{

#ifdef CONFIG_HIGHMEM

	struct zone *zone;

	struct page *page;

	int nid;



	for_each_zone(zone) {

		unsigned long node_pfn, zone_start_pfn, zone_end_pfn;

		unsigned long zone_start_pfn, zone_end_pfn;



		if (!is_highmem(zone))

			continue;
@@ -443,16 +442,12 @@ void __init set_highmem_pages_init(int bad_ppro) 
		zone_start_pfn = zone->zone_start_pfn;

		zone_end_pfn = zone_start_pfn + zone->spanned_pages;



		nid = zone_to_nid(zone);

		printk("Initializing %s for node %d (%08lx:%08lx)\n",

				zone->name, zone_to_nid(zone),

				zone_start_pfn, zone_end_pfn);

				zone->name, nid, zone_start_pfn, zone_end_pfn);



		for (node_pfn = zone_start_pfn; node_pfn < zone_end_pfn; node_pfn++) {

			if (!pfn_valid(node_pfn))

				continue;

			page = pfn_to_page(node_pfn);

			add_one_highpage_init(page, node_pfn, bad_ppro);

		}

		add_highpages_with_active_regions(nid, zone_start_pfn,

				 zone_end_pfn, bad_ppro);

	}

	totalram_pages += totalhigh_pages;

#endif

arch/x86/mm/init_32.c

+51 −11
Original line number Diff line number Diff line
@@ -287,10 +287,10 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base) 
	pkmap_page_table = pte;

}



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

static 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)) &&

	    !page_is_reserved_early(pfn)) {

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

		ClearPageReserved(page);

		init_page_count(page);

		__free_page(page);
@@ -299,18 +299,58 @@ void __init add_one_highpage_init(struct page *page, int pfn, int bad_ppro) 
		SetPageReserved(page);

}



struct add_highpages_data {

	unsigned long start_pfn;

	unsigned long end_pfn;

	int bad_ppro;

};



static void __init add_highpages_work_fn(unsigned long start_pfn,

					 unsigned long end_pfn, void *datax)

{

	int node_pfn;

	struct page *page;

	unsigned long final_start_pfn, final_end_pfn;

	struct add_highpages_data *data;

	int bad_ppro;



	data = (struct add_highpages_data *)datax;

	bad_ppro = data->bad_ppro;



	final_start_pfn = max(start_pfn, data->start_pfn);

	final_end_pfn = min(end_pfn, data->end_pfn);

	if (final_start_pfn >= final_end_pfn)

		return;



	for (node_pfn = final_start_pfn; node_pfn < final_end_pfn;

	     node_pfn++) {

		if (!pfn_valid(node_pfn))

			continue;

		page = pfn_to_page(node_pfn);

		add_one_highpage_init(page, node_pfn, bad_ppro);

	}



}



void __init add_highpages_with_active_regions(int nid, unsigned long start_pfn,

					      unsigned long end_pfn,

					      int bad_ppro)

{

	struct add_highpages_data data;



	data.start_pfn = start_pfn;

	data.end_pfn = end_pfn;

	data.bad_ppro = bad_ppro;



	work_with_active_regions(nid, add_highpages_work_fn, &data);

}



#ifndef CONFIG_NUMA

static void __init set_highmem_pages_init(int bad_ppro)

{

	int pfn;

	add_highpages_with_active_regions(0, highstart_pfn, highend_pfn,

						bad_ppro);



	for (pfn = highstart_pfn; pfn < highend_pfn; pfn++) {

		/*

		 * Holes under sparsemem might not have no mem_map[]:

		 */

		if (pfn_valid(pfn))

			add_one_highpage_init(pfn_to_page(pfn), pfn, bad_ppro);

	}

	totalram_pages += totalhigh_pages;

}

#endif /* !CONFIG_NUMA */

include/asm-x86/e820.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 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);

include/asm-x86/highmem.h

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ struct page *kmap_atomic_to_page(void *ptr); 


#define flush_cache_kmaps()	do { } while (0)



extern void add_highpages_with_active_regions(int nid, unsigned long start_pfn,

					unsigned long end_pfn, int bad_ppro);



#endif /* __KERNEL__ */



#endif /* _ASM_HIGHMEM_H */