mips: get rid of __ARCH_USE_5LEVEL_HACK
Subsystems (3)
cover mips: get rid of __ARCH_USE_5LEVEL_HACK
From: Mike Rapoport <[email protected]>
Hi,
These patches update the mips page table folding/unfolding to take into account the 5th level.
Mike Rapoport (3):
mips: fix build when "48 bits virtual memory" is enabled
mips: drop __pXd_offset() macros that duplicate pXd_index() ones
mips: add support for folded p4d page tables
arch/mips/include/asm/fixmap.h | 2 +- arch/mips/include/asm/pgalloc.h | 4 +-- arch/mips/include/asm/pgtable-32.h | 6 +--- arch/mips/include/asm/pgtable-64.h | 44 ++++++++++++++++-------------- arch/mips/kvm/mmu.c | 40 ++++++++++++++++----------- arch/mips/kvm/trap_emul.c | 4 ++- arch/mips/mm/c-r3k.c | 4 ++- arch/mips/mm/c-r4k.c | 4 ++- arch/mips/mm/c-tx39.c | 4 ++- arch/mips/mm/fault.c | 12 ++++++-- arch/mips/mm/hugetlbpage.c | 14 +++++++--- arch/mips/mm/init.c | 6 ++-- arch/mips/mm/ioremap.c | 6 +++- arch/mips/mm/pgtable-32.c | 6 ++-- arch/mips/mm/tlb-r4k.c | 4 ++- 15 files changed, 97 insertions(+), 63 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/3 mips: fix build when "48 bits virtual memory" is enabled
From: Mike Rapoport <[email protected]>
With CONFIG_MIPS_VA_BITS_48=y the build fails miserably:
CC arch/mips/kernel/asm-offsets.s
In file included from arch/mips/include/asm/pgtable.h:644,
from include/linux/mm.h:99,
from arch/mips/kernel/asm-offsets.c:15:include/asm-generic/pgtable.h:16:2: error: #error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
#error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
^~~~~include/asm-generic/pgtable.h:390:28: error: unknown type name 'p4d_t'; did you mean 'pmd_t'?
static inline int p4d_same(p4d_t p4d_a, p4d_t p4d_b)
^~~~~
pmd_t[ ... more such errors ... ]
scripts/Makefile.build:99: recipe for target 'arch/mips/kernel/asm-offsets.s' failed make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
This happens because when CONFIG_MIPS_VA_BITS_48 enables 4th level of the page tables, but neither pgtable-nop4d.h nor 5level-fixup.h are included to cope with the 5th level.
Replace #ifdef conditions around includes of the pgtable-nop{m,u}d.h with explicit CONFIG_PGTABLE_LEVELS and add include of 5level-fixup.h for the case when CONFIG_PGTABLE_LEVELS==4
--- arch/mips/include/asm/pgtable-64.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/mips/include/asm/pgtable-64.h +7 -2
@@ -18,10 +18,12 @@#include <asm/fixmap.h> #define __ARCH_USE_5LEVEL_HACK -#if defined(CONFIG_PAGE_SIZE_64KB ) && !defined(CONFIG_MIPS_VA_BITS_48 ) +#if CONFIG_PGTABLE_LEVELS ==2 #include <asm-generic/pgtable-nopmd.h> -#elif !(defined(CONFIG_PAGE_SIZE_4KB ) && defined(CONFIG_MIPS_VA_BITS_48 )) +#elif CONFIG_PGTABLE_LEVELS ==3 #include <asm-generic/pgtable-nopud.h> +#else +#include <asm-generic/5level-fixup.h> #endif /*
@@ -216,6 +218,9 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)return pgd_val (pgd); } +#define pgd_phys (pgd) virt_to_phys((void *)pgd_val(pgd)) +#define pgd_page (pgd) (pfn_to_page(pgd_phys(pgd) >> PAGE_SHIFT)) +static inline pud_t *pud_offset (pgd_t *pgd,unsigned long address) {return (pud_t *)pgd_page_vaddr (*pgd) +pud_index (address);
Signature · 1 line
2.24.0
PATCH 2/3 mips: drop __pXd_offset() macros that duplicate pXd_index() ones
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The __pXd_offset() macros are identical to the pXd_index() macros and there is no point to keep both of them. All architectures define and use pXd_index() so let's keep only those to make mips consistent with the rest of the kernel.
--- arch/mips/include/asm/pgtable-32.h | 5 +---- arch/mips/include/asm/pgtable-64.h | 4 ---- arch/mips/kvm/mmu.c | 24 ++++++++++++------------ arch/mips/mm/fault.c | 2 +- arch/mips/mm/init.c | 6 +++--- arch/mips/mm/pgtable-32.c | 2 +- 6 files changed, 18 insertions(+), 25 deletions(-)
arch/mips/include/asm/pgtable-32.h +1 -4
@@ -196,14 +196,11 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#define pte_page (x) pfn_to_page(pte_pfn(x)) -#define __pgd_offset (address) pgd_index(address) -#define __pud_offset (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -#define __pmd_offset (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) -/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) +#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))/* to find an entry in a page-table-directory */
arch/mips/include/asm/pgtable-64.h +0 -4
@@ -319,10 +319,6 @@ static inline void pud_clear(pud_t *pudp)#define pfn_pmd (pfn, prot) __pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot))#endif -#define __pgd_offset (address) pgd_index(address) -#define __pud_offset (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -#define __pmd_offset (address) pmd_index(address) -/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)
arch/mips/kvm/mmu.c +12 -12
@@ -204,8 +204,8 @@ static bool kvm_mips_flush_gpa_pmd(pmd_t *pmd, unsigned long start_gpa, {pte_t *pte;unsigned long end = ~0ul ; -int i_min =__pmd_offset (start_gpa); -int i_max =__pmd_offset (end_gpa); +int i_min =pmd_index (start_gpa); +int i_max =pmd_index (end_gpa);bool safe_to_remove = (i_min ==0 && i_max ==PTRS_PER_PMD -1 );int i;
@@ -232,8 +232,8 @@ static bool kvm_mips_flush_gpa_pud(pud_t *pud, unsigned long start_gpa, {pmd_t *pmd;unsigned long end = ~0ul ; -int i_min =__pud_offset (start_gpa); -int i_max =__pud_offset (end_gpa); +int i_min =pud_index (start_gpa); +int i_max =pud_index (end_gpa);bool safe_to_remove = (i_min ==0 && i_max ==PTRS_PER_PUD -1 );int i;
@@ -334,8 +334,8 @@ static int kvm_mips_##name##_pmd(pmd_t *pmd, unsigned long start, \int ret =0 ; \pte_t *pte; \unsigned long cur_end = ~0ul ; \ -int i_min =__pmd_offset (start); \ -int i_max =__pmd_offset (end); \ +int i_min =pmd_index (start); \ +int i_max =pmd_index (end); \int i; \ \for (i = i_min; i <= i_max; ++i, start =0 ) { \
@@ -357,8 +357,8 @@ static int kvm_mips_##name##_pud(pud_t *pud, unsigned long start, \int ret =0 ; \pmd_t *pmd; \unsigned long cur_end = ~0ul ; \ -int i_min =__pud_offset (start); \ -int i_max =__pud_offset (end); \ +int i_min =pud_index (start); \ +int i_max =pud_index (end); \int i; \ \for (i = i_min; i <= i_max; ++i, start =0 ) { \
@@ -862,8 +862,8 @@ static bool kvm_mips_flush_gva_pmd(pmd_t *pmd, unsigned long start_gva, {pte_t *pte;unsigned long end = ~0ul ; -int i_min =__pmd_offset (start_gva); -int i_max =__pmd_offset (end_gva); +int i_min =pmd_index (start_gva); +int i_max =pmd_index (end_gva);bool safe_to_remove = (i_min ==0 && i_max ==PTRS_PER_PMD -1 );int i;
@@ -890,8 +890,8 @@ static bool kvm_mips_flush_gva_pud(pud_t *pud, unsigned long start_gva, {pmd_t *pmd;unsigned long end = ~0ul ; -int i_min =__pud_offset (start_gva); -int i_max =__pud_offset (end_gva); +int i_min =pud_index (start_gva); +int i_max =pud_index (end_gva);bool safe_to_remove = (i_min ==0 && i_max ==PTRS_PER_PUD -1 );int i;
arch/mips/mm/fault.c +1 -1
@@ -292,7 +292,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,* Do _not_ use "tsk" here. We might be inside * an interrupt in the middle of a task switch.. */ -int offset =__pgd_offset (address); +int offset =pgd_index (address);pgd_t *pgd, *pgd_k;pud_t *pud, *pud_k;pmd_t *pmd, *pmd_k;
arch/mips/mm/init.c +3 -3
@@ -239,9 +239,9 @@ void __init fixrange_init(unsigned long start, unsigned long end,unsigned long vaddr; vaddr = start; - i =__pgd_offset (vaddr); - j =__pud_offset (vaddr); - k =__pmd_offset (vaddr); + i =pgd_index (vaddr); + j =pud_index (vaddr); + k =pmd_index (vaddr); pgd = pgd_base + i;for ( ; (i <PTRS_PER_PGD ) && (vaddr < end); pgd++, i++) {
arch/mips/mm/pgtable-32.c +1 -1
@@ -81,7 +81,7 @@ void __init pagetable_init(void) vaddr =PKMAP_BASE ;fixrange_init (vaddr &PMD_MASK , vaddr +PAGE_SIZE *LAST_PKMAP , pgd_base); - pgd = swapper_pg_dir +__pgd_offset (vaddr); + pgd = swapper_pg_dir +pgd_index (vaddr); pud =pud_offset (pgd, vaddr); pmd =pmd_offset (pud, vaddr); pte =pte_offset_kernel (pmd, vaddr);
Signature · 1 line
2.24.0
PATCH 3/3 mips: add support for folded p4d page tables
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
Implement primitives necessary for the 4th level folding, add walks of p4d level where appropriate, replace 5leve-fixup.h with pgtable-nop4d.h and drop usage of __ARCH_USE_5LEVEL_HACK.
--- arch/mips/include/asm/fixmap.h | 2 +- arch/mips/include/asm/pgalloc.h | 4 ++-- arch/mips/include/asm/pgtable-32.h | 1 - arch/mips/include/asm/pgtable-64.h | 37 +++++++++++++++--------------- arch/mips/kvm/mmu.c | 16 +++++++++---- arch/mips/kvm/trap_emul.c | 4 +++- arch/mips/mm/c-r3k.c | 4 +++- arch/mips/mm/c-r4k.c | 4 +++- arch/mips/mm/c-tx39.c | 4 +++- arch/mips/mm/fault.c | 10 ++++++-- arch/mips/mm/hugetlbpage.c | 14 +++++++---- arch/mips/mm/ioremap.c | 6 ++++- arch/mips/mm/pgtable-32.c | 4 +++- arch/mips/mm/tlb-r4k.c | 4 +++- 14 files changed, 75 insertions(+), 39 deletions(-)
arch/mips/include/asm/fixmap.h +1 -1
@@ -70,7 +70,7 @@ enum fixed_addresses {#include <asm-generic/fixmap.h> #define kmap_get_fixmap_pte (vaddr) \ - pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)) + pte_offset_kernel(pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)), (vaddr))/* * Called from pgtable_init()
arch/mips/include/asm/pgalloc.h +2 -2
@@ -96,9 +96,9 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud)free_pages ((unsigned long )pud,PUD_ORDER ); } -static inline void pgd_populate (struct mm_struct *mm,pgd_t *pgd,pud_t *pud) +static inline void p4d_populate (struct mm_struct *mm,p4d_t *p4d,pud_t *pud) { -set_pgd (pgd,__pgd ((unsigned long )pud)); +set_p4d (p4d,__p4d ((unsigned long )pud)); }#define __pud_free_tlb (tlb, x, addr) pud_free((tlb)->mm, x)
arch/mips/include/asm/pgtable-32.h +0 -1
@@ -16,7 +16,6 @@#include <asm/cachectl.h> #include <asm/fixmap.h> -#define __ARCH_USE_5LEVEL_HACK#include <asm-generic/pgtable-nopmd.h> #ifdef CONFIG_HIGHMEM
arch/mips/include/asm/pgtable-64.h +19 -18
@@ -17,13 +17,12 @@#include <asm/cachectl.h> #include <asm/fixmap.h> -#define __ARCH_USE_5LEVEL_HACK#if CONFIG_PGTABLE_LEVELS ==2 #include <asm-generic/pgtable-nopmd.h> #elif CONFIG_PGTABLE_LEVELS ==3 #include <asm-generic/pgtable-nopud.h> #else -#include <asm-generic/5level-fixup.h> +#include <asm-generic/pgtable-nop4d.h> #endif /*
@@ -188,47 +187,49 @@ extern pud_t invalid_pud_table[PTRS_PER_PUD];/* * Empty pgd entries point to the invalid_pud_table. */ -static inline int pgd_none (pgd_t pgd) +static inline int p4d_none (p4d_t p4d) { -return pgd_val (pgd) == (unsigned long )invalid_pud_table; +return p4d_val (p4d) == (unsigned long )invalid_pud_table; } -static inline int pgd_bad (pgd_t pgd) +static inline int p4d_bad (p4d_t p4d) { -if (unlikely (pgd_val (pgd) & ~PAGE_MASK )) +if (unlikely (p4d_val (p4d) & ~PAGE_MASK ))return 1 ;return 0 ; } -static inline int pgd_present (pgd_t pgd) +static inline int p4d_present (p4d_t p4d) { -return pgd_val (pgd) != (unsigned long )invalid_pud_table; +return p4d_val (p4d) != (unsigned long )invalid_pud_table; } -static inline void pgd_clear (pgd_t *pgdp) +static inline void p4d_clear (p4d_t *p4dp) { -pgd_val (*pgdp) = (unsigned long )invalid_pud_table; +p4d_val (*p4dp) = (unsigned long )invalid_pud_table; }#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)) -static inline unsigned long pgd_page_vaddr (pgd_t pgd) +static inline unsigned long p4d_page_vaddr (p4d_t p4d) { -return pgd_val (pgd); +return p4d_val (p4d); } -#define pgd_phys (pgd) virt_to_phys((void *)pgd_val(pgd)) -#define pgd_page (pgd) (pfn_to_page(pgd_phys(pgd) >> PAGE_SHIFT)) +#define p4d_phys (p4d) virt_to_phys((void *)p4d_val(p4d)) +#define p4d_page (p4d) (pfn_to_page(p4d_phys(p4d) >> PAGE_SHIFT)) -static inline pud_t *pud_offset (pgd_t *pgd,unsigned long address) +#define p4d_index (address) (((address) >> P4D_SHIFT) & (PTRS_PER_P4D - 1)) + +static inline pud_t *pud_offset (p4d_t *p4d,unsigned long address) { -return (pud_t *)pgd_page_vaddr (*pgd) +pud_index (address); +return (pud_t *)p4d_page_vaddr (*p4d) +pud_index (address); } -static inline void set_pgd (pgd_t *pgd,pgd_t pgdval) +static inline void set_p4d (p4d_t *p4d,p4d_t p4dval) { - *pgd = pgdval; + *p4d = p4dval; }#endif
arch/mips/kvm/mmu.c +12 -4
@@ -136,6 +136,7 @@ pgd_t *kvm_pgd_alloc(void)static pte_t *kvm_mips_walk_pgd (pgd_t *pgd,struct kvm_mmu_memory_cache *cache,unsigned long addr) { +p4d_t *p4d;pud_t *pud;pmd_t *pmd;
@@ -145,7 +146,8 @@ static pte_t *kvm_mips_walk_pgd(pgd_t *pgd, struct kvm_mmu_memory_cache *cache,BUG ();return NULL ; } - pud =pud_offset (pgd, addr); + p4d =p4d_offset (pgd, addr); + pud =pud_offset (p4d, addr);if (pud_none (*pud)) {pmd_t *new_pmd;
@@ -258,6 +260,7 @@ static bool kvm_mips_flush_gpa_pud(pud_t *pud, unsigned long start_gpa,static bool kvm_mips_flush_gpa_pgd (pgd_t *pgd,unsigned long start_gpa,unsigned long end_gpa) { +p4d_t *p4d;pud_t *pud;unsigned long end = ~0ul ;int i_min =pgd_index (start_gpa);
@@ -269,7 +272,8 @@ static bool kvm_mips_flush_gpa_pgd(pgd_t *pgd, unsigned long start_gpa,if (!pgd_present (pgd[i]))continue ; - pud =pud_offset (pgd + i,0 ); + p4d =p4d_offset (pgd,0 ); + pud =pud_offset (p4d + i,0 );if (i == i_max) end = end_gpa;
@@ -378,6 +382,7 @@ static int kvm_mips_##name##_pgd(pgd_t *pgd, unsigned long start, \ unsigned long end) \ { \int ret =0 ; \ +p4d_t *p4d; \pud_t *pud; \unsigned long cur_end = ~0ul ; \int i_min =pgd_index (start); \
@@ -388,7 +393,8 @@ static int kvm_mips_##name##_pgd(pgd_t *pgd, unsigned long start, \if (!pgd_present (pgd[i])) \continue ; \ \ - pud =pud_offset (pgd + i,0 ); \ + p4d =p4d_offset (pgd,0 ); \ + pud =pud_offset (p4d + i,0 ); \if (i == i_max) \ cur_end = end; \ \
@@ -916,6 +922,7 @@ static bool kvm_mips_flush_gva_pud(pud_t *pud, unsigned long start_gva,static bool kvm_mips_flush_gva_pgd (pgd_t *pgd,unsigned long start_gva,unsigned long end_gva) { +p4d_t *p4d;pud_t *pud;unsigned long end = ~0ul ;int i_min =pgd_index (start_gva);
@@ -927,7 +934,8 @@ static bool kvm_mips_flush_gva_pgd(pgd_t *pgd, unsigned long start_gva,if (!pgd_present (pgd[i]))continue ; - pud =pud_offset (pgd + i,0 ); + p4d =p4d_offset (pgd,0 ); + pud =pud_offset (p4d + i,0 );if (i == i_max) end = end_gva;
arch/mips/kvm/trap_emul.c +3 -1
@@ -564,6 +564,7 @@ static void kvm_mips_emul_free_gva_pt(pgd_t *pgd)/* Don't free host kernel page tables copied from init_mm.pgd */ const unsigned long end =0x80000000 ;unsigned long pgd_va, pud_va, pmd_va; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -576,7 +577,8 @@ static void kvm_mips_emul_free_gva_pt(pgd_t *pgd) pgd_va = (unsigned long )i <<PGDIR_SHIFT ;if (pgd_va >= end)break ; - pud =pud_offset (pgd + i,0 ); + p4d =p4d_offset (pgd,0 ); + pud =pud_offset (p4d + i,0 );for (j =0 ; j <PTRS_PER_PUD ; j++) {if (pud_none (pud[j]))continue ;
arch/mips/mm/c-r3k.c +3 -1
@@ -241,6 +241,7 @@ static void r3k_flush_cache_page(struct vm_area_struct *vma,int exec = vma->vm_flags &VM_EXEC ;struct mm_struct *mm = vma->vm_mm;pgd_t *pgdp; +p4d_t *p4dp;pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -253,7 +254,8 @@ static void r3k_flush_cache_page(struct vm_area_struct *vma,return ; pgdp =pgd_offset (mm, addr); - pudp =pud_offset (pgdp, addr); + p4dp =p4d_offset (pgdp, addr); + pudp =pud_offset (p4dp, addr); pmdp =pmd_offset (pudp, addr); ptep =pte_offset (pmdp, addr);
arch/mips/mm/c-r4k.c +3 -1
@@ -650,6 +650,7 @@ static inline void local_r4k_flush_cache_page(void *args)struct mm_struct *mm = vma->vm_mm;int map_coherent =0 ;pgd_t *pgdp; +p4d_t *p4dp;pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -664,7 +665,8 @@ static inline void local_r4k_flush_cache_page(void *args) addr &=PAGE_MASK ; pgdp =pgd_offset (mm, addr); - pudp =pud_offset (pgdp, addr); + p4dp =p4d_offset (pgdp, addr); + pudp =pud_offset (p4dp, addr); pmdp =pmd_offset (pudp, addr); ptep =pte_offset (pmdp, addr);
arch/mips/mm/c-tx39.c +3 -1
@@ -170,6 +170,7 @@ static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long pageint exec = vma->vm_flags &VM_EXEC ;struct mm_struct *mm = vma->vm_mm;pgd_t *pgdp; +p4d_t *p4dp;pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -183,7 +184,8 @@ static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long page page &=PAGE_MASK ; pgdp =pgd_offset (mm, page); - pudp =pud_offset (pgdp, page); + p4dp =p4d_offset (pgdp, page); + pudp =pud_offset (p4dp, page); pmdp =pmd_offset (pudp, page); ptep =pte_offset (pmdp, page);
arch/mips/mm/fault.c +8 -2
@@ -294,6 +294,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,*/ int offset =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;
@@ -305,8 +306,13 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, goto no_context;set_pgd (pgd, *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_k)) + goto no_context; + + pud =pud_offset (p4d, address); + pud_k =pud_offset (p4d_k, address);if (!pud_present (*pud_k)) goto no_context;
arch/mips/mm/hugetlbpage.c +10 -4
@@ -25,11 +25,13 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pte_t *pte =NULL ; pgd =pgd_offset (mm, addr); - pud =pud_alloc (mm, pgd, addr); + p4d =p4d_alloc (mm, pgd, addr); + pud =pud_alloc (mm, p4d, addr);if (pud) pte = (pte_t *)pmd_alloc (mm, pud, addr);
@@ -40,14 +42,18 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr, unsigned long sz) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd =NULL ; pgd =pgd_offset (mm, addr);if (pgd_present (*pgd)) { - pud =pud_offset (pgd, addr); -if (pud_present (*pud)) - pmd =pmd_offset (pud, addr); + p4d =p4d_offset (pgd, addr); +if (p4d_present (*p4d)) { + pud =pud_offset (p4d, addr); +if (pud_present (*pud)) + pmd =pmd_offset (pud, addr); + } }return (pte_t *) pmd; }
arch/mips/mm/ioremap.c +5 -1
@@ -78,11 +78,15 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr,flush_cache_all ();BUG_ON (address >= end); do { + p4d_t *p4d; pud_t *pud; pmd_t *pmd; error = -ENOMEM; - pud = pud_alloc(&init_mm, dir, address); + p4d = p4d_alloc(&init_mm, dir, address); + if (!p4d) + break; + pud = pud_alloc(&init_mm, p4d, address); if (!pud) break; pmd = pmd_alloc(&init_mm, pud, address);
arch/mips/mm/pgtable-32.c +3 -1
@@ -56,6 +56,7 @@ void __init pagetable_init(void)pgd_t *pgd_base;#ifdef CONFIG_HIGHMEM pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -82,7 +83,8 @@ void __init pagetable_init(void)fixrange_init (vaddr &PMD_MASK , vaddr +PAGE_SIZE *LAST_PKMAP , pgd_base); pgd = swapper_pg_dir +pgd_index (vaddr); - pud =pud_offset (pgd, vaddr); + p4d =p4d_offset (pgd, vaddr); + pud =pud_offset (p4d, vaddr); pmd =pmd_offset (pud, vaddr); pte =pte_offset_kernel (pmd, vaddr); pkmap_page_table = pte;
arch/mips/mm/tlb-r4k.c +3 -1
@@ -295,6 +295,7 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte) {unsigned long flags;pgd_t *pgdp; +p4d_t *p4dp;pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -320,7 +321,8 @@ void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)mtc0_tlbw_hazard ();tlb_probe ();tlb_probe_hazard (); - pudp =pud_offset (pgdp, address); + p4dp =p4d_offset (pgdp, address); + pudp =pud_offset (p4dp, address); pmdp =pmd_offset (pudp, address); idx =read_c0_index ();#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
Signature · 1 line
2.24.0
Hello,
Quoted 7 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Hi,
These patches update the mips page table folding/unfolding to take into account the 5th level.
Quoted 7 lines
Mike Rapoport (3):
mips: fix build when "48 bits virtual memory" is enabled
mips: drop__pXd_offset()macros that duplicatepXd_index()ones
mips: add support for folded p4d page tablesarch/mips/include/asm/fixmap.h | 2 +- arch/mips/include/asm/pgalloc.h | 4 +--
Series applied to mips-next.
Quoted 14 lines
mips: fix build when "48 bits virtual memory" is enabled
commit3ed6751bb8fa
https://git.kernel.org/mips/c/3ed6751bb8faSigned-off-by Mike Rapoport <[email protected]>Signed-off-by Paul Burton <[email protected]>mips: drop
__pXd_offset()macros that duplicatepXd_index()ones
commit31168f033e37
https://git.kernel.org/mips/c/31168f033e37Signed-off-by Mike Rapoport <[email protected]>Signed-off-by Paul Burton <[email protected]>
Quoted 6 lines
mips: add support for folded p4d page tables
commit2bee1b58484f
https://git.kernel.org/mips/c/2bee1b58484fSigned-off-by Mike Rapoport <[email protected]>Signed-off-by Paul Burton <[email protected]>
Thanks,
Paul
[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]