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

Commit e626e6bb authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Ingo Molnar
Browse files

x86/mm: Introduce 'pgtable_l5_enabled' 



The new flag would indicate what paging mode we are in.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/20180214111656.88514-5-kirill.shutemov@linux.intel.com


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

arch/x86/boot/compressed/kaslr.c

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ 
#define STATIC

#include <linux/decompress/mm.h>



#ifdef CONFIG_X86_5LEVEL

unsigned int pgtable_l5_enabled __ro_after_init = 1;

#endif



extern unsigned long get_cmd_line_ptr(void);



/* Simplified build-specific string for starting entropy. */

arch/x86/include/asm/pgtable_32_types.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
# include <asm/pgtable-2level_types.h>

#endif



#define pgtable_l5_enabled 0



#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE - 1))

arch/x86/include/asm/pgtable_64_types.h

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ typedef unsigned long pgprotval_t; 


typedef struct { pteval_t pte; } pte_t;



#ifdef CONFIG_X86_5LEVEL

extern unsigned int pgtable_l5_enabled;

#else

#define pgtable_l5_enabled 0

#endif



#endif	/* !__ASSEMBLY__ */



#define SHARED_KERNEL_PMD	0

arch/x86/kernel/head64.c

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ extern pmd_t early_dynamic_pgts[EARLY_DYNAMIC_PAGE_TABLES][PTRS_PER_PMD]; 
static unsigned int __initdata next_early_pgt;

pmdval_t early_pmd_flags = __PAGE_KERNEL_LARGE & ~(_PAGE_GLOBAL | _PAGE_NX);



#ifdef CONFIG_X86_5LEVEL

unsigned int pgtable_l5_enabled __ro_after_init = 1;

EXPORT_SYMBOL(pgtable_l5_enabled);

#endif



#ifdef CONFIG_DYNAMIC_MEMORY_LAYOUT

unsigned long page_offset_base __ro_after_init = __PAGE_OFFSET_BASE;

EXPORT_SYMBOL(page_offset_base);