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

Commit c1329375 authored by Tejun Heo's avatar Tejun Heo
Browse files

bootmem: clean up arch-specific bootmem wrapping 



Impact: cleaner and consistent bootmem wrapping

By setting CONFIG_HAVE_ARCH_BOOTMEM_NODE, archs can define
arch-specific wrappers for bootmem allocation.  However, this is done
a bit strangely in that only the high level convenience macros can be
changed while lower level, but still exported, interface functions
can't be wrapped.  This not only is messy but also leads to strange
situation where alloc_bootmem() does what the arch wants it to do but
the equivalent __alloc_bootmem() call doesn't although they should be
able to be used interchangeably.

This patch updates bootmem such that archs can override / wrap the
backend function - alloc_bootmem_core() instead of the highlevel
interface functions to allow simpler and consistent wrapping.  Also,
HAVE_ARCH_BOOTMEM_NODE is renamed to HAVE_ARCH_BOOTMEM.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Johannes Weiner <hannes@saeurebad.de>
parent cb83b42e

arch/avr32/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ source "kernel/Kconfig.preempt" 
config QUICKLIST

	def_bool y



config HAVE_ARCH_BOOTMEM_NODE

config HAVE_ARCH_BOOTMEM

	def_bool n



config ARCH_HAVE_MEMORY_PRESENT

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ config NODES_SHIFT 
	  Specify the maximum number of NUMA Nodes available on the target

	  system.  Increases memory reserved to accomodate various tables.



config HAVE_ARCH_BOOTMEM_NODE

config HAVE_ARCH_BOOTMEM

	def_bool y

	depends on X86_32 && NUMA

arch/x86/include/asm/mmzone_32.h

+5 −38
Original line number Diff line number Diff line
@@ -93,45 +93,12 @@ static inline int pfn_valid(int pfn) 
#endif /* CONFIG_DISCONTIGMEM */



#ifdef CONFIG_NEED_MULTIPLE_NODES



/*

 * Following are macros that are specific to this numa platform.

 */

#define reserve_bootmem(addr, size, flags) \

	reserve_bootmem_node(NODE_DATA(0), (addr), (size), (flags))

#define alloc_bootmem(x) \

	__alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_nopanic(x) \

	__alloc_bootmem_node_nopanic(NODE_DATA(0), (x), SMP_CACHE_BYTES, \

				__pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low(x) \

	__alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES, 0)

#define alloc_bootmem_pages(x) \

	__alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_pages_nopanic(x) \

	__alloc_bootmem_node_nopanic(NODE_DATA(0), (x), PAGE_SIZE, \

				__pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0)

#define alloc_bootmem_node(pgdat, x)					\

({									\

	struct pglist_data  __maybe_unused			\

				*__alloc_bootmem_node__pgdat = (pgdat);	\

	__alloc_bootmem_node(NODE_DATA(0), (x), SMP_CACHE_BYTES,	\

						__pa(MAX_DMA_ADDRESS));	\

})

#define alloc_bootmem_pages_node(pgdat, x)				\

({									\

	struct pglist_data  __maybe_unused			\

				*__alloc_bootmem_node__pgdat = (pgdat);	\

	__alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE,		\

						__pa(MAX_DMA_ADDRESS));	\

})

#define alloc_bootmem_low_pages_node(pgdat, x)				\

/* always use node 0 for bootmem on this numa platform */

#define alloc_bootmem_core(__bdata, size, align, goal, limit)		\

({									\

	struct pglist_data  __maybe_unused			\

				*__alloc_bootmem_node__pgdat = (pgdat);	\

	__alloc_bootmem_node(NODE_DATA(0), (x), PAGE_SIZE, 0);		\

	bootmem_data_t __maybe_unused *	__abm_bdata_dummy = (__bdata);	\

	__alloc_bootmem_core(NODE_DATA(0)->bdata,			\

			     (size), (align), (goal), (limit));		\

})

#endif /* CONFIG_NEED_MULTIPLE_NODES */

include/linux/bootmem.h

+4 −6
Original line number Diff line number Diff line
@@ -69,10 +69,9 @@ extern int reserve_bootmem_node(pg_data_t *pgdat, 
				 unsigned long physaddr,

				 unsigned long size,

				 int flags);

#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

extern int reserve_bootmem(unsigned long addr, unsigned long size, int flags);

#endif



extern int reserve_bootmem(unsigned long addr,

			   unsigned long size,

			   int flags);

extern void *__alloc_bootmem_nopanic(unsigned long size,

			     unsigned long align,

			     unsigned long goal);
@@ -94,7 +93,7 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 
				      unsigned long size,

				      unsigned long align,

				      unsigned long goal);

#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE



#define alloc_bootmem(x) \

	__alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_nopanic(x) \
@@ -113,7 +112,6 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 
	__alloc_bootmem_node(pgdat, x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages_node(pgdat, x) \

	__alloc_bootmem_low_node(pgdat, x, PAGE_SIZE, 0)

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */



extern int reserve_bootmem_generic(unsigned long addr, unsigned long size,

				   int flags);

mm/bootmem.c

+11 −3
Original line number Diff line number Diff line
@@ -37,6 +37,16 @@ static struct list_head bdata_list __initdata = LIST_HEAD_INIT(bdata_list); 


static int bootmem_debug;



/*

 * If an arch needs to apply workarounds to bootmem allocation, it can

 * set CONFIG_HAVE_ARCH_BOOTMEM and define a wrapper around

 * __alloc_bootmem_core().

 */

#ifndef CONFIG_HAVE_ARCH_BOOTMEM

#define alloc_bootmem_core(bdata, size, align, goal, limit)		\

	__alloc_bootmem_core((bdata), (size), (align), (goal), (limit))

#endif



static int __init bootmem_debug_setup(char *buf)

{

	bootmem_debug = 1;
@@ -382,7 +392,6 @@ int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, 
	return mark_bootmem_node(pgdat->bdata, start, end, 1, flags);

}



#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

/**

 * reserve_bootmem - mark a page range as usable

 * @addr: starting address of the range
@@ -403,7 +412,6 @@ int __init reserve_bootmem(unsigned long addr, unsigned long size, 


	return mark_bootmem(start, end, 1, flags);

}

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */



static unsigned long align_idx(struct bootmem_data *bdata, unsigned long idx,

			unsigned long step)
@@ -428,7 +436,7 @@ static unsigned long align_off(struct bootmem_data *bdata, unsigned long off, 
	return ALIGN(base + off, align) - base;

}



static void * __init alloc_bootmem_core(struct bootmem_data *bdata,

static void * __init __alloc_bootmem_core(struct bootmem_data *bdata,

				unsigned long size, unsigned long align,

				unsigned long goal, unsigned long limit)

{