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

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

mm: nobootmem: 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 avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
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 2c478eae

mm/nobootmem.c

+54 −52
Original line number Diff line number Diff line
@@ -274,6 +274,57 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, 
	return ___alloc_bootmem(size, align, goal, limit);

}



static void * __init ___alloc_bootmem_node_nopanic(pg_data_t *pgdat,

						   unsigned long size,

						   unsigned long align,

						   unsigned long goal,

						   unsigned long limit)

{

	void *ptr;



again:

	ptr = __alloc_memory_core_early(pgdat->node_id, size, align,

					goal, limit);

	if (ptr)

		return ptr;



	ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align,

					goal, limit);

	if (ptr)

		return ptr;



	if (goal) {

		goal = 0;

		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, size, align, goal, 0);

}



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

				    unsigned long align, unsigned long goal,

				    unsigned long limit)

{

	void *ptr;



	ptr = ___alloc_bootmem_node_nopanic(pgdat, size, align, goal, limit);

	if (ptr)

		return ptr;



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

	panic("Out of memory");

	return NULL;

}



/**

 * __alloc_bootmem_node - allocate boot memory from a specific node

 * @pgdat: node to allocate from
@@ -292,30 +343,10 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, 
void * __init __alloc_bootmem_node(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);



again:

	ptr = __alloc_memory_core_early(pgdat->node_id, size, align,

					 goal, -1ULL);

	if (ptr)

		return ptr;



	ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align,

					goal, -1ULL);

	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;

	return ___alloc_bootmem_node(pgdat, size, align, goal, 0);

}



void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size,
@@ -346,22 +377,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_memory_core_early(pgdat->node_id, size, align,

						 goal, -1ULL);

	if (ptr)

		return ptr;



	return __alloc_bootmem_nopanic(size, align, goal);

}



#ifndef ARCH_LOW_ADDRESS_LIMIT

#define ARCH_LOW_ADDRESS_LIMIT	0xffffffffUL

#endif
@@ -403,22 +418,9 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, 
void * __init __alloc_bootmem_low_node(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_memory_core_early(pgdat->node_id, size, align,

				goal, ARCH_LOW_ADDRESS_LIMIT);

	if (ptr)

		return ptr;



	ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align,

					goal, ARCH_LOW_ADDRESS_LIMIT);

	if (ptr)

		return ptr;



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

	panic("Out of memory");

	return NULL;

	return ___alloc_bootmem_node(pgdat, size, align, goal,

				     ARCH_LOW_ADDRESS_LIMIT);

}