diff options
| author | Vineet Gupta <vgupta@kernel.org> | 2020-10-01 15:46:42 -0700 |
|---|---|---|
| committer | Vineet Gupta <vgupta@kernel.org> | 2021-08-26 13:43:19 -0700 |
| commit | 8747ff704ac886f6ef992b1b7eadcf77d151fd3a (patch) | |
| tree | 566687879eccba9a936adf38363b01d02bba5ca4 /arch/arc/mm | |
| parent | 2dde02ab6d1a725ddccc7144ff6bf5f55d37f916 (diff) | |
| download | linux-stable-8747ff704ac886f6ef992b1b7eadcf77d151fd3a.tar.gz linux-stable-8747ff704ac886f6ef992b1b7eadcf77d151fd3a.tar.bz2 linux-stable-8747ff704ac886f6ef992b1b7eadcf77d151fd3a.zip | |
ARC: mm: support 4 levels of page tables
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Vineet Gupta <vgupta@kernel.org>
Diffstat (limited to 'arch/arc/mm')
| -rw-r--r-- | arch/arc/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/arc/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/arc/mm/tlbex.S | 9 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c index 8da2f0ad8c69..f8994164fa36 100644 --- a/arch/arc/mm/fault.c +++ b/arch/arc/mm/fault.c @@ -46,6 +46,8 @@ noinline static int handle_kernel_vaddr_fault(unsigned long address) if (!p4d_present(*p4d_k)) goto bad_area; + set_p4d(p4d, *p4d_k); + pud = pud_offset(p4d, address); pud_k = pud_offset(p4d_k, address); if (!pud_present(*pud_k)) diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c index f7ba2a5d5ec8..699ecf119641 100644 --- a/arch/arc/mm/init.c +++ b/arch/arc/mm/init.c @@ -191,6 +191,7 @@ void __init mem_init(void) highmem_init(); BUILD_BUG_ON((PTRS_PER_PGD * sizeof(pgd_t)) > PAGE_SIZE); + BUILD_BUG_ON((PTRS_PER_PUD * sizeof(pud_t)) > PAGE_SIZE); BUILD_BUG_ON((PTRS_PER_PMD * sizeof(pmd_t)) > PAGE_SIZE); BUILD_BUG_ON((PTRS_PER_PTE * sizeof(pte_t)) > PAGE_SIZE); } diff --git a/arch/arc/mm/tlbex.S b/arch/arc/mm/tlbex.S index 5f57eba1089d..e054780a8fe0 100644 --- a/arch/arc/mm/tlbex.S +++ b/arch/arc/mm/tlbex.S @@ -173,6 +173,15 @@ ex_saved_reg1: tst r3, r3 bz do_slow_path_pf ; if no Page Table, do page fault +#if CONFIG_PGTABLE_LEVELS > 3 + lsr r0, r2, PUD_SHIFT ; Bits for indexing into PUD + and r0, r0, (PTRS_PER_PUD - 1) + ld.as r1, [r3, r0] ; PMD entry + tst r1, r1 + bz do_slow_path_pf + mov r3, r1 +#endif + #if CONFIG_PGTABLE_LEVELS > 2 lsr r0, r2, PMD_SHIFT ; Bits for indexing into PMD and r0, r0, (PTRS_PER_PMD - 1) |