{PATCH] x86: print out initial max_pfn_mapped
Impact: more debug info
check range that is mapped before init_memory_mapping(). also make 64bit have max_pfn_mapped assigned before that calling
--- arch/x86/kernel/setup.c | 3 +++ arch/x86/mm/init.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/kernel/setup.c +3 -0
@@ -836,12 +836,15 @@ void __init setup_arch(char **cmdline_p) max_low_pfn = max_pfn; high_memory = (void *)__va (max_pfn *PAGE_SIZE -1 ) +1 ; + max_pfn_mapped =KERNEL_IMAGE_SIZE >>PAGE_SHIFT ;#endif #ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION setup_bios_corruption_check ();#endif +printk (KERN_DEBUG "initial memory mapped %lx\n" , max_pfn_mapped<<PAGE_SHIFT ); +/* 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;
arch/x86/mm/init.c +3 -4
@@ -65,12 +65,11 @@ static void __init find_early_table_spac*/ #ifdef CONFIG_X86_32 start =0x7000 ; - e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , - tables,PAGE_SIZE ); -#else /* CONFIG_X86_64 */ +#else start =0x8000 ; - e820_table_start =find_e820_area (start, end, tables,PAGE_SIZE );#endif + e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , + tables,PAGE_SIZE );if (e820_table_start ==-1UL )panic ("Cannot find space for the kernel page tables" );
H. Peter Anvin
reviewerQuoted 15 lines · Yinghai Lu
Impact: more debug info
check range that is mapped before
init_memory_mapping(). also make 64bit havemax_pfn_mappedassigned before that callingIndex:
linux-2.6/arch/x86/mm/init.c
===================================================================arch/x86/mm/init.c +0
-2@@ -65,12 +65,11 @@ static void __init find_early_table_spac*/ #ifdef CONFIG_X86_32 start =0x7000 ; - e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , - tables,PAGE_SIZE );
arch/x86/mm/init.c static void __init find_early_table_spac · line 75
Quoted 10 lines
arch/x86/mm/init.c +3
-2-#else /* CONFIG_X86_64 */ +#else start =0x8000 ; - e820_table_start =find_e820_area (start, end, tables,PAGE_SIZE );#endif + e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , + tables,PAGE_SIZE );if (e820_table_start ==-1UL )panic ("Cannot find space for the kernel page tables" );
This doesn't seem to match anything anywhere in the description. Furthermore, why do we even have a different starting address for different architectures? If anything, this starting address is way too low (hogging ZONE_DMA and all that...)
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.
Quoted 23 lines · H. Peter Anvin
Quoted 22 lines · Yinghai Lu
Impact: more debug info
check range that is mapped before
init_memory_mapping(). also make 64bit havemax_pfn_mappedassigned before that callingIndex:
linux-2.6/arch/x86/mm/init.c
===================================================================arch/x86/mm/init.c +3
-4@@ -65,12 +65,11 @@ static void __init find_early_table_spac*/ #ifdef CONFIG_X86_32 start =0x7000 ; - e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , - tables,PAGE_SIZE ); -#else /* CONFIG_X86_64 */ +#else start =0x8000 ; - e820_table_start =find_e820_area (start, end, tables,PAGE_SIZE );#endif + e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , + tables,PAGE_SIZE );
Quoted 12 lines
arch/x86/mm/init.c static void __init find_early_table_spac · line 75
Quoted 3 lines
arch/x86/mm/init.c +0
-0if (e820_table_start ==-1UL )panic ("Cannot find space for the kernel page tables" );This doesn't seem to match anything anywhere in the description. Furthermore, why do we even have a different starting address for different architectures? If anything, this starting address is way too low (hogging
ZONE_DMAand all that...)Quoted 1 line
also make 64bit have
max_pfn_mappedassigned before that calling
so find_e820_area() could use max_pfn_mapped for 64 bit too.
for 64bit, you could use start from 16M for searching free range for left page table. right now for 32bit, you may need to increase initial max_pfn_mapped to 32M (?) so could start searching from 16M. need some code for head_32.S
anyway that will be another patch.
YH
[tip:x86/mm] x86: clean up and and print out initial max_pfn_mapped
In reply to Yinghai LuCommit-ID: 80989ce0643c1034822f3e339ed8d790b649abe1 Gitweb: http://git.kernel.org/tip/80989ce0643c1034822f3e339ed8d790b649abe1 Author: Yinghai Lu <[email protected]> AuthorDate: Sat, 9 May 2009 23:47:42 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 11 May 2009 11:11:12 +0200
x86: clean up and and print out initial max_pfn_mapped
Do this so we can check the range that is mapped before init_memory_mapping().
To be able to print out meaningful info, we first have to fix 64-bit to have max_pfn_mapped assigned before that call. This also unifies the code-path a bit.
[ Impact: print more debug info, cleanup ]
LKML-Reference: <[email protected]>
--- arch/x86/kernel/setup.c | 4 ++++ arch/x86/mm/init.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-)
arch/x86/kernel/setup.c +4 -0
@@ -862,12 +862,16 @@ void __init setup_arch(char **cmdline_p) max_low_pfn = max_pfn; high_memory = (void *)__va (max_pfn *PAGE_SIZE -1 ) +1 ; + max_pfn_mapped =KERNEL_IMAGE_SIZE >>PAGE_SHIFT ;#endif #ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION setup_bios_corruption_check ();#endif +printk (KERN_DEBUG "initial memory mapped : 0 - %08lx\n" , + max_pfn_mapped<<PAGE_SHIFT ); +reserve_brk ();/* max_pfn_mapped is updated here */
arch/x86/mm/init.c +3 -4
@@ -132,12 +132,11 @@ static void __init find_early_table_space(unsigned long end, int use_pse,*/ #ifdef CONFIG_X86_32 start =0x7000 ; - e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , - tables,PAGE_SIZE ); -#else /* CONFIG_X86_64 */ +#else start =0x8000 ; - e820_table_start =find_e820_area (start, end, tables,PAGE_SIZE );#endif + e820_table_start =find_e820_area (start, max_pfn_mapped<<PAGE_SHIFT , + tables,PAGE_SIZE );if (e820_table_start ==-1UL )panic ("Cannot find space for the kernel page tables" );