Merge tag 'x86-mm-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (e96ec8cf) · Commits · 戴 / test

arch/x86/include/asm/pgtable_64.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -168,8 +168,6 @@ static inline void native_pgd_clear(pgd_t *pgd)
		native_set_pgd(pgd, native_make_pgd(0));
		}

		extern void sync_global_pgds(unsigned long start, unsigned long end);

		/*
		* Conversion functions: convert a page and protection to a page entry,
		* and a page entry and page directory to the page they refer to.

arch/x86/include/asm/pgtable_64_types.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -159,6 +159,4 @@ extern unsigned int ptrs_per_p4d;

		#define PGD_KERNEL_START ((PAGE_SIZE / 2) / sizeof(pgd_t))

		#define ARCH_PAGE_TABLE_SYNC_MASK (pgtable_l5_enabled() ? PGTBL_PGD_MODIFIED : PGTBL_P4D_MODIFIED)

		#endif /* _ASM_X86_PGTABLE_64_DEFS_H */

arch/x86/mm/init_64.c

+53 −6

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ static void sync_global_pgds_l4(unsigned long start, unsigned long end)
		* When memory was added make sure all the processes MM have
		* suitable PGD entries in the local PGD level page.
		*/
		void sync_global_pgds(unsigned long start, unsigned long end)
		static void sync_global_pgds(unsigned long start, unsigned long end)
		{
		if (pgtable_l5_enabled())
		sync_global_pgds_l5(start, end);
		@@ -217,11 +217,6 @@ void sync_global_pgds(unsigned long start, unsigned long end)
		sync_global_pgds_l4(start, end);
		}

		void arch_sync_kernel_mappings(unsigned long start, unsigned long end)
		{
		sync_global_pgds(start, end);
		}

		/*
		* NOTE: This function is marked __ref because it calls __init function
		* (alloc_bootmem_pages). It's safe to do it ONLY when after_bootmem == 0.
		@@ -1238,6 +1233,56 @@ static void __init register_page_bootmem_info(void)
		#endif
		}

		/*
		* Pre-allocates page-table pages for the vmalloc area in the kernel page-table.
		* Only the level which needs to be synchronized between all page-tables is
		* allocated because the synchronization can be expensive.
		*/
		static void __init preallocate_vmalloc_pages(void)
		{
		unsigned long addr;
		const char *lvl;

		for (addr = VMALLOC_START; addr <= VMALLOC_END; addr = ALIGN(addr + 1, PGDIR_SIZE)) {
		pgd_t *pgd = pgd_offset_k(addr);
		p4d_t *p4d;
		pud_t *pud;

		p4d = p4d_offset(pgd, addr);
		if (p4d_none(*p4d)) {
		/* Can only happen with 5-level paging */
		p4d = p4d_alloc(&init_mm, pgd, addr);
		if (!p4d) {
		lvl = "p4d";
		goto failed;
		}
		}

		if (pgtable_l5_enabled())
		continue;

		pud = pud_offset(p4d, addr);
		if (pud_none(*pud)) {
		/* Ends up here only with 4-level paging */
		pud = pud_alloc(&init_mm, p4d, addr);
		if (!pud) {
		lvl = "pud";
		goto failed;
		}
		}
		}

		return;

		failed:

		/*
		* The pages have to be there now or they will be missing in
		* process page-tables later.
		*/
		panic("Failed to pre-allocate %s pages for vmalloc area\n", lvl);
		}

		void __init mem_init(void)
		{
		pci_iommu_alloc();
		@@ -1261,6 +1306,8 @@ void __init mem_init(void)
		if (get_gate_vma(&init_mm))
		kclist_add(&kcore_vsyscall, (void *)VSYSCALL_ADDR, PAGE_SIZE, KCORE_USER);

		preallocate_vmalloc_pages();

		mem_init_print_info(NULL);
		}

Admin message