X86: make sparse mem work in non-NUMA mode
PATCH 1/1 X86: make sparse mem work in non-NUMA mode
With sparse, memory holes should not be marked present for memmap. This patch makes sparse really works on non-NUMA mode.
arch/x86/mm/init_32.c +2 -2
@@ -761,15 +761,15 @@ void __init initmem_init(unsigned long start_pfn, highstart_pfn = highend_pfn = max_pfn;if (max_pfn > max_low_pfn) highstart_pfn = max_low_pfn; -memory_present (0 ,0 , highend_pfn);e820_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 -memory_present (0 ,0 , max_low_pfn);e820_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 ;#endif
arch/x86/mm/init_64.c +1 -1
@@ -638,7 +638,7 @@ void __init paging_init(void) max_zone_pfns[ZONE_DMA32 ] =MAX_DMA32_PFN ; max_zone_pfns[ZONE_NORMAL ] = max_pfn; -memory_present (0 ,0 , max_pfn); +sparse_memory_present_with_active_regions (0 );sparse_init ();free_area_init_nodes (max_zone_pfns); }
Quoted 5 lines · Shaohua Li
With sparse, memory holes should not be marked present for memmap. This patch makes sparse really works on non-NUMA mode.
Signed-off-by Shaohua Li <[email protected]>Signed-off-by Sheng Yang <[email protected]>
It does not apply cleanly to the latest x86 tree:
patching file arch/x86/mm/init_32.c
Hunk #1 succeeded at 718 (offset -43 lines).
patching file arch/x86/mm/init_64.c
Hunk #1 FAILED at 638.
1 out of 1 hunk FAILED -- rejects in file arch/x86/mm/init_64.c
Could you please send a patch against:
http://people.redhat.com/mingo/tip.git/README
Thanks,
Ingo
Quoted 8 lines · Ingo Molnar
Quoted 5 lines · Shaohua Li
With sparse, memory holes should not be marked present for memmap. This patch makes sparse really works on non-NUMA mode.
Signed-off-by Shaohua Li <[email protected]>Signed-off-by Sheng Yang <[email protected]>
Quoted 7 lines
It does not apply cleanly to the latest x86 tree:
patching file
arch/x86/mm/init_32.c
Hunk #1 succeeded at 718 (offset -43 lines).
patching filearch/x86/mm/init_64.c
Hunk #1 FAILED at 638.
1 out of 1 hunk FAILED -- rejects in filearch/x86/mm/init_64.c
Looks the x64 code already has the fix.
With sparse, memory holes should not be marked present for memmap. This patch makes sparse really works on SMP mode.
arch/x86/mm/init_32.c +2 -2
@@ -718,15 +718,15 @@ void __init initmem_init(unsigned long start_pfn, highstart_pfn = highend_pfn = max_pfn;if (max_pfn > max_low_pfn) highstart_pfn = max_low_pfn; -memory_present (0 ,0 , highend_pfn);e820_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 -memory_present (0 ,0 , max_low_pfn);e820_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 ;#endif
[tip:x86/mm] x86: make sparse mem work in non-NUMA mode
Commit-ID: ed077b58f6146684069975122b1728a9d248a501 Gitweb: http://git.kernel.org/tip/ed077b58f6146684069975122b1728a9d248a501 Author: Shaohua Li <[email protected]> AuthorDate: Tue, 12 May 2009 16:40:00 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 12 May 2009 11:26:35 +0200
x86: make sparse mem work in non-NUMA mode
With sparse memory, holes should not be marked present for memmap. This patch makes sure sparsemem really works on SMP mode (!NUMA).
[ Impact: use less memory to map fragmented RAM, avoid boot-OOM/crash ]
LKML-Reference: <[email protected]>
--- arch/x86/mm/init_32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init_32.c +2 -2
@@ -706,15 +706,15 @@ void __init initmem_init(unsigned long start_pfn, highstart_pfn = highend_pfn = max_pfn;if (max_pfn > max_low_pfn) highstart_pfn = max_low_pfn; -memory_present (0 ,0 , highend_pfn);e820_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 -memory_present (0 ,0 , max_low_pfn);e820_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 ;#endif