mm: bootmem: allocate in order node+goal, goal, node, anywhere
Match the nobootmem version of __alloc_bootmem_node. Try to satisfy both the node and the goal, then just the goal, then just the node, then allocate anywhere before panicking. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: David S. Miller <davem@davemloft.net> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Gavin Shan <shangw@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>hifive-unleashed-5.1
parent
c12ab504aa
commit
ab38184322
14
mm/bootmem.c
14
mm/bootmem.c
|
@ -704,6 +704,7 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,
|
||||||
{
|
{
|
||||||
void *ptr;
|
void *ptr;
|
||||||
|
|
||||||
|
again:
|
||||||
ptr = alloc_arch_preferred_bootmem(bdata, size, align, goal, limit);
|
ptr = alloc_arch_preferred_bootmem(bdata, size, align, goal, limit);
|
||||||
if (ptr)
|
if (ptr)
|
||||||
return ptr;
|
return ptr;
|
||||||
|
@ -712,7 +713,18 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,
|
||||||
if (ptr)
|
if (ptr)
|
||||||
return ptr;
|
return ptr;
|
||||||
|
|
||||||
return ___alloc_bootmem(size, align, goal, limit);
|
ptr = alloc_bootmem_core(size, align, goal, limit);
|
||||||
|
if (ptr)
|
||||||
|
return ptr;
|
||||||
|
|
||||||
|
if (goal) {
|
||||||
|
goal = 0;
|
||||||
|
goto again;
|
||||||
|
}
|
||||||
|
|
||||||
|
printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);
|
||||||
|
panic("Out of memory");
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue