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

toshikani · KAGA-KOKO · commit f70abb0fc3da · 2015-09-22T21:27:32.000+02:00
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: Juergen Gross <jgross@suse.com> Signed-off-by: Toshi 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: Thomas Gleixner <tglx@linutronix.de>
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
@@ -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)
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -142,12 +142,12 @@ static inline unsigned long pte_pfn(pte_t pte)`
`142`	`142`
`143`	`143`	`static inline unsigned long pmd_pfn(pmd_t pmd)`
`144`	`144`	`{`
`145`		`- return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT;`
	`145`	`+ return (pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`static inline unsigned long pud_pfn(pud_t pud)`
`149`	`149`	`{`
`150`		`- return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;`
	`150`	`+ return (pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT;`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`#define pte_page(pte) pfn_to_page(pte_pfn(pte))`
`@@ -502,14 +502,15 @@ static inline int pmd_none(pmd_t pmd)`
`502`	`502`
`503`	`503`	`static inline unsigned long pmd_page_vaddr(pmd_t pmd)`
`504`	`504`	`{`
`505`		`- return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);`
	`505`	`+ return (unsigned long)__va(pmd_val(pmd) & pmd_pfn_mask(pmd));`
`506`	`506`	`}`
`507`	`507`
`508`	`508`	`/*`
`509`	`509`	`* Currently stuck as a macro due to indirect forward reference to`
`510`	`510`	`* linux/mmzone.h's __section_mem_map_addr() definition:`
`511`	`511`	`*/`
`512`		`-#define pmd_page(pmd) pfn_to_page((pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT)`
	`512`	`+#define pmd_page(pmd) \`
	`513`	`+ pfn_to_page((pmd_val(pmd) & pmd_pfn_mask(pmd)) >> PAGE_SHIFT)`
`513`	`514`
`514`	`515`	`/*`
`515`	`516`	`* 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)`
`570`	`571`
`571`	`572`	`static inline unsigned long pud_page_vaddr(pud_t pud)`
`572`	`573`	`{`
`573`		`- return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);`
	`574`	`+ return (unsigned long)__va(pud_val(pud) & pud_pfn_mask(pud));`
`574`	`575`	`}`
`575`	`576`
`576`	`577`	`/*`
`577`	`578`	`* Currently stuck as a macro due to indirect forward reference to`
`578`	`579`	`* linux/mmzone.h's __section_mem_map_addr() definition:`
`579`	`580`	`*/`
`580`		`-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)`
	`581`	`+#define pud_page(pud) \`
	`582`	`+ pfn_to_page((pud_val(pud) & pud_pfn_mask(pud)) >> PAGE_SHIFT)`
`581`	`583`
`582`	`584`	`/* Find an entry in the second-level page table.. */`
`583`	`585`	`static inline pmd_t pmd_offset(pud_t pud, unsigned long address)`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ static inline pudval_t pud_flags_mask(pud_t pud)`
`294`	`294`
`295`	`295`	`static inline pudval_t pud_flags(pud_t pud)`
`296`	`296`	`{`
`297`		`- return native_pud_val(pud) & PTE_FLAGS_MASK;`
	`297`	`+ return native_pud_val(pud) & pud_flags_mask(pud);`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`static inline pmdval_t pmd_pfn_mask(pmd_t pmd)`
`@@ -315,7 +315,7 @@ static inline pmdval_t pmd_flags_mask(pmd_t pmd)`
`315`	`315`
`316`	`316`	`static inline pmdval_t pmd_flags(pmd_t pmd)`
`317`	`317`	`{`
`318`		`- return native_pmd_val(pmd) & PTE_FLAGS_MASK;`
	`318`	`+ return native_pmd_val(pmd) & pmd_flags_mask(pmd);`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`static inline pte_t native_make_pte(pteval_t val)`