leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, NUMA: Drop @start/last_pfn from initmem_init()

Browse Source 
initmem_init() extensively accesses and modifies global data
structures and the parameters aren't even followed depending on which
path is being used.  Drop @start/last_pfn and let it deal with
@max_pfn directly.  This is in preparation for further NUMA init
cleanups.

- v2: x86-32 initmem_init() weren't updated breaking 32bit builds.
  Fixed.  Found by Yinghai.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Tejun Heo 2011-02-16 12:13:06 +01:00
parent 13081df5dd
commit 86ef4dbf1f
6 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/page_types.h
View File

@ -56,8 +56,7 @@ extern unsigned long init_memory_mapping(unsigned long start,
void init_memory_mapping_high(void); void init_memory_mapping_high(void);
extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn, extern void initmem_init(int acpi, int k8);
int acpi, int k8);
extern void free_initmem(void); extern void free_initmem(void);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */

2
arch/x86/kernel/setup.c
View File

@ -1003,7 +1003,7 @@ void __init setup_arch(char **cmdline_p)
amd = !amd_numa_init(0, max_pfn); amd = !amd_numa_init(0, max_pfn);
#endif #endif
initmem_init(0, max_pfn, acpi, amd); initmem_init(acpi, amd);
memblock_find_dma_reserve(); memblock_find_dma_reserve();
dma32_reserve_bootmem(); dma32_reserve_bootmem();

3
arch/x86/mm/init_32.c
View File

@ -644,8 +644,7 @@ void __init find_low_pfn_range(void)
} }
#ifndef CONFIG_NEED_MULTIPLE_NODES #ifndef CONFIG_NEED_MULTIPLE_NODES
void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, void __init initmem_init(int acpi, int k8)
int acpi, int k8)
{ {
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
highstart_pfn = highend_pfn = max_pfn; highstart_pfn = highend_pfn = max_pfn;

5
arch/x86/mm/init_64.c
View File

@ -603,10 +603,9 @@ kernel_physical_mapping_init(unsigned long start,
} }
#ifndef CONFIG_NUMA #ifndef CONFIG_NUMA
void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, void __init initmem_init(int acpi, int k8)
int acpi, int k8)
{ {
memblock_x86_register_active_regions(0, start_pfn, end_pfn); memblock_x86_register_active_regions(0, 0, max_pfn);
init_memory_mapping_high(); init_memory_mapping_high();
} }
#endif #endif

3
arch/x86/mm/numa_32.c
View File

@ -352,8 +352,7 @@ static void init_remap_allocator(int nid)
(ulong) node_remap_end_vaddr[nid]); (ulong) node_remap_end_vaddr[nid]);
} }
void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn, void __init initmem_init(int acpi, int k8)
int acpi, int k8)
{ {
int nid; int nid;
long kva_target_pfn; long kva_target_pfn;

21
arch/x86/mm/numa_64.c
View File

@ -579,8 +579,7 @@ static int __init numa_emulation(unsigned long start_pfn,
} }
#endif /* CONFIG_NUMA_EMU */ #endif /* CONFIG_NUMA_EMU */
void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn, void __init initmem_init(int acpi, int amd)
int acpi, int amd)
{ {
int i; int i;
@ -588,19 +587,16 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
nodes_clear(node_online_map); nodes_clear(node_online_map);
#ifdef CONFIG_NUMA_EMU #ifdef CONFIG_NUMA_EMU
setup_physnodes(start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT, setup_physnodes(0, max_pfn << PAGE_SHIFT, acpi, amd);
acpi, amd); if (cmdline && !numa_emulation(0, max_pfn, acpi, amd))
if (cmdline && !numa_emulation(start_pfn, last_pfn, acpi, amd))
return; return;
setup_physnodes(start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT, setup_physnodes(0, max_pfn << PAGE_SHIFT, acpi, amd);
acpi, amd);
nodes_clear(node_possible_map); nodes_clear(node_possible_map);
nodes_clear(node_online_map); nodes_clear(node_online_map);
#endif #endif
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
if (!numa_off && acpi && !acpi_scan_nodes(start_pfn << PAGE_SHIFT, if (!numa_off && acpi && !acpi_scan_nodes(0, max_pfn << PAGE_SHIFT))
last_pfn << PAGE_SHIFT))
return; return;
nodes_clear(node_possible_map); nodes_clear(node_possible_map);
nodes_clear(node_online_map); nodes_clear(node_online_map);
@ -616,8 +612,7 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
numa_off ? "NUMA turned off" : "No NUMA configuration found"); numa_off ? "NUMA turned off" : "No NUMA configuration found");
printk(KERN_INFO "Faking a node at %016lx-%016lx\n", printk(KERN_INFO "Faking a node at %016lx-%016lx\n",
start_pfn << PAGE_SHIFT, 0LU, max_pfn << PAGE_SHIFT);
last_pfn << PAGE_SHIFT);
/* setup dummy node covering all memory */ /* setup dummy node covering all memory */
memnode_shift = 63; memnode_shift = 63;
memnodemap = memnode.embedded_map; memnodemap = memnode.embedded_map;
@ -626,9 +621,9 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
node_set(0, node_possible_map); node_set(0, node_possible_map);
for (i = 0; i < MAX_LOCAL_APIC; i++) for (i = 0; i < MAX_LOCAL_APIC; i++)
set_apicid_to_node(i, NUMA_NO_NODE); set_apicid_to_node(i, NUMA_NO_NODE);
memblock_x86_register_active_regions(0, start_pfn, last_pfn); memblock_x86_register_active_regions(0, 0, max_pfn);
init_memory_mapping_high(); init_memory_mapping_high();
setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT); setup_node_bootmem(0, 0, max_pfn << PAGE_SHIFT);
numa_init_array(); numa_init_array();
} }