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

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

x86: Make 64 bit use early_res instead of bootmem before slab 



Finally we can use early_res to replace bootmem for x86_64 now.

Still can use CONFIG_NO_BOOTMEM to enable it or not.

-v2: fix 32bit compiling about MAX_DMA32_PFN
-v3: folded bug fix from LKML message below

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B747239.4070907@kernel.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent c252a5bb

arch/x86/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -568,6 +568,19 @@ config PARAVIRT_DEBUG 
	  Enable to debug paravirt_ops internals.  Specifically, BUG if

	  a paravirt_op is missing when it is called.



config NO_BOOTMEM

	default y

	bool "Disable Bootmem code"

	depends on X86_64

	---help---

	  Use early_res directly instead of bootmem before slab is ready.

		- allocator (buddy) [generic]

		- early allocator (bootmem) [generic]

		- very early allocator (reserve_early*()) [x86]

		- very very early allocator (early brk model) [x86]

	  So reduce one layer between early allocator to final allocator





config MEMTEST

	bool "Memtest"

	---help---

arch/x86/include/asm/e820.h

+6 −0
Original line number Diff line number Diff line
@@ -117,6 +117,12 @@ extern void free_early(u64 start, u64 end); 
extern void early_res_to_bootmem(u64 start, u64 end);

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



void reserve_early_without_check(u64 start, u64 end, char *name);

u64 find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end,

			 u64 size, u64 align);

#include <linux/range.h>

int get_free_all_memory_range(struct range **rangep, int nodeid);



extern unsigned long e820_end_of_ram_pfn(void);

extern unsigned long e820_end_of_low_ram_pfn(void);

extern int e820_find_active_region(const struct e820entry *ei,

arch/x86/kernel/e820.c

+146 −13
Original line number Diff line number Diff line
@@ -977,6 +977,25 @@ void __init reserve_early(u64 start, u64 end, char *name) 
	__reserve_early(start, end, name, 0);

}



void __init reserve_early_without_check(u64 start, u64 end, char *name)

{

	struct early_res *r;



	if (start >= end)

		return;



	__check_and_double_early_res(end);



	r = &early_res[early_res_count];



	r->start = start;

	r->end = end;

	r->overlap_ok = 0;

	if (name)

		strncpy(r->name, name, sizeof(r->name) - 1);

	early_res_count++;

}



void __init free_early(u64 start, u64 end)

{

	struct early_res *r;
@@ -991,6 +1010,94 @@ void __init free_early(u64 start, u64 end) 
	drop_range(i);

}



#ifdef CONFIG_NO_BOOTMEM

static void __init subtract_early_res(struct range *range, int az)

{

	int i, count;

	u64 final_start, final_end;

	int idx = 0;



	count  = 0;

	for (i = 0; i < max_early_res && early_res[i].end; i++)

		count++;



	/* need to skip first one ?*/

	if (early_res != early_res_x)

		idx = 1;



#if 1

	printk(KERN_INFO "Subtract (%d early reservations)\n", count);

#endif

	for (i = idx; i < count; i++) {

		struct early_res *r = &early_res[i];

#if 0

		printk(KERN_INFO "  #%d [%010llx - %010llx] %15s", i,

			r->start, r->end, r->name);

#endif

		final_start = PFN_DOWN(r->start);

		final_end = PFN_UP(r->end);

		if (final_start >= final_end) {

#if 0

			printk(KERN_CONT "\n");

#endif

			continue;

		}

#if 0

		printk(KERN_CONT " subtract pfn [%010llx - %010llx]\n",

			final_start, final_end);

#endif

		subtract_range(range, az, final_start, final_end);

	}



}



int __init get_free_all_memory_range(struct range **rangep, int nodeid)

{

	int i, count;

	u64 start = 0, end;

	u64 size;

	u64 mem;

	struct range *range;

	int nr_range;



	count  = 0;

	for (i = 0; i < max_early_res && early_res[i].end; i++)

		count++;



	count *= 2;



	size = sizeof(struct range) * count;

#ifdef MAX_DMA32_PFN

	if (max_pfn_mapped > MAX_DMA32_PFN)

		start = MAX_DMA32_PFN << PAGE_SHIFT;

#endif

	end = max_pfn_mapped << PAGE_SHIFT;

	mem = find_e820_area(start, end, size, sizeof(struct range));

	if (mem == -1ULL)

		panic("can not find more space for range free");



	range = __va(mem);

	/* use early_node_map[] and early_res to get range array at first */

	memset(range, 0, size);

	nr_range = 0;



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

	nr_range = add_from_early_node_map(range, count, nr_range, nodeid);

	subtract_early_res(range, count);

	nr_range = clean_sort_range(range, count);



	/* need to clear it ? */

	if (nodeid == MAX_NUMNODES) {

		memset(&early_res[0], 0,

			 sizeof(struct early_res) * max_early_res);

		early_res = NULL;

		max_early_res = 0;

	}



	*rangep = range;

	return nr_range;

}

#else

void __init early_res_to_bootmem(u64 start, u64 end)

{

	int i, count;
@@ -1028,6 +1135,7 @@ void __init early_res_to_bootmem(u64 start, u64 end) 
	max_early_res = 0;

	early_res_count = 0;

}

#endif



/* Check for already reserved areas */

static inline int __init bad_addr(u64 *addrp, u64 size, u64 align)
@@ -1083,31 +1191,56 @@ again: 


/*

 * Find a free area with specified alignment in a specific range.

 * only with the area.between start to end is active range from early_node_map

 * so they are good as RAM

 */

u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)

u64 __init find_early_area(u64 ei_start, u64 ei_last, u64 start, u64 end,

			 u64 size, u64 align)

{

	int i;



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];

	u64 addr, last;

		u64 ei_last;



		if (ei->type != E820_RAM)

			continue;

		addr = round_up(ei->addr, align);

		ei_last = ei->addr + ei->size;

	addr = round_up(ei_start, align);

	if (addr < start)

		addr = round_up(start, align);

	if (addr >= ei_last)

			continue;

		goto out;

	while (bad_addr(&addr, size, align) && addr+size <= ei_last)

		;

	last = addr + size;

	if (last > ei_last)

			continue;

		goto out;

	if (last > end)

		goto out;



	return addr;



out:

	return -1ULL;

}



/*

 * Find a free area with specified alignment in a specific range.

 */

u64 __init find_e820_area(u64 start, u64 end, u64 size, u64 align)

{

	int i;



	for (i = 0; i < e820.nr_map; i++) {

		struct e820entry *ei = &e820.map[i];

		u64 addr;

		u64 ei_start, ei_last;



		if (ei->type != E820_RAM)

			continue;



		ei_last = ei->addr + ei->size;

		ei_start = ei->addr;

		addr = find_early_area(ei_start, ei_last, start, end,

					 size, align);



		if (addr == -1ULL)

			continue;



		return addr;

	}

	return -1ULL;

arch/x86/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -967,7 +967,9 @@ void __init setup_arch(char **cmdline_p) 
#endif



	initmem_init(0, max_pfn, acpi, k8);

#ifndef CONFIG_NO_BOOTMEM

	early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);

#endif



	dma32_reserve_bootmem();

arch/x86/mm/init_64.c

+4 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ kernel_physical_mapping_init(unsigned long start, 
void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,

				int acpi, int k8)

{

#ifndef CONFIG_NO_BOOTMEM

	unsigned long bootmap_size, bootmap;



	bootmap_size = bootmem_bootmap_pages(end_pfn)<<PAGE_SHIFT;
@@ -585,6 +586,9 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, 
					 0, end_pfn);

	e820_register_active_regions(0, start_pfn, end_pfn);

	free_bootmem_with_active_regions(0, end_pfn);

#else

	e820_register_active_regions(0, start_pfn, end_pfn);

#endif

}

#endif