x86, mm: init_memory_mapping cleanup
cover x86, mm: init_memory_mapping cleanup
Only create mapping for E820_820 and E820_RESERVED_KERN.
Seperate calculate_table_space_size and find_early_page_table out with init_memory_mapping.
For all ranges, will allocate page table one time, but init mapping only for E820 RAM and E820_RESERVED_KERN.
Could be found at:git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git for-x86-mm
Thanks
Yinghai
Jacob Shin (4):
x86: if kernel .text .data .bss are not marked as E820_RAM, complain and fix
x86: Fixup code testing if a pfn is direct mapped
x86: Only direct map addresses that are marked as E820_RAM
x86/mm: calculate_table_space_size based on memory ranges that are being mapped
Yinghai Lu (10):
x86, mm: Add global page_size_mask
x86, mm: Split out split_mem_range
x86, mm: Moving init_memory_mapping calling
x86, mm: Revert back good_end setting for 64bit
x86, mm: Find early page table only one time
x86, mm: Separate out calculate_table_space_size() x86, mm: Move down two calculate_table_space_size down. x86, mm: set memblock initial limit to 1M
x86, mm: Use func pointer to table size calculation and mapping x86, mm: Map ISA area with connected ram range at the same time
arch/x86/include/asm/init.h | 1 - arch/x86/include/asm/page_types.h | 2 + arch/x86/include/asm/pgtable.h | 1 + arch/x86/kernel/cpu/amd.c | 8 +- arch/x86/kernel/setup.c | 36 +++-- arch/x86/mm/init.c | 357 +++++++++++++++++++++++++------------ arch/x86/mm/init_64.c | 6 +- arch/x86/platform/efi/efi.c | 8 +- 8 files changed, 280 insertions(+), 139 deletions(-)
Signature · 1 line
1.7.7
PATCH 1/14 x86, mm: Add global page_size_mask
detect if need to use 1G or 2M and store them in page_size_mask.
Only probe them one time.
--- arch/x86/include/asm/pgtable.h | 1 + arch/x86/kernel/setup.c | 1 + arch/x86/mm/init.c | 66 +++++++++++++++++++--------------------- 3 files changed, 33 insertions(+), 35 deletions(-)
arch/x86/include/asm/pgtable.h +1 -0
@@ -597,6 +597,7 @@ static inline int pgd_none(pgd_t pgd)#ifndef __ASSEMBLY__extern int direct_gbpages; +void probe_page_size_mask (void );/* local pte updates need not use xchg for locking */ static inline pte_t native_local_ptep_get_and_clear (pte_t *ptep)
arch/x86/kernel/setup.c +1 -0
@@ -912,6 +912,7 @@ void __init setup_arch(char **cmdline_p)setup_real_mode ();init_gbpages (); +probe_page_size_mask ();/* max_pfn_mapped is updated here */ max_low_pfn_mapped =init_memory_mapping (0 , max_low_pfn<<PAGE_SHIFT );
arch/x86/mm/init.c +31 -35
111 lines not on this page · raw message
Signature · 1 line
1.7.7
PATCH 2/14 x86, mm: Split out split_mem_range
In reply to Yinghai Lufrom init_memory_mapping, so make init_memory_mapping readable.
--- arch/x86/mm/init.c | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-)
arch/x86/mm/init.c +26 -16
@@ -143,25 +143,13 @@ static int __meminit save_mr(struct map_range *mr, int nr_range,return nr_range; } -/* -* Setup the direct mapping of the physical memory at PAGE_OFFSET. -* This runs before bootmem is initialized and gets pages directly from -* the physical memory. To access them they are temporarily mapped. -*/ -unsigned long __init_refok init_memory_mapping (unsigned long start, -unsigned long end) +static int __meminit split_mem_range (struct map_range *mr,int nr_range, +unsigned long start, +unsigned long end) {unsigned long start_pfn, end_pfn; -unsigned long ret =0 ;unsigned long pos; -struct map_range mr[NR_RANGE_MR ]; -int nr_range, i; - -printk (KERN_INFO "init_memory_mapping: [mem %#010lx-%#010lx]\n" , - start, end -1 ); - -memset (mr,0 ,sizeof (mr)); - nr_range =0 ; +int i;/* head if not big page alignment ? */ start_pfn = start >>PAGE_SHIFT ;
@@ -255,6 +243,28 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, (mr[i].page_size_mask & (1 <<PG_LEVEL_1G ))?"1G" :( (mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k")); +return nr_range; +} + +/* +* Setup the direct mapping of the physical memory at PAGE_OFFSET. +* This runs before bootmem is initialized and gets pages directly from +* the physical memory. To access them they are temporarily mapped. +*/ +unsigned long __init_refok init_memory_mapping (unsigned long start, +unsigned long end) +{ +struct map_range mr[NR_RANGE_MR ]; +unsigned long ret =0 ; +int nr_range, i; + +pr_info ("init_memory_mapping: [mem %#010lx-%#010lx]\n" , + start, end -1 ); + +memset (mr,0 ,sizeof (mr)); + nr_range =0 ; + nr_range =split_mem_range (mr, nr_range, start, end); +/* * Find space for the kernel direct mapping tables. *
Signature · 1 line
1.7.7
PATCH 3/14 x86, mm: Moving init_memory_mapping calling
In reply to Yinghai Lufrom setup.c to mm/init.c
So could update all related calling together later
--- arch/x86/include/asm/init.h | 1 - arch/x86/include/asm/pgtable.h | 2 +- arch/x86/kernel/setup.c | 13 +------------ arch/x86/mm/init.c | 19 ++++++++++++++++++- 4 files changed, 20 insertions(+), 15 deletions(-)
arch/x86/include/asm/init.h +0 -1
@@ -12,7 +12,6 @@ kernel_physical_mapping_init(unsigned long start,unsigned long end, unsigned long page_size_mask); -extern unsigned long __initdata pgt_buf_start;extern unsigned long __meminitdata pgt_buf_end;extern unsigned long __meminitdata pgt_buf_top;
arch/x86/include/asm/pgtable.h +1 -1
@@ -597,7 +597,7 @@ static inline int pgd_none(pgd_t pgd)#ifndef __ASSEMBLY__extern int direct_gbpages; -void probe_page_size_mask (void ); +void init_mem_mapping (void );/* local pte updates need not use xchg for locking */ static inline pte_t native_local_ptep_get_and_clear (pte_t *ptep)
arch/x86/kernel/setup.c +1 -12
@@ -912,20 +912,9 @@ void __init setup_arch(char **cmdline_p)setup_real_mode ();init_gbpages (); -probe_page_size_mask (); -/* max_pfn_mapped is updated here */ - max_low_pfn_mapped =init_memory_mapping (0 , max_low_pfn<<PAGE_SHIFT ); - max_pfn_mapped = max_low_pfn_mapped; +init_mem_mapping (); -#ifdef CONFIG_X86_64 -if (max_pfn > max_low_pfn) { - max_pfn_mapped =init_memory_mapping (1UL <<32 , - max_pfn<<PAGE_SHIFT ); -/* can we preseve max_low_pfn ?*/ - max_low_pfn = max_pfn; - } -#endif memblock.current_limit =get_max_mapped ();dma_contiguous_reserve (0 );
arch/x86/mm/init.c +18 -1
@@ -92,7 +92,7 @@ static void __init find_early_table_space(struct map_range *mr, (pgt_buf_top << PAGE_SHIFT) - 1); } -void probe_page_size_mask (void ) +static void __init probe_page_size_mask (void ) {#if !defined(CONFIG_DEBUG_PAGEALLOC ) && !defined(CONFIG_KMEMCHECK )/*
@@ -312,6 +312,23 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,return ret >>PAGE_SHIFT ; } +void __init init_mem_mapping (void ) +{ +probe_page_size_mask (); + +/* max_pfn_mapped is updated here */ + max_low_pfn_mapped =init_memory_mapping (0 , max_low_pfn<<PAGE_SHIFT ); + max_pfn_mapped = max_low_pfn_mapped; + +#ifdef CONFIG_X86_64 +if (max_pfn > max_low_pfn) { + max_pfn_mapped =init_memory_mapping (1UL <<32 , + max_pfn<<PAGE_SHIFT ); +/* can we preseve max_low_pfn ?*/ + max_low_pfn = max_pfn; + } +#endif +}/* * devmem_is_allowed() checks to see if /dev/mem access to a certain address
Signature · 1 line
1.7.7
PATCH 4/14 x86, mm: Revert back good_end setting for 64bit
In reply to Yinghai LuSo we could put page table high again for 64bit.
--- arch/x86/mm/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/mm/init.c +1 -1
@@ -76,8 +76,8 @@ static void __init find_early_table_space(struct map_range *mr,#ifdef CONFIG_X86_32 /* for fixmap */ tables +=roundup (__end_of_fixed_addresses *sizeof (pte_t),PAGE_SIZE ); -#endif good_end = max_pfn_mapped <<PAGE_SHIFT ; +#endif base =memblock_find_in_range (start, good_end, tables,PAGE_SIZE );if (!base)
Signature · 1 line
1.7.7
PATCH 5/14 x86, mm: Find early page table only one time
In reply to Yinghai LuShould not do that in every calling of init_memory_mapping. Actually in early time, only need do once.
Also move down early_memtest.
-v2: fix one early_memtest with 32bit by passing max_pfn_mapped instead.
--- arch/x86/mm/init.c | 72 ++++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 35 deletions(-)
arch/x86/mm/init.c +37 -35
@@ -37,7 +37,7 @@ struct map_range {static int page_size_mask; -static void __init find_early_table_space (struct map_range *mr, +static void __init find_early_table_space (unsigned long begin,unsigned long end) {unsigned long puds, pmds, ptes, tables, start =0 , good_end = end;
@@ -64,8 +64,8 @@ static void __init find_early_table_space(struct map_range *mr, extra +=PMD_SIZE ;#endif /* The first 2/4M doesn't use large pages. */ -if (mr->start <PMD_SIZE ) - extra += mr->end - mr->start; +if (begin <PMD_SIZE ) + extra += (PMD_SIZE - begin) >>PAGE_SHIFT ; ptes = (extra +PAGE_SIZE -1 ) >>PAGE_SHIFT ; }else
@@ -265,16 +265,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, nr_range =0 ; nr_range =split_mem_range (mr, nr_range, start, end); -/* -* Find space for the kernel direct mapping tables. -* -* Later we should allocate these tables in the local node of the -* memory mapped. Unfortunately this is done currently before the -* nodes are discovered. -*/ -if (!after_bootmem) -find_early_table_space (&mr[0 ], end); -for (i =0 ; i < nr_range; i++) ret =kernel_physical_mapping_init (mr[i].start, mr[i].end, mr[i].page_size_mask);
@@ -287,6 +277,36 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,__flush_tlb_all (); +return ret >>PAGE_SHIFT ; +} + +void __init init_mem_mapping (void ) +{ +probe_page_size_mask (); + +/* +* Find space for the kernel direct mapping tables. +* +* Later we should allocate these tables in the local node of the +* memory mapped. Unfortunately this is done currently before the +* nodes are discovered. +*/ +#ifdef CONFIG_X86_64 +find_early_table_space (0 , max_pfn<<PAGE_SHIFT ); +#else +find_early_table_space (0 , max_low_pfn<<PAGE_SHIFT ); +#endif + max_low_pfn_mapped =init_memory_mapping (0 , max_low_pfn<<PAGE_SHIFT ); + max_pfn_mapped = max_low_pfn_mapped; + +#ifdef CONFIG_X86_64 +if (max_pfn > max_low_pfn) { + max_pfn_mapped =init_memory_mapping (1UL <<32 , + max_pfn<<PAGE_SHIFT ); +/* can we preseve max_low_pfn ?*/ + max_low_pfn = max_pfn; + } +#endif /* * Reserve the kernel pagetable pages we used (pgt_buf_start - * pgt_buf_end) and free the other ones (pgt_buf_end - pgt_buf_top)
@@ -302,32 +322,14 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,* RO all the pagetable pages, including the ones that are beyond * pgt_buf_end at that time. */ -if (!after_bootmem && pgt_buf_end > pgt_buf_start) +if (pgt_buf_end > pgt_buf_start) x86_init.mapping.pagetable_reserve (PFN_PHYS (pgt_buf_start),PFN_PHYS (pgt_buf_end)); -if (!after_bootmem) -early_memtest (start, end); +/* stop the wrong using */ + pgt_buf_top =0 ; -return ret >>PAGE_SHIFT ; -} - -void __init init_mem_mapping (void ) -{ -probe_page_size_mask (); - -/* max_pfn_mapped is updated here */ - max_low_pfn_mapped =init_memory_mapping (0 , max_low_pfn<<PAGE_SHIFT ); - max_pfn_mapped = max_low_pfn_mapped; - -#ifdef CONFIG_X86_64 -if (max_pfn > max_low_pfn) { - max_pfn_mapped =init_memory_mapping (1UL <<32 , - max_pfn<<PAGE_SHIFT ); -/* can we preseve max_low_pfn ?*/ - max_low_pfn = max_pfn; - } -#endif +early_memtest (0 , max_pfn_mapped <<PAGE_SHIFT ); }/*
Signature · 1 line
1.7.7
PATCH 6/14 x86, mm: Separate out calculate_table_space_size()
In reply to Yinghai Luit should take physical address range that will need to be mapped. and find_early_table_space should take range that pgt buff should be in. Separate those two to reduce confusion.
--- arch/x86/mm/init.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-)
arch/x86/mm/init.c +28 -11
@@ -37,11 +37,10 @@ struct map_range {static int page_size_mask; -static void __init find_early_table_space (unsigned long begin, +static unsigned long __init calculate_table_space_size (unsigned long begin,unsigned long end) { -unsigned long puds, pmds, ptes, tables, start =0 , good_end = end; -phys_addr_t base; +unsigned long puds, pmds, ptes, tables; puds = (end +PUD_SIZE -1 ) >>PUD_SHIFT ; tables =roundup (puds *sizeof (pud_t),PAGE_SIZE );
@@ -76,9 +75,17 @@ static void __init find_early_table_space(unsigned long begin,#ifdef CONFIG_X86_32 /* for fixmap */ tables +=roundup (__end_of_fixed_addresses *sizeof (pte_t),PAGE_SIZE ); - good_end = max_pfn_mapped <<PAGE_SHIFT ;#endif +return tables; +} + +static void __init find_early_table_space (unsigned long start, +unsigned long good_end, +unsigned long tables) +{ +phys_addr_t base; + base =memblock_find_in_range (start, good_end, tables,PAGE_SIZE );if (!base)panic ("Cannot find space for the kernel page tables" );
@@ -86,10 +93,6 @@ static void __init find_early_table_space(unsigned long begin, pgt_buf_start = base >>PAGE_SHIFT ; pgt_buf_end = pgt_buf_start; pgt_buf_top = pgt_buf_start + (tables >>PAGE_SHIFT ); - -printk (KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx]\n" , - end -1 , pgt_buf_start <<PAGE_SHIFT , - (pgt_buf_top <<PAGE_SHIFT ) -1 ); }static void __init probe_page_size_mask (void )
@@ -282,6 +285,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,void __init init_mem_mapping (void ) { +unsigned long tables, good_end, end; +probe_page_size_mask ();/*
@@ -292,10 +297,18 @@ void __init init_mem_mapping(void)* nodes are discovered. */ #ifdef CONFIG_X86_64 -find_early_table_space (0 , max_pfn<<PAGE_SHIFT ); + end = max_pfn <<PAGE_SHIFT ; + good_end = end;#else -find_early_table_space (0 , max_low_pfn<<PAGE_SHIFT ); + end = max_low_pfn <<PAGE_SHIFT ; + good_end = max_pfn_mapped <<PAGE_SHIFT ;#endif + tables =calculate_table_space_size (0 , end); +find_early_table_space (0 , good_end, tables); +printk (KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx] prealloc\n" , + end -1 , pgt_buf_start <<PAGE_SHIFT , + (pgt_buf_top <<PAGE_SHIFT ) -1 ); + max_low_pfn_mapped =init_memory_mapping (0 , max_low_pfn<<PAGE_SHIFT ); max_pfn_mapped = max_low_pfn_mapped;
@@ -322,9 +335,13 @@ void __init init_mem_mapping(void)* RO all the pagetable pages, including the ones that are beyond * pgt_buf_end at that time. */ -if (pgt_buf_end > pgt_buf_start) +if (pgt_buf_end > pgt_buf_start) { +printk (KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx] final\n" , + end -1 , pgt_buf_start <<PAGE_SHIFT , + (pgt_buf_end <<PAGE_SHIFT ) -1 ); x86_init.mapping.pagetable_reserve (PFN_PHYS (pgt_buf_start),PFN_PHYS (pgt_buf_end)); + }/* stop the wrong using */ pgt_buf_top =0 ;
Signature · 1 line
1.7.7
PATCH 7/14 x86, mm: Move down two calculate_table_space_size down.
In reply to Yinghai LuSo later could make it call split_mem_range...
--- arch/x86/mm/init.c | 116 ++++++++++++++++++++++++++-------------------------- 1 files changed, 58 insertions(+), 58 deletions(-)
arch/x86/mm/init.c +58 -58
@@ -37,64 +37,6 @@ struct map_range {static int page_size_mask; -static unsigned long __init calculate_table_space_size (unsigned long begin, -unsigned long end) -{ -unsigned long puds, pmds, ptes, tables; - - puds = (end +PUD_SIZE -1 ) >>PUD_SHIFT ; - tables =roundup (puds *sizeof (pud_t),PAGE_SIZE ); - -if (page_size_mask & (1 <<PG_LEVEL_1G )) { -unsigned long extra; - - extra = end - ((end>>PUD_SHIFT ) <<PUD_SHIFT ); - pmds = (extra +PMD_SIZE -1 ) >>PMD_SHIFT ; - }else - pmds = (end +PMD_SIZE -1 ) >>PMD_SHIFT ; - - tables +=roundup (pmds *sizeof (pmd_t),PAGE_SIZE ); - -if (page_size_mask & (1 <<PG_LEVEL_2M )) { -unsigned long extra; - - extra = end - ((end>>PMD_SHIFT ) <<PMD_SHIFT ); -#ifdef CONFIG_X86_32 - extra +=PMD_SIZE ; -#endif -/* The first 2/4M doesn't use large pages. */ -if (begin <PMD_SIZE ) - extra += (PMD_SIZE - begin) >>PAGE_SHIFT ; - - ptes = (extra +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - }else - ptes = (end +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - - tables +=roundup (ptes *sizeof (pte_t),PAGE_SIZE ); - -#ifdef CONFIG_X86_32 -/* for fixmap */ - tables +=roundup (__end_of_fixed_addresses *sizeof (pte_t),PAGE_SIZE ); -#endif - -return tables; -} - -static void __init find_early_table_space (unsigned long start, -unsigned long good_end, -unsigned long tables) -{ -phys_addr_t base; - - base =memblock_find_in_range (start, good_end, tables,PAGE_SIZE ); -if (!base) -panic ("Cannot find space for the kernel page tables" ); - - pgt_buf_start = base >>PAGE_SHIFT ; - pgt_buf_end = pgt_buf_start; - pgt_buf_top = pgt_buf_start + (tables >>PAGE_SHIFT ); -} -static void __init probe_page_size_mask (void ) {#if !defined(CONFIG_DEBUG_PAGEALLOC ) && !defined(CONFIG_KMEMCHECK )
@@ -249,6 +191,64 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,return nr_range; } +static unsigned long __init calculate_table_space_size (unsigned long begin, +unsigned long end) +{ +unsigned long puds, pmds, ptes, tables; + + puds = (end +PUD_SIZE -1 ) >>PUD_SHIFT ; + tables =roundup (puds *sizeof (pud_t),PAGE_SIZE ); + +if (page_size_mask & (1 <<PG_LEVEL_1G )) { +unsigned long extra; + + extra = end - ((end>>PUD_SHIFT ) <<PUD_SHIFT ); + pmds = (extra +PMD_SIZE -1 ) >>PMD_SHIFT ; + }else + pmds = (end +PMD_SIZE -1 ) >>PMD_SHIFT ; + + tables +=roundup (pmds *sizeof (pmd_t),PAGE_SIZE ); + +if (page_size_mask & (1 <<PG_LEVEL_2M )) { +unsigned long extra; + + extra = end - ((end>>PMD_SHIFT ) <<PMD_SHIFT ); +#ifdef CONFIG_X86_32 + extra +=PMD_SIZE ; +#endif +/* The first 2/4M doesn't use large pages. */ +if (begin <PMD_SIZE ) + extra += (PMD_SIZE - begin) >>PAGE_SHIFT ; + + ptes = (extra +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + }else + ptes = (end +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + + tables +=roundup (ptes *sizeof (pte_t),PAGE_SIZE ); + +#ifdef CONFIG_X86_32 +/* for fixmap */ + tables +=roundup (__end_of_fixed_addresses *sizeof (pte_t),PAGE_SIZE ); +#endif + +return tables; +} + +static void __init find_early_table_space (unsigned long start, +unsigned long good_end, +unsigned long tables) +{ +phys_addr_t base; + + base =memblock_find_in_range (start, good_end, tables,PAGE_SIZE ); +if (!base) +panic ("Cannot find space for the kernel page tables" ); + + pgt_buf_start = base >>PAGE_SHIFT ; + pgt_buf_end = pgt_buf_start; + pgt_buf_top = pgt_buf_start + (tables >>PAGE_SHIFT ); +} +/* * Setup the direct mapping of the physical memory at PAGE_OFFSET. * This runs before bootmem is initialized and gets pages directly from
Signature · 1 line
1.7.7
PATCH 8/14 x86, mm: set memblock initial limit to 1M
In reply to Yinghai Lumemblock_x86_fill() could double memory array.
and we set max_pfn_mapped to 512M, so memory array could be around 512M. So kdump will not get big range (like 512M) under 1024M.
Try to put it down under 1M, it could use about 4k or so.
Also we need this one when we try to only map ram range only later. if the early double the range near 512M, and later init_mem_mapping() first several range could under 512M, then after mapping get reset, we will lose access the memblock memory array. but we are using memblock memory array for iteration.
--- arch/x86/kernel/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/setup.c +1 -1
@@ -889,7 +889,7 @@ void __init setup_arch(char **cmdline_p)cleanup_highmap (); - memblock.current_limit =get_max_mapped (); + memblock.current_limit =ISA_END_ADDRESS ;memblock_x86_fill ();/*
Signature · 1 line
1.7.7
PATCH 9/14 x86: if kernel .text .data .bss are not marked as E820_RAM, complain and fix
In reply to Yinghai LuFrom: Jacob Shin <[email protected]>
There could be cases where user supplied memmap=exactmap memory mappings do not mark the region where the kernel .text .data and .bss reside as E820_RAM, as reported here:
https://lkml.org/lkml/2012/8/14/86
Handle it by complaining, and adding the range back into the e820.
--- arch/x86/kernel/setup.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
arch/x86/kernel/setup.c +14 -0
@@ -831,6 +831,20 @@ void __init setup_arch(char **cmdline_p)insert_resource (&iomem_resource, &data_resource);insert_resource (&iomem_resource, &bss_resource); +/* +* Complain if .text .data and .bss are not marked as E820_RAM and +* attempt to fix it by adding the range. We may have a confused BIOS, +* or the user may have incorrectly supplied it via memmap=exactmap. If +* we really are running on top non-RAM, we will crash later anyways. +*/ +if (!e820_all_mapped (code_resource.start,__pa (__brk_limit),E820_RAM )) { +pr_warn (".text .data .bss are not marked as E820_RAM!\n" ); + +e820_add_region (code_resource.start, +__pa (__brk_limit) - code_resource.start +1 , +E820_RAM ); + } +trim_bios_range ();#ifdef CONFIG_X86_32 if (ppro_with_ram_bug ()) {
Signature · 1 line
1.7.7
PATCH 10/14 x86: Fixup code testing if a pfn is direct mapped
In reply to Yinghai LuFrom: Jacob Shin <[email protected]>
Update code that previously assumed pfns [ 0 - max_low_pfn_mapped ) and [ 4GB - max_pfn_mapped ) were always direct mapped, to now look up pfn_mapped ranges instead.
-v2: change applying sequence to keep git bisecting working.
so add dummy pfn_range_is_mapped(). - Yinghai Lu
--- arch/x86/include/asm/page_types.h | 8 ++++++++ arch/x86/kernel/cpu/amd.c | 8 +++----- arch/x86/platform/efi/efi.c | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-)
arch/x86/include/asm/page_types.h +8 -0
@@ -51,6 +51,14 @@ static inline phys_addr_t get_max_mapped(void)return (phys_addr_t )max_pfn_mapped <<PAGE_SHIFT ; } +static inline bool pfn_range_is_mapped (unsigned long start_pfn, +unsigned long end_pfn) +{ +return end_pfn <= max_low_pfn_mapped || + (end_pfn > (1UL << (32 -PAGE_SHIFT )) && + end_pfn <= max_pfn_mapped); +} +extern unsigned long init_memory_mapping (unsigned long start,unsigned long end);
arch/x86/kernel/cpu/amd.c +3 -5
@@ -676,12 +676,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)* benefit in doing so. */ if (!rdmsrl_safe (MSR_K8_TSEG_ADDR , &tseg)) { +unsigned long pfn = tseg >>PAGE_SHIFT ; +printk (KERN_DEBUG "tseg: %010llx\n" , tseg); -if ((tseg>>PMD_SHIFT ) < - (max_low_pfn_mapped>>(PMD_SHIFT -PAGE_SHIFT )) || - ((tseg>>PMD_SHIFT ) < - (max_pfn_mapped>>(PMD_SHIFT -PAGE_SHIFT )) && - (tseg>>PMD_SHIFT ) >= (1ULL <<(32 -PMD_SHIFT )))) +if (pfn_range_is_mapped (pfn, pfn +1 ))set_memory_4k ((unsigned long )__va (tseg),1 ); } }
arch/x86/platform/efi/efi.c +4 -4
@@ -776,7 +776,7 @@ void __init efi_enter_virtual_mode(void)efi_memory_desc_t *md, *prev_md =NULL ;efi_status_t status;unsigned long size; -u64 end, systab, addr, npages, end_pfn; +u64 end, systab, addr, npages, start_pfn, end_pfn;void *p, *va, *new_memmap =NULL ;int count =0 ;
@@ -827,10 +827,10 @@ void __init efi_enter_virtual_mode(void) size = md->num_pages <<EFI_PAGE_SHIFT ; end = md->phys_addr + size; + start_pfn =PFN_DOWN (md->phys_addr); end_pfn =PFN_UP (end); -if (end_pfn <= max_low_pfn_mapped - || (end_pfn > (1UL << (32 -PAGE_SHIFT )) - && end_pfn <= max_pfn_mapped)) + +if (pfn_range_is_mapped (start_pfn, end_pfn)) va =__va (md->phys_addr);else va =efi_ioremap (md->phys_addr, size, md->type);
Signature · 1 line
1.7.7
PATCH 11/14 x86: Only direct map addresses that are marked as E820_RAM
In reply to Yinghai LuFrom: Jacob Shin <[email protected]>
Currently direct mappings are created for [ 0 to max_low_pfn<<PAGE_SHIFT ) and [ 4GB to max_pfn<<PAGE_SHIFT ), which may include regions that are not backed by actual DRAM. This is fine for holes under 4GB which are covered by fixed and variable range MTRRs to be UC. However, we run into trouble on higher memory addresses which cannot be covered by MTRRs.
Our system with 1TB of RAM has an e820 that looks like this:
BIOS-e820: [mem 0x0000000000000000-0x00000000000983ff] usable
BIOS-e820: [mem 0x0000000000098400-0x000000000009ffff] reserved
BIOS-e820: [mem 0x00000000000d0000-0x00000000000fffff] reserved
BIOS-e820: [mem 0x0000000000100000-0x00000000c7ebffff] usable
BIOS-e820: [mem 0x00000000c7ec0000-0x00000000c7ed7fff] ACPI data
BIOS-e820: [mem 0x00000000c7ed8000-0x00000000c7ed9fff] ACPI NVS
BIOS-e820: [mem 0x00000000c7eda000-0x00000000c7ffffff] reserved
BIOS-e820: [mem 0x00000000fec00000-0x00000000fec0ffff] reserved
BIOS-e820: [mem 0x00000000fee00000-0x00000000fee00fff] reserved
BIOS-e820: [mem 0x00000000fff00000-0x00000000ffffffff] reserved
BIOS-e820: [mem 0x0000000100000000-0x000000e037ffffff] usable
BIOS-e820: [mem 0x000000e038000000-0x000000fcffffffff] reserved
BIOS-e820: [mem 0x0000010000000000-0x0000011ffeffffff] usable
and so direct mappings are created for huge memory hole between 0x000000e038000000 to 0x0000010000000000. Even though the kernel never generates memory accesses in that region, since the page tables mark them incorrectly as being WB, our (AMD) processor ends up causing a MCE while doing some memory bookkeeping/optimizations around that area.
This patch iterates through e820 and only direct maps ranges that are marked as E820_RAM, and keeps track of those pfn ranges. Depending on the alignment of E820 ranges, this may possibly result in using smaller size (i.e. 4K instead of 2M or 1G) page tables.
-v2: move changes from setup.c to mm/init.c, also use for_each_mem_pfn_range
instead. - Yinghai Lu
-v3: add calculate_all_table_space_size() to get correct needed page table
size. - Yinghai Lu
--- arch/x86/include/asm/page_types.h | 8 +-- arch/x86/kernel/setup.c | 8 ++- arch/x86/mm/init.c | 119 +++++++++++++++++++++++++++++++++---- arch/x86/mm/init_64.c | 6 +- 4 files changed, 116 insertions(+), 25 deletions(-)
arch/x86/include/asm/page_types.h +1 -7
@@ -51,13 +51,7 @@ static inline phys_addr_t get_max_mapped(void)return (phys_addr_t )max_pfn_mapped <<PAGE_SHIFT ; } -static inline bool pfn_range_is_mapped (unsigned long start_pfn, -unsigned long end_pfn) -{ -return end_pfn <= max_low_pfn_mapped || - (end_pfn > (1UL << (32 -PAGE_SHIFT )) && - end_pfn <= max_pfn_mapped); -} +bool pfn_range_is_mapped (unsigned long start_pfn,unsigned long end_pfn);extern unsigned long init_memory_mapping (unsigned long start,unsigned long end);
arch/x86/kernel/setup.c +5 -3
@@ -115,9 +115,11 @@#include <asm/prom.h> /* -* end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. -* The direct mapping extends to max_pfn_mapped, so that we can directly access -* apertures, ACPI and other tables without having to play with fixmaps. +* max_low_pfn_mapped: highest direct mapped pfn under 4GB +* max_pfn_mapped: highest direct mapped pfn over 4GB +* +* The direct mapping only covers E820_RAM regions, so the ranges and gaps are +* represented by pfn_mapped */ unsigned long max_low_pfn_mapped;unsigned long max_pfn_mapped;
arch/x86/mm/init.c +108 -11
152 lines not on this page · raw message
arch/x86/mm/init_64.c +2 -4
@@ -657,13 +657,11 @@ int arch_add_memory(int nid, u64 start, u64 size) {struct pglist_data *pgdat =NODE_DATA (nid);struct zone *zone = pgdat->node_zones +ZONE_NORMAL ; -unsigned long last_mapped_pfn, start_pfn = start >>PAGE_SHIFT ; +unsigned long start_pfn = start >>PAGE_SHIFT ;unsigned long nr_pages = size >>PAGE_SHIFT ;int ret; - last_mapped_pfn =init_memory_mapping (start, start + size); -if (last_mapped_pfn > max_pfn_mapped) - max_pfn_mapped = last_mapped_pfn; +init_memory_mapping (start, start + size); ret =__add_pages (nid, zone, start_pfn, nr_pages);WARN_ON_ONCE (ret);
Signature · 1 line
1.7.7
PATCH 12/14 x86/mm: calculate_table_space_size based on memory ranges that are being mapped
In reply to Yinghai LuFrom: Jacob Shin <[email protected]>
Current logic finds enough space for direct mapping page tables from 0 to end. Instead, we only need to find enough space to cover mr[0].start to mr[nr_range].end -- the range that is actually being mapped by init_memory_mapping()
This patch also reportedly fixes suspend/resume issue reported in:
https://lkml.org/lkml/2012/8/11/83
-v2: update with calculate_table_space_size()
clear max_pfn_mapped before init_all_memory_mapping to get right value
-Yinghai Lu
--- arch/x86/mm/init.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 21 deletions(-)
arch/x86/mm/init.c +30 -21
@@ -191,39 +191,48 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,return nr_range; } -static unsigned long __init calculate_table_space_size (unsigned long begin, +static unsigned long __init calculate_table_space_size (unsigned long start,unsigned long end) { -unsigned long puds, pmds, ptes, tables; +unsigned long puds =0 , pmds =0 , ptes =0 , tables; +struct map_range mr[NR_RANGE_MR ]; +int nr_range, i; - puds = (end +PUD_SIZE -1 ) >>PUD_SHIFT ; - tables =roundup (puds *sizeof (pud_t),PAGE_SIZE ); +pr_info ("calculate_table_space_size: [mem %#010lx-%#010lx]\n" , + start, end -1 ); -if (page_size_mask & (1 <<PG_LEVEL_1G )) { -unsigned long extra; +memset (mr,0 ,sizeof (mr)); + nr_range =0 ; + nr_range =split_mem_range (mr, nr_range, start, end); - extra = end - ((end>>PUD_SHIFT ) <<PUD_SHIFT ); - pmds = (extra +PMD_SIZE -1 ) >>PMD_SHIFT ; - }else - pmds = (end +PMD_SIZE -1 ) >>PMD_SHIFT ; +for (i =0 ; i < nr_range; i++) { +unsigned long range, extra; - tables +=roundup (pmds *sizeof (pmd_t),PAGE_SIZE ); + range = mr[i].end - mr[i].start; + puds += (range +PUD_SIZE -1 ) >>PUD_SHIFT ; -if (page_size_mask & (1 <<PG_LEVEL_2M )) { -unsigned long extra; +if (mr[i].page_size_mask & (1 <<PG_LEVEL_1G )) { + extra = range - ((range >>PUD_SHIFT ) <<PUD_SHIFT ); + pmds += (extra +PMD_SIZE -1 ) >>PMD_SHIFT ; + }else + pmds += (range +PMD_SIZE -1 ) >>PMD_SHIFT ; - extra = end - ((end>>PMD_SHIFT ) <<PMD_SHIFT ); +if (mr[i].page_size_mask & (1 <<PG_LEVEL_2M )) { + extra = range - ((range >>PMD_SHIFT ) <<PMD_SHIFT );#ifdef CONFIG_X86_32 - extra +=PMD_SIZE ; + extra +=PMD_SIZE ;#endif -/* The first 2/4M doesn't use large pages. */ -if (begin <PMD_SIZE ) - extra += (PMD_SIZE - begin) >>PAGE_SHIFT ; +/* The first 2/4M doesn't use large pages. */ +if (mr[i].start <PMD_SIZE ) + extra +=PMD_SIZE - mr[i].start; - ptes = (extra +PAGE_SIZE -1 ) >>PAGE_SHIFT ; - }else - ptes = (end +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + ptes += (extra +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + }else + ptes += (range +PAGE_SIZE -1 ) >>PAGE_SHIFT ; + } + tables =roundup (puds *sizeof (pud_t),PAGE_SIZE ); + tables +=roundup (pmds *sizeof (pmd_t),PAGE_SIZE ); tables +=roundup (ptes *sizeof (pte_t),PAGE_SIZE );#ifdef CONFIG_X86_32
Signature · 1 line
1.7.7
PATCH 13/14 x86, mm: Use func pointer to table size calculation and mapping
In reply to Yinghai LuThey all need to go over ram range in same sequence. So add shared function to reduce duplicated code.
-v2: Change to walk_ram_ranges() according to Pekka Enberg.
--- arch/x86/mm/init.c | 64 ++++++++++++++++++--------------------------------- 1 files changed, 23 insertions(+), 41 deletions(-)
arch/x86/mm/init.c +23 -41
@@ -243,14 +243,15 @@ static unsigned long __init calculate_table_space_size(unsigned long start,return tables; } -static unsigned long __init calculate_all_table_space_size (void ) +static void __init walk_ram_ranges ( +void (*work_fn)(unsigned long ,unsigned long ,void *), +void *data) {unsigned long start_pfn, end_pfn; -unsigned long tables;int i;/* the ISA range is always mapped regardless of memory holes */ - tables =calculate_table_space_size (0 ,ISA_END_ADDRESS ); +work_fn (0 ,ISA_END_ADDRESS , data);for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) {u64 start = start_pfn <<PAGE_SHIFT ;
@@ -269,10 +270,15 @@ static unsigned long __init calculate_all_table_space_size(void)if ((end >>PAGE_SHIFT ) > max_low_pfn) end = max_low_pfn <<PAGE_SHIFT ;#endif - tables +=calculate_table_space_size (start, end); +work_fn (start, end, data); } +} -return tables; +static void __init size_work_fn (unsigned long start,unsigned long end,void *data) +{ +unsigned long *size = data; + + *size +=calculate_table_space_size (start, end); } static void __init find_early_table_space(unsigned long start,
@@ -361,45 +367,15 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,* Depending on the alignment of E820 ranges, this may possibly result in using * smaller size (i.e. 4K instead of 2M or 1G) page tables. */ -static void __init init_all_memory_mapping (void ) +static void __init mapping_work_fn (unsigned long start,unsigned long end, +void *data) { -unsigned long start_pfn, end_pfn; -int i; - -/* the ISA range is always mapped regardless of memory holes */ -init_memory_mapping (0 ,ISA_END_ADDRESS ); - -for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) { -u64 start = start_pfn <<PAGE_SHIFT ; -u64 end = end_pfn <<PAGE_SHIFT ; - -if (end <=ISA_END_ADDRESS ) -continue ; - -if (start <ISA_END_ADDRESS ) - start =ISA_END_ADDRESS ; -#ifdef CONFIG_X86_32 -/* on 32 bit, we only map up to max_low_pfn */ -if ((start >>PAGE_SHIFT ) >= max_low_pfn) -continue ; - -if ((end >>PAGE_SHIFT ) > max_low_pfn) - end = max_low_pfn <<PAGE_SHIFT ; -#endif -init_memory_mapping (start, end); - } - -#ifdef CONFIG_X86_64 -if (max_pfn > max_low_pfn) { -/* can we preseve max_low_pfn ?*/ - max_low_pfn = max_pfn; - } -#endif +init_memory_mapping (start, end); }void __init init_mem_mapping (void ) { -unsigned long tables, good_end, end; +unsigned long tables =0 , good_end, end;probe_page_size_mask ();
@@ -417,15 +393,21 @@ void __init init_mem_mapping(void) end = max_low_pfn <<PAGE_SHIFT ; good_end = max_pfn_mapped <<PAGE_SHIFT ;#endif - tables =calculate_all_table_space_size (); +walk_ram_ranges (size_work_fn, &tables);find_early_table_space (0 , good_end, tables);printk (KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx] prealloc\n" , end -1 , pgt_buf_start <<PAGE_SHIFT , (pgt_buf_top <<PAGE_SHIFT ) -1 ); max_pfn_mapped =0 ;/* will get exact value next */ -init_all_memory_mapping (); +walk_ram_ranges (mapping_work_fn,NULL ); +#ifdef CONFIG_X86_64 +if (max_pfn > max_low_pfn) { +/* can we preseve max_low_pfn ?*/ + max_low_pfn = max_pfn; + } +#endif /* * Reserve the kernel pagetable pages we used (pgt_buf_start - * pgt_buf_end) and free the other ones (pgt_buf_end - pgt_buf_top)
Signature · 1 line
1.7.7
Re: [PATCH -v3 13/14] x86, mm: Use func pointer to table size calculation and mapping
Quoted 6 lines · Yinghai Lu
They all need to go over ram range in same sequence. So add shared function to reduce duplicated code.
-v2: Change to
walk_ram_ranges()according to Pekka Enberg.Signed-off-by Yinghai Lu <[email protected]>
PATCH 14/14 x86, mm: Map ISA area with connected ram range at the same time
In reply to Yinghai Luso could reduce one loop.
--- arch/x86/mm/init.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-)
arch/x86/mm/init.c +14 -7
@@ -248,20 +248,27 @@ static void __init walk_ram_ranges( void *data) {unsigned long start_pfn, end_pfn; +bool isa_done = false;int i; -/* the ISA range is always mapped regardless of memory holes */ -work_fn (0 ,ISA_END_ADDRESS , data); -for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) {u64 start = start_pfn <<PAGE_SHIFT ;u64 end = end_pfn <<PAGE_SHIFT ; -if (end <=ISA_END_ADDRESS ) -continue ; +if (!isa_done && start >ISA_END_ADDRESS ) { +work_fn (0 ,ISA_END_ADDRESS , data); + isa_done = true; + }else { +if (end <ISA_END_ADDRESS ) +continue ; + +if (start <=ISA_END_ADDRESS && + end >=ISA_END_ADDRESS ) { + start =0 ; + isa_done = true; + } + } -if (start <ISA_END_ADDRESS ) - start =ISA_END_ADDRESS ;#ifdef CONFIG_X86_32 /* on 32 bit, we only map up to max_low_pfn */ if ((start >>PAGE_SHIFT ) >= max_low_pfn)
Signature · 1 line
1.7.7
Re: [PATCH -v3 14/14] x86, mm: Map ISA area with connected ram range at the same time
Quoted 3 lines · Yinghai Lu
so could reduce one loop.
Signed-off-by Yinghai Lu <[email protected]>
How significant is the speed gain? The "isa_done" flag makes code flow more difficult to follow.
Quoted 51 lines
--- arch/x86/mm/init.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-)arch/x86/mm/init.c +14
-8@@ -248,20 +248,27 @@ static void __init walk_ram_ranges( void *data) {unsigned long start_pfn, end_pfn; +bool isa_done = false;int i; -/* the ISA range is always mapped regardless of memory holes */ -work_fn (0 ,ISA_END_ADDRESS , data); -for_each_mem_pfn_range (i,MAX_NUMNODES , &start_pfn, &end_pfn,NULL ) {u64 start = start_pfn <<PAGE_SHIFT ;u64 end = end_pfn <<PAGE_SHIFT ; -if (end <=ISA_END_ADDRESS ) -continue ; +if (!isa_done && start >ISA_END_ADDRESS ) { +work_fn (0 ,ISA_END_ADDRESS , data); + isa_done = true; + }else { +if (end <ISA_END_ADDRESS ) +continue ; + +if (start <=ISA_END_ADDRESS && + end >=ISA_END_ADDRESS ) { + start =0 ; + isa_done = true; + } + } -if (start <ISA_END_ADDRESS ) - start =ISA_END_ADDRESS ;#ifdef CONFIG_X86_32 /* on 32 bit, we only map up to max_low_pfn */ if ((start >>PAGE_SHIFT ) >= max_low_pfn) --1.7.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH -v3 14/14] x86, mm: Map ISA area with connected ram range at the same time
Quoted 3 lines · Pekka Enberg
How significant is the speed gain? The "
isa_done" flag makes code flow more difficult to follow.
Not really much.
when booting system:
memmap=16m$128m memmap=16m$512m memmap=16m$256m memmap=16m$768m memmap=16m$1024m
with the patch
[ 0.000000] init_memory_mapping: [mem 0x00000000-0x07ffffff] [ 0.000000] [mem 0x00000000-0x07ffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x09000000-0x0fffffff] [ 0.000000] [mem 0x09000000-0x0fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x11000000-0x1fffffff] [ 0.000000] [mem 0x11000000-0x1fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x21000000-0x2fffffff] [ 0.000000] [mem 0x21000000-0x2fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x31000000-0x3fffffff] [ 0.000000] [mem 0x31000000-0x3fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x41000000-0x7fffdfff] [ 0.000000] [mem 0x41000000-0x7fdfffff] page 2M [ 0.000000] [mem 0x7fe00000-0x7fffdfff] page 4k
otherwise will have
[ 0.000000] init_memory_mapping: [mem 0x00000000-0x000fffff] [ 0.000000] [mem 0x00000000-0x000fffff] page 4k [ 0.000000] init_memory_mapping: [mem 0x00100000-0x07ffffff] [ 0.000000] [mem 0x00100000-0x001fffff] page 4k [ 0.000000] [mem 0x00200000-0x07ffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x09000000-0x0fffffff] [ 0.000000] [mem 0x09000000-0x0fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x11000000-0x1fffffff] [ 0.000000] [mem 0x11000000-0x1fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x21000000-0x2fffffff] [ 0.000000] [mem 0x21000000-0x2fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x31000000-0x3fffffff] [ 0.000000] [mem 0x31000000-0x3fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x41000000-0x7fffdfff] [ 0.000000] [mem 0x41000000-0x7fdfffff] page 2M [ 0.000000] [mem 0x7fe00000-0x7fffdfff] page 4k
Re: [PATCH -v3 14/14] x86, mm: Map ISA area with connected ram range at the same time
Quoted 2 lines · Pekka Enberg
Quoted 2 lines
How significant is the speed gain? The "
isa_done" flag makes code flow more difficult to follow.
Quoted 22 lines · Yinghai Lu
Not really much.
when booting system:
memmap=16m$128m memmap=16m$512m memmap=16m$256m memmap=16m$768m memmap=16m$1024mwith the patch
[ 0.000000] init_memory_mapping: [mem 0x00000000-0x07ffffff] [ 0.000000] [mem 0x00000000-0x07ffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x09000000-0x0fffffff] [ 0.000000] [mem 0x09000000-0x0fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x11000000-0x1fffffff] [ 0.000000] [mem 0x11000000-0x1fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x21000000-0x2fffffff] [ 0.000000] [mem 0x21000000-0x2fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x31000000-0x3fffffff] [ 0.000000] [mem 0x31000000-0x3fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x41000000-0x7fffdfff] [ 0.000000] [mem 0x41000000-0x7fdfffff] page 2M [ 0.000000] [mem 0x7fe00000-0x7fffdfff] page 4kotherwise will have
Quoted 16 lines
[ 0.000000] init_memory_mapping: [mem 0x00000000-0x000fffff] [ 0.000000] [mem 0x00000000-0x000fffff] page 4k [ 0.000000] init_memory_mapping: [mem 0x00100000-0x07ffffff] [ 0.000000] [mem 0x00100000-0x001fffff] page 4k [ 0.000000] [mem 0x00200000-0x07ffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x09000000-0x0fffffff] [ 0.000000] [mem 0x09000000-0x0fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x11000000-0x1fffffff] [ 0.000000] [mem 0x11000000-0x1fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x21000000-0x2fffffff] [ 0.000000] [mem 0x21000000-0x2fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x31000000-0x3fffffff] [ 0.000000] [mem 0x31000000-0x3fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x41000000-0x7fffdfff] [ 0.000000] [mem 0x41000000-0x7fdfffff] page 2M [ 0.000000] [mem 0x7fe00000-0x7fffdfff] page 4k
OK. Is there any other reason than performance to do this?
Pekka
Re: [PATCH -v3 14/14] x86, mm: Map ISA area with connected ram range at the same time
Quoted 44 lines · Pekka Enberg
Quoted 2 lines · Pekka Enberg
Quoted 2 lines
How significant is the speed gain? The "
isa_done" flag makes code flow more difficult to follow.Quoted 22 lines · Yinghai Lu
Not really much.
when booting system:
memmap=16m$128m memmap=16m$512m memmap=16m$256m memmap=16m$768m memmap=16m$1024mwith the patch
[ 0.000000] init_memory_mapping: [mem 0x00000000-0x07ffffff] [ 0.000000] [mem 0x00000000-0x07ffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x09000000-0x0fffffff] [ 0.000000] [mem 0x09000000-0x0fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x11000000-0x1fffffff] [ 0.000000] [mem 0x11000000-0x1fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x21000000-0x2fffffff] [ 0.000000] [mem 0x21000000-0x2fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x31000000-0x3fffffff] [ 0.000000] [mem 0x31000000-0x3fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x41000000-0x7fffdfff] [ 0.000000] [mem 0x41000000-0x7fdfffff] page 2M [ 0.000000] [mem 0x7fe00000-0x7fffdfff] page 4kotherwise will have
Quoted 16 lines
[ 0.000000] init_memory_mapping: [mem 0x00000000-0x000fffff] [ 0.000000] [mem 0x00000000-0x000fffff] page 4k [ 0.000000] init_memory_mapping: [mem 0x00100000-0x07ffffff] [ 0.000000] [mem 0x00100000-0x001fffff] page 4k [ 0.000000] [mem 0x00200000-0x07ffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x09000000-0x0fffffff] [ 0.000000] [mem 0x09000000-0x0fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x11000000-0x1fffffff] [ 0.000000] [mem 0x11000000-0x1fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x21000000-0x2fffffff] [ 0.000000] [mem 0x21000000-0x2fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x31000000-0x3fffffff] [ 0.000000] [mem 0x31000000-0x3fffffff] page 2M [ 0.000000] init_memory_mapping: [mem 0x41000000-0x7fffdfff] [ 0.000000] [mem 0x41000000-0x7fdfffff] page 2M [ 0.000000] [mem 0x7fe00000-0x7fffdfff] page 4k
Quoted 1 line
OK. Is there any other reason than performance to do this?
May be minor, but ..
The first range [mem 0x00000000-0x07ffffff] is covered entirely by 2M page tables, instead of some 4K + some 2M.
-Jacob
Quoted 3 lines
Pekka
Quoted 33 lines · Yinghai Lu
Only create mapping for
E820_820andE820_RESERVED_KERN.Seperate
calculate_table_space_sizeandfind_early_page_tableout withinit_memory_mapping.For all ranges, will allocate page table one time, but init mapping only for E820 RAM and
E820_RESERVED_KERN.Could be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.gitfor-x86-mmThanks
YinghaiJacob Shin (4):
x86: if kernel .text .data .bss are not marked asE820_RAM, complain and fix
x86: Fixup code testing if a pfn is direct mapped
x86: Only direct map addresses that are marked asE820_RAM
x86/mm:calculate_table_space_sizebased on memory ranges that are being mappedYinghai Lu (10):
x86, mm: Add globalpage_size_mask
x86, mm: Split outsplit_mem_range
x86, mm: Movinginit_memory_mappingcalling
x86, mm: Revert backgood_endsetting for 64bit
x86, mm: Find early page table only one time
x86, mm: Separate outcalculate_table_space_size()x86, mm: Move down twocalculate_table_space_sizedown. x86, mm: set memblock initial limit to 1M
x86, mm: Use func pointer to table size calculation and mapping x86, mm: Map ISA area with connected ram range at the same time
Quoted 14 lines
arch/x86/include/asm/init.h | 1 - arch/x86/include/asm/page_types.h | 2 + arch/x86/include/asm/pgtable.h | 1 + arch/x86/kernel/cpu/amd.c | 8 +- arch/x86/kernel/setup.c | 36 +++-- arch/x86/mm/init.c | 357 +++++++++++++++++++++++++------------ arch/x86/mm/init_64.c | 6 +- arch/x86/platform/efi/efi.c | 8 +- 8 files changed, 280 insertions(+), 139 deletions(-)Signature · 1 line
1.7.7
Tested -v3 on our (AMD) machines and everything looks good.
Thanks,
-Jacob
Quoted 44 lines · Jacob Shin
Quoted 43 lines · Yinghai Lu
Only create mapping for
E820_820andE820_RESERVED_KERN.Seperate
calculate_table_space_sizeandfind_early_page_tableout withinit_memory_mapping.For all ranges, will allocate page table one time, but init mapping only for E820 RAM and
E820_RESERVED_KERN.Could be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.gitfor-x86-mmThanks
YinghaiJacob Shin (4):
x86: if kernel .text .data .bss are not marked asE820_RAM, complain and fix
x86: Fixup code testing if a pfn is direct mapped
x86: Only direct map addresses that are marked asE820_RAM
x86/mm:calculate_table_space_sizebased on memory ranges that are being mappedYinghai Lu (10):
x86, mm: Add globalpage_size_mask
x86, mm: Split outsplit_mem_range
x86, mm: Movinginit_memory_mappingcalling
x86, mm: Revert backgood_endsetting for 64bit
x86, mm: Find early page table only one time
x86, mm: Separate outcalculate_table_space_size()x86, mm: Move down twocalculate_table_space_sizedown. x86, mm: set memblock initial limit to 1M
x86, mm: Use func pointer to table size calculation and mapping x86, mm: Map ISA area with connected ram range at the same timearch/x86/include/asm/init.h | 1 - arch/x86/include/asm/page_types.h | 2 + arch/x86/include/asm/pgtable.h | 1 + arch/x86/kernel/cpu/amd.c | 8 +- arch/x86/kernel/setup.c | 36 +++-- arch/x86/mm/init.c | 357 +++++++++++++++++++++++++------------ arch/x86/mm/init_64.c | 6 +- arch/x86/platform/efi/efi.c | 8 +- 8 files changed, 280 insertions(+), 139 deletions(-)
Quoted 6 lines
Quoted 4 lines
Signature · 1 line
1.7.7Tested -v3 on our (AMD) machines and everything looks good.
Hi, hpa, wondering if this version finally looks okay to you for 3.7 ?
Thanks,
-Jacob
Quoted 45 lines · Jacob Shin
Quoted 44 lines · Jacob Shin
Quoted 43 lines · Yinghai Lu
Only create mapping for
E820_820andE820_RESERVED_KERN.Seperate
calculate_table_space_sizeandfind_early_page_tableout withinit_memory_mapping.For all ranges, will allocate page table one time, but init mapping only for E820 RAM and
E820_RESERVED_KERN.Could be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.gitfor-x86-mmThanks
YinghaiJacob Shin (4):
x86: if kernel .text .data .bss are not marked asE820_RAM, complain and fix
x86: Fixup code testing if a pfn is direct mapped
x86: Only direct map addresses that are marked asE820_RAM
x86/mm:calculate_table_space_sizebased on memory ranges that are being mappedYinghai Lu (10):
x86, mm: Add globalpage_size_mask
x86, mm: Split outsplit_mem_range
x86, mm: Movinginit_memory_mappingcalling
x86, mm: Revert backgood_endsetting for 64bit
x86, mm: Find early page table only one time
x86, mm: Separate outcalculate_table_space_size()x86, mm: Move down twocalculate_table_space_sizedown. x86, mm: set memblock initial limit to 1M
x86, mm: Use func pointer to table size calculation and mapping x86, mm: Map ISA area with connected ram range at the same timearch/x86/include/asm/init.h | 1 - arch/x86/include/asm/page_types.h | 2 + arch/x86/include/asm/pgtable.h | 1 + arch/x86/kernel/cpu/amd.c | 8 +- arch/x86/kernel/setup.c | 36 +++-- arch/x86/mm/init.c | 357 +++++++++++++++++++++++++------------ arch/x86/mm/init_64.c | 6 +- arch/x86/platform/efi/efi.c | 8 +- 8 files changed, 280 insertions(+), 139 deletions(-)
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
--
1.7.7Tested -v3 on our (AMD) machines and everything looks good.
Hi, hpa, wondering if this version finally looks okay to you for 3.7 ?
Can you please put patch 1-13 into tip?
Thanks
Yinghai