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

Commit c91c4773 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

bootmem: fix slab fallback on numa 



If the user requested bootmem allocation on a specific node, we should use
kzalloc_node() for the fallback allocation.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 441c7e0a

mm/bootmem.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -665,6 +665,9 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, 
void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,

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

				   unsigned long align, unsigned long goal)

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

	return ___alloc_bootmem_node(pgdat->bdata, size, align, goal, 0);

}

}
@@ -696,6 +699,9 @@ void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size, 
{

{

	void *ptr;

	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);

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

	if (ptr)

	if (ptr)

		return ptr;

		return ptr;
@@ -748,6 +754,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,

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

				       unsigned long align, unsigned long goal)

				       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(pgdat->bdata, size, align,

	return ___alloc_bootmem_node(pgdat->bdata, size, align,

				goal, ARCH_LOW_ADDRESS_LIMIT);

				goal, ARCH_LOW_ADDRESS_LIMIT);

}
 
}