sh-add-support-for-folded-p4d-page-tables.patch removed from -mm tree
The patch titled
Subject: sh: add support for folded p4d page tables
has been removed from the -mm tree. Its filename was
sh-add-support-for-folded-p4d-page-tables.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: sh: add support for folded p4d page tables
Implement primitives necessary for the 4th level folding, add walks of p4d level where appropriate and remove usage of __ARCH_USE_5LEVEL_HACK.
---
arch/sh/include/asm/pgtable-2level.h | 1 arch/sh/include/asm/pgtable-3level.h | 1 arch/sh/kernel/io_trapped.c | 7 +++++- arch/sh/mm/cache-sh4.c | 4 ++- arch/sh/mm/cache-sh5.c | 7 +++++- arch/sh/mm/fault.c | 26 ++++++++++++++++++++--- arch/sh/mm/hugetlbpage.c | 28 ++++++++++++++++--------- arch/sh/mm/init.c | 9 +++++++- arch/sh/mm/kmap.c | 2 - arch/sh/mm/tlbex_32.c | 6 ++++- arch/sh/mm/tlbex_64.c | 7 +++++- 11 files changed, 76 insertions(+), 22 deletions(-)
arch/sh/include/asm/pgtable-2level.h renamed from arch/sh/include/asm/pgtable-2level.h~sh-add-support-for-folded-p4d-page-tables +0 -1
@@ -2,7 +2,6 @@#ifndef __ASM_SH_PGTABLE_2LEVEL_H#define __ASM_SH_PGTABLE_2LEVEL_H -#define __ARCH_USE_5LEVEL_HACK#include <asm-generic/pgtable-nopmd.h> /*
arch/sh/include/asm/pgtable-3level.h renamed from arch/sh/include/asm/pgtable-3level.h~sh-add-support-for-folded-p4d-page-tables +0 -1
@@ -2,7 +2,6 @@#ifndef __ASM_SH_PGTABLE_3LEVEL_H#define __ASM_SH_PGTABLE_3LEVEL_H -#define __ARCH_USE_5LEVEL_HACK#include <asm-generic/pgtable-nopud.h> /*
arch/sh/kernel/io_trapped.c renamed from arch/sh/kernel/io_trapped.c~sh-add-support-for-folded-p4d-page-tables +6 -1
@@ -136,6 +136,7 @@ EXPORT_SYMBOL_GPL(match_trapped_io_handlstatic struct trapped_io *lookup_tiop (unsigned long address) {pgd_t *pgd_k; +p4d_t *p4d_k;pud_t *pud_k;pmd_t *pmd_k;pte_t *pte_k;
@@ -145,7 +146,11 @@ static struct trapped_io *lookup_tiop(unif (!pgd_present (*pgd_k))return NULL ; - pud_k =pud_offset (pgd_k, address); + p4d_k =p4d_offset (pgd_k, address); +if (!p4d_present (*p4d_k)) +return NULL ; + + pud_k =pud_offset (p4d_k, address);if (!pud_present (*pud_k))return NULL ;
arch/sh/mm/cache-sh4.c renamed from arch/sh/mm/cache-sh4.c~sh-add-support-for-folded-p4d-page-tables +3 -1
@@ -209,6 +209,7 @@ static void sh4_flush_cache_page(void *aunsigned long address, pfn, phys;int map_coherent =0 ;pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -224,7 +225,8 @@ static void sh4_flush_cache_page(void *areturn ; pgd =pgd_offset (vma->vm_mm, address); - pud =pud_offset (pgd, address); + p4d =p4d_offset (pgd, address); + pud =pud_offset (p4d, address); pmd =pmd_offset (pud, address); pte =pte_offset_kernel (pmd, address);
arch/sh/mm/cache-sh5.c renamed from arch/sh/mm/cache-sh5.c~sh-add-support-for-folded-p4d-page-tables +6 -1
@@ -383,6 +383,7 @@ static void sh64_dcache_purge_user_pages unsigned long addr, unsigned long end) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -397,7 +398,11 @@ static void sh64_dcache_purge_user_pagesif (pgd_bad (*pgd))return ; - pud =pud_offset (pgd, addr); + p4d =p4d_offset (pgd, addr); +if (p4d_none (*p4d) ||p4d_bad (*p4d)) +return ; + + pud =pud_offset (p4d, addr);if (pud_none (*pud) ||pud_bad (*pud))return ;
arch/sh/mm/fault.c renamed from arch/sh/mm/fault.c~sh-add-support-for-folded-p4d-page-tables +23 -3
@@ -53,6 +53,7 @@ static void show_pte(struct mm_struct *m (u64)pgd_val(*pgd)); do { + p4d_t *p4d; pud_t *pud; pmd_t *pmd; pte_t *pte;
@@ -65,7 +66,20 @@ static void show_pte(struct mm_struct *mbreak ; } - pud =pud_offset (pgd, addr); + p4d =p4d_offset (pgd, addr); +if (PTRS_PER_P4D !=1 ) +pr_cont (", *p4d=%0*Lx" , (u32)(sizeof (*p4d) *2 ), + (u64 )p4d_val (*p4d)); + +if (p4d_none (*p4d)) +break ; + +if (p4d_bad (*p4d)) { +pr_cont ("(bad)" ); +break ; + } + + pud =pud_offset (p4d, addr);if (PTRS_PER_PUD !=1 )pr_cont (", *pud=%0*llx" , (u32)(sizeof (*pud) *2 ), (u64 )pud_val (*pud));
@@ -107,6 +121,7 @@ static inline pmd_t *vmalloc_sync_one(pg {unsigned index =pgd_index (address);pgd_t *pgd_k; +p4d_t *p4d, *p4d_k;pud_t *pud, *pud_k;pmd_t *pmd, *pmd_k;
@@ -116,8 +131,13 @@ static inline pmd_t *vmalloc_sync_one(pgif (!pgd_present (*pgd_k))return NULL ; - 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)) +return NULL ; + + pud =pud_offset (p4d, address); + pud_k =pud_offset (p4d_k, address);if (!pud_present (*pud_k))return NULL ;
arch/sh/mm/hugetlbpage.c renamed from arch/sh/mm/hugetlbpage.c~sh-add-support-for-folded-p4d-page-tables +18 -10
@@ -26,17 +26,21 @@ pte_t *huge_pte_alloc(struct mm_struct * unsigned long addr, unsigned long sz) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte =NULL ; pgd =pgd_offset (mm, addr);if (pgd) { - pud =pud_alloc (mm, pgd, addr); -if (pud) { - pmd =pmd_alloc (mm, pud, addr); -if (pmd) - pte =pte_alloc_map (mm, pmd, addr); + p4d =p4d_alloc (mm, pgd, addr); +if (p4d) { + pud =pud_alloc (mm, p4d, addr); +if (pud) { + pmd =pmd_alloc (mm, pud, addr); +if (pmd) + pte =pte_alloc_map (mm, pmd, addr); + } } }
@@ -47,17 +51,21 @@ pte_t *huge_pte_offset(struct mm_struct unsigned long addr, unsigned long sz) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte =NULL ; pgd =pgd_offset (mm, addr);if (pgd) { - pud =pud_offset (pgd, addr); -if (pud) { - pmd =pmd_offset (pud, addr); -if (pmd) - pte =pte_offset_map (pmd, addr); + p4d =p4d_offset (pgd, addr); +if (p4d) { + pud =pud_offset (p4d, addr); +if (pud) { + pmd =pmd_offset (pud, addr); +if (pmd) + pte =pte_offset_map (pmd, addr); + } } }
arch/sh/mm/init.c renamed from arch/sh/mm/init.c~sh-add-support-for-folded-p4d-page-tables +8 -1
@@ -45,6 +45,7 @@ void __init __weak plat_mem_setup(void)static pte_t *__get_pte_phys (unsigned long addr) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;
@@ -54,7 +55,13 @@ static pte_t *__get_pte_phys(unsigned loreturn NULL ; } - pud =pud_alloc (NULL , pgd, addr); + p4d =p4d_alloc (NULL , pgd, addr); +if (unlikely (!p4d)) { +p4d_ERROR (*p4d); +return NULL ; + } + + pud =pud_alloc (NULL , p4d, addr);if (unlikely (!pud)) {pud_ERROR (*pud);return NULL ;
arch/sh/mm/kmap.c renamed from arch/sh/mm/kmap.c~sh-add-support-for-folded-p4d-page-tables +1 -1
@@ -15,7 +15,7 @@#include <asm/cacheflush.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)static pte_t *kmap_coherent_pte;
arch/sh/mm/tlbex_32.c renamed from arch/sh/mm/tlbex_32.c~sh-add-support-for-folded-p4d-page-tables +5 -1
@@ -23,6 +23,7 @@ handle_tlbmiss(struct pt_regs *regs, uns unsigned long address) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -42,7 +43,10 @@ handle_tlbmiss(struct pt_regs *regs, uns pgd =pgd_offset (current->mm, address); } - pud =pud_offset (pgd, address); + p4d =p4d_offset (pgd, address); +if (p4d_none_or_clear_bad (p4d)) +return 1 ; + pud =pud_offset (p4d, address);if (pud_none_or_clear_bad (pud))return 1 ; pmd =pmd_offset (pud, address);
arch/sh/mm/tlbex_64.c renamed from arch/sh/mm/tlbex_64.c~sh-add-support-for-folded-p4d-page-tables +6 -1
@@ -44,6 +44,7 @@ static int handle_tlbmiss(unsigned long unsigned long address) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -58,7 +59,11 @@ static int handle_tlbmiss(unsigned long pgd =pgd_offset (current->mm, address); } - pud =pud_offset (pgd, address); + p4d =p4d_offset (pgd, address); +if (p4d_none (*p4d) || !p4d_present (*p4d)) +return 1 ; + + pud =pud_offset (p4d, address);if (pud_none (*pud) || !pud_present (*pud))return 1 ;
_
Patches currently in -mm which might be from [email protected] are
mm-dont-include-asm-pgtableh-if-linux-mmh-is-already-included.patch mm-introduce-include-linux-pgtableh.patch mm-reorder-includes-after-introduction-of-linux-pgtableh.patch csky-replace-definitions-of-__pxd_offset-with-pxd_index.patch m68k-mm-motorola-move-comment-about-page-table-allocation-funcitons.patch m68k-mm-move-cachenocahe_page-definitions-close-to-their-user.patch x86-mm-simplify-init_trampoline-and-surrounding-logic.patch x86-mm-simplify-init_trampoline-and-surrounding-logic-fix.patch mm-pgtable-add-shortcuts-for-accessing-kernel-pmd-and-pte.patch mm-pgtable-add-shortcuts-for-accessing-kernel-pmd-and-pte-fix.patch mm-consolidate-pte_index-and-pte_offset_-definitions.patch mm-consolidate-pmd_index-and-pmd_offset-definitions.patch mm-consolidate-pud_index-and-pud_offset-definitions.patch mm-consolidate-pgd_index-and-pgd_offset_k-definitions.patch