Commit 75ec4eb3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/mm' into x86/asm, to pick up pending changes 



Concentrate x86 MM and asm related changes into a single super-topic,
in preparation for larger changes.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 19c5787a 15670bfe

Documentation/x86/x86_64/mm.txt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ ff92000000000000 - ffd1ffffffffffff (=54 bits) vmalloc/ioremap space 
ffd2000000000000 - ffd3ffffffffffff (=49 bits) hole

ffd4000000000000 - ffd5ffffffffffff (=49 bits) virtual memory map (512TB)

... unused hole ...

ffd8000000000000 - fff7ffffffffffff (=53 bits) kasan shadow memory (8PB)

ffdf000000000000 - fffffc0000000000 (=53 bits) kasan shadow memory (8PB)

... unused hole ...

ffffff0000000000 - ffffff7fffffffff (=39 bits) %esp fixup stacks

... unused hole ...

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC 
config KASAN_SHADOW_OFFSET

	hex

	depends on KASAN

	default 0xdff8000000000000 if X86_5LEVEL

	default 0xdffffc0000000000



config HAVE_INTEL_TXT

arch/x86/kernel/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ KASAN_SANITIZE_head$(BITS).o := n 
KASAN_SANITIZE_dumpstack.o				:= n

KASAN_SANITIZE_dumpstack_$(BITS).o			:= n

KASAN_SANITIZE_stacktrace.o				:= n

KASAN_SANITIZE_paravirt.o				:= n



OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o	:= y

OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o		:= y

arch/x86/kernel/head_64.S

+6 −5
Original line number Diff line number Diff line
@@ -37,11 +37,12 @@ 
 *

 */



#define p4d_index(x)	(((x) >> P4D_SHIFT) & (PTRS_PER_P4D-1))

#define pud_index(x)	(((x) >> PUD_SHIFT) & (PTRS_PER_PUD-1))



#if defined(CONFIG_XEN_PV) || defined(CONFIG_XEN_PVH)

PGD_PAGE_OFFSET = pgd_index(__PAGE_OFFSET_BASE)

PGD_START_KERNEL = pgd_index(__START_KERNEL_map)

#endif

L3_START_KERNEL = pud_index(__START_KERNEL_map)



	.text
@@ -361,10 +362,7 @@ NEXT_PAGE(early_dynamic_pgts) 


	.data



#ifndef CONFIG_XEN

NEXT_PAGE(init_top_pgt)

	.fill	512,8,0

#else

#if defined(CONFIG_XEN_PV) || defined(CONFIG_XEN_PVH)

NEXT_PAGE(init_top_pgt)

	.quad   level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE_NOENC

	.org    init_top_pgt + PGD_PAGE_OFFSET*8, 0
@@ -381,6 +379,9 @@ NEXT_PAGE(level2_ident_pgt) 
	 * Don't set NX because code runs from these pages.

	 */

	PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)

#else

NEXT_PAGE(init_top_pgt)

	.fill	512,8,0

#endif



#ifdef CONFIG_X86_5LEVEL

arch/x86/mm/init_64.c

+5 −5
Original line number Diff line number Diff line
@@ -1426,16 +1426,16 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node) 


#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE)

void register_page_bootmem_memmap(unsigned long section_nr,

				  struct page *start_page, unsigned long size)

				  struct page *start_page, unsigned long nr_pages)

{

	unsigned long addr = (unsigned long)start_page;

	unsigned long end = (unsigned long)(start_page + size);

	unsigned long end = (unsigned long)(start_page + nr_pages);

	unsigned long next;

	pgd_t *pgd;

	p4d_t *p4d;

	pud_t *pud;

	pmd_t *pmd;

	unsigned int nr_pages;

	unsigned int nr_pmd_pages;

	struct page *page;



	for (; addr < end; addr = next) {
@@ -1482,9 +1482,9 @@ void register_page_bootmem_memmap(unsigned long section_nr, 
			if (pmd_none(*pmd))

				continue;



			nr_pages = 1 << (get_order(PMD_SIZE));

			nr_pmd_pages = 1 << get_order(PMD_SIZE);

			page = pmd_page(*pmd);

			while (nr_pages--)

			while (nr_pmd_pages--)

				get_page_bootmem(section_nr, page++,

						 SECTION_INFO);

		}