x86/mm: Add prot_sethuge() helper to abstract out _PAGE_PSE handling

We still have some historic cases of direct fiddling of page
attributes with (dangerous & fragile) type casting and address shifting.

Add the prot_sethuge() helper instead that gets the types right and
doesn't have to transform addresses.

( Also add a debug check to make sure this doesn't get applied
  to _PAGE_BIT_PAT/_PAGE_BIT_PAT_LARGE pages. )

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 0fe690e..7ea7d47 100644 (file)
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -90,6 +90,12 @@ DEFINE_ENTRY(pud, pud, init)
 DEFINE_ENTRY(pmd, pmd, init)
 DEFINE_ENTRY(pte, pte, init)
 
+static inline pgprot_t prot_sethuge(pgprot_t prot)
+{
+       WARN_ON_ONCE(pgprot_val(prot) & _PAGE_PAT);
+
+       return __pgprot(pgprot_val(prot) | _PAGE_PSE);
+}
 
 /*
  * NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the
@@ -557,9 +563,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end,
                if (page_size_mask & (1<<PG_LEVEL_2M)) {
                        pages++;
                        spin_lock(&init_mm.page_table_lock);
-                       set_pte_init((pte_t *)pmd,
-                                    pfn_pte((paddr & PMD_MASK) >> PAGE_SHIFT,
-                                            __pgprot(pgprot_val(prot) | _PAGE_PSE)),
+                       set_pmd_init(pmd,
+                                    pfn_pmd(paddr >> PAGE_SHIFT, prot_sethuge(prot)),
                                     init);
                        spin_unlock(&init_mm.page_table_lock);
                        paddr_last = paddr_next;
@@ -644,12 +649,8 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
                if (page_size_mask & (1<<PG_LEVEL_1G)) {
                        pages++;
                        spin_lock(&init_mm.page_table_lock);
-
-                       prot = __pgprot(pgprot_val(prot) | _PAGE_PSE);
-
-                       set_pte_init((pte_t *)pud,
-                                    pfn_pte((paddr & PUD_MASK) >> PAGE_SHIFT,
-                                            prot),
+                       set_pud_init(pud,
+                                    pfn_pud(paddr >> PAGE_SHIFT, prot_sethuge(prot)),
                                     init);
                        spin_unlock(&init_mm.page_table_lock);
                        paddr_last = paddr_next;