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

Commit 008857c1 authored by Ravikiran G Thirumalai's avatar Ravikiran G Thirumalai Committed by Linus Torvalds
Browse files

[PATCH] Cleanup bootmem allocator and fix alloc_bootmem_low 



Patch cleans up the alloc_bootmem fix for swiotlb.  Patch removes
alloc_bootmem_*_limit api and fixes alloc_boot_*low api to do the right
thing -- allocate from low32 memory.

Signed-off-by: default avatarRavikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 085cc7d5

include/linux/bootmem.h

+12 −34
Original line number Original line Diff line number Diff line
@@ -43,50 +43,38 @@ typedef struct bootmem_data { 
extern unsigned long __init bootmem_bootmap_pages (unsigned long);

extern unsigned long __init bootmem_bootmap_pages (unsigned long);

extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);

extern unsigned long __init init_bootmem (unsigned long addr, unsigned long memend);

extern void __init free_bootmem (unsigned long addr, unsigned long size);

extern void __init free_bootmem (unsigned long addr, unsigned long size);

extern void * __init __alloc_bootmem_limit (unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);

extern void * __init __alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal);

extern void * __init __alloc_bootmem_low(unsigned long size,

					 unsigned long align,

					 unsigned long goal);

extern void * __init __alloc_bootmem_low_node(pg_data_t *pgdat,

					      unsigned long size,

					      unsigned long align,

					      unsigned long goal);

#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

extern void __init reserve_bootmem (unsigned long addr, unsigned long size);

extern void __init reserve_bootmem (unsigned long addr, unsigned long size);

#define alloc_bootmem(x) \

#define alloc_bootmem(x) \

	__alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

	__alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low(x) \

#define alloc_bootmem_low(x) \

	__alloc_bootmem((x), SMP_CACHE_BYTES, 0)

	__alloc_bootmem_low((x), SMP_CACHE_BYTES, 0)

#define alloc_bootmem_pages(x) \

#define alloc_bootmem_pages(x) \

	__alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

	__alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages(x) \

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem((x), PAGE_SIZE, 0)

	__alloc_bootmem_low((x), PAGE_SIZE, 0)



#define alloc_bootmem_limit(x, limit)						\

	__alloc_bootmem_limit((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS), (limit))

#define alloc_bootmem_low_limit(x, limit)			\

	__alloc_bootmem_limit((x), SMP_CACHE_BYTES, 0, (limit))

#define alloc_bootmem_pages_limit(x, limit)					\

	__alloc_bootmem_limit((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS), (limit))

#define alloc_bootmem_low_pages_limit(x, limit)		\

	__alloc_bootmem_limit((x), PAGE_SIZE, 0, (limit))



#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */

extern unsigned long __init free_all_bootmem (void);

extern unsigned long __init free_all_bootmem (void);



extern void * __init __alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal);

extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn);

extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn);

extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size);

extern void __init reserve_bootmem_node (pg_data_t *pgdat, unsigned long physaddr, unsigned long size);

extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size);

extern void __init free_bootmem_node (pg_data_t *pgdat, unsigned long addr, unsigned long size);

extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat);

extern unsigned long __init free_all_bootmem_node (pg_data_t *pgdat);

extern void * __init __alloc_bootmem_node_limit (pg_data_t *pgdat, unsigned long size, unsigned long align, unsigned long goal, unsigned long limit);

#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

#define alloc_bootmem_node(pgdat, x) \

#define alloc_bootmem_node(pgdat, x) \

	__alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

	__alloc_bootmem_node((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_pages_node(pgdat, x) \

#define alloc_bootmem_pages_node(pgdat, x) \

	__alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

	__alloc_bootmem_node((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages_node(pgdat, x) \

#define alloc_bootmem_low_pages_node(pgdat, x) \

	__alloc_bootmem_node((pgdat), (x), PAGE_SIZE, 0)

	__alloc_bootmem_low_node((pgdat), (x), PAGE_SIZE, 0)



#define alloc_bootmem_node_limit(pgdat, x, limit)				\

	__alloc_bootmem_node_limit((pgdat), (x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS), (limit))

#define alloc_bootmem_pages_node_limit(pgdat, x, limit)				\

	__alloc_bootmem_node_limit((pgdat), (x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS), (limit))

#define alloc_bootmem_low_pages_node_limit(pgdat, x, limit)		\

	__alloc_bootmem_node_limit((pgdat), (x), PAGE_SIZE, 0, (limit))



#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */

#endif /* !CONFIG_HAVE_ARCH_BOOTMEM_NODE */





#ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP

#ifdef CONFIG_HAVE_ARCH_ALLOC_REMAP
@@ -123,15 +111,5 @@ extern void *__init alloc_large_system_hash(const char *tablename, 
#endif

#endif

extern int __initdata hashdist;		/* Distribute hashes across NUMA nodes? */

extern int __initdata hashdist;		/* Distribute hashes across NUMA nodes? */





static inline void *__alloc_bootmem (unsigned long size, unsigned long align, unsigned long goal)

{

	return __alloc_bootmem_limit(size, align, goal, 0);

}



static inline void *__alloc_bootmem_node (pg_data_t *pgdat, unsigned long size, unsigned long align,

				     unsigned long goal)

{

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

}





#endif /* _LINUX_BOOTMEM_H */
 
#endif /* _LINUX_BOOTMEM_H */

lib/swiotlb.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -142,8 +142,7 @@ swiotlb_init_with_default_size (size_t default_size) 
	/*

	/*

	 * Get IO TLB memory from the low pages

	 * Get IO TLB memory from the low pages

	 */

	 */

	io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *

	io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs * (1 << IO_TLB_SHIFT));

					     (1 << IO_TLB_SHIFT), 0x100000000);

	if (!io_tlb_start)

	if (!io_tlb_start)

		panic("Cannot allocate SWIOTLB buffer");

		panic("Cannot allocate SWIOTLB buffer");

	io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);

	io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);

mm/bootmem.c

+31 −7
Original line number Original line Diff line number Diff line
@@ -393,15 +393,14 @@ unsigned long __init free_all_bootmem (void) 
	return(free_all_bootmem_core(NODE_DATA(0)));

	return(free_all_bootmem_core(NODE_DATA(0)));

}

}





void * __init __alloc_bootmem_limit (unsigned long size, unsigned long align, unsigned long goal,

void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned long goal)

				unsigned long limit)

{

{

	pg_data_t *pgdat = pgdat_list;

	pg_data_t *pgdat = pgdat_list;

	void *ptr;

	void *ptr;





	for_each_pgdat(pgdat)

	for_each_pgdat(pgdat)

		if ((ptr = __alloc_bootmem_core(pgdat->bdata, size,

		if ((ptr = __alloc_bootmem_core(pgdat->bdata, size,

						 align, goal, limit)))

						 align, goal, 0)))

			return(ptr);

			return(ptr);





	/*

	/*
@@ -413,15 +412,40 @@ void * __init __alloc_bootmem_limit (unsigned long size, unsigned long align, un 
}

}









void * __init __alloc_bootmem_node_limit (pg_data_t *pgdat, unsigned long size, unsigned long align,

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

				     unsigned long goal, unsigned long limit)

				   unsigned long goal)

{

{

	void *ptr;

	void *ptr;





	ptr = __alloc_bootmem_core(pgdat->bdata, size, align, goal, limit);

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

	if (ptr)

	if (ptr)

		return (ptr);

		return (ptr);





	return __alloc_bootmem_limit(size, align, goal, limit);

	return __alloc_bootmem(size, align, goal);

}

}





#define LOW32LIMIT 0xffffffff



void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, unsigned long goal)

{

	pg_data_t *pgdat = pgdat_list;

	void *ptr;



	for_each_pgdat(pgdat)

		if ((ptr = __alloc_bootmem_core(pgdat->bdata, size,

						 align, goal, LOW32LIMIT)))

			return(ptr);



	/*

	 * Whoops, we cannot satisfy the allocation request.

	 */

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

	panic("Out of low memory");

	return NULL;

}



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

				       unsigned long align, unsigned long goal)

{

	return __alloc_bootmem_core(pgdat->bdata, size, align, goal, LOW32LIMIT);

}