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

Commit f70abb0f authored by Toshi Kani's avatar Toshi Kani Committed by Thomas Gleixner
Browse files

x86/asm: Fix pud/pmd interfaces to handle large PAT bit 



Now that we have pud/pmd mask interfaces, which handle pfn & flags
mask properly for the large PAT bit.

Fix pud/pmd pfn & flags interfaces by replacing PTE_PFN_MASK and
PTE_FLAGS_MASK with the pud/pmd mask interfaces.

Suggested-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarToshi Kani <toshi.kani@hpe.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Konrad Wilk <konrad.wilk@oracle.com>
Cc: Robert Elliot <elliott@hpe.com>
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/1442514264-12475-5-git-send-email-toshi.kani@hpe.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4be4c1fb

arch/x86/include/asm/pgtable.h

+8 −6
Original line number Diff line number Diff line
@@ -142,12 +142,12 @@ static inline unsigned long pte_pfn(pte_t pte) 


static inline unsigned long pmd_pfn(pmd_t pmd)

{

	return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;

	return (pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT;

}



static inline unsigned long pud_pfn(pud_t pud)

{

	return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;

	return (pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT;

}



#define pte_page(pte)	pfn_to_page(pte_pfn(pte))
@@ -502,14 +502,15 @@ static inline int pmd_none(pmd_t pmd) 


static inline unsigned long pmd_page_vaddr(pmd_t pmd)

{

	return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);

	return (unsigned long)__va(pmd_val(pmd) & pmd_pfn_mask(pmd));

}



/*

 * Currently stuck as a macro due to indirect forward reference to

 * linux/mmzone.h's __section_mem_map_addr() definition:

 */

#define pmd_page(pmd)	pfn_to_page((pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT)

#define pmd_page(pmd)		\

	pfn_to_page((pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT)



/*

 * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
@@ -570,14 +571,15 @@ static inline int pud_present(pud_t pud) 


static inline unsigned long pud_page_vaddr(pud_t pud)

{

	return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);

	return (unsigned long)__va(pud_val(pud) & pud_pfn_mask(pud));

}



/*

 * Currently stuck as a macro due to indirect forward reference to

 * linux/mmzone.h's __section_mem_map_addr() definition:

 */

#define pud_page(pud)		pfn_to_page(pud_val(pud) >> PAGE_SHIFT)

#define pud_page(pud)		\

	pfn_to_page((pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT)



/* Find an entry in the second-level page table.. */

static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)

arch/x86/include/asm/pgtable_types.h

+2 −2
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static inline pudval_t pud_flags_mask(pud_t pud) 


static inline pudval_t pud_flags(pud_t pud)

{

	return native_pud_val(pud) & PTE_FLAGS_MASK;

	return native_pud_val(pud) & pud_flags_mask(pud);

}



static inline pmdval_t pmd_pfn_mask(pmd_t pmd)
@@ -315,7 +315,7 @@ static inline pmdval_t pmd_flags_mask(pmd_t pmd) 


static inline pmdval_t pmd_flags(pmd_t pmd)

{

	return native_pmd_val(pmd) & PTE_FLAGS_MASK;

	return native_pmd_val(pmd) & pmd_flags_mask(pmd);

}



static inline pte_t native_make_pte(pteval_t val)