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

x86-64: use vmemmap_populate_basepages() for !pse setups

Browse Source 
We already have generic code to allocate vmemmap with regular pages, use
it.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Bernhard Schmidt <Bernhard.Schmidt@lrz.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: David Miller <davem@davemloft.net>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Weiner 2013-04-29 15:07:54 -07:00 committed by Linus Torvalds
parent 6c7a2ca4c1
commit e8216da5c7
1 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1281,7 +1281,8 @@ static long __meminitdata addr_start, addr_end;
static void __meminitdata *p_start, *p_end; static void __meminitdata *p_start, *p_end;
static int __meminitdata node_start; static int __meminitdata node_start;
int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) static int __meminit vmemmap_populate_hugepages(unsigned long start,
unsigned long end, int node)
{ {
unsigned long addr; unsigned long addr;
unsigned long next; unsigned long next;
@ -1290,7 +1291,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
pmd_t *pmd; pmd_t *pmd;
for (addr = start; addr < end; addr = next) { for (addr = start; addr < end; addr = next) {
void *p = NULL; next = pmd_addr_end(addr, end);
pgd = vmemmap_pgd_populate(addr, node); pgd = vmemmap_pgd_populate(addr, node);
if (!pgd) if (!pgd)
@ -1300,53 +1301,50 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
if (!pud) if (!pud)
return -ENOMEM; return -ENOMEM;
if (!cpu_has_pse) { pmd = pmd_offset(pud, addr);
next = (addr + PAGE_SIZE) & PAGE_MASK; if (pmd_none(*pmd)) {
pmd = vmemmap_pmd_populate(pud, addr, node); pte_t entry;
void *p;
if (!pmd)
return -ENOMEM;
p = vmemmap_pte_populate(pmd, addr, node);
p = vmemmap_alloc_block_buf(PMD_SIZE, node);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
} else {
next = pmd_addr_end(addr, end);
pmd = pmd_offset(pud, addr); entry = pfn_pte(__pa(p) >> PAGE_SHIFT,
if (pmd_none(*pmd)) { PAGE_KERNEL_LARGE);
pte_t entry; set_pmd(pmd, __pmd(pte_val(entry)));
p = vmemmap_alloc_block_buf(PMD_SIZE, node); /* check to see if we have contiguous blocks */
if (!p) if (p_end != p || node_start != node) {
return -ENOMEM; if (p_start)
printk(KERN_DEBUG " [%lx-%lx] PMD -> [%p-%p] on node %d\n",
entry = pfn_pte(__pa(p) >> PAGE_SHIFT, addr_start, addr_end-1, p_start, p_end-1, node_start);
PAGE_KERNEL_LARGE); addr_start = addr;
set_pmd(pmd, __pmd(pte_val(entry))); node_start = node;
p_start = p;
/* check to see if we have contiguous blocks */ }
if (p_end != p || node_start != node) {
if (p_start)
printk(KERN_DEBUG " [%lx-%lx] PMD -> [%p-%p] on node %d\n",
addr_start, addr_end-1, p_start, p_end-1, node_start);
addr_start = addr;
node_start = node;
p_start = p;
}
addr_end = addr + PMD_SIZE;
p_end = p + PMD_SIZE;
} else
vmemmap_verify((pte_t *)pmd, node, addr, next);
}
addr_end = addr + PMD_SIZE;
p_end = p + PMD_SIZE;
} else
vmemmap_verify((pte_t *)pmd, node, addr, next);
} }
sync_global_pgds(start, end - 1);
return 0; return 0;
} }
int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
{
int err;
if (cpu_has_pse)
err = vmemmap_populate_hugepages(start, end, node);
else
err = vmemmap_populate_basepages(start, end, node);
if (!err)
sync_global_pgds(start, end - 1);
return err;
}
#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE) #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE)
void register_page_bootmem_memmap(unsigned long section_nr, void register_page_bootmem_memmap(unsigned long section_nr,
struct page *start_page, unsigned long size) struct page *start_page, unsigned long size)