use lmb with x86
Subsystems (13)
cover use lmb with x86
the new lmb could be used to early_res in x86.
Suggested by: David, Ben, and Thomas
First one should go into 2.6.34.
-v6: change sequence as requested by Thomas
-v7: seperate them to more patches
-v8: add boundary checking to make sure not free partial page. -v9: use lmb_debug to control print out of reserve_lmb.
add e820 clean up, and e820 become __initdata
-v10:use lmb.rmo_size and ARCH_DISCARD_LMB according to Michael
change name to lmb_find_area/reserve_lmb_area/free_lmb_area,
according to Michael
update find_lmb_area to use __lmb_alloc_base according to ben
-v11:move find_lmb_area_size back to x86.
x86 has own find_lmb_area, and could be disabled by ARCH_LMB_FIND_AREA
because _lmb_find_base has different behavoir from x86's old one. one from high to high and one from low to high
need more test
tested for x86 32bit/64bit, numa/nonuma, nobootmem/bootmem.
still keep find_lmb_area, may replace those find_lmb_area will lmb_alloc, if everything go fine
Please consider to put them into tip to have more test coverage.
Thanks
Yinghai
PATCH 1/33 x86: Make e820_remove_range() to handle all covered case
Rusty found on lguest with trim_bios_range, max_pfn is not right anymore, and looks e820_remove_range does not work right.
[ 0.000000] BIOS-provided physical RAM map: [ 0.000000] LGUEST: 0000000000000000 - 0000000004000000 (usable) [ 0.000000] Notice: NX (Execute Disable) protection missing in CPU or disabled in BIOS! [ 0.000000] DMI not present or invalid. [ 0.000000] last_pfn = 0x3fa0 max_arch_pfn = 0x100000 [ 0.000000] init_memory_mapping: 0000000000000000-0000000003fa0000
root cause is: the e820_remove_range doesn't handle that all cover case. e820_remove_range(BIOS_START, BIOS_END - BIOS_start, ,,)
get miss one left range.
Make that is corresponding to e820_update_range() to handle that case too.
--- arch/x86/kernel/e820.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-)
arch/x86/kernel/e820.c +20 -4
@@ -519,29 +519,45 @@ u64 __init e820_remove_range(u64 start, u64 size, unsigned old_type,printk (KERN_DEBUG "e820 remove range: %016Lx - %016Lx " , (unsigned long long ) start, (unsigned long long ) end); -e820_print_type (old_type); +if (checktype) +e820_print_type (old_type);printk (KERN_CONT "\n" );for (i =0 ; i < e820.nr_map; i++) {struct e820entry *ei = &e820.map[i];u64 final_start, final_end; +u64 ei_end;if (checktype && ei->type != old_type)continue ; + + ei_end = ei->addr + ei->size;/* totally covered? */ -if (ei->addr >= start && - (ei->addr + ei->size) <= (start + size)) { +if (ei->addr >= start && ei_end <= end) { real_removed_size += ei->size;memset (ei,0 ,sizeof (struct e820entry ));continue ; } + +/* new range is totally covered? */ +if (ei->addr < start && ei_end > end) { +e820_add_region (end, ei_end - end, ei->type); + ei->size = start - ei->addr; + real_removed_size += size; +continue ; + } +/* partially covered */ final_start =max (start, ei->addr); - final_end =min (start + size, ei->addr + ei->size); + final_end =min (end, ei_end);if (final_start >= final_end)continue ; real_removed_size += final_end - final_start; +/* +* left range could be head or tail, so need to update +* size at first. +*/ ei->size -= final_end - final_start;if (ei->addr < final_start)continue ;
Signature · 1 line
1.6.4.2
PATCH 2/33 lmb: Move lmb.c to mm/
In reply to Yinghai Lulmb.c is memory related, so move it to mm/. It is suggested by Ingo
---
lib/Makefile | 2 --
mm/Makefile | 2 ++
{lib => mm}/lmb.c | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename {lib => mm}/lmb.c (100%)lib/Makefile +0 -2
@@ -85,8 +85,6 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o lib-$(CONFIG_GENERIC_BUG) += bug.o -obj-$(CONFIG_HAVE_LMB) += lmb.o - obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o obj-$(CONFIG_DYNAMIC_DEBUG) += dynamic_debug.o
mm/Makefile +2 -0
@@ -15,6 +15,8 @@ obj-y := bootmem.o filemap.o mempool.o oom_kill.o fadvise.o \ $(mmu-y) obj-y += init-mm.o +obj-$(CONFIG_HAVE_LMB) += lmb.o + obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o obj-$(CONFIG_HAS_DMA) += dmapool.o
mm/lmb.c renamed from lib/lmb.c +0 -0
Signature · 1 line
1.6.4.2
PATCH 3/33 lmb: Seperate region array from lmb_region struct
In reply to Yinghai Lulmb_init() will connect them back.
Add nr_regions in struct lmb_region to track region array size.
So later We can install dynamically allocated region array to that pointer
--- include/linux/lmb.h | 3 ++- mm/lmb.c | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)
include/linux/lmb.h +2 -1
@@ -26,7 +26,8 @@ struct lmb_property {struct lmb_region {unsigned long cnt;u64 size; -struct lmb_property region[MAX_LMB_REGIONS +1 ]; +struct lmb_property *region; +unsigned long nr_regions; };struct lmb {
mm/lmb.c +8 -1
@@ -18,6 +18,8 @@#define LMB_ALLOC_ANYWHERE 0struct lmb lmb; +static struct lmb_property lmb_memory_region[MAX_LMB_REGIONS +1 ]; +static struct lmb_property lmb_reserved_region[MAX_LMB_REGIONS +1 ];static int lmb_debug;
@@ -106,6 +108,11 @@ static void lmb_coalesce_regions(struct lmb_region *rgn,void __init lmb_init (void ) { + lmb.memory.region = lmb_memory_region; + lmb.reserved.region = lmb_reserved_region; + lmb.memory.nr_regions =ARRAY_SIZE (lmb_memory_region); + lmb.reserved.nr_regions =ARRAY_SIZE (lmb_reserved_region); +/* Create a dummy zero size LMB which will get coalesced away later. * This simplifies the lmb_add() code below... */
@@ -169,7 +176,7 @@ static long lmb_add_region(struct lmb_region *rgn, u64 base, u64 size)if (coalesced)return coalesced; -if (rgn->cnt >=MAX_LMB_REGIONS ) +if (rgn->cnt > rgn->nr_regions)return -1 ;/* Couldn't coalesce the LMB, so add it to the sorted table. */
Signature · 1 line
1.6.4.2
PATCH 4/33 lmb: Seperate __lmb_find_base() from __lmb_alloc_base()
In reply to Yinghai LuSo We can construct one generic __find_lmb_area() later
--- mm/lmb.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-)
mm/lmb.c +17 -4
@@ -393,7 +393,7 @@ u64 __init lmb_alloc_base(u64 size, u64 align, u64 max_addr)return alloc; } -u64 __init __lmb_alloc_base (u64 size,u64 align,u64 max_addr) +static u64 __init __lmb_find_base (u64 size,u64 align,u64 max_addr) {long i, j;u64 base =0 ;
@@ -426,8 +426,6 @@ u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr) j =lmb_overlaps_region (&lmb.reserved, base, size);if (j <0 ) {/* this area isn't reserved, take it */ -if (lmb_add_region (&lmb.reserved, base, size) <0 ) -return 0 ;return base; } res_base = lmb.reserved.region[j].base;
@@ -436,7 +434,22 @@ u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr) base =lmb_align_down (res_base - size, align); } } -return 0 ; +return -1ULL ; +} + +u64 __init __lmb_alloc_base (u64 size,u64 align,u64 max_addr) +{ +u64 base; + + base =__lmb_find_base (size, align, max_addr); + +if (base ==-1ULL ) +return 0 ; + +if (lmb_add_region (&lmb.reserved, base, size) <0 ) +return 0 ; + +return base; }/* You must call lmb_analyze() before this. */
Signature · 1 line
1.6.4.2
PATCH 5/33 lmb: Add lmb_find_area()
In reply to Yinghai LuIt will try find area according with size/align in specified range (start, end).
lmb_find_area() will honor goal/limit.
also make it more easy for x86 to use lmb.
x86 early_res is using find/reserve pattern instead of alloc.
When we need temporaray buff for range array etc for range work, if We are using lmb_alloc(), We will need to add some post fix code for buffer that is used by range array, because it is in the lmb.reserved already. and have to call extra lmb_free().
-v2: Change name to lmb_find_area() according to Michael Ellerman -v3: Add generic weak version __lmb_find_area()
--- include/linux/lmb.h | 4 ++++ mm/lmb.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-)
include/linux/lmb.h +4 -0
@@ -83,6 +83,10 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr) lmb_size_pages(type, region_nr); } +u64 __lmb_find_area (u64 ei_start,u64 ei_last,u64 start,u64 end, +u64 size,u64 align); +u64 lmb_find_area (u64 start,u64 end,u64 size,u64 align); +#include <asm/lmb.h> #endif /* __KERNEL__ */
mm/lmb.c +49 -0
61 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 6/33 lmb: Add lmb_reserve_area/lmb_free_area
In reply to Yinghai LuThey will check if the region array is big enough.
__check_and_double_region_array will try to double the region array if that array spare slots is not big enough. Old array will be copied to new array.
Arch code should set lmb.default_alloc_limit accordingly, so the new array is in accessiable address.
-v2: change get_max_mapped() to lmb.default_alloc_limit according to Michael
Ellerman and Ben
change to lmb_reserve_area and lmb_free_area according to Michael Ellerman
-v3: call check_and_double after reserve/free, so could avoid to use
find_lmb_area. Suggested by Michael Ellerman
--- include/linux/lmb.h | 4 +++ mm/lmb.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 0 deletions(-)
include/linux/lmb.h +4 -0
@@ -33,6 +33,7 @@ struct lmb_region {struct lmb {unsigned long debug;u64 rmo_size; +u64 default_alloc_limit;struct lmb_region memory;struct lmb_region reserved; };
@@ -83,6 +84,9 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)lmb_size_pages (type, region_nr); } +void lmb_reserve_area (u64 start,u64 end,char *name); +void lmb_free_area (u64 start,u64 end); +void lmb_add_memory (u64 start,u64 end);u64 __lmb_find_area (u64 ei_start,u64 ei_last,u64 start,u64 end,u64 size,u64 align);u64 lmb_find_area (u64 start,u64 end,u64 size,u64 align);
mm/lmb.c +66 -0
72 lines not on this page · raw message
Signature · 1 line
1.6.4.2
Re: [PATCH 06/33] lmb: Add lmb_reserve_area/lmb_free_area
Quoted 11 lines · Yinghai Lu
They will check if the region array is big enough.
__check_and_double_region_arraywill try to double the region array if that array spare slots is not big enough. Old array will be copied to new array.include/linux/lmb.h +0
-0
include/linux/lmb.h lmb_end_pfn(struct lmb_region *type, unsigned long region_nr) · line 89
Quoted 6 lines
include/linux/lmb.h +3
-0@@ -83,6 +84,9 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)lmb_size_pages (type, region_nr); } +void lmb_reserve_area (u64 start,u64 end,char *name); +void lmb_free_area (u64 start,u64 end); +void lmb_add_memory (u64 start,u64 end);
vs
extern long lmb_reserve(u64 base, u64 size);
extern long lmb_free(u64 base, u64 size);
extern long lmb_add(u64 base, u64 size);
Can you tell which ones handle dynamically expanding the region array?
You're _still_ adding a new API, which I still think is stupid.
cheers
Re: [PATCH 06/33] lmb: Add lmb_reserve_area/lmb_free_area
Quoted 21 lines · Michael Ellerman
Quoted 11 lines · Yinghai Lu
They will check if the region array is big enough.
__check_and_double_region_arraywill try to double the region array if that array spare slots is not big enough. Old array will be copied to new array.include/linux/lmb.h +0
-0include/linux/lmb.h lmb_end_pfn(struct lmb_region *type, unsigned long region_nr) · line 89
Quoted 6 lines
include/linux/lmb.h +3
-0@@ -83,6 +84,9 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)lmb_size_pages (type, region_nr); } +void lmb_reserve_area (u64 start,u64 end,char *name); +void lmb_free_area (u64 start,u64 end); +void lmb_add_memory (u64 start,u64 end);vs
Quoted 8 lines
extern long
lmb_reserve(u64 base, u64 size);
extern longlmb_free(u64 base, u64 size);
extern longlmb_add(u64 base, u64 size);Can you tell which ones handle dynamically expanding the region array?
You're _still_ adding a new API, which I still think is stupid.
please consider to merge them later.
Don't want to break current lmb users
YH
PATCH 7/33 bootmem, x86: Add weak version of reserve_bootmem_generic
In reply to Yinghai LuIt will be used lmb_to_bootmem converting
It is an wrapper for reserve_bootmem, and x86 64bit is using special one.
Also clean up that version for x86_64. We don't need to take care of numa path for that, bootmem can handle it how
--- arch/x86/mm/init_32.c | 6 ------ arch/x86/mm/init_64.c | 20 ++------------------ mm/bootmem.c | 6 ++++++ 3 files changed, 8 insertions(+), 24 deletions(-)
arch/x86/mm/init_32.c +0 -6
@@ -1069,9 +1069,3 @@ void mark_rodata_ro(void) #endif }#endif - -int __init reserve_bootmem_generic (unsigned long phys,unsigned long len, -int flags) -{ -return reserve_bootmem (phys, len, flags); -}
arch/x86/mm/init_64.c +2 -18
@@ -798,13 +798,10 @@ void mark_rodata_ro(void)#endif +#ifndef CONFIG_NO_BOOTMEM int __init reserve_bootmem_generic (unsigned long phys,unsigned long len,int flags) { -#ifdef CONFIG_NUMA -int nid, next_nid; -int ret; -#endif unsigned long pfn = phys >>PAGE_SHIFT ;if (pfn >= max_pfn) {
@@ -820,21 +817,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,return -EFAULT ; } -/* Should check here against the e820 map to avoid double free */ -#ifdef CONFIG_NUMA - nid =phys_to_nid (phys); - next_nid =phys_to_nid (phys + len -1 ); -if (nid == next_nid) - ret =reserve_bootmem_node (NODE_DATA (nid), phys, len, flags); -else - ret =reserve_bootmem (phys, len, flags); - -if (ret !=0 ) -return ret; - -#else reserve_bootmem (phys, len, flags); -#endif if (phys+len <=MAX_DMA_PFN *PAGE_SIZE ) { dma_reserve += len /PAGE_SIZE ;
@@ -843,6 +826,7 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len, return 0; } +#endif int kern_addr_valid (unsigned long addr) {
mm/bootmem.c +6 -0
@@ -512,6 +512,12 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, }#ifndef CONFIG_NO_BOOTMEM +int __weak __init reserve_bootmem_generic (unsigned long phys,unsigned long len, +int flags) +{ +return reserve_bootmem (phys, len, flags); +} +static unsigned long __init align_idx (struct bootmem_data *bdata,unsigned long idx,unsigned long step) {
Signature · 1 line
1.6.4.2
PATCH 8/33 lmb: Add lmb_to_bootmem()
In reply to Yinghai Lulmb_to_bootmem() will reserve lmb.reserved.region in bootmem after bootmem is set up.
We can use it to with all arches that support lmb later.
--- include/linux/lmb.h | 2 ++ mm/lmb.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-)
include/linux/lmb.h +2 -0
@@ -91,6 +91,8 @@ u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end, u64 size, u64 align);u64 lmb_find_area (u64 start,u64 end,u64 size,u64 align); +void lmb_to_bootmem (u64 start,u64 end); +#include <asm/lmb.h> #endif /* __KERNEL__ */
mm/lmb.c +32 -0
@@ -630,6 +630,38 @@ void __init lmb_free_area(u64 start, u64 end)__check_and_double_region_array (&lmb.reserved, &lmb_reserved_region[0 ]); } +#ifndef CONFIG_NO_BOOTMEM +void __init lmb_to_bootmem (u64 start,u64 end) +{ +int i, count; +u64 final_start, final_end; + +/* Take out region array itself */ +if (lmb.reserved.region != lmb_reserved_region) +lmb_free (__pa (lmb.reserved.region),sizeof (struct lmb_property ) * lmb.reserved.nr_regions); + + count = lmb.reserved.cnt; +pr_info ("(%d early reservations) ==> bootmem [%010llx - %010llx]\n" , count, start, end); +for (i =0 ; i < count; i++) { +struct lmb_property *r = &lmb.reserved.region[i]; +pr_info (" #%d [%010llx - %010llx] " , i, r->base, r->base + r->size); + final_start =max (start, r->base); + final_end =min (end, r->base + r->size); +if (final_start >= final_end) { +pr_cont ("\n" ); +continue ; + } +pr_cont (" ==> [%010llx - %010llx]\n" , final_start, final_end); +reserve_bootmem_generic (final_start, final_end - final_start,BOOTMEM_DEFAULT ); + } +/* Clear them to avoid misusing ? */ +memset (&lmb.reserved.region[0 ],0 ,sizeof (struct lmb_property ) * lmb.reserved.nr_regions); + lmb.reserved.region =NULL ; + lmb.reserved.nr_regions =0 ; + lmb.reserved.cnt =0 ; +} +#endif +u64 __init __weak __lmb_find_area (u64 ei_start,u64 ei_last,u64 start,u64 end,u64 size,u64 align) {
Signature · 1 line
1.6.4.2
PATCH 9/33 lmb: Add get_free_all_memory_range()
In reply to Yinghai Luget_free_all_memory_range is for CONFIG_NO_BOOTMEM=y, and will be called by free_all_memory_core_early().
It will use early_node_map aka active ranges subtract lmb.reserved to get all free range, and those ranges will convert to slab pages.
-v3: use __lmb_find_base() to get range free buffer.
--- include/linux/lmb.h | 2 + mm/lmb.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletions(-)
include/linux/lmb.h +2 -0
@@ -92,6 +92,8 @@ u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,u64 lmb_find_area (u64 start,u64 end,u64 size,u64 align);void lmb_to_bootmem (u64 start,u64 end); +struct range ; +int get_free_all_memory_range (struct range **rangep,int nodeid);#include <asm/lmb.h>
mm/lmb.c +85 -1
92 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 10/33 lmb: Add lmb_register_active_regions() and lmb_hole_size()
In reply to Yinghai Lulmb_register_active_regions() will be used to fill early_node_map, the result will be lmb.memory.region AND numa data
lmb_hole_size will be used to find hole size on lmb.memory.region with specified range.
--- include/linux/lmb.h | 4 +++ mm/lmb.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-)
include/linux/lmb.h +4 -0
@@ -95,6 +95,10 @@ void lmb_to_bootmem(u64 start, u64 end);struct range ;int get_free_all_memory_range (struct range **rangep,int nodeid); +void lmb_register_active_regions (int nid,unsigned long start_pfn, +unsigned long last_pfn); +u64 lmb_hole_size (u64 start,u64 end); +#include <asm/lmb.h> #endif /* __KERNEL__ */
mm/lmb.c +68 -0
71 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 11/33 lmb: Prepare to include linux/lmb.h in core file
In reply to Yinghai LuNeed to add protection in linux/lmb.h, to prepare to include it in
mm/page_alloc.c and mm/bootmem.c etc.
--- include/linux/lmb.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
include/linux/lmb.h +3 -0
@@ -2,6 +2,7 @@#define _LINUX_LMB_H#ifdef __KERNEL__ +#ifdef CONFIG_HAVE_LMB /* * Logical memory blocks. *
@@ -101,6 +102,8 @@ u64 lmb_hole_size(u64 start, u64 end);#include <asm/lmb.h> +#endif /* CONFIG_HAVE_LMB */ +#endif /* __KERNEL__ */ #endif /* _LINUX_LMB_H */
Signature · 1 line
1.6.4.2
PATCH 12/33 lmb: Add find_memory_core_early()
In reply to Yinghai LuAccording to node range in early_node_map[] with __lmb_find_area to find free range.
Will be used by lmb_find_area_node()
lmb_find_area_node will be used to find right buffer for NODE_DATA
--- include/linux/mm.h | 2 ++ mm/page_alloc.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-)
include/linux/mm.h +2 -0
@@ -1159,6 +1159,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 +29 -0
@@ -21,6 +21,7 @@#include <linux/pagemap.h> #include <linux/jiffies.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/compiler.h> #include <linux/kernel.h> #include <linux/kmemcheck.h>
@@ -3393,6 +3394,34 @@ void __init free_bootmem_with_active_regions(int nid, } } +#ifdef CONFIG_HAVE_LMB +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; + + ei_last = early_node_map[i].end_pfn; + ei_last <<=PAGE_SHIFT ; + ei_start = early_node_map[i].start_pfn; + ei_start <<=PAGE_SHIFT ; + addr =__lmb_find_area (ei_start, ei_last, + goal, limit, size, align); + +if (addr ==-1ULL ) +continue ; + +return addr; + } + +return -1ULL ; +} +#endif +int __init add_from_early_node_map (struct range *range,int az,int nr_range,int nid) {
Signature · 1 line
1.6.4.2
PATCH 13/33 lmb: Add lmb_find_area_node()
In reply to Yinghai LuIt 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 lmb_find_area(), with node range.
--- include/linux/lmb.h | 1 + mm/lmb.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
include/linux/lmb.h +1 -0
@@ -91,6 +91,7 @@ void lmb_add_memory(u64 start, u64 end);u64 __lmb_find_area (u64 ei_start,u64 ei_last,u64 start,u64 end,u64 size,u64 align);u64 lmb_find_area (u64 start,u64 end,u64 size,u64 align); +u64 lmb_find_area_node (int nid,u64 start,u64 end,u64 size,u64 align);void lmb_to_bootmem (u64 start,u64 end);struct range ;
mm/lmb.c +15 -0
@@ -791,6 +791,21 @@ u64 __init lmb_find_area(u64 start, u64 end, u64 size, u64 align)return -1ULL ; }/* +* Need to call this function after lmb_register_active_regions, +* so early_node_map[] is filled already. +*/ +u64 __init lmb_find_area_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 !=-1ULL ) +return addr; + +/* Fallback, should already have start end within node range */ +return lmb_find_area (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 lmb entry. */
Signature · 1 line
1.6.4.2
PATCH 14/33 lmb: Add lmb_free_memory_size()
In reply to Yinghai LuIt will return free memory size in specified range.
We can not use memory_size - reserved_size here, because some reserved area may not be in the scope of lmb.memory.region.
Use lmb.memory.region subtracting lmb.reserved.region to get free range array. then count size of all free ranges.
--- include/linux/lmb.h | 1 + mm/lmb.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-)
include/linux/lmb.h +1 -0
@@ -100,6 +100,7 @@ int get_free_all_memory_range(struct range **rangep, int nodeid);void lmb_register_active_regions (int nid,unsigned long start_pfn,unsigned long last_pfn);u64 lmb_hole_size (u64 start,u64 end); +u64 lmb_free_memory_size (u64 addr,u64 limit);#include <asm/lmb.h>
mm/lmb.c +51 -0
57 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 15/33 lmb: Add lmb_memory_size()
In reply to Yinghai LuIt will return memory size in specified range according to lmb.memory.region
Try to share some code with lmb_free_memory_size() by passing get_free to __lmb_memory_size().
--- include/linux/lmb.h | 1 + mm/lmb.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-)
include/linux/lmb.h +1 -0
@@ -101,6 +101,7 @@ void lmb_register_active_regions(int nid, unsigned long start_pfn, unsigned long last_pfn);u64 lmb_hole_size (u64 start,u64 end);u64 lmb_free_memory_size (u64 addr,u64 limit); +u64 lmb_memory_size (u64 addr,u64 limit);#include <asm/lmb.h>
mm/lmb.c +17 -1
@@ -746,7 +746,7 @@ void __init lmb_to_bootmem(u64 start, u64 end) }#endif -u64 __init lmb_free_memory_size (u64 addr,u64 limit) +static u64 __init __lmb_memory_size (u64 addr,u64 limit,bool get_free) {int i, count;struct range *range;
@@ -776,6 +776,10 @@ u64 __init lmb_free_memory_size(u64 addr, u64 limit) }subtract_range (range, count,0 , addr);subtract_range (range, count, limit,-1ULL ); + +/* Subtract lmb.reserved.region in range ? */ +if (!get_free) + goto sort_and_count_them;for (i =0 ; i < lmb.reserved.cnt; i++) {struct lmb_property *r = &lmb.reserved.region[i];
@@ -788,6 +792,8 @@ u64 __init lmb_free_memory_size(u64 addr, u64 limit)subtract_range (range, count, final_start, final_end); } + +sort_and_count_them: nr_range =clean_sort_range (range, count); free_size =0 ;
@@ -797,6 +803,16 @@ u64 __init lmb_free_memory_size(u64 addr, u64 limit)return free_size <<PAGE_SHIFT ; } +u64 __init lmb_free_memory_size (u64 addr,u64 limit) +{ +return __lmb_memory_size (addr, limit, true); +} + +u64 __init lmb_memory_size (u64 addr,u64 limit) +{ +return __lmb_memory_size (addr, limit, false); +} +u64 __init __weak __lmb_find_area (u64 ei_start,u64 ei_last,u64 start,u64 end,u64 size,u64 align) {
Signature · 1 line
1.6.4.2
PATCH 16/33 lmb: Add lmb_reserve_area_overlap_ok()
In reply to Yinghai LuSome areas from firmware could be reserved several times from different callers.
If these area are overlapped, We may have overlapped entries in lmb.reserved.
Try to free the area at first, before rerserve them again.
--- include/linux/lmb.h | 1 + mm/lmb.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-)
include/linux/lmb.h +1 -0
@@ -86,6 +86,7 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr) }void lmb_reserve_area (u64 start,u64 end,char *name); +void lmb_reserve_area_overlap_ok (u64 start,u64 end,char *name);void lmb_free_area (u64 start,u64 end);void lmb_add_memory (u64 start,u64 end); u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
mm/lmb.c +25 -2
@@ -605,6 +605,12 @@ void __init lmb_add_memory(u64 start, u64 end)__check_and_double_region_array (&lmb.memory, &lmb_memory_region[0 ]); } +static void __init __lmb_reserve_area (u64 start,u64 end,char *name) +{ +lmb_add_region (&lmb.reserved, start, end - start); +__check_and_double_region_array (&lmb.reserved, &lmb_reserved_region[0 ]); +} +void __init lmb_reserve_area (u64 start,u64 end,char *name) {if (start == end)
@@ -613,8 +619,25 @@ void __init lmb_reserve_area(u64 start, u64 end, char *name)if (WARN_ONCE (start > end,"lmb_reserve_area: wrong range [%#llx, %#llx]\n" , start, end))return ; -lmb_add_region (&lmb.reserved, start, end - start); -__check_and_double_region_array (&lmb.reserved, &lmb_reserved_region[0 ]); +__lmb_reserve_area (start, end, name); +} + +/* +* Could be used to avoid having overlap entries in lmb.reserved.region. +* Don't need to use it with area that is from lmb_find_area() +* Only use it for the area that fw hidden area. +*/ +void __init lmb_reserve_area_overlap_ok (u64 start,u64 end,char *name) +{ +if (start == end) +return ; + +if (WARN_ONCE (start > end,"lmb_reserve_area_overlap_ok: wrong range [%#llx, %#llx]\n" , start, end)) +return ; + +/* Free that region at first */ +lmb_free (start, end - start); +__lmb_reserve_area (start, end, name); }void __init lmb_free_area (u64 start,u64 end)
Signature · 1 line
1.6.4.2
PATCH 17/33 lmb: Use lmb_debug to control debug message print out
In reply to Yinghai LuAlso let lmb_reserve_area/lmb_free_area could print out name if lmb=debug is specified
will also print ther name when reserve_lmb_area/free_lmb_area are called.
--- mm/lmb.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-)
mm/lmb.c +21 -8
@@ -591,8 +591,9 @@ static void __init __check_and_double_region_array(struct lmb_region *type,memset (&old[0 ],0 ,sizeof (struct lmb_property ) * rgnsz); type->region = new; type->nr_regions = rgnsz *2 ; -printk (KERN_DEBUG "lmb.reserved.region array is doubled to %ld at [%llx - %llx]\n" , - type->nr_regions, mem, mem + size -1 ); +if (lmb_debug) +pr_info ("lmb.reserved.region array is doubled to %ld at [%010llx - %010llx]\n" , + type->nr_regions, mem, mem + size -1 );/* Free old one ?*/ if (old != static_region)
@@ -619,6 +620,8 @@ void __init lmb_reserve_area(u64 start, u64 end, char *name)if (WARN_ONCE (start > end,"lmb_reserve_area: wrong range [%#llx, %#llx]\n" , start, end))return ; +if (lmb_debug) +pr_info (" lmb_reserve_area: [%010llx, %010llx] %16s\n" , start, end, name);__lmb_reserve_area (start, end, name); }
@@ -635,6 +638,8 @@ void __init lmb_reserve_area_overlap_ok(u64 start, u64 end, char *name)if (WARN_ONCE (start > end,"lmb_reserve_area_overlap_ok: wrong range [%#llx, %#llx]\n" , start, end))return ; +if (lmb_debug) +pr_info (" lmb_reserve_area_overlap_ok: [%010llx, %010llx] %16s\n" , start, end, name);/* Free that region at first */ lmb_free (start, end - start);__lmb_reserve_area (start, end, name);
@@ -648,6 +653,8 @@ void __init lmb_free_area(u64 start, u64 end)if (WARN_ONCE (start > end,"lmb_free_area: wrong range [%#llx, %#llx]\n" , start, end))return ; +if (lmb_debug) +pr_info (" lmb_free_area: [%010llx, %010llx]\n" , start, end);/* keep punching hole, could run out of slots too */ lmb_free (start, end - start);__check_and_double_region_array (&lmb.reserved, &lmb_reserved_region[0 ]);
@@ -688,11 +695,13 @@ static void __init subtract_lmb_reserved(struct range *range, int az) count = lmb.reserved.cnt; -pr_info ("Subtract (%d early reservations)\n" , count); +if (lmb_debug) +pr_info ("Subtract (%d early reservations)\n" , count);for (i =0 ; i < count; i++) {struct lmb_property *r = &lmb.reserved.region[i]; -pr_info (" #%d [%010llx - %010llx]\n" , i, r->base, r->base + r->size); +if (lmb_debug) +pr_info (" #%03d [%010llx - %010llx]\n" , i, r->base, r->base + r->size); final_start =PFN_DOWN (r->base); final_end =PFN_UP (r->base + r->size);if (final_start >= final_end)
@@ -748,17 +757,21 @@ void __init lmb_to_bootmem(u64 start, u64 end)lmb_free (__pa (lmb.reserved.region),sizeof (struct lmb_property ) * lmb.reserved.nr_regions); count = lmb.reserved.cnt; -pr_info ("(%d early reservations) ==> bootmem [%010llx - %010llx]\n" , count, start, end); +if (lmb_debug) +pr_info ("(%d early reservations) ==> bootmem [%010llx - %010llx]\n" , count, start, end);for (i =0 ; i < count; i++) {struct lmb_property *r = &lmb.reserved.region[i]; -pr_info (" #%d [%010llx - %010llx] " , i, r->base, r->base + r->size); +if (lmb_debug) +pr_info (" #%03d [%010llx - %010llx] " , i, r->base, r->base + r->size); final_start =max (start, r->base); final_end =min (end, r->base + r->size);if (final_start >= final_end) { -pr_cont ("\n" ); +if (lmb_debug) +pr_cont ("\n" );continue ; } -pr_cont (" ==> [%010llx - %010llx]\n" , final_start, final_end); +if (lmb_debug) +pr_cont (" ==> [%010llx - %010llx]\n" , final_start, final_end);reserve_bootmem_generic (final_start, final_end - final_start,BOOTMEM_DEFAULT ); }/* Clear them to avoid misusing ? */
Signature · 1 line
1.6.4.2
PATCH 18/33 lmb: Add ARCH_DISCARD_LMB to put lmb code to .init
In reply to Yinghai LuSo those lmb bits could be released after kernel is booted up.
Arch code could define ARCH_DISCARD_LMB in asm/lmb.h, __init_lmb will become __init, __initdata_lmb will becom __initdata
x86 code will use that.
-v2: use ARCH_DISCARD_LMB according to Michael Ellerman
--- include/linux/lmb.h | 8 +++++++ mm/lmb.c | 54 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 22 deletions(-)
include/linux/lmb.h +8 -0
@@ -106,6 +106,14 @@ u64 lmb_memory_size(u64 addr, u64 limit);#include <asm/lmb.h> +#ifdef ARCH_DISCARD_LMB +#define __init_lmb __init +#define __initdata_lmb __initdata +#else +#define __init_lmb +#define __initdata_lmb +#endif +#endif /* CONFIG_HAVE_LMB */ #endif /* __KERNEL__ */
mm/lmb.c +32 -22
210 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 19/33 x86: Add sanitize_e820_map()
In reply to Yinghai LuSo We don't need to take e820.map with it.
Also change e820_saved to initdata to get some bytes memory back.
--- arch/x86/include/asm/e820.h | 5 ++--- arch/x86/kernel/e820.c | 26 ++++++++++++++++++-------- arch/x86/kernel/efi.c | 2 +- arch/x86/kernel/setup.c | 10 +++++----- arch/x86/xen/setup.c | 4 +--- 5 files changed, 27 insertions(+), 20 deletions(-)
arch/x86/include/asm/e820.h +2 -3
@@ -75,15 +75,14 @@ struct e820map {#ifdef __KERNEL__/* see comment in arch/x86/kernel/e820.c */ extern struct e820map e820; -extern struct e820map e820_saved;extern unsigned long pci_mem_start;extern int e820_any_mapped (u64 start,u64 end,unsigned type);extern int e820_all_mapped (u64 start,u64 end,unsigned type);extern void e820_add_region (u64 start,u64 size,int type);extern void e820_print_map (char *who); -extern int -sanitize_e820_map (struct e820entry *biosmap,int max_nr_map,u32 *pnr_map); +int sanitize_e820_map (void ); +void save_e820_map (void );extern u64 e820_update_range (u64 start,u64 size,unsigned old_type,unsigned new_type); extern u64 e820_remove_range(u64 start, u64 size, unsigned old_type,
arch/x86/kernel/e820.c +18 -8
@@ -35,7 +35,7 @@* next kernel with full memory. */ struct e820map e820; -struct e820map e820_saved; +static struct e820map __initdata e820_saved;/* For PCI or other memory-mapped resources */ unsigned long pci_mem_start =0xaeedbabe ;
@@ -224,7 +224,7 @@ void __init e820_print_map(char *who)* ______________________4_ */ -int __init sanitize_e820_map (struct e820entry *biosmap,int max_nr_map, +static int __init __sanitize_e820_map (struct e820entry *biosmap,int max_nr_map,u32 *pnr_map) { struct change_member {
@@ -383,6 +383,11 @@ int __init sanitize_e820_map(struct e820entry *biosmap, int max_nr_map,return 0 ; } +int __init sanitize_e820_map (void ) +{ +return __sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +} +static int __init __append_e820_map (struct e820entry *biosmap,int nr_map) {while (nr_map) {
@@ -571,7 +576,7 @@ void __init update_e820(void)u32 nr_map; nr_map = e820.nr_map; -if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr_map)) +if (__sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr_map))return ; e820.nr_map = nr_map;printk (KERN_INFO "modified physical RAM map:\n" );
@@ -582,7 +587,7 @@ static void __init update_e820_saved(void)u32 nr_map; nr_map = e820_saved.nr_map; -if (sanitize_e820_map (e820_saved.map,ARRAY_SIZE (e820_saved.map), &nr_map)) +if (__sanitize_e820_map (e820_saved.map,ARRAY_SIZE (e820_saved.map), &nr_map))return ; e820_saved.nr_map = nr_map; }
@@ -677,7 +682,7 @@ void __init parse_e820_ext(struct setup_data *sdata, unsigned long pa_data) sdata =early_ioremap (pa_data, map_len); extmap = (struct e820entry *)(sdata->data);__append_e820_map (extmap, entries); -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +sanitize_e820_map ();if (map_len >PAGE_SIZE )early_iounmap (sdata, map_len);printk (KERN_INFO "extended physical RAM map:\n" );
@@ -1044,7 +1049,7 @@ void __init finish_e820_parsing(void)if (userdef) {u32 nr = e820.nr_map; -if (sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr) <0 ) +if (__sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &nr) <0 )early_panic ("Invalid user supplied memory map" ); e820.nr_map = nr;
@@ -1174,7 +1179,7 @@ char *__init default_machine_specific_memory_setup(void)* the next section from 1mb->appropriate_mem_k */ new_nr = boot_params.e820_entries; -sanitize_e820_map (boot_params.e820_map, +__sanitize_e820_map (boot_params.e820_map,ARRAY_SIZE (boot_params.e820_map), &new_nr); boot_params.e820_entries = new_nr;
@@ -1201,12 +1206,17 @@ char *__init default_machine_specific_memory_setup(void)return who; } +void __init save_e820_map (void ) +{ +memcpy (&e820_saved, &e820,sizeof (struct e820map )); +} +void __init setup_memory_map (void ) {char *who; who = x86_init.resources.memory_setup (); -memcpy (&e820_saved, &e820,sizeof (struct e820map )); +save_e820_map ();printk (KERN_INFO "BIOS-provided physical RAM map:\n" );e820_print_map (who); }
arch/x86/kernel/efi.c +1 -1
@@ -272,7 +272,7 @@ static void __init do_add_efi_memmap(void) }e820_add_region (start, size, e820_type); } -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +sanitize_e820_map (); }void __init efi_reserve_early (void )
arch/x86/kernel/setup.c +5 -5
@@ -463,8 +463,8 @@ static void __init e820_reserve_setup_data(void)if (!found)return ; -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); -memcpy (&e820_saved, &e820,sizeof (struct e820map )); +sanitize_e820_map (); +save_e820_map ();printk (KERN_INFO "extended physical RAM map:\n" );e820_print_map ("reserve setup_data" ); }
@@ -616,7 +616,7 @@ static int __init dmi_low_memory_corruption(const struct dmi_system_id *d) d->ident);e820_update_range (0 ,0x10000 ,E820_RAM ,E820_RESERVED ); -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +sanitize_e820_map ();return 0 ; }
@@ -685,7 +685,7 @@ static void __init trim_bios_range(void)* take them out. */ e820_remove_range (BIOS_BEGIN ,BIOS_END -BIOS_BEGIN ,E820_RAM ,1 ); -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +sanitize_e820_map (); }/*
@@ -856,7 +856,7 @@ void __init setup_arch(char **cmdline_p)if (ppro_with_ram_bug ()) {e820_update_range (0x70000000ULL ,0x40000ULL ,E820_RAM ,E820_RESERVED ); -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +sanitize_e820_map ();printk (KERN_INFO "fixed physical RAM map:\n" );e820_print_map ("bad_ppro" ); }
arch/x86/xen/setup.c +1 -3
@@ -43,8 +43,6 @@ char * __init xen_memory_setup(void) max_pfn =min (MAX_DOMAIN_PAGES , max_pfn); - e820.nr_map =0 ; -e820_add_region (0 ,PFN_PHYS ((u64 )max_pfn),E820_RAM );/*
@@ -65,7 +63,7 @@ char * __init xen_memory_setup(void)__pa (xen_start_info->pt_base), "XEN START INFO"); -sanitize_e820_map (e820.map,ARRAY_SIZE (e820.map), &e820.nr_map); +sanitize_e820_map ();return "Xen" ; }
Signature · 1 line
1.6.4.2
PATCH 20/33 x86, lmb: Add lmb_find_area_size()
In reply to Yinghai Lusize is returned according free range.
Will be used to find free ranges for early_memtest and memory corruption check
Do not mess it up with mm/lmb.c yet.
--- arch/x86/mm/Makefile | 2 + arch/x86/mm/lmb.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) create mode 100644 arch/x86/mm/lmb.c
arch/x86/mm/Makefile +2 -0
@@ -26,4 +26,6 @@ obj-$(CONFIG_NUMA) += numa.o numa_$(BITS).o obj-$(CONFIG_K8_NUMA) += k8topology_64.o obj-$(CONFIG_ACPI_NUMA) += srat_$(BITS).o +obj-$(CONFIG_HAVE_LMB) += lmb.o + obj-$(CONFIG_MEMTEST) += memtest.o
arch/x86/mm/lmb.c new file +88 -0
88 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 21/33 x86, lmb: Add x86 version of __lmb_find_area()
In reply to Yinghai LuGeneric version is going from high to low, and it seems it can not find right area compact enough.
the x86 version will go from goal to limit and just like the way We used for early_res
use ARCH_FIND_LMB_AREA to select from them.
For 32 bit have to use CONFIG_ARCH_FIND_LMB_AREA=y, because some alloc_bootmem in nobootmem config, hard code -1ULL as limit
--- arch/x86/Kconfig | 8 +++++++ arch/x86/mm/lmb.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 0 deletions(-)
arch/x86/Kconfig +8 -0
@@ -585,6 +585,14 @@ config PARAVIRT_DEBUG Enable to debug paravirt_ops internals. Specifically, BUG if a paravirt_op is missing when it is called. +config ARCH_LMB_FIND_AREA + default y + bool "Use x86 own lmb_find_area()" + ---help--- + Use lmb_find_area() version instead of generic version, it get free + area up from low. + Generic one try to get free area down from limit. + config NO_BOOTMEM default y bool "Disable Bootmem code"
arch/x86/mm/lmb.c +57 -0
60 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 22/33 x86: Use lmb to replace early_res
In reply to Yinghai Lu1. replace find_e820_area with lmb_find_area
2. replace reserve_early with lmb_reserve_area
3. replace free_early with lmb_free_area.
4. NO_BOOTMEM will switch to use lmb too.
5. use _e820, _early wrap in the patch, in following patch, will replace them all
6. because lmb_free_area support partial free, we can remove some special care
7. Need to make sure that lmb_find_area() is called after fill_lmb_memory() so adjust some calling later in setup.c::setup_arch()
-- corruption_check and mptable_update
-v2: Move reserve_brk() early
Before fill_lmb_area, to avoid overlap between brk and lmb_find_area() that could happen We have more then 128 RAM entry in E820 tables, and fill_lmb_memory() could use lmb_find_area() to find a new place for lmb.memory.region array.
and We don't need to use extend_brk() after fill_lmb_area()
So move reserve_brk() early before fill_lmb_area().
-v3: Move find_smp_config early
To make sure lmb_find_area not find wrong place, if BIOS doesn't put mptable in right place.
-v4: Treat RESERVED_KERN as RAM in lmb.memory. and they are already in
lmb.reserved already..
use __NOT_KEEP_LMB to make sure lmb related code could be freed later.
--- arch/x86/Kconfig | 9 +-- arch/x86/include/asm/e820.h | 15 +++-- arch/x86/include/asm/lmb.h | 12 +++ arch/x86/kernel/check.c | 14 ++-- arch/x86/kernel/e820.c | 147 ++++++++++----------------------------- arch/x86/kernel/head.c | 3 +- arch/x86/kernel/head32.c | 6 +- arch/x86/kernel/head64.c | 3 + arch/x86/kernel/mpparse.c | 5 +- arch/x86/kernel/setup.c | 40 ++++++++--- arch/x86/kernel/setup_percpu.c | 6 -- arch/x86/mm/numa_64.c | 5 +- kernel/Makefile | 1 - mm/bootmem.c | 1 + mm/page_alloc.c | 35 ++------- mm/sparse-vmemmap.c | 11 --- 16 files changed, 124 insertions(+), 189 deletions(-) create mode 100644 arch/x86/include/asm/lmb.h
arch/x86/Kconfig +3 -6
@@ -27,6 +27,7 @@ config X86 select HAVE_PERF_EVENTS if (!M386 && !M486) select HAVE_IOREMAP_PROT select HAVE_KPROBES + select HAVE_LMB select ARCH_WANT_OPTIONAL_GPIOLIB select ARCH_WANT_FRAME_POINTERS select HAVE_DMA_ATTRS
@@ -192,9 +193,6 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING config ARCH_SUPPORTS_DEBUG_PAGEALLOC def_bool y -config HAVE_EARLY_RES - def_bool y - config HAVE_INTEL_TXT def_bool y depends on EXPERIMENTAL && DMAR && ACPI
@@ -597,14 +595,13 @@ config NO_BOOTMEM default y bool "Disable Bootmem code" ---help--- - Use early_res directly instead of bootmem before slab is ready. + Use lmb directly instead of bootmem before slab is ready. - allocator (buddy) [generic] - early allocator (bootmem) [generic] - - very early allocator (reserve_early*()) [x86] + - very early allocator (lmb) [some generic] - 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 +9 -6
@@ -116,24 +116,27 @@ extern unsigned long end_user_pfn;extern u64 find_e820_area (u64 start,u64 end,u64 size,u64 align);extern u64 find_e820_area_size (u64 start,u64 *sizep,u64 align);extern u64 early_reserve_e820 (u64 startt,u64 sizet,u64 align); -#include <linux/early_res.h> 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, -unsigned long start_pfn, -unsigned long last_pfn, -unsigned long *ei_startpfn, -unsigned long *ei_endpfn);extern void e820_register_active_regions (int nid,unsigned long start_pfn,unsigned long end_pfn);extern u64 e820_hole_size (u64 start,u64 end); + +extern u64 early_reserve_e820 (u64 startt,u64 sizet,u64 align); + +void init_lmb_memory (void ); +void fill_lmb_memory (void ); +extern void finish_e820_parsing (void );extern void e820_reserve_resources (void );extern void e820_reserve_resources_late (void );extern void setup_memory_map (void );extern char *default_machine_specific_memory_setup (void ); +void reserve_early (u64 start,u64 end,char *name); +void free_early (u64 start,u64 end); +/* * Returns true iff the specified range [s,e) is completely contained inside * the ISA region.
arch/x86/include/asm/lmb.h new file +12 -0
@@ -0,0 +1,12 @@ +#ifndef _X86_LMB_H +#define _X86_LMB_H + +u64 lmb_find_area_size (u64 start,u64 *sizep,u64 align); + +#define LMB_DBG(fmt...) printk(fmt) + +#define LMB_REAL_LIMIT 0 + +#define ARCH_DISCARD_LMB + +#endif
arch/x86/kernel/check.c +8 -6
@@ -2,7 +2,8 @@#include <linux/sched.h> #include <linux/kthread.h> #include <linux/workqueue.h> -#include <asm/e820.h> +#include <linux/lmb.h> +#include <asm/proto.h> /*
@@ -18,10 +19,12 @@ static int __read_mostly memory_corruption_check = -1;static unsigned __read_mostly corruption_check_size =64 *1024 ;static unsigned __read_mostly corruption_check_period =60 ;/* seconds */ -static struct e820entry scan_areas[MAX_SCAN_AREAS ]; +static struct scan_area { +u64 addr; +u64 size; +} scan_areas[MAX_SCAN_AREAS ];static int num_scan_areas; -static __init int set_corruption_check (char *arg) {char *end;
@@ -81,7 +84,7 @@ void __init setup_bios_corruption_check(void)while (addr < corruption_check_size && num_scan_areas <MAX_SCAN_AREAS ) {u64 size; - addr =find_e820_area_size (addr, &size,PAGE_SIZE ); + addr =lmb_find_area_size (addr, &size,PAGE_SIZE );if (!(addr +1 ))break ;
@@ -92,7 +95,7 @@ void __init setup_bios_corruption_check(void)if ((addr + size) > corruption_check_size) size = corruption_check_size - addr; -e820_update_range (addr, size,E820_RAM ,E820_RESERVED ); +lmb_reserve_area (addr, addr + size,"SCAN RAM" ); scan_areas[num_scan_areas].addr = addr; scan_areas[num_scan_areas].size = size; num_scan_areas++;
@@ -105,7 +108,6 @@ void __init setup_bios_corruption_check(void)printk (KERN_INFO "Scanning %d areas for low memory corruption\n" , num_scan_areas); -update_e820 (); }
arch/x86/kernel/e820.c +38 -109
203 lines not on this page · raw message
arch/x86/kernel/head.c +2 -1
@@ -1,5 +1,6 @@#include <linux/kernel.h> #include <linux/init.h> +#include <linux/lmb.h> #include <asm/setup.h> #include <asm/bios_ebda.h>
@@ -51,5 +52,5 @@ void __init reserve_ebda_region(void) lowmem =0x9f000 ;/* reserve all memory between lowmem and the 1MB mark */ -reserve_early_overlap_ok (lowmem,0x100000 ,"BIOS reserved" ); +lmb_reserve_area_overlap_ok (lowmem,0x100000 ,"BIOS reserved" ); }
arch/x86/kernel/head32.c +4 -2
@@ -8,6 +8,7 @@#include <linux/init.h> #include <linux/start_kernel.h> #include <linux/mm.h> +#include <linux/lmb.h> #include <asm/setup.h> #include <asm/sections.h>
@@ -30,14 +31,15 @@ static void __init i386_default_early_setup(void)void __init i386_start_kernel (void ) { +init_lmb_memory (); +#ifdef CONFIG_X86_TRAMPOLINE /* * But first pinch a few for the stack/trampoline stuff * FIXME: Don't need the extra page at 4K, but need to fix * trampoline before removing it. (see the GDT stuff) */ -reserve_early_overlap_ok (PAGE_SIZE ,PAGE_SIZE +PAGE_SIZE , -"EX TRAMPOLINE" ); +lmb_reserve_area (PAGE_SIZE ,PAGE_SIZE +PAGE_SIZE ,"EX TRAMPOLINE" );#endif reserve_early (__pa_symbol (&_text),__pa_symbol (&__bss_stop),"TEXT DATA BSS" );
arch/x86/kernel/head64.c +3 -0
@@ -12,6 +12,7 @@#include <linux/percpu.h> #include <linux/start_kernel.h> #include <linux/io.h> +#include <linux/lmb.h> #include <asm/processor.h> #include <asm/proto.h>
@@ -96,6 +97,8 @@ void __init x86_64_start_kernel(char * real_mode_data)void __init x86_64_start_reservations (char *real_mode_data) { +init_lmb_memory (); +copy_bootdata (__va (real_mode_data));reserve_early (__pa_symbol (&_text),__pa_symbol (&__bss_stop),"TEXT DATA BSS" );
arch/x86/kernel/mpparse.c +3 -2
@@ -11,6 +11,7 @@#include <linux/init.h> #include <linux/delay.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/kernel_stat.h> #include <linux/mc146818rtc.h> #include <linux/bitops.h>
@@ -664,7 +665,7 @@ static void __init smp_reserve_memory(struct mpf_intel *mpf) {unsigned long size =get_mpc_size (mpf->physptr); -reserve_early (mpf->physptr, mpf->physptr+size,"MP-table mpc" ); +lmb_reserve_area_overlap_ok (mpf->physptr, mpf->physptr+size,"MP-table mpc" ); }static int __init smp_scan_config (unsigned long base,unsigned long length)
@@ -693,7 +694,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) mpf, (u64)virt_to_phys(mpf)); mem =virt_to_phys (mpf); -reserve_early (mem, mem +sizeof (*mpf),"MP-table mpf" ); +lmb_reserve_area_overlap_ok (mem, mem +sizeof (*mpf),"MP-table mpf" );if (mpf->physptr)smp_reserve_memory (mpf);
arch/x86/kernel/setup.c +30 -10
@@ -31,6 +31,7 @@#include <linux/apm_bios.h> #include <linux/initrd.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/seq_file.h> #include <linux/console.h> #include <linux/mca.h>
@@ -688,6 +689,15 @@ static void __init trim_bios_range(void)sanitize_e820_map (); } +static u64 __init get_max_mapped (void ) +{ +u64 end = max_pfn_mapped; + + end <<=PAGE_SHIFT ; + +return end; +} +/* * Determine if we were loaded by an EFI loader. If so, then we have also been * passed the efi memmap, systab, etc., so we should use these data structures
@@ -870,8 +880,6 @@ void __init setup_arch(char **cmdline_p)*/ max_pfn =e820_end_of_ram_pfn (); -/* preallocate 4k for mptable mpc */ -early_reserve_e820_mpc_new ();/* update e820 for memory not covered by WB MTRRs */ mtrr_bp_init ();if (mtrr_trim_uncached_memory (max_pfn))
@@ -896,6 +904,24 @@ void __init setup_arch(char **cmdline_p) max_pfn_mapped =KERNEL_IMAGE_SIZE >>PAGE_SHIFT ;#endif +/* +* Find and reserve possible boot-time SMP configuration: +*/ +find_smp_config (); + +/* +* Need to conclude brk, before fill_lmb_memory() +* it could use lmb_find_area, could overlap with +* brk area. +*/ +reserve_brk (); + + lmb.default_alloc_limit =get_max_mapped (); +fill_lmb_memory (); + +/* preallocate 4k for mptable mpc */ +early_reserve_e820_mpc_new (); +#ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION setup_bios_corruption_check ();#endif
@@ -903,13 +929,6 @@ void __init setup_arch(char **cmdline_p)printk (KERN_DEBUG "initial memory mapped : 0 - %08lx\n" , max_pfn_mapped<<PAGE_SHIFT ); -reserve_brk (); - -/* -* Find and reserve possible boot-time SMP configuration: -*/ -find_smp_config (); -reserve_trampoline_memory ();#ifdef CONFIG_ACPI_SLEEP
@@ -933,6 +952,7 @@ void __init setup_arch(char **cmdline_p) max_low_pfn = max_pfn; }#endif + lmb.default_alloc_limit =get_max_mapped ();/* * NOTE: On x86-32, only from this point on, fixmaps are ready for use.
@@ -972,7 +992,7 @@ void __init setup_arch(char **cmdline_p)initmem_init (0 , max_pfn, acpi, k8);#ifndef CONFIG_NO_BOOTMEM -early_res_to_bootmem (0 , max_low_pfn<<PAGE_SHIFT ); +lmb_to_bootmem (0 , max_low_pfn<<PAGE_SHIFT );#endif dma32_reserve_bootmem ();
arch/x86/kernel/setup_percpu.c +0 -6
@@ -137,13 +137,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)static void __init pcpu_fc_free (void *ptr,size_t size) { -#ifdef CONFIG_NO_BOOTMEM -u64 start =__pa (ptr); -u64 end = start + size; -free_early_partial (start, end); -#else free_bootmem (__pa (ptr), size); -#endif }static int __init pcpu_cpu_distance (unsigned int from,unsigned int to)
arch/x86/mm/numa_64.c +3 -2
@@ -7,6 +7,7 @@#include <linux/string.h> #include <linux/init.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/mmzone.h> #include <linux/ctype.h> #include <linux/module.h>
@@ -174,7 +175,7 @@ static void * __init early_node_mem(int nodeid, unsigned long start,if (start < (MAX_DMA32_PFN <<PAGE_SHIFT ) && end > (MAX_DMA32_PFN <<PAGE_SHIFT )) start =MAX_DMA32_PFN <<PAGE_SHIFT ; - mem =find_e820_area (start, end, size, align); + mem =lmb_find_area_node (nodeid, start, end, size, align);if (mem !=-1L )return __va (mem);
@@ -184,7 +185,7 @@ static void * __init early_node_mem(int nodeid, unsigned long start, start =MAX_DMA32_PFN <<PAGE_SHIFT ; else start =MAX_DMA_PFN <<PAGE_SHIFT ; - mem =find_e820_area (start, end, size, align); + mem =lmb_find_area_node (nodeid, start, end, size, align);if (mem !=-1L )return __va (mem);
kernel/Makefile +0 -1
@@ -11,7 +11,6 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \ hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \ notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o \ async.o range.o -obj-$(CONFIG_HAVE_EARLY_RES) += early_res.o obj-y += groups.o ifdef CONFIG_FUNCTION_TRACER
mm/bootmem.c +1 -0
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/kmemleak.h> #include <linux/range.h> +#include <linux/lmb.h> #include <asm/bug.h> #include <asm/io.h>
mm/page_alloc.c +8 -27
@@ -3441,38 +3441,19 @@ int __init add_from_early_node_map(struct range *range, int az,void *__init __alloc_memory_core_early (int nid,u64 size,u64 align,u64 goal,u64 limit) { -int i;void *ptr; -/* 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; - - ei_last = early_node_map[i].end_pfn; - ei_last <<=PAGE_SHIFT ; - ei_start = early_node_map[i].start_pfn; - ei_start <<=PAGE_SHIFT ; - addr =find_early_area (ei_start, ei_last, - goal, limit, size, align); - -if (addr ==-1ULL ) -continue ; +u64 addr; -#if 0 -printk (KERN_DEBUG "alloc (nid=%d %llx - %llx) (%llx - %llx) %llx %llx => %llx\n" , - nid, - ei_start, ei_last, goal, limit, size, - align, addr); -#endif + addr =find_memory_core_early (nid, size, align, goal, limit); - ptr =phys_to_virt (addr); -memset (ptr,0 , size); -reserve_early_without_check (addr, addr + size,"BOOTMEM" ); -return ptr; - } +if (addr ==-1ULL ) +return NULL ; -return NULL ; + ptr =phys_to_virt (addr); +memset (ptr,0 , size); +lmb_reserve_area (addr, addr + size,"BOOTMEM" ); +return ptr; }#endif
mm/sparse-vmemmap.c +0 -11
@@ -219,18 +219,7 @@ void __init sparse_mem_maps_populate_node(struct page **map_map,if (vmemmap_buf_start) {/* need to free left buf */ -#ifdef CONFIG_NO_BOOTMEM -free_early (__pa (vmemmap_buf_start),__pa (vmemmap_buf_end)); -if (vmemmap_buf_start < vmemmap_buf) { -char name[15 ]; - -snprintf (name,sizeof (name),"MEMMAP %d" , nodeid); -reserve_early_without_check (__pa (vmemmap_buf_start), -__pa (vmemmap_buf), name); - } -#else free_bootmem (__pa (vmemmap_buf), vmemmap_buf_end - vmemmap_buf); -#endif vmemmap_buf =NULL ; vmemmap_buf_end =NULL ; }
Signature · 1 line
1.6.4.2
PATCH 23/33 x86: Replace e820_/_early string with lmb_
In reply to Yinghai Lu1.include linux/lmb.h directly. so later could reduce e820.h reference. 2 this patch is done by sed scripts mainly
--- arch/x86/include/asm/efi.h | 2 +- arch/x86/kernel/acpi/sleep.c | 5 +++-- arch/x86/kernel/apic/numaq_32.c | 3 ++- arch/x86/kernel/efi.c | 5 +++-- arch/x86/kernel/head32.c | 4 ++-- arch/x86/kernel/head64.c | 4 ++-- arch/x86/kernel/setup.c | 25 ++++++++++++------------- arch/x86/kernel/trampoline.c | 6 +++--- arch/x86/mm/init.c | 5 +++-- arch/x86/mm/init_32.c | 10 ++++++---- arch/x86/mm/init_64.c | 9 +++++---- arch/x86/mm/k8topology_64.c | 4 +++- arch/x86/mm/memtest.c | 7 +++---- arch/x86/mm/numa_32.c | 17 +++++++++-------- arch/x86/mm/numa_64.c | 32 ++++++++++++++++---------------- arch/x86/mm/srat_32.c | 3 ++- arch/x86/mm/srat_64.c | 9 +++++---- arch/x86/xen/mmu.c | 5 +++-- arch/x86/xen/setup.c | 3 ++- mm/bootmem.c | 4 ++-- 20 files changed, 87 insertions(+), 75 deletions(-)
arch/x86/include/asm/efi.h +1 -1
@@ -90,7 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,#endif /* CONFIG_X86_32 */ extern int add_efi_memmap; -extern void efi_reserve_early (void ); +extern void efi_lmb_reserve_area (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void );
arch/x86/kernel/acpi/sleep.c +3 -2
@@ -7,6 +7,7 @@#include <linux/acpi.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/dmi.h> #include <linux/cpumask.h> #include <asm/segment.h>
@@ -133,7 +134,7 @@ void __init acpi_reserve_wakeup_memory(void)return ; } - mem =find_e820_area (0 ,1 <<20 ,WAKEUP_SIZE ,PAGE_SIZE ); + mem =lmb_find_area (0 ,1 <<20 ,WAKEUP_SIZE ,PAGE_SIZE );if (mem ==-1L ) {printk (KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n" );
@@ -141,7 +142,7 @@ void __init acpi_reserve_wakeup_memory(void) } acpi_realmode = (unsigned long )phys_to_virt (mem); acpi_wakeup_address = mem; -reserve_early (mem, mem +WAKEUP_SIZE ,"ACPI WAKEUP" ); +lmb_reserve_area (mem, mem +WAKEUP_SIZE ,"ACPI WAKEUP" ); }
arch/x86/kernel/apic/numaq_32.c +2 -1
@@ -26,6 +26,7 @@#include <linux/nodemask.h> #include <linux/topology.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/threads.h> #include <linux/cpumask.h> #include <linux/kernel.h>
@@ -88,7 +89,7 @@ static inline void numaq_register_node(int node, struct sys_cfg_data *scd) node_end_pfn[node] =MB_TO_PAGES (eq->hi_shrd_mem_start + eq->hi_shrd_mem_size); -e820_register_active_regions (node, node_start_pfn[node], +lmb_register_active_regions (node, node_start_pfn[node], node_end_pfn[node]);memory_present (node, node_start_pfn[node], node_end_pfn[node]);
arch/x86/kernel/efi.c +3 -2
@@ -30,6 +30,7 @@#include <linux/init.h> #include <linux/efi.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/spinlock.h> #include <linux/uaccess.h> #include <linux/time.h>
@@ -275,7 +276,7 @@ static void __init do_add_efi_memmap(void)sanitize_e820_map (); } -void __init efi_reserve_early (void ) +void __init efi_lmb_reserve_area (void ) {unsigned long pmap;
@@ -290,7 +291,7 @@ void __init efi_reserve_early(void) boot_params.efi_info.efi_memdesc_size; memmap.desc_version = boot_params.efi_info.efi_memdesc_version; memmap.desc_size = boot_params.efi_info.efi_memdesc_size; -reserve_early (pmap, pmap + memmap.nr_map * memmap.desc_size, +lmb_reserve_area (pmap, pmap + memmap.nr_map * memmap.desc_size,"EFI memmap" ); }
arch/x86/kernel/head32.c +2 -2
@@ -42,7 +42,7 @@ void __init i386_start_kernel(void)lmb_reserve_area (PAGE_SIZE ,PAGE_SIZE +PAGE_SIZE ,"EX TRAMPOLINE" );#endif -reserve_early (__pa_symbol (&_text),__pa_symbol (&__bss_stop),"TEXT DATA BSS" ); +lmb_reserve_area (__pa_symbol (&_text),__pa_symbol (&__bss_stop),"TEXT DATA BSS" );#ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */
@@ -51,7 +51,7 @@ void __init i386_start_kernel(void)u64 ramdisk_image = boot_params.hdr.ramdisk_image;u64 ramdisk_size = boot_params.hdr.ramdisk_size;u64 ramdisk_end =PAGE_ALIGN (ramdisk_image + ramdisk_size); - reserve_early(ramdisk_image, ramdisk_end, "RAMDISK"); + lmb_reserve_area(ramdisk_image, ramdisk_end, "RAMDISK"); }#endif
arch/x86/kernel/head64.c +2 -2
@@ -101,7 +101,7 @@ void __init x86_64_start_reservations(char *real_mode_data)copy_bootdata (__va (real_mode_data)); -reserve_early (__pa_symbol (&_text),__pa_symbol (&__bss_stop),"TEXT DATA BSS" ); +lmb_reserve_area (__pa_symbol (&_text),__pa_symbol (&__bss_stop),"TEXT DATA BSS" );#ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */
@@ -110,7 +110,7 @@ void __init x86_64_start_reservations(char *real_mode_data)unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;unsigned long ramdisk_size = boot_params.hdr.ramdisk_size;unsigned long ramdisk_end =PAGE_ALIGN (ramdisk_image + ramdisk_size); - reserve_early(ramdisk_image, ramdisk_end, "RAMDISK"); + lmb_reserve_area(ramdisk_image, ramdisk_end, "RAMDISK"); }#endif
arch/x86/kernel/setup.c +12 -13
@@ -303,7 +303,7 @@ static inline void init_gbpages(void)static void __init reserve_brk (void ) {if (_brk_end > _brk_start) -reserve_early (__pa (_brk_start),__pa (_brk_end),"BRK" ); +lmb_reserve_area (__pa (_brk_start),__pa (_brk_end),"BRK" );/* Mark brk area as locked down and no longer taking any new allocations */
@@ -325,7 +325,7 @@ static void __init relocate_initrd(void)char *p, *q;/* We need to move the initrd down into lowmem */ - ramdisk_here =find_e820_area (0 , end_of_lowmem, area_size, + ramdisk_here =lmb_find_area (0 , end_of_lowmem, area_size,PAGE_SIZE );if (ramdisk_here ==-1ULL )
@@ -334,8 +334,7 @@ static void __init relocate_initrd(void)/* Note: this includes all the lowmem currently occupied by the initrd, we rely on that fact to keep the data intact. */ -reserve_early (ramdisk_here, ramdisk_here + area_size, -"NEW RAMDISK" ); +lmb_reserve_area (ramdisk_here, ramdisk_here + area_size,"NEW RAMDISK" ); initrd_start = ramdisk_here +PAGE_OFFSET ; initrd_end = initrd_start + ramdisk_size; printk(KERN_INFO "Allocated new RAMDISK: %08llx - %08llx\n",
@@ -391,7 +390,7 @@ static void __init reserve_initrd(void) initrd_start =0 ;if (ramdisk_size >= (end_of_lowmem>>1 )) { -free_early (ramdisk_image, ramdisk_end); +lmb_free_area (ramdisk_image, ramdisk_end);printk (KERN_ERR "initrd too large to handle, " "disabling initrd\n" );return ;
@@ -414,7 +413,7 @@ static void __init reserve_initrd(void)relocate_initrd (); - free_early(ramdisk_image, ramdisk_end); + lmb_free_area(ramdisk_image, ramdisk_end); }#else static void __init reserve_initrd (void )
@@ -470,7 +469,7 @@ static void __init e820_reserve_setup_data(void)e820_print_map ("reserve setup_data" ); } -static void __init reserve_early_setup_data (void ) +static void __init lmb_reserve_area_setup_data (void ) {struct setup_data *data;u64 pa_data;
@@ -482,7 +481,7 @@ static void __init reserve_early_setup_data(void)while (pa_data) { data =early_memremap (pa_data,sizeof (*data));sprintf (buf,"setup data %x" , data->type); -reserve_early (pa_data, pa_data+sizeof (*data)+data->len, buf); +lmb_reserve_area (pa_data, pa_data+sizeof (*data)+data->len, buf); pa_data = data->next;early_iounmap (data,sizeof (*data)); }
@@ -520,7 +519,7 @@ static void __init reserve_crashkernel(void)if (crash_base <=0 ) {const unsigned long long alignment =16 <<20 ;/* 16M */ - crash_base =find_e820_area (alignment,ULONG_MAX , crash_size, + crash_base =lmb_find_area (alignment,ULONG_MAX , crash_size, alignment);if (crash_base ==-1ULL ) {pr_info ("crashkernel reservation failed - No suitable area found.\n" );
@@ -529,14 +528,14 @@ static void __init reserve_crashkernel(void) }else {unsigned long long start; - start =find_e820_area (crash_base,ULONG_MAX , crash_size, + start =lmb_find_area (crash_base,ULONG_MAX , crash_size,1 <<20 );if (start != crash_base) {pr_info ("crashkernel reservation failed - memory is in use.\n" );return ; } } -reserve_early (crash_base, crash_base + crash_size,"CRASH KERNEL" ); +lmb_reserve_area (crash_base, crash_base + crash_size,"CRASH KERNEL" ); printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " "for crashkernel (System RAM: %ldMB)\n",
@@ -765,7 +764,7 @@ void __init setup_arch(char **cmdline_p)#endif 4)) { efi_enabled =1 ; -efi_reserve_early (); +efi_lmb_reserve_area (); }#endif
@@ -825,7 +824,7 @@ void __init setup_arch(char **cmdline_p)vmi_activate ();/* after early param, so could get panic from serial */ -reserve_early_setup_data (); +lmb_reserve_area_setup_data ();if (acpi_mps_check ()) {#ifdef CONFIG_X86_LOCAL_APIC
arch/x86/kernel/trampoline.c +3 -3
@@ -1,7 +1,7 @@#include <linux/io.h> +#include <linux/lmb.h> #include <asm/trampoline.h> -#include <asm/e820.h> #if defined(CONFIG_X86_64 ) && defined(CONFIG_ACPI_SLEEP )#define __trampinit
@@ -19,12 +19,12 @@ void __init reserve_trampoline_memory(void)unsigned long mem;/* Has to be in very low memory so we can execute real-mode AP code. */ - mem =find_e820_area (0 ,1 <<20 ,TRAMPOLINE_SIZE ,PAGE_SIZE ); + mem =lmb_find_area (0 ,1 <<20 ,TRAMPOLINE_SIZE ,PAGE_SIZE );if (mem ==-1L )panic ("Cannot allocate trampoline\n" ); trampoline_base =__va (mem); -reserve_early (mem, mem +TRAMPOLINE_SIZE ,"TRAMPOLINE" ); +lmb_reserve_area (mem, mem +TRAMPOLINE_SIZE ,"TRAMPOLINE" ); }/*
arch/x86/mm/init.c +3 -2
@@ -1,6 +1,7 @@#include <linux/initrd.h> #include <linux/ioport.h> #include <linux/swap.h> +#include <linux/lmb.h> #include <asm/cacheflush.h> #include <asm/e820.h>
@@ -74,7 +75,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse,#else start =0x8000 ;#endif - e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , + e820_table_start =lmb_find_area (start, max_pfn_mapped<<PAGE_SHIFT , tables,PAGE_SIZE );if (e820_table_start ==-1UL )panic ("Cannot find space for the kernel page tables" );
@@ -298,7 +299,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,__flush_tlb_all ();if (!after_bootmem && e820_table_end > e820_table_start) -reserve_early (e820_table_start <<PAGE_SHIFT , +lmb_reserve_area (e820_table_start <<PAGE_SHIFT , e820_table_end <<PAGE_SHIFT ,"PGTABLE" );if (!after_bootmem)
arch/x86/mm/init_32.c +6 -4
@@ -25,6 +25,7 @@#include <linux/pfn.h> #include <linux/poison.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/memory_hotplug.h>
@@ -712,14 +713,14 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, highstart_pfn = highend_pfn = max_pfn;if (max_pfn > max_low_pfn) highstart_pfn = max_low_pfn; -e820_register_active_regions (0 ,0 , highend_pfn); +lmb_register_active_regions (0 ,0 , highend_pfn);sparse_memory_present_with_active_regions (0 );printk (KERN_NOTICE "%ldMB HIGHMEM available.\n" ,pages_to_mb (highend_pfn - highstart_pfn)); num_physpages = highend_pfn; high_memory = (void *)__va (highstart_pfn *PAGE_SIZE -1 ) +1 ;#else -e820_register_active_regions (0 ,0 , max_low_pfn); +lmb_register_active_regions (0 ,0 , max_low_pfn);sparse_memory_present_with_active_regions (0 ); num_physpages = max_low_pfn; high_memory = (void *)__va (max_low_pfn *PAGE_SIZE -1 ) +1 ;
@@ -781,11 +782,11 @@ void __init setup_bootmem_allocator(void)* Initialize the boot-time allocator (with low memory only): */ bootmap_size =bootmem_bootmap_pages (max_low_pfn)<<PAGE_SHIFT ; - bootmap =find_e820_area (0 , max_pfn_mapped<<PAGE_SHIFT , bootmap_size, + bootmap =lmb_find_area (0 , max_pfn_mapped<<PAGE_SHIFT , bootmap_size,PAGE_SIZE );if (bootmap ==-1L )panic ("Cannot find bootmem map of size %ld\n" , bootmap_size); -reserve_early (bootmap, bootmap + bootmap_size,"BOOTMAP" ); +lmb_reserve_area (bootmap, bootmap + bootmap_size,"BOOTMAP" );#endif printk(KERN_INFO " mapped low ram: 0 - %08lx\n",
@@ -1069,3 +1070,4 @@ void mark_rodata_ro(void) #endif }#endif +
arch/x86/mm/init_64.c +5 -4
@@ -21,6 +21,7 @@#include <linux/initrd.h> #include <linux/pagemap.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/proc_fs.h> #include <linux/pci.h> #include <linux/pfn.h>
@@ -576,18 +577,18 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,unsigned long bootmap_size, bootmap; bootmap_size =bootmem_bootmap_pages (end_pfn)<<PAGE_SHIFT ; - bootmap =find_e820_area (0 , end_pfn<<PAGE_SHIFT , bootmap_size, + bootmap =lmb_find_area (0 , end_pfn<<PAGE_SHIFT , bootmap_size,PAGE_SIZE );if (bootmap ==-1L )panic ("Cannot find bootmem map of size %ld\n" , bootmap_size); -reserve_early (bootmap, bootmap + bootmap_size,"BOOTMAP" ); +lmb_reserve_area (bootmap, bootmap + bootmap_size,"BOOTMAP" );/* don't touch min_low_pfn */ bootmap_size =init_bootmem_node (NODE_DATA (0 ), bootmap >>PAGE_SHIFT ,0 , end_pfn); -e820_register_active_regions (0 , start_pfn, end_pfn); +lmb_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); +lmb_register_active_regions (0 , start_pfn, end_pfn); #endif }#endif
arch/x86/mm/k8topology_64.c +3 -1
@@ -11,6 +11,8 @@#include <linux/string.h> #include <linux/module.h> #include <linux/nodemask.h> +#include <linux/lmb.h> +#include <asm/io.h> #include <linux/pci_ids.h> #include <linux/acpi.h>
@@ -222,7 +224,7 @@ int __init k8_scan_nodes(void)for_each_node_mask (i, node_possible_map) {int j; -e820_register_active_regions (i, +lmb_register_active_regions (i, nodes[i].start >>PAGE_SHIFT , nodes[i].end >>PAGE_SHIFT );for (j = apicid_base; j < cores + apicid_base; j++)
arch/x86/mm/memtest.c +3 -4
@@ -6,8 +6,7 @@#include <linux/smp.h> #include <linux/init.h> #include <linux/pfn.h> - -#include <asm/e820.h> +#include <linux/lmb.h> static u64 patterns[]__initdata = {0 ,
@@ -35,7 +34,7 @@ static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad) (unsigned long long ) pattern, (unsigned long long ) start_bad, (unsigned long long) end_bad); -reserve_early (start_bad, end_bad,"BAD RAM" ); +lmb_reserve_area (start_bad, end_bad,"BAD RAM" ); }static void __init memtest (u64 pattern,u64 start_phys,u64 size)
@@ -74,7 +73,7 @@ static void __init do_one_pass(u64 pattern, u64 start, u64 end)u64 size =0 ;while (start < end) { - start =find_e820_area_size (start, &size,1 ); + start =lmb_find_area_size (start, &size,1 );/* done ? */ if (start >= end)
arch/x86/mm/numa_32.c +9 -8
@@ -24,6 +24,7 @@#include <linux/mm.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/mmzone.h> #include <linux/highmem.h> #include <linux/initrd.h>
@@ -120,7 +121,7 @@ int __init get_memcfg_numa_flat(void) node_start_pfn[0 ] =0 ; node_end_pfn[0 ] = max_pfn; -e820_register_active_regions (0 ,0 , max_pfn); +lmb_register_active_regions (0 ,0 , max_pfn);memory_present (0 ,0 , max_pfn); node_remap_size[0 ] =node_memmap_size_bytes (0 ,0 , max_pfn);
@@ -161,14 +162,14 @@ static void __init allocate_pgdat(int nid)NODE_DATA (nid) = (pg_data_t *)node_remap_start_vaddr[nid]; else {unsigned long pgdat_phys; - pgdat_phys =find_e820_area (min_low_pfn<<PAGE_SHIFT , + pgdat_phys =lmb_find_area (min_low_pfn<<PAGE_SHIFT , max_pfn_mapped<<PAGE_SHIFT ,sizeof (pg_data_t),PAGE_SIZE );NODE_DATA (nid) = (pg_data_t *)(pfn_to_kaddr (pgdat_phys>>PAGE_SHIFT ));memset (buf,0 ,sizeof (buf));sprintf (buf,"NODE_DATA %d" , nid); -reserve_early (pgdat_phys, pgdat_phys +sizeof (pg_data_t), buf); +lmb_reserve_area (pgdat_phys, pgdat_phys +sizeof (pg_data_t), buf); }printk (KERN_DEBUG "allocate_pgdat: node %d NODE_DATA %08lx\n" , nid, (unsigned long )NODE_DATA (nid));
@@ -291,7 +292,7 @@ static __init unsigned long calculate_numa_remap_pages(void) PTRS_PER_PTE); node_kva_target <<=PAGE_SHIFT ; do { - node_kva_final = find_e820_area(node_kva_target, + node_kva_final = lmb_find_area(node_kva_target, ((u64)node_end_pfn[nid])<<PAGE_SHIFT, ((u64)size)<<PAGE_SHIFT, LARGE_PAGE_BYTES);
@@ -318,9 +319,9 @@ static __init unsigned long calculate_numa_remap_pages(void)* but we could have some hole in high memory, and it will only * check page_is_ram(pfn) && !page_is_reserved_early(pfn) to decide * to use it as free. -* So reserve_early here, hope we don't run out of that array +* So lmb_reserve_area here, hope we don't run out of that array */ -reserve_early (node_kva_final, +lmb_reserve_area (node_kva_final, node_kva_final+(((u64 )size)<<PAGE_SHIFT ),"KVA RAM" );
@@ -367,7 +368,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, kva_target_pfn =round_down (max_low_pfn - kva_pages,PTRS_PER_PTE ); do { - kva_start_pfn = find_e820_area(kva_target_pfn<<PAGE_SHIFT, + kva_start_pfn = lmb_find_area(kva_target_pfn<<PAGE_SHIFT, max_low_pfn<<PAGE_SHIFT, kva_pages<<PAGE_SHIFT, PTRS_PER_PTE<<PAGE_SHIFT) >> PAGE_SHIFT;
@@ -382,7 +383,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,printk (KERN_INFO "max_pfn = %lx\n" , max_pfn);/* avoid clash with initrd */ -reserve_early (kva_start_pfn<<PAGE_SHIFT , +lmb_reserve_area (kva_start_pfn<<PAGE_SHIFT , (kva_start_pfn + kva_pages)<<PAGE_SHIFT ,"KVA PG" );#ifdef CONFIG_HIGHMEM
arch/x86/mm/numa_64.c +16 -16
@@ -90,7 +90,7 @@ static int __init allocate_cachealigned_memnodemap(void) addr =0x8000 ; nodemap_size =roundup (sizeof (s16) * memnodemapsize,L1_CACHE_BYTES ); - nodemap_addr =find_e820_area (addr, max_pfn<<PAGE_SHIFT , + nodemap_addr =lmb_find_area (addr, max_pfn<<PAGE_SHIFT , nodemap_size,L1_CACHE_BYTES );if (nodemap_addr ==-1UL ) { printk(KERN_ERR
@@ -99,7 +99,7 @@ static int __init allocate_cachealigned_memnodemap(void)return -1 ; } memnodemap =phys_to_virt (nodemap_addr); -reserve_early (nodemap_addr, nodemap_addr + nodemap_size,"MEMNODEMAP" ); +lmb_reserve_area (nodemap_addr, nodemap_addr + nodemap_size,"MEMNODEMAP" );printk (KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n" , nodemap_addr, nodemap_addr + nodemap_size);
@@ -230,7 +230,7 @@ setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)if (node_data[nodeid] ==NULL )return ; nodedata_phys =__pa (node_data[nodeid]); -reserve_early (nodedata_phys, nodedata_phys + pgdat_size,"NODE_DATA" ); +lmb_reserve_area (nodedata_phys, nodedata_phys + pgdat_size,"NODE_DATA" );printk (KERN_INFO " NODE_DATA [%016lx - %016lx]\n" , nodedata_phys, nodedata_phys + pgdat_size -1 ); nid =phys_to_nid (nodedata_phys);
@@ -249,7 +249,7 @@ setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)* Find a place for the bootmem map * nodedata_phys could be on other nodes by alloc_bootmem, * so need to sure bootmap_start not to be small, otherwise -* early_node_mem will get that with find_e820_area instead +* early_node_mem will get that with lmb_find_area instead * of alloc_bootmem, that could clash with reserved range */ bootmap_pages =bootmem_bootmap_pages (last_pfn - start_pfn);
@@ -261,12 +261,12 @@ setup_node_bootmem(int nodeid, unsigned long start, unsigned long end) bootmap =early_node_mem (nodeid, bootmap_start, end, bootmap_pages<<PAGE_SHIFT ,PAGE_SIZE );if (bootmap ==NULL ) { -free_early (nodedata_phys, nodedata_phys + pgdat_size); +lmb_free_area (nodedata_phys, nodedata_phys + pgdat_size); node_data[nodeid] =NULL ;return ; } bootmap_start =__pa (bootmap); -reserve_early (bootmap_start, bootmap_start+(bootmap_pages<<PAGE_SHIFT ), +lmb_reserve_area (bootmap_start, bootmap_start+(bootmap_pages<<PAGE_SHIFT ),"BOOTMAP" ); bootmap_size = init_bootmem_node(NODE_DATA(nodeid),
@@ -420,7 +420,7 @@ static int __init split_nodes_interleave(u64 addr, u64 max_addr, nr_nodes =MAX_NUMNODES ; } - size = (max_addr - addr -e820_hole_size (addr, max_addr)) / nr_nodes; + size = (max_addr - addr -lmb_hole_size (addr, max_addr)) / nr_nodes;/* * Calculate the number of big nodes that can be allocated as a result * of consolidating the remainder.
@@ -456,7 +456,7 @@ static int __init split_nodes_interleave(u64 addr, u64 max_addr,* non-reserved memory is less than the per-node size. */ while (end - physnodes[i].start - -e820_hole_size (physnodes[i].start, end) < size) { +lmb_hole_size (physnodes[i].start, end) < size) { end +=FAKE_NODE_MIN_SIZE ;if (end > physnodes[i].end) { end = physnodes[i].end;
@@ -470,7 +470,7 @@ static int __init split_nodes_interleave(u64 addr, u64 max_addr,* this one must extend to the boundary. */ if (end < dma32_end && dma32_end - end - -e820_hole_size (end, dma32_end) <FAKE_NODE_MIN_SIZE ) +lmb_hole_size (end, dma32_end) <FAKE_NODE_MIN_SIZE ) end = dma32_end;/*
@@ -479,7 +479,7 @@ static int __init split_nodes_interleave(u64 addr, u64 max_addr,* physical node. */ if (physnodes[i].end - end - -e820_hole_size (end, physnodes[i].end) < size) +lmb_hole_size (end, physnodes[i].end) < size) end = physnodes[i].end;/*
@@ -507,7 +507,7 @@ static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size) {u64 end = start + size; -while (end - start -e820_hole_size (start, end) < size) { +while (end - start -lmb_hole_size (start, end) < size) { end +=FAKE_NODE_MIN_SIZE ;if (end > max_addr) { end = max_addr;
@@ -536,7 +536,7 @@ static int __init split_nodes_size_interleave(u64 addr, u64 max_addr, u64 size)* creates a uniform distribution of node sizes across the entire * machine (but not necessarily over physical nodes). */ - min_size = (max_addr - addr -e820_hole_size (addr, max_addr)) / + min_size = (max_addr - addr -lmb_hole_size (addr, max_addr)) /MAX_NUMNODES ; min_size =max (min_size,FAKE_NODE_MIN_SIZE );if ((min_size &FAKE_NODE_MIN_HASH_MASK ) < min_size)
@@ -569,7 +569,7 @@ static int __init split_nodes_size_interleave(u64 addr, u64 max_addr, u64 size)* this one must extend to the boundary. */ if (end < dma32_end && dma32_end - end - -e820_hole_size (end, dma32_end) <FAKE_NODE_MIN_SIZE ) +lmb_hole_size (end, dma32_end) <FAKE_NODE_MIN_SIZE ) end = dma32_end;/*
@@ -578,7 +578,7 @@ static int __init split_nodes_size_interleave(u64 addr, u64 max_addr, u64 size)* physical node. */ if (physnodes[i].end - end - -e820_hole_size (end, physnodes[i].end) < size) +lmb_hole_size (end, physnodes[i].end) < size) end = physnodes[i].end;/*
@@ -642,7 +642,7 @@ static int __init numa_emulation(unsigned long start_pfn,*/ remove_all_active_ranges ();for_each_node_mask (i, node_possible_map) { -e820_register_active_regions (i, nodes[i].start >>PAGE_SHIFT , +lmb_register_active_regions (i, nodes[i].start >>PAGE_SHIFT , nodes[i].end >>PAGE_SHIFT );setup_node_bootmem (i, nodes[i].start, nodes[i].end); }
@@ -695,7 +695,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,node_set (0 , node_possible_map);for (i =0 ; i < nr_cpu_ids; i++)numa_set_node (i,0 ); -e820_register_active_regions (0 , start_pfn, last_pfn); +lmb_register_active_regions (0 , start_pfn, last_pfn);setup_node_bootmem (0 , start_pfn <<PAGE_SHIFT , last_pfn <<PAGE_SHIFT ); }
arch/x86/mm/srat_32.c +2 -1
@@ -25,6 +25,7 @@*/ #include <linux/mm.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/mmzone.h> #include <linux/acpi.h> #include <linux/nodemask.h>
@@ -264,7 +265,7 @@ int __init get_memcfg_from_srat(void)if (node_read_chunk (chunk->nid, chunk))continue ; -e820_register_active_regions (chunk->nid, chunk->start_pfn, +lmb_register_active_regions (chunk->nid, chunk->start_pfn,min (chunk->end_pfn, max_pfn)); }/* for out of order entries in SRAT */
arch/x86/mm/srat_64.c +5 -4
@@ -16,6 +16,7 @@#include <linux/module.h> #include <linux/topology.h> #include <linux/bootmem.h> +#include <linux/lmb.h> #include <linux/mm.h> #include <asm/proto.h> #include <asm/numa.h>
@@ -98,7 +99,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)unsigned long phys; length = slit->header.length; - phys =find_e820_area (0 , max_pfn_mapped<<PAGE_SHIFT , length, + phys =lmb_find_area (0 , max_pfn_mapped<<PAGE_SHIFT , length,PAGE_SIZE );if (phys ==-1L )
@@ -106,7 +107,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) acpi_slit =__va (phys);memcpy (acpi_slit, slit, length); -reserve_early (phys, phys + length,"ACPI SLIT" ); +lmb_reserve_area (phys, phys + length,"ACPI SLIT" ); }/* Callback for Proximity Domain -> x2APIC mapping */
@@ -324,7 +325,7 @@ static int __init nodes_cover_memory(const struct bootnode *nodes) pxmram =0 ; } - e820ram = max_pfn - (e820_hole_size (0 , max_pfn<<PAGE_SHIFT )>>PAGE_SHIFT ); + e820ram = max_pfn - (lmb_hole_size (0 , max_pfn<<PAGE_SHIFT )>>PAGE_SHIFT );/* We seem to lose 3 pages somewhere. Allow 1M of slack. */ if ((long )(e820ram - pxmram) >= (1 <<(20 -PAGE_SHIFT ))) { printk(KERN_ERR
@@ -373,7 +374,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) }for_each_node_mask (i, nodes_parsed) -e820_register_active_regions (i, nodes[i].start >>PAGE_SHIFT , +lmb_register_active_regions (i, nodes[i].start >>PAGE_SHIFT , nodes[i].end >>PAGE_SHIFT );/* for out of order entries in SRAT */ sort_node_map ();
arch/x86/xen/mmu.c +3 -2
@@ -43,6 +43,7 @@#include <linux/debugfs.h> #include <linux/bug.h> #include <linux/module.h> +#include <linux/lmb.h> #include <asm/pgtable.h> #include <asm/tlbflush.h>
@@ -1734,7 +1735,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,__xen_write_cr3 (true,__pa (pgd));xen_mc_issue (PARAVIRT_LAZY_CPU ); -reserve_early (__pa (xen_start_info->pt_base), +lmb_reserve_area (__pa (xen_start_info->pt_base),__pa (xen_start_info->pt_base + xen_start_info->nr_pt_frames *PAGE_SIZE ),"XEN PAGETABLES" );
@@ -1772,7 +1773,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,pin_pagetable_pfn (MMUEXT_PIN_L3_TABLE ,PFN_DOWN (__pa (swapper_pg_dir))); -reserve_early (__pa (xen_start_info->pt_base), +lmb_reserve_area (__pa (xen_start_info->pt_base),__pa (xen_start_info->pt_base + xen_start_info->nr_pt_frames *PAGE_SIZE ),"XEN PAGETABLES" );
arch/x86/xen/setup.c +2 -1
@@ -8,6 +8,7 @@#include <linux/sched.h> #include <linux/mm.h> #include <linux/pm.h> +#include <linux/lmb.h> #include <asm/elf.h> #include <asm/vdso.h>
@@ -59,7 +60,7 @@ char * __init xen_memory_setup(void)* - xen_start_info * See comment above "struct start_info" in <xen/interface/xen.h> */ -reserve_early (__pa (xen_start_info->mfn_list), +lmb_reserve_area (__pa (xen_start_info->mfn_list),__pa (xen_start_info->pt_base),"XEN START INFO" );
mm/bootmem.c +2 -2
@@ -421,7 +421,7 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, unsigned long size) {#ifdef CONFIG_NO_BOOTMEM -free_early (physaddr, physaddr + size); +lmb_free_area (physaddr, physaddr + size);#else unsigned long start, end;
@@ -446,7 +446,7 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,void __init free_bootmem (unsigned long addr,unsigned long size) {#ifdef CONFIG_NO_BOOTMEM -free_early (addr, addr + size); +lmb_free_area (addr, addr + size);#else unsigned long start, end;
Signature · 1 line
1.6.4.2
PATCH 24/33 nobootmem: use lmb.default_alloc_limit in alloc_bootmem path
In reply to Yinghai LuGeneric version __lmb_find_area() is going from high to low, and for 32bit active_region for 32bit does include high pages
need to replace the limit with lmb.default_alloc_limit, aka get_max_mapped()
with this patch, x86 32bit could use generic version of __lmb_find_area()
--- mm/page_alloc.c | 3 +++ 1 file changed, 3 insertions(+)
mm/page_alloc.c +3 -0
@@ -3445,6 +3445,9 @@ void * __init __alloc_memory_core_early(u64 addr; +if (limit > lmb.default_alloc_limit) + limit = lmb.default_alloc_limit; + addr =find_memory_core_early (nid, size, align, goal, limit);if (addr ==-1ULL )
Signature · 1 line
1.6.4.2
PATCH 25/33 x86, lmb: turn off ARCH_LMB_FIND_AREA
In reply to Yinghai Lu32bit now can use generic __find_lmb_area now. So we can turn arch one off
--- arch/x86/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/Kconfig +1 -1
@@ -584,7 +584,7 @@ config PARAVIRT_DEBUG a paravirt_op is missing when it is called. config ARCH_LMB_FIND_AREA - default y + default n bool "Use x86 own lmb_find_area()" ---help--- Use lmb_find_area() version instead of generic version, it get free
Signature · 1 line
1.6.4.2
Re: [PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA
Quoted 12 lines · Yinghai Lu
32bit now can use generic
__find_lmb_areanow. So we can turn arch one offSigned-off-by Yinghai Lu <[email protected]>--- arch/x86/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/Kconfig +0
-0
arch/x86/Kconfig config PARAVIRT_DEBUG · line 590
Quoted 8 lines
arch/x86/Kconfig +1
-1@@ -584,7 +584,7 @@ config PARAVIRT_DEBUG a paravirt_op is missing when it is called. config ARCH_LMB_FIND_AREA - default y + default n bool "Use x86 own lmb_find_area()" ---help--- Use lmb_find_area() version instead of generic version, it get free
So can't the whole ARCH_LMB_FIND_AREA go away then? And the generic version be made non-weak?
cheers
Re: [PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA
Quoted 15 lines · Michael Ellerman
Quoted 14 lines · Yinghai Lu
32bit now can use generic
__find_lmb_areanow. So we can turn arch one offSigned-off-by Yinghai Lu <[email protected]>--- arch/x86/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/x86/Kconfig +0
-0@@ -584,7 +584,7 @@ config PARAVIRT_DEBUG a paravirt_op is missing when it is called.
Quoted 9 lines
arch/x86/Kconfig config PARAVIRT_DEBUG · line 590
Quoted 6 lines
arch/x86/Kconfig +1
-1config ARCH_LMB_FIND_AREA - default y + default n bool "Use x86 own lmb_find_area()" ---help--- Use lmb_find_area() version instead of generic version, it get freeSo can't the whole
ARCH_LMB_FIND_AREAgo away then? And the generic version be made non-weak?
Later after more test, to make sure x86 could endure from high to low. then we can remove ARCH_LMB_FIND_AREA.
YH
PATCH 26/33 x86: Remove not used early_res code
In reply to Yinghai Luand some functions in e820.c that are not used anymore
--- arch/x86/include/asm/e820.h | 14 - arch/x86/kernel/e820.c | 42 --- include/linux/early_res.h | 23 -- kernel/early_res.c | 584 ------------------------------------------- 4 files changed, 0 insertions(+), 663 deletions(-) delete mode 100644 include/linux/early_res.h delete mode 100644 kernel/early_res.c
arch/x86/include/asm/e820.h +0 -14
@@ -111,32 +111,18 @@ static inline void early_memtest(unsigned long start, unsigned long end) }#endif -extern unsigned long end_user_pfn; - -extern u64 find_e820_area (u64 start,u64 end,u64 size,u64 align); -extern u64 find_e820_area_size (u64 start,u64 *sizep,u64 align); -extern u64 early_reserve_e820 (u64 startt,u64 sizet,u64 align); -extern unsigned long e820_end_of_ram_pfn (void );extern unsigned long e820_end_of_low_ram_pfn (void ); -extern void e820_register_active_regions (int nid,unsigned long start_pfn, -unsigned long end_pfn); -extern u64 e820_hole_size (u64 start,u64 end); -extern u64 early_reserve_e820 (u64 startt,u64 sizet,u64 align);void init_lmb_memory (void );void fill_lmb_memory (void ); -extern void finish_e820_parsing (void );extern void e820_reserve_resources (void );extern void e820_reserve_resources_late (void );extern void setup_memory_map (void );extern char *default_machine_specific_memory_setup (void ); -void reserve_early (u64 start,u64 end,char *name); -void free_early (u64 start,u64 end); -/* * Returns true iff the specified range [s,e) is completely contained inside * the ISA region.
arch/x86/kernel/e820.c +0 -42
54 lines not on this page · raw message
include/linux/early_res.h deleted +0 -23
@@ -1,23 +0,0 @@ -#ifndef _LINUX_EARLY_RES_H -#define _LINUX_EARLY_RES_H -#ifdef __KERNEL__ - -extern void reserve_early (u64 start,u64 end,char *name); -extern void reserve_early_overlap_ok (u64 start,u64 end,char *name); -extern void free_early (u64 start,u64 end); -void free_early_partial (u64 start,u64 end); -extern void early_res_to_bootmem (u64 start,u64 end); - -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); -u64 find_early_area_size (u64 ei_start,u64 ei_last,u64 start, -u64 *sizep,u64 align); -u64 find_fw_memmap_area (u64 start,u64 end,u64 size,u64 align); -u64 get_max_mapped (void ); -#include <linux/range.h> -int get_free_all_memory_range (struct range **rangep,int nodeid); - -#endif /* __KERNEL__ */ - -#endif /* _LINUX_EARLY_RES_H */
kernel/early_res.c deleted +0 -584
584 lines not on this page · raw message
Signature · 1 line
1.6.4.2
PATCH 27/33 x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve
In reply to Yinghai Lulmb_memory_size() will return memory size in lmb.memory.region. lmb_free_memory_size() will return free memory size in lmb.memory.region.
So We can get exact reseved size in specified range.
Set the size right after initmem_init(), because later bootmem API will get area above 16M. (except some fallback).
Later after we remove the bootmem, We could call that just before paging_init().
--- arch/x86/include/asm/e820.h | 2 ++ arch/x86/kernel/e820.c | 17 +++++++++++++++++ arch/x86/kernel/setup.c | 1 + arch/x86/mm/init_64.c | 7 ------- 4 files changed, 20 insertions(+), 7 deletions(-)
arch/x86/include/asm/e820.h +2 -0
@@ -117,6 +117,8 @@ extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);void init_lmb_memory (void );void fill_lmb_memory (void ); +void find_lmb_dma_reserve (void ); +extern void finish_e820_parsing (void );extern void e820_reserve_resources (void );extern void e820_reserve_resources_late (void );
arch/x86/kernel/e820.c +17 -0
@@ -1107,3 +1107,20 @@ void __init fill_lmb_memory(void)lmb_analyze ();lmb_dump_all (); } + +void __init find_lmb_dma_reserve (void ) +{ +#ifdef CONFIG_X86_64 +u64 free_size_pfn; +u64 mem_size_pfn; +/* +* need to find out used area below MAX_DMA_PFN +* need to use lmb to get free size in [0, MAX_DMA_PFN] +* at first, and assume boot_mem will not take below MAX_DMA_PFN +*/ + mem_size_pfn =lmb_memory_size (0 ,MAX_DMA_PFN <<PAGE_SHIFT ) >>PAGE_SHIFT ; + free_size_pfn =lmb_free_memory_size (0 ,MAX_DMA_PFN <<PAGE_SHIFT ) >>PAGE_SHIFT ; +set_dma_reserve (mem_size_pfn - free_size_pfn); +#endif +} +
arch/x86/kernel/setup.c +1 -0
@@ -990,6 +990,7 @@ void __init setup_arch(char **cmdline_p)#endif initmem_init (0 , max_pfn, acpi, k8); +find_lmb_dma_reserve ();#ifndef CONFIG_NO_BOOTMEM lmb_to_bootmem (0 , max_low_pfn<<PAGE_SHIFT );#endif
arch/x86/mm/init_64.c +0 -7
@@ -52,8 +52,6 @@#include <asm/init.h> #include <linux/bootmem.h> -static unsigned long dma_reserve__initdata ; -static int __init parse_direct_gbpages_off (char *arg) { direct_gbpages =0 ;
@@ -820,11 +818,6 @@ int __init reserve_bootmem_generic(unsigned long phys, unsigned long len,reserve_bootmem (phys, len, flags); -if (phys+len <=MAX_DMA_PFN *PAGE_SIZE ) { - dma_reserve += len /PAGE_SIZE ; -set_dma_reserve (dma_reserve); - } - return 0; }#endif
Signature · 1 line
1.6.4.2
PATCH 28/33 x86: Align e820 ram range to page
In reply to Yinghai Luto workaround wrong BIOS memory map.
--- arch/x86/kernel/e820.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
arch/x86/kernel/e820.c +44 -0
@@ -910,6 +910,47 @@ static int __init parse_memmap_opt(char *p) }early_param ("memmap" , parse_memmap_opt); +static void __init e820_align_ram_page (void ) +{ +int i; +bool changed = false;; + +for (i =0 ; i < e820.nr_map; i++) { +struct e820entry *entry = &e820.map[i]; +u64 start, end; +u64 start_aligned, end_aligned; + +if (entry->type !=E820_RAM ) +continue ; + + start = entry->addr; + end = start + entry->size; + + start_aligned =round_up (start,PAGE_SIZE ); + end_aligned =round_down (end,PAGE_SIZE ); + +if (end_aligned <= start_aligned) { +e820_update_range (start, end - start,E820_RAM ,E820_RESERVED ); + changed = true; +continue ; + } +if (start < start_aligned) { +e820_update_range (start, start_aligned - start,E820_RAM ,E820_RESERVED ); + changed = true; + } +if (end_aligned < end) { +e820_update_range (end_aligned, end - end_aligned,E820_RAM ,E820_RESERVED ); + changed = true; + } + } + +if (changed) { +sanitize_e820_map (); +printk (KERN_INFO "aligned physical RAM map:\n" ); +e820_print_map ("aligned" ); + } +} +void __init finish_e820_parsing (void ) {if (userdef) {
@@ -922,6 +963,9 @@ void __init finish_e820_parsing(void)printk (KERN_INFO "user-defined physical RAM map:\n" );e820_print_map ("user" ); } + +/* In case, We have RAM entres that are not PAGE aligned */ +e820_align_ram_page (); }static inline const char *e820_type_to_string (int e820_type)
Signature · 1 line
1.6.4.2
PATCH 29/33 x86: Use wake_system_ram_range instead of e820_any_mapped in agp path
In reply to Yinghai LuMove apterture_valid back to .c
and early path still use e820_any_mapped()
so later we can make e820_any_mapped() to _init
--- arch/x86/include/asm/gart.h | 22 ---------------------- arch/x86/kernel/aperture_64.c | 22 ++++++++++++++++++++++ drivers/char/agp/amd64-agp.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 60 insertions(+), 23 deletions(-)
arch/x86/include/asm/gart.h +0 -22
@@ -74,26 +74,4 @@ static inline void enable_gart_translation(struct pci_dev *dev, u64 addr) pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); } -static inline int aperture_valid (u64 aper_base,u32 aper_size,u32 min_size) -{ -if (!aper_base) -return 0 ; - -if (aper_base + aper_size >0x100000000ULL ) { -printk (KERN_INFO "Aperture beyond 4GB. Ignoring.\n" ); -return 0 ; - } -if (e820_any_mapped (aper_base, aper_base + aper_size,E820_RAM )) { -printk (KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n" ); -return 0 ; - } -if (aper_size < min_size) { -printk (KERN_INFO "Aperture too small (%d MB) than (%d MB)\n" , - aper_size>>20 , min_size>>20 ); -return 0 ; - } - -return 1 ; -} -#endif /* _ASM_X86_GART_H */
arch/x86/kernel/aperture_64.c +22 -0
@@ -145,6 +145,28 @@ static u32 __init find_cap(int bus, int slot, int func, int cap)return 0 ; } +static int __init aperture_valid (u64 aper_base,u32 aper_size,u32 min_size) +{ +if (!aper_base) +return 0 ; + +if (aper_base + aper_size >0x100000000ULL ) { +printk (KERN_INFO "Aperture beyond 4GB. Ignoring.\n" ); +return 0 ; + } +if (e820_any_mapped (aper_base, aper_base + aper_size,E820_RAM )) { +printk (KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n" ); +return 0 ; + } +if (aper_size < min_size) { +printk (KERN_INFO "Aperture too small (%d MB) than (%d MB)\n" , + aper_size>>20 , min_size>>20 ); +return 0 ; + } + +return 1 ; +} +/* Read a standard AGPv3 bridge header */ static u32 __init read_agp (int bus,int slot,int func,int cap,u32 *order) {
drivers/char/agp/amd64-agp.c +38 -1
@@ -14,7 +14,6 @@#include <linux/agp_backend.h> #include <linux/mmzone.h> #include <asm/page.h> /* PAGE_SIZE */ -#include <asm/e820.h> #include <asm/k8.h> #include <asm/gart.h> #include "agp.h"
@@ -231,6 +230,44 @@ static const struct agp_bridge_driver amd_8151_driver = { .agp_type_to_mask_type = agp_generic_type_to_mask_type, }; +static int __devinit +__is_ram (unsigned long pfn,unsigned long nr_pages,void *arg) +{ +return 1 ; +} + +static int __devinit any_ram_in_range (u64 base,u64 size) +{ +unsigned long pfn, nr_pages; + + pfn = base >>PAGE_SHIFT ; + nr_pages = size >>PAGE_SHIFT ; + +return walk_system_ram_range (pfn, nr_pages,NULL , __is_ram) ==1 ; +} + +static int __devinit aperture_valid (u64 aper_base,u32 aper_size,u32 min_size) +{ +if (!aper_base) +return 0 ; + +if (aper_base + aper_size >0x100000000ULL ) { +printk (KERN_INFO "Aperture beyond 4GB. Ignoring.\n" ); +return 0 ; + } +if (any_ram_in_range (aper_base, aper_size)) { +printk (KERN_INFO "Aperture pointing to E820 RAM. Ignoring.\n" ); +return 0 ; + } +if (aper_size < min_size) { +printk (KERN_INFO "Aperture too small (%d MB) than (%d MB)\n" , + aper_size>>20 , min_size>>20 ); +return 0 ; + } + +return 1 ; +} +/* Some basic sanity checks for the aperture. */ static int __devinit agp_aperture_valid (u64 aper,u32 size) {
Signature · 1 line
1.6.4.2
PATCH 30/33 x86: Add get_centaur_ram_top()
In reply to Yinghai LuSo we can avoid to access e820.map[] directly.
later we could move e820 to static and _initdata
--- arch/x86/include/asm/e820.h | 9 ++++++ arch/x86/kernel/cpu/centaur.c | 53 +------------------------------------- arch/x86/kernel/e820.c | 56 +++++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/setup.c | 2 + 4 files changed, 69 insertions(+), 51 deletions(-)
arch/x86/include/asm/e820.h +9 -0
@@ -76,6 +76,15 @@ struct e820map {/* see comment in arch/x86/kernel/e820.c */ extern struct e820map e820; +#if defined(CONFIG_X86_OOSTORE ) && defined(CONFIG_CPU_SUP_CENTAUR ) +extern int centaur_ram_top; +void get_centaur_ram_top (void ); +#else +static inline void get_centaur_ram_top (void ) +{ +} +#endif +extern unsigned long pci_mem_start;extern int e820_any_mapped (u64 start,u64 end,unsigned type);extern int e820_all_mapped (u64 start,u64 end,unsigned type);
arch/x86/kernel/cpu/centaur.c +2 -51
65 lines not on this page · raw message
arch/x86/kernel/e820.c +56 -0
62 lines not on this page · raw message
arch/x86/kernel/setup.c +2 -0
@@ -884,6 +884,8 @@ void __init setup_arch(char **cmdline_p)if (mtrr_trim_uncached_memory (max_pfn)) max_pfn =e820_end_of_ram_pfn (); +get_centaur_ram_top (); +#ifdef CONFIG_X86_32 /* max_low_pfn get updated here */ find_low_pfn_range ();
Signature · 1 line
1.6.4.2
PATCH 31/33 x86: Change e820_any_mapped() to __init
In reply to Yinghai LuWe don't need to expose e820_any_mapped() anymore
--- arch/x86/kernel/e820.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/e820.c +3 -3
@@ -47,9 +47,10 @@ EXPORT_SYMBOL(pci_mem_start);/* * This function checks if any part of the range <start,end> is mapped * with type. +* phys_pud_init() is using it and is _meminit, but we have !after_bootmem +* so could use refok here */ -int -e820_any_mapped (u64 start,u64 end,unsigned type) +int __init_refok e820_any_mapped(u64 start, u64 end, unsigned type) {int i;
@@ -64,7 +65,6 @@ e820_any_mapped(u64 start, u64 end, unsigned type) }return 0 ; } -EXPORT_SYMBOL_GPL (e820_any_mapped);/* * This function checks if the entire range <start,end> is mapped with type.
Signature · 1 line
1.6.4.2
PATCH 32/33 x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot
In reply to Yinghai LuSo we can make e820 to be __initdata
--- arch/x86/kernel/tboot.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-)
arch/x86/kernel/tboot.c +9 -13
@@ -170,34 +170,30 @@ static void tboot_create_trampoline(void)#ifdef CONFIG_ACPI_SLEEP -static void add_mac_region (phys_addr_t start,unsigned long size) +static int +add_mac_region (unsigned long start_pfn,unsigned long nr_pages,void *arg) { +u64 start = start_pfn; +u64 size = nr_pages;struct tboot_mac_region *mr; -phys_addr_t end = start + size;if (tboot->num_mac_regions >=MAX_TB_MAC_REGIONS )panic ("tboot: Too many MAC regions\n" );if (start && size) { mr = &tboot->mac_regions[tboot->num_mac_regions++]; - mr->start =round_down (start,PAGE_SIZE ); - mr->size =round_up (end,PAGE_SIZE ) - mr->start; + mr->start = start <<PAGE_SHIFT ; + mr->size = (u32) (size <<PAGE_SHIFT ); } + +return 0 ; }static int tboot_setup_sleep (void ) { -int i; - tboot->num_mac_regions =0 ; -for (i =0 ; i < e820.nr_map; i++) { -if ((e820.map[i].type !=E820_RAM ) - && (e820.map[i].type !=E820_RESERVED_KERN )) -continue ; - -add_mac_region (e820.map[i].addr, e820.map[i].size); - } +walk_system_ram_range (0 , max_pfn,NULL , add_mac_region); tboot->acpi_sinfo.kernel_s3_resume_vector = acpi_wakeup_address;
Signature · 1 line
1.6.4.2
PATCH 33/33 x86: make e820 to be __initdata
In reply to Yinghai LuFinally no users after init boot stage. We can free it to save some bytes.
--- arch/x86/include/asm/e820.h | 2 -- arch/x86/kernel/e820.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-)
arch/x86/include/asm/e820.h +0 -2
@@ -73,8 +73,6 @@ struct e820map {#define BIOS_END 0x00100000#ifdef __KERNEL__ -/* see comment in arch/x86/kernel/e820.c */ -extern struct e820map e820;#if defined(CONFIG_X86_OOSTORE ) && defined(CONFIG_CPU_SUP_CENTAUR )extern int centaur_ram_top;
arch/x86/kernel/e820.c +1 -1
@@ -35,7 +35,7 @@* user can e.g. boot the original kernel with mem=1G while still booting the * next kernel with full memory. */ -struct e820map e820; +static struct e820map __initdata e820;static struct e820map __initdata e820_saved;/* For PCI or other memory-mapped resources */
Signature · 1 line
1.6.4.2