summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/mm/fault.c
diff options
context:
space:
mode:
authorMike Rapoport <rppt@linux.ibm.com>2019-11-05 16:33:19 +0200
committerMax Filippov <jcmvbkbc@gmail.com>2019-11-26 11:33:39 -0800
commitf0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7 (patch)
treed7d8ecd9e6c38a6f52680888b1453a74b72a5823 /arch/xtensa/mm/fault.c
parent8951eb1530ddf83dbb815d38e97afddc6a0d1140 (diff)
downloadlinux-f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7.tar.gz
linux-f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7.tar.bz2
linux-f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7.zip
xtensa: mm: fix PMD folding implementation
There was a definition of pmd_offset() in arch/xtensa/include/asm/pgtable.h that shadowed the generic implementation defined in include/asm-generic/pgtable-nopmd.h. As the result, xtensa had shortcuts in page table traversal in several places instead of doing level unfolding. Remove local override for pmd_offset() and add page table unfolding where necessary. Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Message-Id: <1572964400-16542-2-git-send-email-rppt@kernel.org> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/mm/fault.c')
-rw-r--r--arch/xtensa/mm/fault.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index f81b1478da61..68a041402025 100644
--- 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;
+ pud_t *pud, *pud_k;
pmd_t *pmd, *pmd_k;
pte_t *pte_k;
@@ -211,8 +212,13 @@ vmalloc_fault:
pgd_val(*pgd) = pgd_val(*pgd_k);
- pmd = pmd_offset(pgd, address);
- pmd_k = pmd_offset(pgd_k, address);
+ pud = pud_offset(pgd, address);
+ pud_k = pud_offset(pgd_k, address);
+ if (!pud_present(*pud) || !pud_present(*pud_k))
+ goto bad_page_fault;
+
+ pmd = pmd_offset(pud, address);
+ pmd_k = pmd_offset(pud_k, address);
if (!pmd_present(*pmd) || !pmd_present(*pmd_k))
goto bad_page_fault;