Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 421456ed authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: bootmem: unify allocation policy of (non-)panicking node allocations 



While the panicking node-specific allocation function tries to satisfy
node+goal, goal, node, anywhere, the non-panicking function still does
node+goal, goal, anywhere.

Make it simpler: define the panicking version in terms of the
non-panicking one, like the node-agnostic interface, so they always behave
the same way apart from how to deal with allocation failure.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab381843

mm/bootmem.c

+24 −20
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, 
	return ___alloc_bootmem(size, align, goal, limit);

}



static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata,

static void * __init ___alloc_bootmem_node_nopanic(bootmem_data_t *bdata,

				unsigned long size, unsigned long align,

				unsigned long goal, unsigned long limit)

{
@@ -722,6 +722,29 @@ again: 
		goto again;

	}



	return NULL;

}



void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,

				   unsigned long align, unsigned long goal)

{

	if (WARN_ON_ONCE(slab_is_available()))

		return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);



	return ___alloc_bootmem_node_nopanic(pgdat->bdata, size,

					     align, goal, 0);

}



void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, unsigned long size,

				    unsigned long align, unsigned long goal,

				    unsigned long limit)

{

	void *ptr;



	ptr = ___alloc_bootmem_node_nopanic(bdata, size, align, goal, 0);

	if (ptr)

		return ptr;



	printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);

	panic("Out of memory");

	return NULL;
@@ -802,25 +825,6 @@ void * __init alloc_bootmem_section(unsigned long size, 
}

#endif



void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,

				   unsigned long align, unsigned long goal)

{

	void *ptr;



	if (WARN_ON_ONCE(slab_is_available()))

		return kzalloc_node(size, GFP_NOWAIT, pgdat->node_id);



	ptr = alloc_arch_preferred_bootmem(pgdat->bdata, size, align, goal, 0);

	if (ptr)

		return ptr;



	ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, 0);

	if (ptr)

		return ptr;



	return __alloc_bootmem_nopanic(size, align, goal);

}



#ifndef ARCH_LOW_ADDRESS_LIMIT

#define ARCH_LOW_ADDRESS_LIMIT	0xffffffffUL

#endif