xtensa: get rid of __ARCH_USE_5LEVEL_HACK

xtensa has 2-level page tables and already uses pgtable-nopmd for page
table folding.

Add walks of p4d level where appropriate and drop usage of
__ARCH_USE_5LEVEL_HACK.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Message-Id: <1572964400-16542-3-git-send-email-rppt@kernel.org>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> [fix up
               arch/xtensa/include/asm/fixmap.h and
               arch/xtensa/mm/tlb.c]

diff --git a/arch/xtensa/include/asm/fixmap.h b/arch/xtensa/include/asm/fixmap.h
index 7e25c1b50ac012962cfe38bc2849aeee467d2a89..cfb8696917e985f213e4fe51069b8b41ec2a080c 100644 (file)
--- a/arch/xtensa/include/asm/fixmap.h
+++ b/arch/xtensa/include/asm/fixmap.h
@@ -78,8 +78,10 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
 
 #define kmap_get_fixmap_pte(vaddr) \
        pte_offset_kernel( \
-               pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), \
-               (vaddr) \
-       )
+               pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), \
+                                                (vaddr)), \
+                                     (vaddr)), \
+                          (vaddr)), \
+               (vaddr))
 
 #endif

diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h
index af72f02004f100fe7a433e8e1d7b1706a183698c..27ac17c9da0969ae9d4dfe16fe8dce4287a1e7b0 100644 (file)
--- a/arch/xtensa/include/asm/pgtable.h
+++ b/arch/xtensa/include/asm/pgtable.h
@@ -8,7 +8,6 @@
 #ifndef _XTENSA_PGTABLE_H
 #define _XTENSA_PGTABLE_H
 
-#define __ARCH_USE_5LEVEL_HACK
 #include <asm/page.h>
 #include <asm/kmem_layout.h>
 #include <asm-generic/pgtable-nopmd.h>

diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 68a041402025667784f18f0cf71455745b7defef..bee30a77cd700d030273328ea7a6ba5df9f24959 100644 (file)
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -197,6 +197,7 @@ vmalloc_fault:
                struct mm_struct *act_mm = current->active_mm;
                int index = pgd_index(address);
                pgd_t *pgd, *pgd_k;
+               p4d_t *p4d, *p4d_k;
                pud_t *pud, *pud_k;
                pmd_t *pmd, *pmd_k;
                pte_t *pte_k;
@@ -212,8 +213,13 @@ vmalloc_fault:
 
                pgd_val(*pgd) = pgd_val(*pgd_k);
 
-               pud = pud_offset(pgd, address);
-               pud_k = pud_offset(pgd_k, address);
+               p4d = p4d_offset(pgd, address);
+               p4d_k = p4d_offset(pgd_k, address);
+               if (!p4d_present(*p4d) || !p4d_present(*p4d_k))
+                       goto bad_page_fault;
+
+               pud = pud_offset(p4d, address);
+               pud_k = pud_offset(p4d_k, address);
                if (!pud_present(*pud) || !pud_present(*pud_k))
                        goto bad_page_fault;
 

diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c
index ace98bdf5191da4933c5b37d4c562901dd6c2403..9c957791bb337af95e6c6a8be1dae67c01be0a33 100644 (file)
--- a/arch/xtensa/mm/kasan_init.c
+++ b/arch/xtensa/mm/kasan_init.c
@@ -20,7 +20,8 @@ void __init kasan_early_init(void)
 {
        unsigned long vaddr = KASAN_SHADOW_START;
        pgd_t *pgd = pgd_offset_k(vaddr);
-       pud_t *pud = pud_offset(pgd, vaddr);
+       p4d_t *p4d = p4d_offset(pgd, vaddr);
+       pud_t *pud = pud_offset(p4d, vaddr);
        pmd_t *pmd = pmd_offset(pud, vaddr);
        int i;
 
@@ -43,7 +44,8 @@ static void __init populate(void *start, void *end)
        unsigned long i, j;
        unsigned long vaddr = (unsigned long)start;
        pgd_t *pgd = pgd_offset_k(vaddr);
-       pud_t *pud = pud_offset(pgd, vaddr);
+       p4d_t *p4d = p4d_offset(pgd, vaddr);
+       pud_t *pud = pud_offset(p4d, vaddr);
        pmd_t *pmd = pmd_offset(pud, vaddr);
        pte_t *pte = memblock_alloc(n_pages * sizeof(pte_t), PAGE_SIZE);
 

diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c
index 018dda2c6a9168db979c257b791948bbee4f2f28..37e478a278771774b5d71726298883beb23090cb 100644 (file)
--- a/arch/xtensa/mm/mmu.c
+++ b/arch/xtensa/mm/mmu.c
@@ -22,7 +22,8 @@
 static void * __init init_pmd(unsigned long vaddr, unsigned long n_pages)
 {
        pgd_t *pgd = pgd_offset_k(vaddr);
-       pud_t *pud = pud_offset(pgd, vaddr);
+       p4d_t *p4d = p4d_offset(pgd, vaddr);
+       pud_t *pud = pud_offset(p4d, vaddr);
        pmd_t *pmd = pmd_offset(pud, vaddr);
        pte_t *pte;
        unsigned long i;

diff --git a/arch/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c
index 164a2ca07a1f0e96b1324a64c0798fd5a49a3335..ec82209732529b1f35ed03aa22aaebd0cb8c4a7c 100644 (file)
--- a/arch/xtensa/mm/tlb.c
+++ b/arch/xtensa/mm/tlb.c
@@ -169,6 +169,7 @@ static unsigned get_pte_for_vaddr(unsigned vaddr)
        struct task_struct *task = get_current();
        struct mm_struct *mm = task->mm;
        pgd_t *pgd;
+       p4d_t *p4d;
        pud_t *pud;
        pmd_t *pmd;
        pte_t *pte;
@@ -178,7 +179,10 @@ static unsigned get_pte_for_vaddr(unsigned vaddr)
        pgd = pgd_offset(mm, vaddr);
        if (pgd_none_or_clear_bad(pgd))
                return 0;
-       pud = pud_offset(pgd, vaddr);
+       p4d = p4d_offset(pgd, vaddr);
+       if (p4d_none_or_clear_bad(p4d))
+               return 0;
+       pud = pud_offset(p4d, vaddr);
        if (pud_none_or_clear_bad(pud))
                return 0;
        pmd = pmd_offset(pud, vaddr);