Commit 64a02daa authored by Tejun Heo's avatar Tejun Heo Committed by H. Peter Anvin
Browse files

memblock, x86: Make free_all_memory_core_early() explicitly free lowmem only 



nomemblock is currently used only by x86 and on x86_32
free_all_memory_core_early() silently freed only the low mem because
get_free_all_memory_range() in arch/x86/mm/memblock.c implicitly
limited range to max_low_pfn.

Rename free_all_memory_core_early() to free_low_memory_core_early()
and make it call __get_free_all_memory_range() and limit the range to
max_low_pfn explicitly.  This makes things clearer and also is
consistent with the bootmem behavior.

This leaves get_free_all_memory_range() without any user.  Kill it.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/1310462166-31469-9-git-send-email-tj@kernel.org


Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 8d89ac80

arch/x86/include/asm/memblock.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ void memblock_x86_free_range(u64 start, u64 end); 
struct range;

int __get_free_all_memory_range(struct range **range, int nodeid,

			 unsigned long start_pfn, unsigned long end_pfn);

int get_free_all_memory_range(struct range **rangep, int nodeid);



u64 memblock_x86_hole_size(u64 start, u64 end);

u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit);

arch/x86/mm/memblock.c

+0 −10
Original line number Diff line number Diff line
@@ -89,16 +89,6 @@ int __init __get_free_all_memory_range(struct range **rangep, int nodeid, 
	return nr_range;

}



int __init get_free_all_memory_range(struct range **rangep, int nodeid)

{

	unsigned long end_pfn = -1UL;



#ifdef CONFIG_X86_32

	end_pfn = max_low_pfn;

#endif

	return __get_free_all_memory_range(rangep, nodeid, 0, end_pfn);

}



static u64 __init __memblock_x86_memory_in_range(u64 addr, u64 limit, bool get_free)

{

	int i, count;

arch/x86/mm/numa_64.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ unsigned long __init numa_free_all_bootmem(void) 
	for_each_online_node(i)

		pages += free_all_bootmem_node(NODE_DATA(i));



	pages += free_all_memory_core_early(MAX_NUMNODES);

	pages += free_low_memory_core_early(MAX_NUMNODES);



	return pages;

}

include/linux/bootmem.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat, 
				       unsigned long endpfn);

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



unsigned long free_all_memory_core_early(int nodeid);

extern unsigned long free_low_memory_core_early(int nodeid);

extern unsigned long free_all_bootmem_node(pg_data_t *pgdat);

extern unsigned long free_all_bootmem(void);

mm/nobootmem.c

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end) 
		__free_pages_bootmem(pfn_to_page(i), 0);

}



unsigned long __init free_all_memory_core_early(int nodeid)

unsigned long __init free_low_memory_core_early(int nodeid)

{

	int i;

	u64 start, end;
@@ -114,7 +114,7 @@ unsigned long __init free_all_memory_core_early(int nodeid) 
	struct range *range = NULL;

	int nr_range;



	nr_range = get_free_all_memory_range(&range, nodeid);

	nr_range = __get_free_all_memory_range(&range, nodeid, 0, max_low_pfn);



	for (i = 0; i < nr_range; i++) {

		start = range[i].start;
@@ -136,7 +136,7 @@ unsigned long __init free_all_bootmem_node(pg_data_t *pgdat) 
{

	register_page_bootmem_info_node(pgdat);



	/* free_all_memory_core_early(MAX_NUMNODES) will be called later */

	/* free_low_memory_core_early(MAX_NUMNODES) will be called later */

	return 0;

}
@@ -154,7 +154,7 @@ unsigned long __init free_all_bootmem(void) 
	 * Use MAX_NUMNODES will make sure all ranges in early_node_map[]

	 *  will be used instead of only Node0 related

	 */

	return free_all_memory_core_early(MAX_NUMNODES);

	return free_low_memory_core_early(MAX_NUMNODES);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE