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

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

x86/mm: Stop pretending pgtable_l5_enabled is a variable 



pgtable_l5_enabled is defined using cpu_feature_enabled() but we refer
to it as a variable. This is misleading.

Make pgtable_l5_enabled() a function.

We cannot literally define it as a function due to circular dependencies
between header files. Function-alike macros is close enough.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Hugh Dickins <hughd@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180518103528.59260-4-kirill.shutemov@linux.intel.com


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

arch/x86/include/asm/page_64_types.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#define __PHYSICAL_MASK_SHIFT	52



#ifdef CONFIG_X86_5LEVEL

#define __VIRTUAL_MASK_SHIFT	(pgtable_l5_enabled ? 56 : 47)

#define __VIRTUAL_MASK_SHIFT	(pgtable_l5_enabled() ? 56 : 47)

#else

#define __VIRTUAL_MASK_SHIFT	47

#endif

arch/x86/include/asm/paravirt.h

+2 −2
Original line number Diff line number Diff line
@@ -574,14 +574,14 @@ static inline void __set_pgd(pgd_t *pgdp, pgd_t pgd) 
}



#define set_pgd(pgdp, pgdval) do {					\

	if (pgtable_l5_enabled)						\

	if (pgtable_l5_enabled())						\

		__set_pgd(pgdp, pgdval);				\

	else								\

		set_p4d((p4d_t *)(pgdp), (p4d_t) { (pgdval).pgd });	\

} while (0)



#define pgd_clear(pgdp) do {						\

	if (pgtable_l5_enabled)						\

	if (pgtable_l5_enabled())						\

		set_pgd(pgdp, __pgd(0));				\

} while (0)

arch/x86/include/asm/pgalloc.h

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, 
#if CONFIG_PGTABLE_LEVELS > 4

static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, p4d_t *p4d)

{

	if (!pgtable_l5_enabled)

	if (!pgtable_l5_enabled())

		return;

	paravirt_alloc_p4d(mm, __pa(p4d) >> PAGE_SHIFT);

	set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(p4d)));
@@ -193,7 +193,7 @@ extern void ___p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d); 
static inline void __p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,

				  unsigned long address)

{

	if (pgtable_l5_enabled)

	if (pgtable_l5_enabled())

		___p4d_free_tlb(tlb, p4d);

}

arch/x86/include/asm/pgtable.h

+5 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ extern pmdval_t early_pmd_flags; 


#ifndef __PAGETABLE_P4D_FOLDED

#define set_pgd(pgdp, pgd)		native_set_pgd(pgdp, pgd)

#define pgd_clear(pgd)			(pgtable_l5_enabled ? native_pgd_clear(pgd) : 0)

#define pgd_clear(pgd)			(pgtable_l5_enabled() ? native_pgd_clear(pgd) : 0)

#endif



#ifndef set_p4d
@@ -881,7 +881,7 @@ static inline unsigned long p4d_index(unsigned long address) 
#if CONFIG_PGTABLE_LEVELS > 4

static inline int pgd_present(pgd_t pgd)

{

	if (!pgtable_l5_enabled)

	if (!pgtable_l5_enabled())

		return 1;

	return pgd_flags(pgd) & _PAGE_PRESENT;

}
@@ -900,7 +900,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) 
/* to find an entry in a page-table-directory. */

static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)

{

	if (!pgtable_l5_enabled)

	if (!pgtable_l5_enabled())

		return (p4d_t *)pgd;

	return (p4d_t *)pgd_page_vaddr(*pgd) + p4d_index(address);

}
@@ -909,7 +909,7 @@ static inline int pgd_bad(pgd_t pgd) 
{

	unsigned long ignore_flags = _PAGE_USER;



	if (!pgtable_l5_enabled)

	if (!pgtable_l5_enabled())

		return 0;



	if (IS_ENABLED(CONFIG_PAGE_TABLE_ISOLATION))
@@ -920,7 +920,7 @@ static inline int pgd_bad(pgd_t pgd) 


static inline int pgd_none(pgd_t pgd)

{

	if (!pgtable_l5_enabled)

	if (!pgtable_l5_enabled())

		return 0;

	/*

	 * There is no need to do a workaround for the KNL stray

arch/x86/include/asm/pgtable_32_types.h

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

#endif



#define pgtable_l5_enabled 0

#define pgtable_l5_enabled() 0



#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE - 1))