Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 15:11:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86-64, NUMA: Revert NUMA affine page table allocation

Browse Source 
This patch reverts NUMA affine page table allocation added by commit
1411e0ec31 (x86-64, numa: Put pgtable to local node memory).

The commit made an undocumented change where the kernel linear mapping
strictly follows intersection of e820 memory map and NUMA
configuration.  If the physical memory configuration has holes or NUMA
nodes are not properly aligned, this leads to using unnecessarily
smaller mapping size which leads to increased TLB pressure.  For
details,

  http://thread.gmane.org/gmane.linux.kernel/1104672

Patches to fix the problem have been proposed but the underlying code
needs more cleanup and the approach itself seems a bit heavy handed
and it has been determined to revert the feature for now and come back
to it in the next developement cycle.

  http://thread.gmane.org/gmane.linux.kernel/1105959

As init_memory_mapping_high() callsites have been consolidated since
the commit, reverting is done manually.  Also, the RED-PEN comment in
arch/x86/mm/init.c is not restored as the problem no longer exists
with memblock based top-down early memory allocation.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Tejun Heo 2011-03-04 10:26:36 +01:00
parent eb8c1e2c83
commit f891125028
4 changed files with 8 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +54,6 @@ static inline phys_addr_t get_max_mapped(void)
extern unsigned long init_memory_mapping(unsigned long start,
unsigned long end);
void init_memory_mapping_high(void);
extern void initmem_init(void);
extern void free_initmem(void);

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

@ -963,6 +963,14 @@ void __init setup_arch(char **cmdline_p)
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
memblock.current_limit = get_max_mapped();
/*

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

@ -606,63 +606,9 @@ kernel_physical_mapping_init(unsigned long start,
void __init initmem_init(void)
{
memblock_x86_register_active_regions(0, 0, max_pfn);
init_memory_mapping_high();
}
#endif
struct mapping_work_data {
unsigned long start;
unsigned long end;
unsigned long pfn_mapped;
};
static int __init_refok
mapping_work_fn(unsigned long start_pfn, unsigned long end_pfn, void *datax)
{
struct mapping_work_data *data = datax;
unsigned long pfn_mapped;
unsigned long final_start, final_end;
final_start = max_t(unsigned long, start_pfn<<PAGE_SHIFT, data->start);
final_end = min_t(unsigned long, end_pfn<<PAGE_SHIFT, data->end);
if (final_end <= final_start)
return 0;
pfn_mapped = init_memory_mapping(final_start, final_end);
if (pfn_mapped > data->pfn_mapped)
data->pfn_mapped = pfn_mapped;
return 0;
}
static unsigned long __init_refok
init_memory_mapping_active_regions(unsigned long start, unsigned long end)
{
struct mapping_work_data data;
data.start = start;
data.end = end;
data.pfn_mapped = 0;
work_with_active_regions(MAX_NUMNODES, mapping_work_fn, &data);
return data.pfn_mapped;
}
void __init_refok init_memory_mapping_high(void)
{
if (max_pfn > max_low_pfn) {
max_pfn_mapped = init_memory_mapping_active_regions(1UL<<32,
max_pfn<<PAGE_SHIFT);
/* can we preserve max_low_pfn ? */
max_low_pfn = max_pfn;
memblock.current_limit = get_max_mapped();
}
}
void __init paging_init(void)
{
unsigned long max_zone_pfns[MAX_NR_ZONES];

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

@ -543,8 +543,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
if (!numa_meminfo_cover_memory(mi))
return -EINVAL;
init_memory_mapping_high();
/* Finally register nodes. */
for_each_node_mask(nid, node_possible_map) {
u64 start = (u64)max_pfn << PAGE_SHIFT;