Memory hotplug can happen on a machine under load, memory shortness
and fragmentation, so huge page allocations for the vmemmap are not
guaranteed to succeed.
Try to fall back to regular pages before failing the hotplug event
completely.
Signed-off-by: Johannes Weiner <han...@cmpxchg.org>
---
arch/x86/mm/init_64.c | 51 ++++++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 134c85d..e2e7afb 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1286,11 +1286,14 @@ static int __meminit
vmemmap_populate_hugepages(unsigned long start,
unsigned long end, int node)
{
unsigned long addr;
+ unsigned long next;
pgd_t *pgd;
pud_t *pud;
pmd_t *pmd;
- for (addr = start; addr < end; addr += PMD_SIZE) {
+ for (addr = start; addr < end; addr = next) {
+ next = pmd_addr_end(addr, end);
+
pgd = vmemmap_pgd_populate(addr, node);
if (!pgd)
return -ENOMEM;
@@ -1301,31 +1304,37 @@ static int __meminit
vmemmap_populate_hugepages(unsigned long start,
pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd)) {
- pte_t entry;
void *p;
p = vmemmap_alloc_block_buf(PMD_SIZE, node);
- if (!p)
- return -ENOMEM;
-
- entry = pfn_pte(__pa(p) >> PAGE_SHIFT,
- PAGE_KERNEL_LARGE);
- set_pmd(pmd, __pmd(pte_val(entry)));
-
- /* 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;
- }
+ if (p) {
+ pte_t entry;
+
+ entry = pfn_pte(__pa(p) >> PAGE_SHIFT,
+ PAGE_KERNEL_LARGE);
+ set_pmd(pmd, __pmd(pte_val(entry)));
+
+ /* 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
+ addr_end = addr + PMD_SIZE;
+ p_end = p + PMD_SIZE;
+ continue;
+ }
+ } else if (pmd_large(*pmd)) {
vmemmap_verify((pte_t *)pmd, node, addr, next);
+ continue;
+ }
+ pr_warn_once("vmemmap: falling back to regular page backing\n");
+ if (vmemmap_populate_basepages(addr, next, node))
+ return -ENOMEM;
}
return 0;
}
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
