Commit 98233368 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

x86: expose number of page table levels on Kconfig level 



We would want to use number of page table level to define mm_struct.
Let's expose it as CONFIG_PGTABLE_LEVELS.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6b8ce2a1

arch/x86/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -277,6 +277,12 @@ config ARCH_SUPPORTS_UPROBES 
config FIX_EARLYCON_MEM

	def_bool y



config PGTABLE_LEVELS

	int

	default 4 if X86_64

	default 3 if X86_PAE

	default 2



source "init/Kconfig"

source "kernel/Kconfig.freezer"

arch/x86/include/asm/paravirt.h

+4 −4
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) 
		PVOP_VCALL2(pv_mmu_ops.set_pmd, pmdp, val);

}



#if PAGETABLE_LEVELS >= 3

#if CONFIG_PGTABLE_LEVELS >= 3

static inline pmd_t __pmd(pmdval_t val)

{

	pmdval_t ret;
@@ -585,7 +585,7 @@ static inline void set_pud(pud_t *pudp, pud_t pud) 
		PVOP_VCALL2(pv_mmu_ops.set_pud, pudp,

			    val);

}

#if PAGETABLE_LEVELS == 4

#if CONFIG_PGTABLE_LEVELS == 4

static inline pud_t __pud(pudval_t val)

{

	pudval_t ret;
@@ -636,9 +636,9 @@ static inline void pud_clear(pud_t *pudp) 
	set_pud(pudp, __pud(0));

}



#endif	/* PAGETABLE_LEVELS == 4 */

#endif	/* CONFIG_PGTABLE_LEVELS == 4 */



#endif	/* PAGETABLE_LEVELS >= 3 */

#endif	/* CONFIG_PGTABLE_LEVELS >= 3 */



#ifdef CONFIG_X86_PAE

/* Special-case pte-setting operations for PAE, which can't update a

arch/x86/include/asm/paravirt_types.h

+4 −4
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ struct pv_mmu_ops { 
	struct paravirt_callee_save pgd_val;

	struct paravirt_callee_save make_pgd;



#if PAGETABLE_LEVELS >= 3

#if CONFIG_PGTABLE_LEVELS >= 3

#ifdef CONFIG_X86_PAE

	void (*set_pte_atomic)(pte_t *ptep, pte_t pteval);

	void (*pte_clear)(struct mm_struct *mm, unsigned long addr,
@@ -308,13 +308,13 @@ struct pv_mmu_ops { 
	struct paravirt_callee_save pmd_val;

	struct paravirt_callee_save make_pmd;



#if PAGETABLE_LEVELS == 4

#if CONFIG_PGTABLE_LEVELS == 4

	struct paravirt_callee_save pud_val;

	struct paravirt_callee_save make_pud;



	void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);

#endif	/* PAGETABLE_LEVELS == 4 */

#endif	/* PAGETABLE_LEVELS >= 3 */

#endif	/* CONFIG_PGTABLE_LEVELS == 4 */

#endif	/* CONFIG_PGTABLE_LEVELS >= 3 */



	struct pv_lazy_ops lazy_mode;

arch/x86/include/asm/pgalloc.h

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 


#define pmd_pgtable(pmd) pmd_page(pmd)



#if PAGETABLE_LEVELS > 2

#if CONFIG_PGTABLE_LEVELS > 2

static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	struct page *page;
@@ -116,7 +116,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) 
}

#endif	/* CONFIG_X86_PAE */



#if PAGETABLE_LEVELS > 3

#if CONFIG_PGTABLE_LEVELS > 3

static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)

{

	paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
@@ -142,7 +142,7 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, 
	___pud_free_tlb(tlb, pud);

}



#endif	/* PAGETABLE_LEVELS > 3 */

#endif	/* PAGETABLE_LEVELS > 2 */

#endif	/* CONFIG_PGTABLE_LEVELS > 3 */

#endif	/* CONFIG_PGTABLE_LEVELS > 2 */



#endif /* _ASM_X86_PGALLOC_H */

arch/x86/include/asm/pgtable-2level_types.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ typedef union { 
#endif	/* !__ASSEMBLY__ */



#define SHARED_KERNEL_PMD	0

#define PAGETABLE_LEVELS	2



/*

 * traditional i386 two-level paging structure:

CRA Git | Maintained and supported by SUSTech CRA and CCSE