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

Commit 8dd33030 authored by Igor Mammedov's avatar Igor Mammedov Committed by Ingo Molnar
Browse files

x86/mm: Introduce max_possible_pfn 



max_possible_pfn will be used for tracking max possible
PFN for memory that isn't present in E820 table and
could be hotplugged later.

By default max_possible_pfn is initialized with max_pfn,
but later it could be updated with highest PFN of
hotpluggable memory ranges declared in ACPI SRAT table
if any present.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akataria@vmware.com
Cc: fujita.tomonori@lab.ntt.co.jp
Cc: konrad.wilk@oracle.com
Cc: pbonzini@redhat.com
Cc: revers@redhat.com
Cc: riel@redhat.com
Link: http://lkml.kernel.org/r/1449234426-273049-2-git-send-email-imammedo@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 071ac0c4

arch/x86/kernel/setup.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1048,6 +1048,8 @@ void __init setup_arch(char **cmdline_p) 
	if (mtrr_trim_uncached_memory(max_pfn))

	if (mtrr_trim_uncached_memory(max_pfn))

		max_pfn = e820_end_of_ram_pfn();

		max_pfn = e820_end_of_ram_pfn();





	max_possible_pfn = max_pfn;



#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

	/* max_low_pfn get updated here */

	/* max_low_pfn get updated here */

	find_low_pfn_range();

	find_low_pfn_range();

arch/x86/mm/srat.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -203,6 +203,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
		pr_warn("SRAT: Failed to mark hotplug range [mem %#010Lx-%#010Lx] in memblock\n",

		pr_warn("SRAT: Failed to mark hotplug range [mem %#010Lx-%#010Lx] in memblock\n",

			(unsigned long long)start, (unsigned long long)end - 1);

			(unsigned long long)start, (unsigned long long)end - 1);





	max_possible_pfn = max(max_possible_pfn, PFN_UP(end - 1));



	return 0;

	return 0;

out_err_bad_srat:

out_err_bad_srat:

	bad_srat();

	bad_srat();

include/linux/bootmem.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,10 @@ extern unsigned long min_low_pfn; 
 * highest page

 * highest page

 */

 */

extern unsigned long max_pfn;

extern unsigned long max_pfn;

/*

 * highest possible page

 */

extern unsigned long long max_possible_pfn;





#ifndef CONFIG_NO_BOOTMEM

#ifndef CONFIG_NO_BOOTMEM

/*

/*

mm/bootmem.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ EXPORT_SYMBOL(contig_page_data); 
unsigned long max_low_pfn;

unsigned long max_low_pfn;

unsigned long min_low_pfn;

unsigned long min_low_pfn;

unsigned long max_pfn;

unsigned long max_pfn;

unsigned long long max_possible_pfn;





bootmem_data_t bootmem_node_data[MAX_NUMNODES] __initdata;

bootmem_data_t bootmem_node_data[MAX_NUMNODES] __initdata;

mm/nobootmem.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ EXPORT_SYMBOL(contig_page_data); 
unsigned long max_low_pfn;

unsigned long max_low_pfn;

unsigned long min_low_pfn;

unsigned long min_low_pfn;

unsigned long max_pfn;

unsigned long max_pfn;

unsigned long long max_possible_pfn;





static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,

static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,

					u64 goal, u64 limit)

					u64 goal, u64 limit)