mm: remove __ARCH_HAS_4LEVEL_HACK
Subsystems (13)
Mike Rapoport
reviewerv4 cover mm: remove __ARCH_HAS_4LEVEL_HACK
From: Mike Rapoport <[email protected]>
Hi,
These patches convert several architectures to use page table folding and remove __ARCH_HAS_4LEVEL_HACK along with include/asm-generic/4level-fixup.h.
For the nommu configurations the folding is already implemented by the generic code so the only change was to use the appropriate header file.
As for the rest, the changes are mostly about mechanical replacement of pgd accessors with pud/pmd ones and the addition of higher levels to page table traversals.
With Vineet's patches from "elide extraneous generated code for folded p4d/pud/pmd" series [1] there is a small shrink of the kernel size of about -0.01% for the defconfig builds.
The set is boot-tested on UML, qemu-{alpha,sparc} and aranym.
v4 changes:
* m68k: fix sun3x_defconfig build and reorder ifdefs as per Geert's suggestion
v3 changes:
* alpha: fix changelog to use pgtable-nopud.h rather than pgtable-nop4d.h
* um: remove dead-code that was intended as provisioning for 4-level page tables
v2 changes:
* m68k: fixed ifdefs around pmd_t defintion to work with nommu
* parisc: added conversion of hugetlb (thanks, Helge!); lexical fixups in comments and changelog
* collected acks
[1] https://lore.kernel.org/lkml/[email protected]
Helge Deller (1):
parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup
Mike Rapoport (12):
alpha: use pgtable-nopud instead of 4level-fixup
arm: nommu: use pgtable-nopud instead of 4level-fixup
c6x: use pgtable-nopud instead of 4level-fixup
m68k: nommu: use pgtable-nopud instead of 4level-fixup
m68k: mm: use pgtable-nopXd instead of 4level-fixup
microblaze: use pgtable-nopmd instead of 4level-fixup
nds32: use pgtable-nopmd instead of 4level-fixup
parisc: use pgtable-nopXd instead of 4level-fixup
sparc32: use pgtable-nopud instead of 4level-fixup
um: remove unused pxx_offset_proc() and addr_pte() functions
um: add support for folded p4d page tables
mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h
arch/alpha/include/asm/mmzone.h | 1 - arch/alpha/include/asm/pgalloc.h | 4 +- arch/alpha/include/asm/pgtable.h | 24 ++++----- arch/alpha/mm/init.c | 12 +++-- arch/arm/include/asm/pgtable.h | 2 +- arch/c6x/include/asm/pgtable.h | 2 +- arch/m68k/include/asm/mcf_pgalloc.h | 7 --- arch/m68k/include/asm/mcf_pgtable.h | 28 ++++------- arch/m68k/include/asm/mmu_context.h | 12 ++++- arch/m68k/include/asm/motorola_pgalloc.h | 4 +- arch/m68k/include/asm/motorola_pgtable.h | 32 +++++++----- arch/m68k/include/asm/page.h | 9 ++-- arch/m68k/include/asm/pgtable_mm.h | 11 +++-- arch/m68k/include/asm/pgtable_no.h | 2 +- arch/m68k/include/asm/sun3_pgalloc.h | 5 -- arch/m68k/include/asm/sun3_pgtable.h | 18 ------- arch/m68k/kernel/sys_m68k.c | 10 +++- arch/m68k/mm/init.c | 6 ++- arch/m68k/mm/kmap.c | 39 +++++++++++---- arch/m68k/mm/mcfmmu.c | 16 +++++- arch/m68k/mm/motorola.c | 17 ++++--- arch/m68k/sun3x/dvma.c | 7 ++- arch/microblaze/include/asm/page.h | 3 -- arch/microblaze/include/asm/pgalloc.h | 16 ------ arch/microblaze/include/asm/pgtable.h | 32 +----------- arch/microblaze/kernel/signal.c | 10 ++-- arch/microblaze/mm/init.c | 7 ++- arch/microblaze/mm/pgtable.c | 13 ++++- arch/nds32/include/asm/page.h | 3 -- arch/nds32/include/asm/pgalloc.h | 3 -- arch/nds32/include/asm/pgtable.h | 12 +---- arch/nds32/include/asm/tlb.h | 1 - arch/nds32/kernel/pm.c | 4 +- arch/nds32/mm/fault.c | 16 ++++-- arch/nds32/mm/init.c | 11 +++-- arch/nds32/mm/mm-nds32.c | 6 ++- arch/nds32/mm/proc.c | 26 ++++++---- arch/parisc/include/asm/page.h | 30 ++++++----- arch/parisc/include/asm/pgalloc.h | 41 ++++++--------- arch/parisc/include/asm/pgtable.h | 52 ++++++++++--------- arch/parisc/include/asm/tlb.h | 2 + arch/parisc/kernel/cache.c | 13 +++-- arch/parisc/kernel/pci-dma.c | 9 +++- arch/parisc/mm/fixmap.c | 10 ++-- arch/parisc/mm/hugetlbpage.c | 18 ++++--- arch/sparc/include/asm/pgalloc_32.h | 6 +-- arch/sparc/include/asm/pgtable_32.h | 28 +++++------ arch/sparc/mm/fault_32.c | 11 ++++- arch/sparc/mm/highmem.c | 6 ++- arch/sparc/mm/io-unit.c | 6 ++- arch/sparc/mm/iommu.c | 6 ++- arch/sparc/mm/srmmu.c | 51 ++++++++++++++----- arch/um/include/asm/pgtable-2level.h | 1 - arch/um/include/asm/pgtable-3level.h | 1 - arch/um/include/asm/pgtable.h | 3 ++ arch/um/kernel/mem.c | 8 ++- arch/um/kernel/skas/mmu.c | 12 ++++- arch/um/kernel/skas/uaccess.c | 7 ++- arch/um/kernel/tlb.c | 85 +++++++++++++++++++------------- arch/um/kernel/trap.c | 4 +- include/asm-generic/4level-fixup.h | 40 --------------- include/asm-generic/tlb.h | 2 - include/linux/mm.h | 10 ++-- mm/memory.c | 8 --- 64 files changed, 483 insertions(+), 418 deletions(-) delete mode 100644 include/asm-generic/4level-fixup.h
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 1/13 alpha: use pgtable-nopud instead of 4level-fixup
From: Mike Rapoport <[email protected]>
It is not likely alpha will have 5-level page tables.
Replace usage of include/asm-generic/4level-fixup.h and implied __ARCH_HAS_4LEVEL_HACK with include/asm-generic/pgtable-nopud.h and adjust page table manipulation macros and functions accordingly.
--- arch/alpha/include/asm/mmzone.h | 1 - arch/alpha/include/asm/pgalloc.h | 4 ++-- arch/alpha/include/asm/pgtable.h | 24 ++++++++++++------------ arch/alpha/mm/init.c | 12 ++++++++---- 4 files changed, 22 insertions(+), 19 deletions(-)
arch/alpha/include/asm/mmzone.h +0 -1
@@ -73,7 +73,6 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)#define virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)#define pmd_page (pmd) (pfn_to_page(pmd_val(pmd) >> 32)) -#define pgd_page (pgd) (pfn_to_page(pgd_val(pgd) >> 32))#define pte_pfn (pte) (pte_val(pte) >> 32)#define mk_pte (page, pgprot) \
arch/alpha/include/asm/pgalloc.h +2 -2
@@ -27,9 +27,9 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) }static inline void -pgd_populate (struct mm_struct *mm,pgd_t *pgd,pmd_t *pmd) +pud_populate (struct mm_struct *mm,pud_t *pud,pmd_t *pmd) { -pgd_set (pgd, pmd); +pud_set (pud, pmd); }extern pgd_t *pgd_alloc (struct mm_struct *mm);
arch/alpha/include/asm/pgtable.h +12 -12
@@ -2,7 +2,7 @@#ifndef _ALPHA_PGTABLE_H#define _ALPHA_PGTABLE_H -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopud.h> /* * This file contains the functions and defines necessary to modify and use
@@ -226,8 +226,8 @@ extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)extern inline void pmd_set (pmd_t * pmdp,pte_t * ptep) {pmd_val (*pmdp) = _PAGE_TABLE | ((((unsigned long ) ptep) -PAGE_OFFSET ) << (32 -PAGE_SHIFT )); } -extern inline void pgd_set (pgd_t * pgdp,pmd_t * pmdp) -{pgd_val (*pgdp) = _PAGE_TABLE | ((((unsigned long ) pmdp) -PAGE_OFFSET ) << (32 -PAGE_SHIFT )); } +extern inline void pud_set (pud_t * pudp,pmd_t * pmdp) +{pud_val (*pudp) = _PAGE_TABLE | ((((unsigned long ) pmdp) -PAGE_OFFSET ) << (32 -PAGE_SHIFT )); } extern inline unsigned long
@@ -238,11 +238,11 @@ pmd_page_vaddr(pmd_t pmd)#ifndef CONFIG_DISCONTIGMEM #define pmd_page (pmd) (mem_map + ((pmd_val(pmd) & _PFN_MASK) >> 32)) -#define pgd_page (pgd) (mem_map + ((pgd_val(pgd) & _PFN_MASK) >> 32)) +#define pud_page (pud) (mem_map + ((pud_val(pud) & _PFN_MASK) >> 32))#endif -extern inline unsigned long pgd_page_vaddr (pgd_t pgd) -{return PAGE_OFFSET + ((pgd_val (pgd) & _PFN_MASK) >> (32 -PAGE_SHIFT )); } +extern inline unsigned long pud_page_vaddr (pud_t pgd) +{return PAGE_OFFSET + ((pud_val (pgd) & _PFN_MASK) >> (32 -PAGE_SHIFT )); }extern inline int pte_none (pte_t pte) {return !pte_val (pte); }extern inline int pte_present (pte_t pte) {return pte_val (pte) & _PAGE_VALID; }
@@ -256,10 +256,10 @@ extern inline int pmd_bad(pmd_t pmd) { return (pmd_val(pmd) & ~_PFN_MASK) != _Pextern inline int pmd_present (pmd_t pmd) {return pmd_val (pmd) & _PAGE_VALID; }extern inline void pmd_clear (pmd_t * pmdp) {pmd_val (*pmdp) =0 ; } -extern inline int pgd_none (pgd_t pgd) {return !pgd_val (pgd); } -extern inline int pgd_bad (pgd_t pgd) {return (pgd_val (pgd) & ~_PFN_MASK) != _PAGE_TABLE; } -extern inline int pgd_present (pgd_t pgd) {return pgd_val (pgd) & _PAGE_VALID; } -extern inline void pgd_clear (pgd_t * pgdp) {pgd_val (*pgdp) =0 ; } +extern inline int pud_none (pud_t pud) {return !pud_val (pud); } +extern inline int pud_bad (pud_t pud) {return (pud_val (pud) & ~_PFN_MASK) != _PAGE_TABLE; } +extern inline int pud_present (pud_t pud) {return pud_val (pud) & _PAGE_VALID; } +extern inline void pud_clear (pud_t * pudp) {pud_val (*pudp) =0 ; }/* * The following only work if pte_present() is true.
@@ -301,9 +301,9 @@ extern inline pte_t pte_mkspecial(pte_t pte) { return pte; }*/ /* Find an entry in the second-level page table.. */ -extern inline pmd_t *pmd_offset (pgd_t * dir,unsigned long address) +extern inline pmd_t *pmd_offset (pud_t * dir,unsigned long address) { -pmd_t *ret = (pmd_t *)pgd_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PAGE -1 )); +pmd_t *ret = (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PAGE -1 ));smp_read_barrier_depends ();/* see above */ return ret; }
arch/alpha/mm/init.c +8 -4
@@ -146,6 +146,8 @@ callback_init(void * kernel_end) {struct crb_struct * crb;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;void *two_pages;
@@ -184,8 +186,10 @@ callback_init(void * kernel_end)memset (two_pages,0 ,2 *PAGE_SIZE ); pgd =pgd_offset_k (VMALLOC_START ); -pgd_set (pgd, (pmd_t *)two_pages); - pmd =pmd_offset (pgd,VMALLOC_START ); + p4d =p4d_offset (pgd,VMALLOC_START ); + pud =pud_offset (p4d,VMALLOC_START ); +pud_set (pud, (pmd_t *)two_pages); + pmd =pmd_offset (pud,VMALLOC_START );pmd_set (pmd, (pte_t *)(two_pages +PAGE_SIZE ));if (alpha_using_srm) {
@@ -214,9 +218,9 @@ callback_init(void * kernel_end)/* Newer consoles (especially on larger systems) may require more pages of PTEs. Grab additional pages as needed. */ -if (pmd !=pmd_offset (pgd, vaddr)) { +if (pmd !=pmd_offset (pud, vaddr)) {memset (kernel_end,0 ,PAGE_SIZE ); - pmd =pmd_offset (pgd, vaddr); + pmd =pmd_offset (pud, vaddr);pmd_set (pmd, (pte_t *)kernel_end); kernel_end +=PAGE_SIZE ; }
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 2/13 arm: nommu: use pgtable-nopud instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The generic nommu implementation of page table manipulation takes care of folding of the upper levels and does not require fixups.
Simply replace of include/asm-generic/4level-fixup.h with include/asm-generic/pgtable-nopud.h.
--- arch/arm/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/pgtable.h +1 -1
@@ -12,7 +12,7 @@#ifndef CONFIG_MMU -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopud.h> #include <asm/pgtable-nommu.h> #else
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 3/13 c6x: use pgtable-nopud instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
c6x is a nommu architecture and does not require fixup for upper layers of the page tables because it is already handled by the generic nommu implementation.
Replace usage of include/asm-generic/4level-fixup.h with include/asm-generic/pgtable-nopud.h
--- arch/c6x/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/c6x/include/asm/pgtable.h +1 -1
@@ -8,7 +8,7 @@#ifndef _ASM_C6X_PGTABLE_H#define _ASM_C6X_PGTABLE_H -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopud.h> #include <asm/setup.h> #include <asm/page.h>
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 4/13 m68k: nommu: use pgtable-nopud instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The generic nommu implementation of page table manipulation takes care of folding of the upper levels and does not require fixups.
Simply replace of include/asm-generic/4level-fixup.h with include/asm-generic/pgtable-nopud.h.
--- arch/m68k/include/asm/pgtable_no.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/include/asm/pgtable_no.h +1 -1
@@ -2,7 +2,7 @@#ifndef _M68KNOMMU_PGTABLE_H#define _M68KNOMMU_PGTABLE_H -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopud.h> /* * (C) Copyright 2000-2002, Greg Ungerer <[email protected]>
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 5/13 m68k: mm: use pgtable-nopXd instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Replace usage of include/asm-generic/4level-fixup.h and explicit definitions of __PAGETABLE_PxD_FOLDED in m68k with include/asm-generic/pgtable-nopmd.h for two-level configurations and with include/asm-generic/pgtable-nopud.h for three-lelve configurations and adjust page table manipulation macros and functions accordingly.
--- arch/m68k/include/asm/mcf_pgalloc.h | 7 ------ arch/m68k/include/asm/mcf_pgtable.h | 28 ++++++++--------------- arch/m68k/include/asm/mmu_context.h | 12 +++++++++- arch/m68k/include/asm/motorola_pgalloc.h | 4 ++-- arch/m68k/include/asm/motorola_pgtable.h | 32 ++++++++++++++++---------- arch/m68k/include/asm/page.h | 9 +++++--- arch/m68k/include/asm/pgtable_mm.h | 11 +++++---- arch/m68k/include/asm/sun3_pgalloc.h | 5 ---- arch/m68k/include/asm/sun3_pgtable.h | 18 --------------- arch/m68k/kernel/sys_m68k.c | 10 +++++++- arch/m68k/mm/init.c | 6 +++-- arch/m68k/mm/kmap.c | 39 ++++++++++++++++++++++++-------- arch/m68k/mm/mcfmmu.c | 16 ++++++++++++- arch/m68k/mm/motorola.c | 17 +++++++++----- arch/m68k/sun3x/dvma.c | 7 ++++-- 15 files changed, 129 insertions(+), 92 deletions(-)
arch/m68k/include/asm/mcf_pgalloc.h +0 -7
@@ -28,9 +28,6 @@ extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)return (pmd_t *) pgd; } -#define pmd_alloc_one_fast (mm, address) ({ BUG(); ((pmd_t *)1); }) -#define pmd_alloc_one (mm, address) ({ BUG(); ((pmd_t *)2); }) -#define pmd_populate (mm, pmd, page) (pmd_val(*pmd) = \ (unsigned long)(page_address(page)))
@@ -45,8 +42,6 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page,__free_page (page); } -#define __pmd_free_tlb (tlb, pmd, address) do { } while (0) -static inline struct page *pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );
@@ -100,6 +95,4 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) return new_pgd; } -#define pgd_populate (mm, pmd, pte) BUG() -#endif /* M68K_MCF_PGALLOC_H */
arch/m68k/include/asm/mcf_pgtable.h +10 -18
@@ -198,17 +198,9 @@ static inline int pmd_bad2(pmd_t *pmd) { return 0; }#define pmd_present (pmd) (!pmd_none2(&(pmd)))static inline void pmd_clear (pmd_t *pmdp) {pmd_val (*pmdp) =0 ; } -static inline int pgd_none (pgd_t pgd) {return 0 ; } -static inline int pgd_bad (pgd_t pgd) {return 0 ; } -static inline int pgd_present (pgd_t pgd) {return 1 ; } -static inline void pgd_clear (pgd_t *pgdp) {} -#define pte_ERROR (e) \ printk(KERN_ERR "%s:%d: bad pte %08lx.\n", \ __FILE__, __LINE__, pte_val(e)) -#define pmd_ERROR (e) \ - printk(KERN_ERR "%s:%d: bad pmd %08lx.\n", \ - __FILE__, __LINE__, pmd_val(e))#define pgd_ERROR (e) \ printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", \ __FILE__, __LINE__, pgd_val(e))
@@ -340,14 +332,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD];#define pgd_offset_k (address) pgd_offset(&init_mm, address)/* -* Find an entry in the second-level pagetable. -*/ -static inline pmd_t *pmd_offset (pgd_t *pgd,unsigned long address) -{ -return (pmd_t *) pgd; -} - -/* * Find an entry in the third-level pagetable. */ #define __pte_offset (address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
@@ -360,12 +344,16 @@ static inline pmd_t *pmd_offset(pgd_t *pgd, unsigned long address)static inline void nocache_page (void *vaddr) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;unsigned long addr = (unsigned long ) vaddr; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mknocache (*ptep); }
@@ -376,12 +364,16 @@ static inline void nocache_page(void *vaddr)static inline void cache_page (void *vaddr) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;unsigned long addr = (unsigned long ) vaddr; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mkcache (*ptep); }
arch/m68k/include/asm/mmu_context.h +11 -1
@@ -100,6 +100,8 @@ static inline void load_ksp_mmu(struct task_struct *task)struct mm_struct *mm;int asid;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;unsigned long mmuar;
@@ -127,7 +129,15 @@ static inline void load_ksp_mmu(struct task_struct *task)if (pgd_none (*pgd)) goto bug; - pmd =pmd_offset (pgd, mmuar); + p4d =p4d_offset (pgd, mmuar); +if (p4d_none (*p4d)) + goto bug; + + pud =pud_offset (p4d, mmuar); +if (pud_none (*pud)) + goto bug; + + pmd =pmd_offset (pud, mmuar);if (pmd_none (*pmd)) goto bug;
arch/m68k/include/asm/motorola_pgalloc.h +2 -2
@@ -106,9 +106,9 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page }#define pmd_pgtable (pmd) pmd_page(pmd) -static inline void pgd_populate (struct mm_struct *mm,pgd_t *pgd,pmd_t *pmd) +static inline void pud_populate (struct mm_struct *mm,pud_t *pud,pmd_t *pmd) { -pgd_set (pgd, pmd); +pud_set (pud, pmd); }#endif /* _MOTOROLA_PGALLOC_H */
arch/m68k/include/asm/motorola_pgtable.h +20 -12
@@ -117,14 +117,14 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) } } -static inline void pgd_set (pgd_t *pgdp,pmd_t *pmdp) +static inline void pud_set (pud_t *pudp,pmd_t *pmdp) { -pgd_val (*pgdp) = _PAGE_TABLE | _PAGE_ACCESSED |__pa (pmdp); +pud_val (*pudp) = _PAGE_TABLE | _PAGE_ACCESSED |__pa (pmdp); }#define __pte_page (pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK))#define __pmd_page (pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK)) -#define __pgd_page (pgd) ((unsigned long)__va(pgd_val(pgd) & _TABLE_MASK)) +#define pud_page_vaddr (pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK))#define pte_none (pte) (!pte_val(pte))
@@ -147,11 +147,11 @@ static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)#define pmd_page (pmd) virt_to_page(__va(pmd_val(pmd))) -#define pgd_none (pgd) (!pgd_val(pgd)) -#define pgd_bad (pgd) ((pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE) -#define pgd_present (pgd) (pgd_val(pgd) & _PAGE_TABLE) -#define pgd_clear (pgdp) ({ pgd_val(*pgdp) = 0; }) -#define pgd_page (pgd) (mem_map + ((unsigned long)(__va(pgd_val(pgd)) - PAGE_OFFSET) >> PAGE_SHIFT)) +#define pud_none (pud) (!pud_val(pud)) +#define pud_bad (pud) ((pud_val(pud) & _DESCTYPE_MASK) != _PAGE_TABLE) +#define pud_present (pud) (pud_val(pud) & _PAGE_TABLE) +#define pud_clear (pudp) ({ pud_val(*pudp) = 0; }) +#define pud_page (pud) (mem_map + ((unsigned long)(__va(pud_val(pud)) - PAGE_OFFSET) >> PAGE_SHIFT))#define pte_ERROR (e) \ printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@@ -209,9 +209,9 @@ static inline pgd_t *pgd_offset_k(unsigned long address)/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pgd_t *dir,unsigned long address) +static inline pmd_t *pmd_offset (pud_t *dir,unsigned long address) { -return (pmd_t *)__pgd_page (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); +return (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); }/* Find an entry in the third-level page table.. */
@@ -239,11 +239,15 @@ static inline void nocache_page(void *vaddr)if (CPU_IS_040_OR_060 ) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mknocache (*ptep); }
@@ -255,11 +259,15 @@ static inline void cache_page(void *vaddr)if (CPU_IS_040_OR_060 ) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mkcache (*ptep); }
arch/m68k/include/asm/page.h +6 -3
@@ -21,19 +21,22 @@/* * These are used to make use of C type-checking.. */ -typedef struct {unsigned long pte; }pte_t ; +#if !defined(CONFIG_MMU ) ||CONFIG_PGTABLE_LEVELS ==3 typedef struct {unsigned long pmd[16 ]; }pmd_t ; +#define pmd_val (x) ((&x)->pmd[0]) +#define __pmd (x) ((pmd_t) { { (x) }, }) +#endif + +typedef struct {unsigned long pte; }pte_t ;typedef struct {unsigned long pgd; }pgd_t ;typedef struct {unsigned long pgprot; }pgprot_t ;typedef struct page *pgtable_t ;#define pte_val (x) ((x).pte) -#define pmd_val (x) ((&x)->pmd[0])#define pgd_val (x) ((x).pgd)#define pgprot_val (x) ((x).pgprot)#define __pte (x) ((pte_t) { (x) } ) -#define __pmd (x) ((pmd_t) { { (x) }, })#define __pgd (x) ((pgd_t) { (x) } )#define __pgprot (x) ((pgprot_t) { (x) } )
arch/m68k/include/asm/pgtable_mm.h +7 -4
@@ -2,7 +2,12 @@#ifndef _M68K_PGTABLE_H#define _M68K_PGTABLE_H -#include <asm-generic/4level-fixup.h> + +#if defined(CONFIG_SUN3 ) || defined(CONFIG_COLDFIRE ) +#include <asm-generic/pgtable-nopmd.h> +#else +#include <asm-generic/pgtable-nopud.h> +#endif #include <asm/setup.h>
@@ -30,9 +35,7 @@/* PMD_SHIFT determines the size of the area a second-level page table can map */ -#ifdef CONFIG_SUN3 -#define PMD_SHIFT 17 -#else +#if CONFIG_PGTABLE_LEVELS ==3 #define PMD_SHIFT 22#endif #define PMD_SIZE (1UL << PMD_SHIFT)
arch/m68k/include/asm/sun3_pgalloc.h +0 -5
@@ -17,8 +17,6 @@extern const char bad_pmd_string[]; -#define pmd_alloc_one (mm,address) ({ BUG(); ((pmd_t *)2); }) -#define __pte_free_tlb (tlb,pte,addr) \ do { \ pgtable_pte_page_dtor(pte); \
@@ -41,7 +39,6 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page* inside the pgd, so has no extra memory associated with it. */ #define pmd_free (mm, x) do { } while (0) -#define __pmd_free_tlb (tlb, x, addr) do { } while (0)static inline void pgd_free (struct mm_struct *mm,pgd_t *pgd) {
@@ -58,6 +55,4 @@ static inline pgd_t * pgd_alloc(struct mm_struct *mm) return new_pgd; } -#define pgd_populate (mm, pmd, pte) BUG() -#endif /* SUN3_PGALLOC_H */
arch/m68k/include/asm/sun3_pgtable.h +0 -18
@@ -110,11 +110,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define pmd_set (pmdp,ptep) do {} while (0) -static inline void pgd_set (pgd_t *pgdp,pmd_t *pmdp) -{ -pgd_val (*pgdp) =virt_to_phys (pmdp); -} -#define __pte_page (pte) \ ((unsigned long) __va ((pte_val (pte) & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT))#define __pmd_page (pmd) \
@@ -145,16 +140,9 @@ static inline int pmd_present2 (pmd_t *pmd) { return pmd_val (*pmd) & SUN3_PMD_V#define pmd_present (pmd) (!pmd_none2(&(pmd)))static inline void pmd_clear (pmd_t *pmdp) {pmd_val (*pmdp) =0 ; } -static inline int pgd_none (pgd_t pgd) {return 0 ; } -static inline int pgd_bad (pgd_t pgd) {return 0 ; } -static inline int pgd_present (pgd_t pgd) {return 1 ; } -static inline void pgd_clear (pgd_t *pgdp) {} -#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) -#define pmd_ERROR (e) \ - pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))#define pgd_ERROR (e) \ pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
@@ -194,12 +182,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD];/* Find an entry in a kernel pagetable directory. */ #define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* Find an entry in the second-level pagetable. */ -static inline pmd_t *pmd_offset (pgd_t *pgd,unsigned long address) -{ -return (pmd_t *) pgd; -} -/* Find an entry in the third-level pagetable. */ #define pte_index (address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE-1))#define pte_offset_kernel (pmd, address) ((pte_t *) __pmd_page(*pmd) + pte_index(address))
arch/m68k/kernel/sys_m68k.c +9 -1
@@ -465,6 +465,8 @@ sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,for (;;) {struct mm_struct *mm = current->mm;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;spinlock_t *ptl;
@@ -474,7 +476,13 @@ sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5, pgd =pgd_offset (mm, (unsigned long )mem);if (!pgd_present (*pgd)) goto bad_access; - pmd =pmd_offset (pgd, (unsigned long )mem); + p4d =p4d_offset (pgd, (unsigned long )mem); +if (!p4d_present (*p4d)) + goto bad_access; + pud =pud_offset (p4d, (unsigned long )mem); +if (!pud_present (*pud)) + goto bad_access; + pmd =pmd_offset (pud, (unsigned long )mem);if (!pmd_present (*pmd)) goto bad_access; pte =pte_offset_map_lock (mm, pmd, (unsigned long )mem, &ptl);
arch/m68k/mm/init.c +4 -2
@@ -130,8 +130,10 @@ static inline void init_pointer_tables(void)/* insert pointer tables allocated so far into the tablelist */ init_pointer_table ((unsigned long )kernel_pg_dir);for (i =0 ; i <PTRS_PER_PGD ; i++) { -if (pgd_present (kernel_pg_dir[i])) -init_pointer_table (__pgd_page (kernel_pg_dir[i])); +pud_t *pud = (pud_t *)(&kernel_pg_dir[i]); + +if (pud_present (*pud)) +init_pointer_table (pgd_page_vaddr (kernel_pg_dir[i])); }/* insert also pointer table that we used to unmap the zero page */
arch/m68k/mm/kmap.c +29 -10
@@ -110,6 +110,8 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflaunsigned long virtaddr, retaddr;long offset;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;
@@ -196,18 +198,23 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflaprintk ("\npa=%#lx va=%#lx " , physaddr, virtaddr);#endif pgd_dir =pgd_offset_k (virtaddr); - pmd_dir =pmd_alloc (&init_mm, pgd_dir, virtaddr); + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); + pmd_dir =pmd_alloc (&init_mm, pud_dir, virtaddr);if (!pmd_dir) {printk ("ioremap: no mem for pmd_dir\n" );return NULL ; } +#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) { pmd_dir->pmd[(virtaddr/PTRTREESIZE ) &15 ] = physaddr; physaddr +=PTRTREESIZE ; virtaddr +=PTRTREESIZE ; size -=PTRTREESIZE ; - }else { + } else +#endif + { pte_dir =pte_alloc_kernel (pmd_dir, virtaddr);if (!pte_dir) {printk ("ioremap: no mem for pte_dir\n" );
@@ -258,18 +265,23 @@ void __iounmap(void *addr, unsigned long size) {unsigned long virtaddr = (unsigned long )addr;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;while ((long )size >0 ) { pgd_dir =pgd_offset_k (virtaddr); -if (pgd_bad (*pgd_dir)) { -printk ("iounmap: bad pgd(%08lx)\n" ,pgd_val (*pgd_dir)); -pgd_clear (pgd_dir); + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); +if (pud_bad (*pud_dir)) { +printk ("iounmap: bad pgd(%08lx)\n" ,pud_val (*pud_dir)); +pud_clear (pud_dir);return ; } - pmd_dir =pmd_offset (pgd_dir, virtaddr); + pmd_dir =pmd_offset (pud_dir, virtaddr); +#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) {int pmd_off = (virtaddr/PTRTREESIZE ) &15 ;int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
@@ -282,6 +294,7 @@ void __iounmap(void *addr, unsigned long size) } else if (pmd_type == 0)continue ; } +#endif if (pmd_bad (*pmd_dir)) {printk ("iounmap: bad pmd (%08lx)\n" ,pmd_val (*pmd_dir));
@@ -307,6 +320,8 @@ void kernel_set_cachemode(void *addr, unsigned long size, int cmode) {unsigned long virtaddr = (unsigned long )addr;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;
@@ -341,13 +356,16 @@ void kernel_set_cachemode(void *addr, unsigned long size, int cmode)while ((long )size >0 ) { pgd_dir =pgd_offset_k (virtaddr); -if (pgd_bad (*pgd_dir)) { -printk ("iocachemode: bad pgd(%08lx)\n" ,pgd_val (*pgd_dir)); -pgd_clear (pgd_dir); + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); +if (pud_bad (*pud_dir)) { +printk ("iocachemode: bad pud(%08lx)\n" ,pud_val (*pud_dir)); +pud_clear (pud_dir);return ; } - pmd_dir =pmd_offset (pgd_dir, virtaddr); + pmd_dir =pmd_offset (pud_dir, virtaddr); +#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) {int pmd_off = (virtaddr/PTRTREESIZE ) &15 ;
@@ -359,6 +377,7 @@ void kernel_set_cachemode(void *addr, unsigned long size, int cmode) continue; } } +#endif if (pmd_bad (*pmd_dir)) {printk ("iocachemode: bad pmd (%08lx)\n" ,pmd_val (*pmd_dir));
arch/m68k/mm/mcfmmu.c +15 -1
@@ -92,6 +92,8 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)unsigned long flags, mmuar, mmutr;struct mm_struct *mm;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;int asid;
@@ -113,7 +115,19 @@ int cf_tlb_miss(struct pt_regs *regs, int write, int dtlb, int extension_word)return -1 ; } - pmd =pmd_offset (pgd, mmuar); + p4d =p4d_offset (pgd, mmuar); +if (p4d_none (*p4d)) { +local_irq_restore (flags); +return -1 ; + } + + pud =pud_offset (p4d, mmuar); +if (pud_none (*pud)) { +local_irq_restore (flags); +return -1 ; + } + + pmd =pmd_offset (pud, mmuar);if (pmd_none (*pmd)) {local_irq_restore (flags);return -1 ;
arch/m68k/mm/motorola.c +11 -6
@@ -82,9 +82,11 @@ static pmd_t * __init kernel_ptr_table(void)*/ last = (unsigned long )kernel_pg_dir;for (i =0 ; i <PTRS_PER_PGD ; i++) { -if (!pgd_present (kernel_pg_dir[i])) +pud_t *pud = (pud_t *)(&kernel_pg_dir[i]); + +if (!pud_present (*pud))continue ; - pmd =__pgd_page (kernel_pg_dir[i]); + pmd =pgd_page_vaddr (kernel_pg_dir[i]);if (pmd > last) last = pmd; }
@@ -118,6 +120,8 @@ static void __init map_node(int node)#define ROOTTREESIZE (32*1024*1024)unsigned long physaddr, virtaddr, size;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;
@@ -149,14 +153,16 @@ static void __init map_node(int node)continue ; } } -if (!pgd_present (*pgd_dir)) { + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); +if (!pud_present (*pud_dir)) { pmd_dir =kernel_ptr_table ();#ifdef DEBUG printk ("[new pointer %p]" , pmd_dir);#endif -pgd_set (pgd_dir, pmd_dir); +pud_set (pud_dir, pmd_dir); }else - pmd_dir =pmd_offset (pgd_dir, virtaddr); + pmd_dir =pmd_offset (pud_dir, virtaddr);if (CPU_IS_020_OR_030 ) {if (virtaddr) {
@@ -304,4 +310,3 @@ void __init paging_init(void)node_set_state (i,N_NORMAL_MEMORY ); } } -
arch/m68k/sun3x/dvma.c +5 -2
@@ -80,6 +80,8 @@ inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len) {pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;unsigned long end;int ret =0 ;
@@ -90,12 +92,14 @@ inline int dvma_map_cpu(unsigned long kaddr,pr_debug ("dvma: mapping kern %08lx to virt %08lx\n" , kaddr, vaddr); pgd =pgd_offset_k (vaddr); + p4d =p4d_offset (pgd, vaddr); + pud =pud_offset (p4d, vaddr); do { pmd_t *pmd; unsigned long end2; - if((pmd = pmd_alloc(&init_mm, pgd, vaddr)) == NULL) { + if((pmd = pmd_alloc(&init_mm, pud, vaddr)) == NULL) { ret = -ENOMEM; goto out; }
@@ -196,4 +200,3 @@ void dvma_unmap_iommu(unsigned long baddr, int len) } } -
Signature · 1 line
2.7.4
Re: [PATCH v4 05/13] m68k: mm: use pgtable-nopXd instead of 4level-fixup
Hi Mike,
Quoted 5 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Quoted 8 lines
Replace usage of
include/asm-generic/4level-fixup.hand explicit definitions of__PAGETABLE_PxD_FOLDEDin m68k withinclude/asm-generic/pgtable-nopmd.hfor two-level configurations and withinclude/asm-generic/pgtable-nopud.hfor three-lelve configurations and adjust page table manipulation macros and functions accordingly.Signed-off-by Mike Rapoport <[email protected]>Acked-by Greg Ungerer <[email protected]>
One forgotten error message update below.
Quoted 10 lines
arch/m68k/mm/kmap.c +2
-0@@ -258,18 +265,23 @@ void __iounmap(void *addr, unsigned long size) {unsigned long virtaddr = (unsigned long )addr;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;
arch/m68k/mm/kmap.c void __iounmap(void *addr, unsigned long size) · line 278
Quoted 10 lines
arch/m68k/mm/kmap.c +4
-3while ((long )size >0 ) { pgd_dir =pgd_offset_k (virtaddr); -if (pgd_bad (*pgd_dir)) { -printk ("iounmap: bad pgd(%08lx)\n" ,pgd_val (*pgd_dir)); -pgd_clear (pgd_dir); + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); +if (pud_bad (*pud_dir)) { +printk ("iounmap: bad pgd(%08lx)\n" ,pud_val (*pud_dir));
bad pud
arch/m68k/mm/kmap.c void __iounmap(void *addr, unsigned long size) · line 287
Quoted 10 lines
arch/m68k/mm/kmap.c +3
-1+pud_clear (pud_dir);return ; } - pmd_dir =pmd_offset (pgd_dir, virtaddr); + pmd_dir =pmd_offset (pud_dir, virtaddr); +#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) {int pmd_off = (virtaddr/PTRTREESIZE ) &15 ;int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Andrew Morton
maintainerRe: [PATCH v4 05/13] m68k: mm: use pgtable-nopXd instead of 4level-fixup
In reply to Mike RapoportQuoted 8 lines · On Tue, 5 Nov 2019 09:15:27 +0200 Mike Rapoport <[email protected]> wrote:
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Replace usage of
include/asm-generic/4level-fixup.hand explicit definitions of__PAGETABLE_PxD_FOLDEDin m68k withinclude/asm-generic/pgtable-nopmd.hfor two-level configurations and withinclude/asm-generic/pgtable-nopud.hfor three-lelve configurations and adjust page table manipulation macros and functions accordingly.
This one was messed up by linux-next changes in arch/m68k/mm/kmap.c. Can you please take a look?
Geert Uytterhoeven
maintainerRe: [PATCH v4 05/13] m68k: mm: use pgtable-nopXd instead of 4level-fixup
Hi Andrew,
Quoted 4 lines · Andrew Morton
Quoted 3 lines · On Tue, 5 Nov 2019 09:15:27 +0200 Mike Rapoport <[email protected]> wrote:
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Quoted 8 lines
Quoted 5 lines
Replace usage of
include/asm-generic/4level-fixup.hand explicit definitions of__PAGETABLE_PxD_FOLDEDin m68k withinclude/asm-generic/pgtable-nopmd.hfor two-level configurations and withinclude/asm-generic/pgtable-nopud.hfor three-lelve configurations and adjust page table manipulation macros and functions accordingly.This one was messed up by linux-next changes in
arch/m68k/mm/kmap.c. Can you please take a look?
You mean due to the rename and move of __iounmap() to __free_io_area() in commit aa3a1664285d0bec ("m68k: rename __iounmap and mark it static")?
Commit 42d6c83d6180f800 ("m68k: mm: use pgtable-nopXd instead of 4level-fixup") in next-20191108 looks good to me.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Mike Rapoport
reviewerRe: [PATCH v4 05/13] m68k: mm: use pgtable-nopXd instead of 4level-fixup
Hi Andrew,
Quoted 15 lines · Geert Uytterhoeven
Hi Andrew,
Quoted 12 lines · Andrew Morton
Quoted 8 lines · On Tue, 5 Nov 2019 09:15:27 +0200 Mike Rapoport <[email protected]> wrote:
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Replace usage of
include/asm-generic/4level-fixup.hand explicit definitions of__PAGETABLE_PxD_FOLDEDin m68k withinclude/asm-generic/pgtable-nopmd.hfor two-level configurations and withinclude/asm-generic/pgtable-nopud.hfor three-lelve configurations and adjust page table manipulation macros and functions accordingly.This one was messed up by linux-next changes in
arch/m68k/mm/kmap.c. Can you please take a look?
Can you please elaborate what was the problem?
The patch applies cleanly to v5.4-rc6-mmots-2019-11-08-16-23 (from github.com/hnaz/linux-mm) and all the page table traversals in arch/m68k/mm/kmap.c look Ok.
I've build atari_defconfig and it boots fine on aranym.
Quoted 16 lines
You mean due to the rename and move of
__iounmap()to__free_io_area()in commitaa3a1664285d0bec("m68k: rename__iounmapand mark it static")?Commit
42d6c83d6180f800("m68k: mm: use pgtable-nopXd instead of 4level-fixup") in next-20191108 looks good to me.Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Signature · 2 lines
Sincerely yours, Mike.
Re: [PATCH v4 05/13] m68k: mm: use pgtable-nopXd instead of 4level-fixup
In reply to Geert UytterhoevenQuoted 11 lines · On Sat, 9 Nov 2019 15:26:29 +0100 Geert Uytterhoeven <[email protected]>…
Quoted 10 lines · Andrew Morton
Quoted 8 lines · On Tue, 5 Nov 2019 09:15:27 +0200 Mike Rapoport <[email protected]> wrote:
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Replace usage of
include/asm-generic/4level-fixup.hand explicit definitions of__PAGETABLE_PxD_FOLDEDin m68k withinclude/asm-generic/pgtable-nopmd.hfor two-level configurations and withinclude/asm-generic/pgtable-nopud.hfor three-lelve configurations and adjust page table manipulation macros and functions accordingly.
Quoted 8 lines
Quoted 2 lines
This one was messed up by linux-next changes in
arch/m68k/mm/kmap.c. Can you please take a look?You mean due to the rename and move of
__iounmap()to__free_io_area()in commitaa3a1664285d0bec("m68k: rename__iounmapand mark it static")?Commit
42d6c83d6180f800("m68k: mm: use pgtable-nopXd instead of 4level-fixup") in next-20191108 looks good to me.
I seem to be getting a different reject now and I'm not sure why.
Oh well, I fixed things up.
From: Mike Rapoport <[email protected]>
Subject: m68k: mm: use pgtable-nopXd instead of 4level-fixup
m68k has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Replace usage of include/asm-generic/4level-fixup.h and explicit definitions of __PAGETABLE_PxD_FOLDED in m68k with include/asm-generic/pgtable-nopmd.h for two-level configurations and with include/asm-generic/pgtable-nopud.h for three-lelve configurations and adjust page table manipulation macros and functions accordingly.
---
arch/m68k/include/asm/mcf_pgalloc.h | 7 ---- arch/m68k/include/asm/mcf_pgtable.h | 28 ++++++------------ arch/m68k/include/asm/mmu_context.h | 12 +++++++ arch/m68k/include/asm/motorola_pgalloc.h | 4 +- arch/m68k/include/asm/motorola_pgtable.h | 32 +++++++++++++-------- arch/m68k/include/asm/page.h | 9 +++-- arch/m68k/include/asm/pgtable_mm.h | 11 ++++--- arch/m68k/include/asm/sun3_pgalloc.h | 5 --- arch/m68k/include/asm/sun3_pgtable.h | 18 ----------- arch/m68k/kernel/sys_m68k.c | 10 +++++- arch/m68k/mm/init.c | 6 ++- arch/m68k/mm/kmap.c | 24 +++++++++++---- arch/m68k/mm/mcfmmu.c | 16 +++++++++- arch/m68k/mm/motorola.c | 17 +++++++---- arch/m68k/sun3x/dvma.c | 7 +++- 15 files changed, 118 insertions(+), 88 deletions(-)
arch/m68k/include/asm/mcf_pgalloc.h renamed from arch/m68k/include/asm/mcf_pgalloc.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +0 -7
@@ -28,9 +28,6 @@ extern inline pmd_t *pmd_alloc_kernel(pgreturn (pmd_t *) pgd; } -#define pmd_alloc_one_fast (mm, address) ({ BUG(); ((pmd_t *)1); }) -#define pmd_alloc_one (mm, address) ({ BUG(); ((pmd_t *)2); }) -#define pmd_populate (mm, pmd, page) (pmd_val(*pmd) = \ (unsigned long)(page_address(page)))
@@ -45,8 +42,6 @@ static inline void __pte_free_tlb(struct__free_page (page); } -#define __pmd_free_tlb (tlb, pmd, address) do { } while (0) -static inline struct page *pte_alloc_one (struct mm_struct *mm) {struct page *page =alloc_pages (GFP_DMA ,0 );
@@ -100,6 +95,4 @@ static inline pgd_t *pgd_alloc(struct mm return new_pgd; } -#define pgd_populate (mm, pmd, pte) BUG() -#endif /* M68K_MCF_PGALLOC_H */
arch/m68k/include/asm/mcf_pgtable.h renamed from arch/m68k/include/asm/mcf_pgtable.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +10 -18
@@ -198,17 +198,9 @@ static inline int pmd_bad2(pmd_t *pmd) {#define pmd_present (pmd) (!pmd_none2(&(pmd)))static inline void pmd_clear (pmd_t *pmdp) {pmd_val (*pmdp) =0 ; } -static inline int pgd_none (pgd_t pgd) {return 0 ; } -static inline int pgd_bad (pgd_t pgd) {return 0 ; } -static inline int pgd_present (pgd_t pgd) {return 1 ; } -static inline void pgd_clear (pgd_t *pgdp) {} -#define pte_ERROR (e) \ printk(KERN_ERR "%s:%d: bad pte %08lx.\n", \ __FILE__, __LINE__, pte_val(e)) -#define pmd_ERROR (e) \ - printk(KERN_ERR "%s:%d: bad pmd %08lx.\n", \ - __FILE__, __LINE__, pmd_val(e))#define pgd_ERROR (e) \ printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", \ __FILE__, __LINE__, pgd_val(e))
@@ -340,14 +332,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD]#define pgd_offset_k (address) pgd_offset(&init_mm, address)/* -* Find an entry in the second-level pagetable. -*/ -static inline pmd_t *pmd_offset (pgd_t *pgd,unsigned long address) -{ -return (pmd_t *) pgd; -} - -/* * Find an entry in the third-level pagetable. */ #define __pte_offset (address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
@@ -360,12 +344,16 @@ static inline pmd_t *pmd_offset(pgd_t *pstatic inline void nocache_page (void *vaddr) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;unsigned long addr = (unsigned long ) vaddr; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mknocache (*ptep); }
@@ -376,12 +364,16 @@ static inline void nocache_page(void *vastatic inline void cache_page (void *vaddr) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;unsigned long addr = (unsigned long ) vaddr; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mkcache (*ptep); }
arch/m68k/include/asm/mmu_context.h renamed from arch/m68k/include/asm/mmu_context.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +11 -1
@@ -100,6 +100,8 @@ static inline void load_ksp_mmu(struct tstruct mm_struct *mm;int asid;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;unsigned long mmuar;
@@ -127,7 +129,15 @@ static inline void load_ksp_mmu(struct tif (pgd_none (*pgd)) goto bug; - pmd =pmd_offset (pgd, mmuar); + p4d =p4d_offset (pgd, mmuar); +if (p4d_none (*p4d)) + goto bug; + + pud =pud_offset (p4d, mmuar); +if (pud_none (*pud)) + goto bug; + + pmd =pmd_offset (pud, mmuar);if (pmd_none (*pmd)) goto bug;
arch/m68k/include/asm/motorola_pgalloc.h renamed from arch/m68k/include/asm/motorola_pgalloc.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +2 -2
@@ -106,9 +106,9 @@ static inline void pmd_populate(struct m }#define pmd_pgtable (pmd) pmd_page(pmd) -static inline void pgd_populate (struct mm_struct *mm,pgd_t *pgd,pmd_t *pmd) +static inline void pud_populate (struct mm_struct *mm,pud_t *pud,pmd_t *pmd) { -pgd_set (pgd, pmd); +pud_set (pud, pmd); }#endif /* _MOTOROLA_PGALLOC_H */
arch/m68k/include/asm/motorola_pgtable.h renamed from arch/m68k/include/asm/motorola_pgtable.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +20 -12
@@ -117,14 +117,14 @@ static inline void pmd_set(pmd_t *pmdp, } } -static inline void pgd_set (pgd_t *pgdp,pmd_t *pmdp) +static inline void pud_set (pud_t *pudp,pmd_t *pmdp) { -pgd_val (*pgdp) = _PAGE_TABLE | _PAGE_ACCESSED |__pa (pmdp); +pud_val (*pudp) = _PAGE_TABLE | _PAGE_ACCESSED |__pa (pmdp); }#define __pte_page (pte) ((unsigned long)__va(pte_val(pte) & PAGE_MASK))#define __pmd_page (pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK)) -#define __pgd_page (pgd) ((unsigned long)__va(pgd_val(pgd) & _TABLE_MASK)) +#define pud_page_vaddr (pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK))#define pte_none (pte) (!pte_val(pte))
@@ -147,11 +147,11 @@ static inline void pgd_set(pgd_t *pgdp,#define pmd_page (pmd) virt_to_page(__va(pmd_val(pmd))) -#define pgd_none (pgd) (!pgd_val(pgd)) -#define pgd_bad (pgd) ((pgd_val(pgd) & _DESCTYPE_MASK) != _PAGE_TABLE) -#define pgd_present (pgd) (pgd_val(pgd) & _PAGE_TABLE) -#define pgd_clear (pgdp) ({ pgd_val(*pgdp) = 0; }) -#define pgd_page (pgd) (mem_map + ((unsigned long)(__va(pgd_val(pgd)) - PAGE_OFFSET) >> PAGE_SHIFT)) +#define pud_none (pud) (!pud_val(pud)) +#define pud_bad (pud) ((pud_val(pud) & _DESCTYPE_MASK) != _PAGE_TABLE) +#define pud_present (pud) (pud_val(pud) & _PAGE_TABLE) +#define pud_clear (pudp) ({ pud_val(*pudp) = 0; }) +#define pud_page (pud) (mem_map + ((unsigned long)(__va(pud_val(pud)) - PAGE_OFFSET) >> PAGE_SHIFT))#define pte_ERROR (e) \ printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
@@ -209,9 +209,9 @@ static inline pgd_t *pgd_offset_k(unsign/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pgd_t *dir,unsigned long address) +static inline pmd_t *pmd_offset (pud_t *dir,unsigned long address) { -return (pmd_t *)__pgd_page (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); +return (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); }/* Find an entry in the third-level page table.. */
@@ -239,11 +239,15 @@ static inline void nocache_page(void *vaif (CPU_IS_040_OR_060 ) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mknocache (*ptep); }
@@ -255,11 +259,15 @@ static inline void cache_page(void *vaddif (CPU_IS_040_OR_060 ) {pgd_t *dir; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep; dir =pgd_offset_k (addr); - pmdp =pmd_offset (dir, addr); + p4dp =p4d_offset (dir, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_kernel (pmdp, addr); *ptep =pte_mkcache (*ptep); }
arch/m68k/include/asm/page.h renamed from arch/m68k/include/asm/page.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +6 -3
@@ -21,19 +21,22 @@/* * These are used to make use of C type-checking.. */ -typedef struct {unsigned long pte; }pte_t ; +#if !defined(CONFIG_MMU ) ||CONFIG_PGTABLE_LEVELS ==3 typedef struct {unsigned long pmd[16 ]; }pmd_t ; +#define pmd_val (x) ((&x)->pmd[0]) +#define __pmd (x) ((pmd_t) { { (x) }, }) +#endif + +typedef struct {unsigned long pte; }pte_t ;typedef struct {unsigned long pgd; }pgd_t ;typedef struct {unsigned long pgprot; }pgprot_t ;typedef struct page *pgtable_t ;#define pte_val (x) ((x).pte) -#define pmd_val (x) ((&x)->pmd[0])#define pgd_val (x) ((x).pgd)#define pgprot_val (x) ((x).pgprot)#define __pte (x) ((pte_t) { (x) } ) -#define __pmd (x) ((pmd_t) { { (x) }, })#define __pgd (x) ((pgd_t) { (x) } )#define __pgprot (x) ((pgprot_t) { (x) } )
arch/m68k/include/asm/pgtable_mm.h renamed from arch/m68k/include/asm/pgtable_mm.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +7 -4
@@ -2,7 +2,12 @@#ifndef _M68K_PGTABLE_H#define _M68K_PGTABLE_H -#include <asm-generic/4level-fixup.h> + +#if defined(CONFIG_SUN3 ) || defined(CONFIG_COLDFIRE ) +#include <asm-generic/pgtable-nopmd.h> +#else +#include <asm-generic/pgtable-nopud.h> +#endif #include <asm/setup.h>
@@ -30,9 +35,7 @@/* PMD_SHIFT determines the size of the area a second-level page table can map */ -#ifdef CONFIG_SUN3 -#define PMD_SHIFT 17 -#else +#if CONFIG_PGTABLE_LEVELS ==3 #define PMD_SHIFT 22#endif #define PMD_SIZE (1UL << PMD_SHIFT)
arch/m68k/include/asm/sun3_pgalloc.h renamed from arch/m68k/include/asm/sun3_pgalloc.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +0 -5
@@ -17,8 +17,6 @@extern const char bad_pmd_string[]; -#define pmd_alloc_one (mm,address) ({ BUG(); ((pmd_t *)2); }) -#define __pte_free_tlb (tlb,pte,addr) \ do { \ pgtable_pte_page_dtor(pte); \
@@ -41,7 +39,6 @@ static inline void pmd_populate(struct m* inside the pgd, so has no extra memory associated with it. */ #define pmd_free (mm, x) do { } while (0) -#define __pmd_free_tlb (tlb, x, addr) do { } while (0)static inline void pgd_free (struct mm_struct *mm,pgd_t *pgd) {
@@ -58,6 +55,4 @@ static inline pgd_t * pgd_alloc(struct m return new_pgd; } -#define pgd_populate (mm, pmd, pte) BUG() -#endif /* SUN3_PGALLOC_H */
arch/m68k/include/asm/sun3_pgtable.h renamed from arch/m68k/include/asm/sun3_pgtable.h~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +0 -18
@@ -110,11 +110,6 @@ static inline pte_t pte_modify(pte_t pte#define pmd_set (pmdp,ptep) do {} while (0) -static inline void pgd_set (pgd_t *pgdp,pmd_t *pmdp) -{ -pgd_val (*pgdp) =virt_to_phys (pmdp); -} -#define __pte_page (pte) \ ((unsigned long) __va ((pte_val (pte) & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT))#define __pmd_page (pmd) \
@@ -145,16 +140,9 @@ static inline int pmd_present2 (pmd_t *p#define pmd_present (pmd) (!pmd_none2(&(pmd)))static inline void pmd_clear (pmd_t *pmdp) {pmd_val (*pmdp) =0 ; } -static inline int pgd_none (pgd_t pgd) {return 0 ; } -static inline int pgd_bad (pgd_t pgd) {return 0 ; } -static inline int pgd_present (pgd_t pgd) {return 1 ; } -static inline void pgd_clear (pgd_t *pgdp) {} -#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) -#define pmd_ERROR (e) \ - pr_err("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))#define pgd_ERROR (e) \ pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
@@ -194,12 +182,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD]/* Find an entry in a kernel pagetable directory. */ #define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* Find an entry in the second-level pagetable. */ -static inline pmd_t *pmd_offset (pgd_t *pgd,unsigned long address) -{ -return (pmd_t *) pgd; -} -/* Find an entry in the third-level pagetable. */ #define pte_index (address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE-1))#define pte_offset_kernel (pmd, address) ((pte_t *) __pmd_page(*pmd) + pte_index(address))
arch/m68k/kernel/sys_m68k.c renamed from arch/m68k/kernel/sys_m68k.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +9 -1
@@ -465,6 +465,8 @@ sys_atomic_cmpxchg_32(unsigned long newvfor (;;) {struct mm_struct *mm = current->mm;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;spinlock_t *ptl;
@@ -474,7 +476,13 @@ sys_atomic_cmpxchg_32(unsigned long newv pgd =pgd_offset (mm, (unsigned long )mem);if (!pgd_present (*pgd)) goto bad_access; - pmd =pmd_offset (pgd, (unsigned long )mem); + p4d =p4d_offset (pgd, (unsigned long )mem); +if (!p4d_present (*p4d)) + goto bad_access; + pud =pud_offset (p4d, (unsigned long )mem); +if (!pud_present (*pud)) + goto bad_access; + pmd =pmd_offset (pud, (unsigned long )mem);if (!pmd_present (*pmd)) goto bad_access; pte =pte_offset_map_lock (mm, pmd, (unsigned long )mem, &ptl);
arch/m68k/mm/init.c renamed from arch/m68k/mm/init.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +4 -2
@@ -130,8 +130,10 @@ static inline void init_pointer_tables(v/* insert pointer tables allocated so far into the tablelist */ init_pointer_table ((unsigned long )kernel_pg_dir);for (i =0 ; i <PTRS_PER_PGD ; i++) { -if (pgd_present (kernel_pg_dir[i])) -init_pointer_table (__pgd_page (kernel_pg_dir[i])); +pud_t *pud = (pud_t *)(&kernel_pg_dir[i]); + +if (pud_present (*pud)) +init_pointer_table (pgd_page_vaddr (kernel_pg_dir[i])); }/* insert also pointer table that we used to unmap the zero page */
arch/m68k/mm/kmap.c renamed from arch/m68k/mm/kmap.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +18 -6
@@ -159,6 +159,8 @@ void __iomem *__ioremap(unsigned long phunsigned long virtaddr, retaddr;long offset;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;
@@ -245,18 +247,23 @@ void __iomem *__ioremap(unsigned long phprintk ("\npa=%#lx va=%#lx " , physaddr, virtaddr);#endif pgd_dir =pgd_offset_k (virtaddr); - pmd_dir =pmd_alloc (&init_mm, pgd_dir, virtaddr); + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); + pmd_dir =pmd_alloc (&init_mm, pud_dir, virtaddr);if (!pmd_dir) {printk ("ioremap: no mem for pmd_dir\n" );return NULL ; } +#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) { pmd_dir->pmd[(virtaddr/PTRTREESIZE ) &15 ] = physaddr; physaddr +=PTRTREESIZE ; virtaddr +=PTRTREESIZE ; size -=PTRTREESIZE ; - }else { + } else +#endif + { pte_dir =pte_alloc_kernel (pmd_dir, virtaddr);if (!pte_dir) {printk ("ioremap: no mem for pte_dir\n" );
@@ -338,16 +345,20 @@ void kernel_set_cachemode(void *addr, un cmode = 0; } } +#endif while ((long )size >0 ) { pgd_dir =pgd_offset_k (virtaddr); -if (pgd_bad (*pgd_dir)) { -printk ("iocachemode: bad pgd(%08lx)\n" ,pgd_val (*pgd_dir)); -pgd_clear (pgd_dir); + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); +if (pud_bad (*pud_dir)) { +printk ("iocachemode: bad pud(%08lx)\n" ,pud_val (*pud_dir)); +pud_clear (pud_dir);return ; } - pmd_dir =pmd_offset (pgd_dir, virtaddr); + pmd_dir =pmd_offset (pud_dir, virtaddr); +#if CONFIG_PGTABLE_LEVELS ==3 if (CPU_IS_020_OR_030 ) {int pmd_off = (virtaddr/PTRTREESIZE ) &15 ;
@@ -359,6 +370,7 @@ void kernel_set_cachemode(void *addr, un continue; } } +#endif if (pmd_bad (*pmd_dir)) {printk ("iocachemode: bad pmd (%08lx)\n" ,pmd_val (*pmd_dir));
arch/m68k/mm/mcfmmu.c renamed from arch/m68k/mm/mcfmmu.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +15 -1
@@ -92,6 +92,8 @@ int cf_tlb_miss(struct pt_regs *regs, inunsigned long flags, mmuar, mmutr;struct mm_struct *mm;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;int asid;
@@ -113,7 +115,19 @@ int cf_tlb_miss(struct pt_regs *regs, inreturn -1 ; } - pmd =pmd_offset (pgd, mmuar); + p4d =p4d_offset (pgd, mmuar); +if (p4d_none (*p4d)) { +local_irq_restore (flags); +return -1 ; + } + + pud =pud_offset (p4d, mmuar); +if (pud_none (*pud)) { +local_irq_restore (flags); +return -1 ; + } + + pmd =pmd_offset (pud, mmuar);if (pmd_none (*pmd)) {local_irq_restore (flags);return -1 ;
arch/m68k/mm/motorola.c renamed from arch/m68k/mm/motorola.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +11 -6
@@ -82,9 +82,11 @@ static pmd_t * __init kernel_ptr_table(v*/ last = (unsigned long )kernel_pg_dir;for (i =0 ; i <PTRS_PER_PGD ; i++) { -if (!pgd_present (kernel_pg_dir[i])) +pud_t *pud = (pud_t *)(&kernel_pg_dir[i]); + +if (!pud_present (*pud))continue ; - pmd =__pgd_page (kernel_pg_dir[i]); + pmd =pgd_page_vaddr (kernel_pg_dir[i]);if (pmd > last) last = pmd; }
@@ -118,6 +120,8 @@ static void __init map_node(int node)#define ROOTTREESIZE (32*1024*1024)unsigned long physaddr, virtaddr, size;pgd_t *pgd_dir; +p4d_t *p4d_dir; +pud_t *pud_dir;pmd_t *pmd_dir;pte_t *pte_dir;
@@ -149,14 +153,16 @@ static void __init map_node(int node)continue ; } } -if (!pgd_present (*pgd_dir)) { + p4d_dir =p4d_offset (pgd_dir, virtaddr); + pud_dir =pud_offset (p4d_dir, virtaddr); +if (!pud_present (*pud_dir)) { pmd_dir =kernel_ptr_table ();#ifdef DEBUG printk ("[new pointer %p]" , pmd_dir);#endif -pgd_set (pgd_dir, pmd_dir); +pud_set (pud_dir, pmd_dir); }else - pmd_dir =pmd_offset (pgd_dir, virtaddr); + pmd_dir =pmd_offset (pud_dir, virtaddr);if (CPU_IS_020_OR_030 ) {if (virtaddr) {
@@ -304,4 +310,3 @@ void __init paging_init(void)node_set_state (i,N_NORMAL_MEMORY ); } } -
arch/m68k/sun3x/dvma.c renamed from arch/m68k/sun3x/dvma.c~m68k-mm-use-pgtable-nopxd-instead-of-4level-fixup +5 -2
@@ -80,6 +80,8 @@ inline int dvma_map_cpu(unsigned long ka unsigned long vaddr, int len) {pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;unsigned long end;int ret =0 ;
@@ -90,12 +92,14 @@ inline int dvma_map_cpu(unsigned long kapr_debug ("dvma: mapping kern %08lx to virt %08lx\n" , kaddr, vaddr); pgd =pgd_offset_k (vaddr); + p4d =p4d_offset (pgd, vaddr); + pud =pud_offset (p4d, vaddr); do { pmd_t *pmd; unsigned long end2; - if((pmd = pmd_alloc(&init_mm, pgd, vaddr)) == NULL) { + if((pmd = pmd_alloc(&init_mm, pud, vaddr)) == NULL) { ret = -ENOMEM; goto out; }
@@ -196,4 +200,3 @@ void dvma_unmap_iommu(unsigned long badd } } -
_
Mike Rapoport
reviewerPATCH v4 6/13 microblaze: use pgtable-nopmd instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
microblaze has only two-level page tables and can use pgtable-nopmd and folding of the upper layers.
Replace usage of include/asm-generic/4level-fixup.h and explicit definition of __PAGETABLE_PMD_FOLDED in microblaze with include/asm-generic/pgtable-nopmd.h and adjust page table manipulation macros and functions accordingly.
--- arch/microblaze/include/asm/page.h | 3 --- arch/microblaze/include/asm/pgalloc.h | 16 ---------------- arch/microblaze/include/asm/pgtable.h | 32 ++------------------------------ arch/microblaze/kernel/signal.c | 10 +++++++--- arch/microblaze/mm/init.c | 7 +++++-- arch/microblaze/mm/pgtable.c | 13 +++++++++++-- 6 files changed, 25 insertions(+), 56 deletions(-)
arch/microblaze/include/asm/page.h +0 -3
@@ -90,7 +90,6 @@ typedef struct { unsigned long pte; } pte_t;typedef struct {unsigned long pgprot; }pgprot_t ;/* FIXME this can depend on linux kernel version */ # ifdef CONFIG_MMU -typedef struct {unsigned long pmd; }pmd_t ;typedef struct {unsigned long pgd; }pgd_t ;# else /* CONFIG_MMU */ typedef struct {unsigned long ste[64 ]; }pmd_t ;
@@ -103,7 +102,6 @@ typedef struct { p4d_t pge[1]; } pgd_t;# define pgprot_val (x) ((x).pgprot)# ifdef CONFIG_MMU -# define pmd_val (x) ((x).pmd)# define pgd_val (x) ((x).pgd)# else /* CONFIG_MMU */ # define pmd_val (x) ((x).ste[0])
@@ -112,7 +110,6 @@ typedef struct { p4d_t pge[1]; } pgd_t;# endif /* CONFIG_MMU */ # define __pte (x) ((pte_t) { (x) }) -# define __pmd (x) ((pmd_t) { (x) })# define __pgd (x) ((pgd_t) { (x) })# define __pgprot (x) ((pgprot_t) { (x) })
arch/microblaze/include/asm/pgalloc.h +0 -16
@@ -41,13 +41,6 @@ static inline void free_pgd(pgd_t *pgd)#define pmd_pgtable (pmd) pmd_page(pmd) -/* -* We don't have any real pmd's, and this code never triggers because -* the pgd will always be present.. -*/ -#define pmd_alloc_one_fast (mm, address) ({ BUG(); ((pmd_t *)1); }) -#define pmd_alloc_one (mm, address) ({ BUG(); ((pmd_t *)2); }) -extern pte_t *pte_alloc_one_kernel (struct mm_struct *mm);#define __pte_free_tlb (tlb, pte, addr) pte_free((tlb)->mm, (pte))
@@ -58,15 +51,6 @@ extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm);#define pmd_populate_kernel (mm, pmd, pte) \ (pmd_val(*(pmd)) = (unsigned long) (pte)) -/* -* We don't have any real pmd's, and this code never triggers because -* the pgd will always be present.. -*/ -#define pmd_alloc_one (mm, address) ({ BUG(); ((pmd_t *)2); }) -#define pmd_free (mm, x) do { } while (0) -#define __pmd_free_tlb (tlb, x, addr) pmd_free((tlb)->mm, x) -#define pgd_populate (mm, pmd, pte) BUG() -#endif /* CONFIG_MMU */ #endif /* _ASM_MICROBLAZE_PGALLOC_H */
arch/microblaze/include/asm/pgtable.h +2 -30
@@ -59,9 +59,7 @@ extern int mem_init_done;#else /* CONFIG_MMU */ -#include <asm-generic/4level-fixup.h> - -#define __PAGETABLE_PMD_FOLDED 1 +#include <asm-generic/pgtable-nopmd.h> #ifdef __KERNEL__#ifndef __ASSEMBLY__
@@ -138,13 +136,8 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }* */ -/* PMD_SHIFT determines the size of the area mapped by the PTE pages */ -#define PMD_SHIFT (PAGE_SHIFT + PTE_SHIFT) -#define PMD_SIZE (1UL << PMD_SHIFT) -#define PMD_MASK (~(PMD_SIZE-1)) -/* PGDIR_SHIFT determines what a top-level page table entry can map */ -#define PGDIR_SHIFT PMD_SHIFT +#define PGDIR_SHIFT (PAGE_SHIFT + PTE_SHIFT)#define PGDIR_SIZE (1UL << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE-1))
@@ -165,9 +158,6 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }#define pte_ERROR (e) \ printk(KERN_ERR "%s:%d: bad pte "PTE_FMT".\n", \ __FILE__, __LINE__, pte_val(e)) -#define pmd_ERROR (e) \ - printk(KERN_ERR "%s:%d: bad pmd %08lx.\n", \ - __FILE__, __LINE__, pmd_val(e))#define pgd_ERROR (e) \ printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", \ __FILE__, __LINE__, pgd_val(e))
@@ -314,18 +304,6 @@ extern unsigned long empty_zero_page[1024];#ifndef __ASSEMBLY__/* -* The "pgd_xxx()" functions here are trivial for a folded two-level -* setup: the pgd is never bad, and a pmd always exists (as it's folded -* into the pgd entry) -*/ -static inline int pgd_none (pgd_t pgd) {return 0 ; } -static inline int pgd_bad (pgd_t pgd) {return 0 ; } -static inline int pgd_present (pgd_t pgd) {return 1 ; } -#define pgd_clear (xp) do { } while (0) -#define pgd_page (pgd) \ - ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK)) - -/* * The following only work if pte_present() is true. * Undefined behaviour if not.. */
@@ -479,12 +457,6 @@ static inline void ptep_mkdirty(struct mm_struct *mm,#define pgd_index (address) ((address) >> PGDIR_SHIFT)#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pgd_t *dir,unsigned long address) -{ -return (pmd_t *) dir; -} -/* Find an entry in the third-level page table.. */ #define pte_index (address) \ (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
arch/microblaze/kernel/signal.c +7 -3
@@ -160,6 +160,9 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,int err =0 , sig = ksig->sig;unsigned long address =0 ;#ifdef CONFIG_MMU +pgd_t *pgdp; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;#endif
@@ -195,9 +198,10 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, address = ((unsigned long )frame->tramp);#ifdef CONFIG_MMU - pmdp =pmd_offset (pud_offset ( -pgd_offset (current->mm, address), - address), address); + pgdp =pgd_offset (current->mm, address); + p4dp =p4d_offset (pgdp, address); + pudp =pud_offset (p4dp, address); + pmdp =pmd_offset (pudp, address);preempt_disable (); ptep =pte_offset_map (pmdp, address);
arch/microblaze/mm/init.c +5 -2
@@ -53,8 +53,11 @@ EXPORT_SYMBOL(kmap_prot);static inline pte_t *virt_to_kpte (unsigned long vaddr) { -return pte_offset_kernel (pmd_offset (pgd_offset_k (vaddr), - vaddr), vaddr); +pgd_t *pgd =pgd_offset_k (vaddr); +p4d_t *p4d =p4d_offset (pgd, vaddr); +pud_t *pud =pud_offset (p4d, vaddr); + +return pte_offset_kernel (pmd_offset (pud, vaddr), vaddr); }static void __init highmem_init (void )
arch/microblaze/mm/pgtable.c +11 -2
@@ -134,11 +134,16 @@ EXPORT_SYMBOL(iounmap);int map_page (unsigned long va,phys_addr_t pa,int flags) { +p4d_t *p4d; +pud_t *pud;pmd_t *pd;pte_t *pg;int err = -ENOMEM ; +/* Use upper 10 bits of VA to index the first level map */ - pd =pmd_offset (pgd_offset_k (va), va); + p4d =p4d_offset (pgd_offset_k (va), va); + pud =pud_offset (p4d, va); + pd =pmd_offset (pud, va);/* Use middle 10 bits of VA to index the second-level map */ pg =pte_alloc_kernel (pd, va);/* from powerpc - pgtable.c */ /* pg = pte_alloc_kernel(&init_mm, pd, va); */
@@ -188,13 +193,17 @@ void __init mapin_ram(void)static int get_pteptr (struct mm_struct *mm,unsigned long addr,pte_t **ptep) {pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *pte;int retval =0 ; pgd =pgd_offset (mm, addr &PAGE_MASK );if (pgd) { - pmd =pmd_offset (pgd, addr &PAGE_MASK ); + p4d =p4d_offset (pgd, addr &PAGE_MASK ); + pud =pud_offset (p4d, addr &PAGE_MASK ); + pmd =pmd_offset (pud, addr &PAGE_MASK );if (pmd_present (*pmd)) { pte =pte_offset_kernel (pmd, addr &PAGE_MASK );if (pte) {
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 7/13 nds32: use pgtable-nopmd instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
nds32 has only two-level page tables and can use pgtable-nopmd and folding of the upper layers.
Replace usage of include/asm-generic/4level-fixup.h and explicit definition of __PAGETABLE_PMD_FOLDED in nds32 with include/asm-generic/pgtable-nopmd.h and adjust page table manipulation macros and functions accordingly.
--- arch/nds32/include/asm/page.h | 3 --- arch/nds32/include/asm/pgalloc.h | 3 --- arch/nds32/include/asm/pgtable.h | 12 +----------- arch/nds32/include/asm/tlb.h | 1 - arch/nds32/kernel/pm.c | 4 +++- arch/nds32/mm/fault.c | 16 +++++++++++++--- arch/nds32/mm/init.c | 11 ++++++++--- arch/nds32/mm/mm-nds32.c | 6 +++++- arch/nds32/mm/proc.c | 26 +++++++++++++++++--------- 9 files changed, 47 insertions(+), 35 deletions(-)
arch/nds32/include/asm/page.h +0 -3
@@ -41,17 +41,14 @@ void clear_page(void *page);void copy_page (void *to,void *from);typedef unsigned long pte_t ; -typedef unsigned long pmd_t ;typedef unsigned long pgd_t ;typedef unsigned long pgprot_t ;#define pte_val (x) (x) -#define pmd_val (x) (x)#define pgd_val (x) (x)#define pgprot_val (x) (x)#define __pte (x) (x) -#define __pmd (x) (x)#define __pgd (x) (x)#define __pgprot (x) (x)
arch/nds32/include/asm/pgalloc.h +0 -3
@@ -15,9 +15,6 @@/* * Since we have only two-level page tables, these are trivial */ -#define pmd_alloc_one (mm, addr) ({ BUG(); ((pmd_t *)2); }) -#define pmd_free (mm, pmd) do { } while (0) -#define pgd_populate (mm, pmd, pte) BUG()#define pmd_pgtable (pmd) pmd_page(pmd)extern pgd_t *pgd_alloc (struct mm_struct *mm);
arch/nds32/include/asm/pgtable.h +1 -11
@@ -4,8 +4,7 @@#ifndef _ASMNDS32_PGTABLE_H#define _ASMNDS32_PGTABLE_H -#define __PAGETABLE_PMD_FOLDED 1 -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopmd.h> #include <linux/sizes.h> #include <asm/memory.h>
@@ -19,26 +18,20 @@#ifdef CONFIG_ANDES_PAGE_SIZE_4KB #define PGDIR_SHIFT 22#define PTRS_PER_PGD 1024 -#define PMD_SHIFT 22 -#define PTRS_PER_PMD 1#define PTRS_PER_PTE 1024#endif #ifdef CONFIG_ANDES_PAGE_SIZE_8KB #define PGDIR_SHIFT 24#define PTRS_PER_PGD 256 -#define PMD_SHIFT 24 -#define PTRS_PER_PMD 1#define PTRS_PER_PTE 2048#endif #ifndef __ASSEMBLY__extern void __pte_error (const char *file,int line,unsigned long val); -extern void __pmd_error (const char *file,int line,unsigned long val);extern void __pgd_error (const char *file,int line,unsigned long val);#define pte_ERROR (pte) __pte_error(__FILE__, __LINE__, pte_val(pte)) -#define pmd_ERROR (pmd) __pmd_error(__FILE__, __LINE__, pmd_val(pmd))#define pgd_ERROR (pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd))#endif /* !__ASSEMBLY__ */
@@ -366,9 +359,6 @@ static inline pmd_t __mk_pmd(pte_t * ptep, unsigned long prot)/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (addr) pgd_offset(&init_mm, addr) -/* Find an entry in the second-level page table.. */ -#define pmd_offset (dir, addr) ((pmd_t *)(dir)) -static inline pte_t pte_modify (pte_t pte,pgprot_t newprot) {const unsigned long mask =0xfff ;
arch/nds32/include/asm/tlb.h +0 -1
@@ -7,6 +7,5 @@#include <asm-generic/tlb.h> #define __pte_free_tlb (tlb, pte, addr) pte_free((tlb)->mm, pte) -#define __pmd_free_tlb (tlb, pmd, addr) pmd_free((tln)->mm, pmd)#endif
arch/nds32/kernel/pm.c +3 -1
@@ -14,6 +14,7 @@ unsigned int *phy_addr_sp_tmp;static void nds32_suspend2ram (void ) {pgd_t *pgdv; +p4d_t *p4dv;pud_t *pudv;pmd_t *pmdv;pte_t *ptev;
@@ -21,7 +22,8 @@ static void nds32_suspend2ram(void) pgdv = (pgd_t *)__va ((__nds32__mfsr (NDS32_SR_L1_PPTB ) & L1_PPTB_mskBASE)) +pgd_index ((unsigned int )cpu_resume); - pudv =pud_offset (pgdv, (unsigned int )cpu_resume); + p4dv =p4d_offset (pgdv, (unsigned int )cpu_resume); + pudv =pud_offset (p4dv, (unsigned int )cpu_resume); pmdv =pmd_offset (pudv, (unsigned int )cpu_resume); ptev =pte_offset_map (pmdv, (unsigned int )cpu_resume);
arch/nds32/mm/fault.c +13 -3
@@ -31,6 +31,8 @@ void show_pte(struct mm_struct *mm, unsigned long addr)pr_alert ("[%08lx] *pgd=%08lx" , addr,pgd_val (*pgd)); do { + p4d_t *p4d; + pud_t *pud; pmd_t *pmd; if (pgd_none(*pgd))
@@ -41,7 +43,9 @@ void show_pte(struct mm_struct *mm, unsigned long addr)break ; } - pmd =pmd_offset (pgd, addr); + p4d =p4d_offset (pgd, addr); + pud =pud_offset (p4d, addr); + pmd =pmd_offset (pud, addr);#if PTRS_PER_PMD !=1 pr_alert (", *pmd=%08lx" ,pmd_val (*pmd));#endif
@@ -359,6 +363,7 @@ void do_page_fault(unsigned long entry, unsigned long addr,unsigned int index =pgd_index (addr);pgd_t *pgd, *pgd_k; +p4d_t *p4d, *p4d_k;pud_t *pud, *pud_k;pmd_t *pmd, *pmd_k;pte_t *pte_k;
@@ -369,8 +374,13 @@ void do_page_fault(unsigned long entry, unsigned long addr,if (!pgd_present (*pgd_k)) goto no_context; - pud =pud_offset (pgd, addr); - pud_k =pud_offset (pgd_k, addr); + p4d =p4d_offset (pgd, addr); + p4d_k =p4d_offset (pgd_k, addr); +if (!p4d_present (*p4d_k)) + goto no_context; + + pud =pud_offset (p4d, addr); + pud_k =pud_offset (p4d_k, addr);if (!pud_present (*pud_k)) goto no_context;
arch/nds32/mm/init.c +8 -3
@@ -54,6 +54,7 @@ static void __init map_ram(void) {unsigned long v, p, e;pgd_t *pge; +p4d_t *p4e;pud_t *pue;pmd_t *pme;pte_t *pte;
@@ -69,7 +70,8 @@ static void __init map_ram(void)while (p < e) {int j; - pue =pud_offset (pge, v); + p4e =p4d_offset (pge, v); + pue =pud_offset (p4e, v); pme =pmd_offset (pue, v);if ((u32 ) pue != (u32 ) pge || (u32 ) pme != (u32 ) pge) {
@@ -100,6 +102,7 @@ static void __init fixedrange_init(void) {unsigned long vaddr;pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;#ifdef CONFIG_HIGHMEM
@@ -111,7 +114,8 @@ static void __init fixedrange_init(void)*/ vaddr =__fix_to_virt (__end_of_fixed_addresses -1 ); 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); fixmap_pmd_p =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!fixmap_pmd_p)
@@ -126,7 +130,8 @@ static void __init fixedrange_init(void) vaddr =PKMAP_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 =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!pte)
arch/nds32/mm/mm-nds32.c +5 -1
@@ -74,6 +74,8 @@ void setup_mm_for_reboot(char mode) {unsigned long pmdval;pgd_t *pgd; +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;int i;
@@ -84,7 +86,9 @@ void setup_mm_for_reboot(char mode)for (i =0 ; i <USER_PTRS_PER_PGD ; i++) { pmdval = (i <<PGDIR_SHIFT ); - pmd =pmd_offset (pgd + i, i <<PGDIR_SHIFT ); + p4d =p4d_offset (pgd, i <<PGDIR_SHIFT ); + pud =pud_offset (p4d, i <<PGDIR_SHIFT ); + pmd =pmd_offset (pud + i, i <<PGDIR_SHIFT );set_pmd (pmd,__pmd (pmdval)); } }
arch/nds32/mm/proc.c +17 -9
@@ -16,10 +16,14 @@ extern struct cache_info L1_cache_info[2];int va_kernel_present (unsigned long addr) { +p4d_t *p4d; +pud_t *pud;pmd_t *pmd;pte_t *ptep, pte; - pmd =pmd_offset (pgd_offset_k (addr), addr); + p4d =p4d_offset (pgd_offset_k (addr), addr); + pud =pud_offset (p4d, addr); + pmd =pmd_offset (pud, addr);if (!pmd_none (*pmd)) { ptep =pte_offset_map (pmd, addr); pte = *ptep;
@@ -32,20 +36,24 @@ int va_kernel_present(unsigned long addr)pte_t va_present (struct mm_struct * mm,unsigned long addr) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *ptep, pte; pgd =pgd_offset (mm, addr);if (!pgd_none (*pgd)) { - pud =pud_offset (pgd, addr); -if (!pud_none (*pud)) { - pmd =pmd_offset (pud, addr); -if (!pmd_none (*pmd)) { - ptep =pte_offset_map (pmd, addr); - pte = *ptep; -if (pte_present (pte)) -return pte; + p4d =p4d_offset (pgd, addr); +if (!p4d_none (*p4d)) { + pud =pud_offset (p4d, addr); +if (!pud_none (*pud)) { + pmd =pmd_offset (pud, addr); +if (!pmd_none (*pmd)) { + ptep =pte_offset_map (pmd, addr); + pte = *ptep; +if (pte_present (pte)) +return pte; + } } } }
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 8/13 parisc: use pgtable-nopXd instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
parisc has two or three levels of page tables and can use appropriate pgtable-nopXd and folding of the upper layers.
Replace usage of include/asm-generic/4level-fixup.h and explicit definitions of __PAGETABLE_PxD_FOLDED in parisc with include/asm-generic/pgtable-nopmd.h for two-level configurations and with include/asm-generic/pgtable-nopud.h for three-lelve configurations and adjust page table manipulation macros and functions accordingly.
--- arch/parisc/include/asm/page.h | 30 +++++++++++++--------- arch/parisc/include/asm/pgalloc.h | 41 +++++++++++------------------- arch/parisc/include/asm/pgtable.h | 52 +++++++++++++++++++-------------------- arch/parisc/include/asm/tlb.h | 2 ++ arch/parisc/kernel/cache.c | 13 ++++++---- arch/parisc/kernel/pci-dma.c | 9 +++++-- arch/parisc/mm/fixmap.c | 10 +++++--- 7 files changed, 81 insertions(+), 76 deletions(-)
arch/parisc/include/asm/page.h +18 -12
@@ -42,48 +42,54 @@ typedef struct { unsigned long pte; } pte_t; /* either 32 or 64bit *//* NOTE: even on 64 bits, these entries are __u32 because we allocate * the pmd and pgd in ZONE_DMA (i.e. under 4GB) */ -typedef struct {__u32 pmd; }pmd_t ;typedef struct {__u32 pgd; }pgd_t ;typedef struct {unsigned long pgprot; }pgprot_t ; -#define pte_val (x) ((x).pte) -/* These do not work lvalues, so make sure we don't use them as such. */ +#if CONFIG_PGTABLE_LEVELS ==3 +typedef struct {__u32 pmd; }pmd_t ; +#define __pmd (x) ((pmd_t) { (x) } ) +/* pXd_val() do not work as lvalues, so make sure we don't use them as such. */ #define pmd_val (x) ((x).pmd + 0) +#endif + +#define pte_val (x) ((x).pte)#define pgd_val (x) ((x).pgd + 0)#define pgprot_val (x) ((x).pgprot)#define __pte (x) ((pte_t) { (x) } ) -#define __pmd (x) ((pmd_t) { (x) } )#define __pgd (x) ((pgd_t) { (x) } )#define __pgprot (x) ((pgprot_t) { (x) } ) -#define __pmd_val_set (x,n) (x).pmd = (n) -#define __pgd_val_set (x,n) (x).pgd = (n) -#else /* * .. while these make it easier on the compiler */ typedef unsigned long pte_t ; + +#if CONFIG_PGTABLE_LEVELS ==3 typedef __u32 pmd_t ; +#define pmd_val (x) (x) +#define __pmd (x) (x) +#endif +typedef __u32 pgd_t ;typedef unsigned long pgprot_t ;#define pte_val (x) (x) -#define pmd_val (x) (x)#define pgd_val (x) (x)#define pgprot_val (x) (x)#define __pte (x) (x) -#define __pmd (x) (x)#define __pgd (x) (x)#define __pgprot (x) (x) -#define __pmd_val_set (x,n) (x) = (n) -#define __pgd_val_set (x,n) (x) = (n) -#endif /* STRICT_MM_TYPECHECKS */ +#define set_pmd (pmdptr, pmdval) (*(pmdptr) = (pmdval)) +#if CONFIG_PGTABLE_LEVELS ==3 +#define set_pud (pudptr, pudval) (*(pudptr) = (pudval)) +#endif +typedef struct page *pgtable_t ; typedef struct __physmem_range {
arch/parisc/include/asm/pgalloc.h +14 -27
70 lines not on this page · raw message
arch/parisc/include/asm/pgtable.h +25 -27
114 lines not on this page · raw message
arch/parisc/include/asm/tlb.h +2 -0
@@ -4,7 +4,9 @@#include <asm-generic/tlb.h> +#if CONFIG_PGTABLE_LEVELS ==3 #define __pmd_free_tlb (tlb, pmd, addr) pmd_free((tlb)->mm, pmd) +#endif #define __pte_free_tlb (tlb, pte, addr) pte_free((tlb)->mm, pte)#endif
arch/parisc/kernel/cache.c +8 -5
@@ -534,11 +534,14 @@ static inline pte_t *get_ptep(pgd_t *pgd, unsigned long addr)pte_t *ptep =NULL ;if (!pgd_none (*pgd)) { -pud_t *pud =pud_offset (pgd, addr); -if (!pud_none (*pud)) { -pmd_t *pmd =pmd_offset (pud, addr); -if (!pmd_none (*pmd)) - ptep =pte_offset_map (pmd, addr); +p4d_t *p4d =p4d_offset (pgd, addr); +if (!p4d_none (*p4d)) { +pud_t *pud =pud_offset (p4d, addr); +if (!pud_none (*pud)) { +pmd_t *pmd =pmd_offset (pud, addr); +if (!pmd_none (*pmd)) + ptep =pte_offset_map (pmd, addr); + } } }return ptep;
arch/parisc/kernel/pci-dma.c +7 -2
@@ -133,9 +133,14 @@ static inline int map_uncached_pages(unsigned long vaddr, unsigned long size, dir =pgd_offset_k (vaddr); do { + p4d_t *p4d; + pud_t *pud; pmd_t *pmd; - - pmd = pmd_alloc(NULL, dir, vaddr); + + p4d = p4d_offset(dir, vaddr); + pud = pud_offset(p4d, vaddr); + pmd = pmd_alloc(NULL, pud, vaddr); + if (!pmd) return -ENOMEM; if (map_pmd_uncached(pmd, vaddr, end - vaddr, &paddr))
arch/parisc/mm/fixmap.c +7 -3
@@ -14,11 +14,13 @@ void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys) {unsigned long vaddr =__fix_to_virt (idx);pgd_t *pgd =pgd_offset_k (vaddr); -pmd_t *pmd =pmd_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;if (pmd_none (*pmd)) - pmd =pmd_alloc (NULL , pgd, vaddr); + pmd =pmd_alloc (NULL , pud, vaddr); pte =pte_offset_kernel (pmd, vaddr);if (pte_none (*pte))
@@ -32,7 +34,9 @@ void notrace clear_fixmap(enum fixed_addresses idx) {unsigned long vaddr =__fix_to_virt (idx);pgd_t *pgd =pgd_offset_k (vaddr); -pmd_t *pmd =pmd_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 =pte_offset_kernel (pmd, vaddr);if (WARN_ON (pte_none (*pte)))
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 9/13 parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup
In reply to Mike RapoportFrom: Helge Deller <[email protected]>
--- arch/parisc/mm/hugetlbpage.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
arch/parisc/mm/hugetlbpage.c +12 -6
@@ -49,6 +49,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte =NULL ;
@@ -61,7 +62,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, addr &=HPAGE_MASK ; pgd =pgd_offset (mm, addr); - pud =pud_alloc (mm, pgd, addr); + p4d =p4d_offset (pgd, addr); + pud =pud_alloc (mm, p4d, addr);if (pud) { pmd =pmd_alloc (mm, pud, addr);if (pmd)
@@ -74,6 +76,7 @@ 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;pte_t *pte =NULL ;
@@ -82,11 +85,14 @@ pte_t *huge_pte_offset(struct mm_struct *mm, pgd =pgd_offset (mm, addr);if (!pgd_none (*pgd)) { - pud =pud_offset (pgd, addr); -if (!pud_none (*pud)) { - pmd =pmd_offset (pud, addr); -if (!pmd_none (*pmd)) - pte =pte_offset_map (pmd, addr); + p4d =p4d_offset (pgd, addr); +if (!p4d_none (*p4d)) { + pud =pud_offset (p4d, addr); +if (!pud_none (*pud)) { + pmd =pmd_offset (pud, addr); +if (!pmd_none (*pmd)) + pte =pte_offset_map (pmd, addr); + } } }return pte;
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 10/13 sparc32: use pgtable-nopud instead of 4level-fixup
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
32-bit version of sparc has three-level page tables and can use pgtable-nopud and folding of the upper layers.
Replace usage of include/asm-generic/4level-fixup.h with include/asm-generic/pgtable-nopud.h and adjust page table manipulation macros and functions accordingly.
--- arch/sparc/include/asm/pgalloc_32.h | 6 ++--- arch/sparc/include/asm/pgtable_32.h | 28 ++++++++++---------- arch/sparc/mm/fault_32.c | 11 ++++++-- arch/sparc/mm/highmem.c | 6 ++++- arch/sparc/mm/io-unit.c | 6 ++++- arch/sparc/mm/iommu.c | 6 ++++- arch/sparc/mm/srmmu.c | 51 +++++++++++++++++++++++++++++-------- 7 files changed, 81 insertions(+), 33 deletions(-)
arch/sparc/include/asm/pgalloc_32.h +3 -3
@@ -26,14 +26,14 @@ static inline void free_pgd_fast(pgd_t *pgd)#define pgd_free (mm, pgd) free_pgd_fast(pgd)#define pgd_alloc (mm) get_pgd_fast() -static inline void pgd_set (pgd_t * pgdp,pmd_t * pmdp) +static inline void pud_set (pud_t * pudp,pmd_t * pmdp) {unsigned long pa =__nocache_pa (pmdp); -set_pte ((pte_t *)pgdp,__pte ((SRMMU_ET_PTD | (pa >>4 )))); +set_pte ((pte_t *)pudp,__pte ((SRMMU_ET_PTD | (pa >>4 )))); } -#define pgd_populate (MM ,PGD ,PMD ) pgd_set(PGD, PMD) +#define pud_populate (MM ,PGD ,PMD ) pud_set(PGD, PMD)static inline pmd_t *pmd_alloc_one (struct mm_struct *mm,unsigned long address)
arch/sparc/include/asm/pgtable_32.h +14 -14
@@ -12,7 +12,7 @@#include <linux/const.h> #ifndef __ASSEMBLY__ -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopud.h> #include <linux/spinlock.h> #include <linux/mm_types.h>
@@ -132,12 +132,12 @@ static inline struct page *pmd_page(pmd_t pmd)return pfn_to_page ((pmd_val (pmd) &SRMMU_PTD_PMASK ) >> (PAGE_SHIFT -4 )); } -static inline unsigned long pgd_page_vaddr (pgd_t pgd) +static inline unsigned long pud_page_vaddr (pud_t pud) { -if (srmmu_device_memory (pgd_val (pgd))) { +if (srmmu_device_memory (pud_val (pud))) {return ~0 ; }else { -unsigned long v =pgd_val (pgd) &SRMMU_PTD_PMASK ; +unsigned long v =pud_val (pud) &SRMMU_PTD_PMASK ;return (unsigned long )__nocache_va (v <<4 ); } }
@@ -184,24 +184,24 @@ static inline void pmd_clear(pmd_t *pmdp)set_pte ((pte_t *)&pmdp->pmdv[i],__pte (0 )); } -static inline int pgd_none (pgd_t pgd) +static inline int pud_none (pud_t pud) { -return !(pgd_val (pgd) &0xFFFFFFF ); +return !(pud_val (pud) &0xFFFFFFF ); } -static inline int pgd_bad (pgd_t pgd) +static inline int pud_bad (pud_t pud) { -return (pgd_val (pgd) &SRMMU_ET_MASK ) !=SRMMU_ET_PTD ; +return (pud_val (pud) &SRMMU_ET_MASK ) !=SRMMU_ET_PTD ; } -static inline int pgd_present (pgd_t pgd) +static inline int pud_present (pud_t pud) { -return ((pgd_val (pgd) &SRMMU_ET_MASK ) ==SRMMU_ET_PTD ); +return ((pud_val (pud) &SRMMU_ET_MASK ) ==SRMMU_ET_PTD ); } -static inline void pgd_clear (pgd_t *pgdp) +static inline void pud_clear (pud_t *pudp) { -set_pte ((pte_t *)pgdp,__pte (0 )); +set_pte ((pte_t *)pudp,__pte (0 )); }/*
@@ -319,9 +319,9 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define pgd_offset_k (address) pgd_offset(&init_mm, address)/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pgd_t * dir,unsigned long address) +static inline pmd_t *pmd_offset (pud_t * dir,unsigned long address) { -return (pmd_t *)pgd_page_vaddr (*dir) + +return (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); }
arch/sparc/mm/fault_32.c +9 -2
@@ -351,6 +351,8 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int 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; pgd = tsk->active_mm->pgd + offset;
@@ -363,8 +365,13 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,return ; } - pmd =pmd_offset (pgd, address); - pmd_k =pmd_offset (pgd_k, address); + p4d =p4d_offset (pgd, address); + pud =pud_offset (p4d, address); + pmd =pmd_offset (pud, address); + + p4d_k =p4d_offset (pgd_k, address); + pud_k =pud_offset (p4d_k, address); + pmd_k =pmd_offset (pud_k, address);if (pmd_present (*pmd) || !pmd_present (*pmd_k)) goto bad_area_nosemaphore;
arch/sparc/mm/highmem.c +5 -1
@@ -39,10 +39,14 @@ static pte_t *kmap_pte;void __init kmap_init (void ) {unsigned long address; +p4d_t *p4d; +pud_t *pud;pmd_t *dir; address =__fix_to_virt (FIX_KMAP_BEGIN ); - dir =pmd_offset (pgd_offset_k (address), address); + p4d =p4d_offset (pgd_offset_k (address), address); + pud =pud_offset (p4d, address); + dir =pmd_offset (pud, address);/* cache the first kmap pte */ kmap_pte =pte_offset_kernel (dir, address);
arch/sparc/mm/io-unit.c +5 -1
@@ -239,12 +239,16 @@ static void *iounit_alloc(struct device *dev, size_t len, page = va; {pgd_t *pgdp; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;long i; pgdp =pgd_offset (&init_mm, addr); - pmdp =pmd_offset (pgdp, addr); + p4dp =p4d_offset (pgdp, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_map (pmdp, addr);set_pte (ptep,mk_pte (virt_to_page (page), dvma_prot));
arch/sparc/mm/iommu.c +5 -1
@@ -343,6 +343,8 @@ static void *sbus_iommu_alloc(struct device *dev, size_t len, page = va; {pgd_t *pgdp; +p4d_t *p4dp; +pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -354,7 +356,9 @@ static void *sbus_iommu_alloc(struct device *dev, size_t len,__flush_page_to_ram (page); pgdp =pgd_offset (&init_mm, addr); - pmdp =pmd_offset (pgdp, addr); + p4dp =p4d_offset (pgdp, addr); + pudp =pud_offset (p4dp, addr); + pmdp =pmd_offset (pudp, addr); ptep =pte_offset_map (pmdp, addr);set_pte (ptep,mk_pte (virt_to_page (page), dvma_prot));
arch/sparc/mm/srmmu.c +40 -11
152 lines not on this page · raw message
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 11/13 um: remove unused pxx_offset_proc() and addr_pte() functions
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The pxx_offset_proc() and addr_pte() functions are never used. Remove them.
--- arch/um/kernel/tlb.c | 29 ----------------------------- 1 file changed, 29 deletions(-)
arch/um/kernel/tlb.c +0 -29
@@ -490,35 +490,6 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long address)force_sig (SIGKILL ); } -pgd_t *pgd_offset_proc (struct mm_struct *mm,unsigned long address) -{ -return pgd_offset (mm, address); -} - -pud_t *pud_offset_proc (pgd_t *pgd,unsigned long address) -{ -return pud_offset (pgd, address); -} - -pmd_t *pmd_offset_proc (pud_t *pud,unsigned long address) -{ -return pmd_offset (pud, address); -} - -pte_t *pte_offset_proc (pmd_t *pmd,unsigned long address) -{ -return pte_offset_kernel (pmd, address); -} - -pte_t *addr_pte (struct task_struct *task,unsigned long addr) -{ -pgd_t *pgd =pgd_offset (task->mm, addr); -pud_t *pud =pud_offset (pgd, addr); -pmd_t *pmd =pmd_offset (pud, addr); - -return pte_offset_map (pmd, addr); -} -void flush_tlb_all (void ) {/*
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 12/13 um: add support for folded p4d page tables
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The UML port uses 4 and 5 level fixups to support higher level page table directories in the generic VM code.
Implement primitives necessary for the 4th level folding, add walks of p4d level where appropriate and drop usage of __ARCH_USE_5LEVEL_HACK.
--- arch/um/include/asm/pgtable-2level.h | 1 - arch/um/include/asm/pgtable-3level.h | 1 - arch/um/include/asm/pgtable.h | 3 ++ arch/um/kernel/mem.c | 8 ++++-- arch/um/kernel/skas/mmu.c | 12 ++++++-- arch/um/kernel/skas/uaccess.c | 7 ++++- arch/um/kernel/tlb.c | 56 ++++++++++++++++++++++++++++++++---- arch/um/kernel/trap.c | 4 ++- 8 files changed, 78 insertions(+), 14 deletions(-)
arch/um/include/asm/pgtable-2level.h +0 -1
@@ -8,7 +8,6 @@#ifndef __UM_PGTABLE_2LEVEL_H#define __UM_PGTABLE_2LEVEL_H -#define __ARCH_USE_5LEVEL_HACK#include <asm-generic/pgtable-nopmd.h> /* PGDIR_SHIFT determines what a third-level page table entry can map */
arch/um/include/asm/pgtable-3level.h +0 -1
@@ -7,7 +7,6 @@#ifndef __UM_PGTABLE_3LEVEL_H#define __UM_PGTABLE_3LEVEL_H -#define __ARCH_USE_5LEVEL_HACK#include <asm-generic/pgtable-nopud.h> /* PGDIR_SHIFT determines what a third-level page table entry can map */
arch/um/include/asm/pgtable.h +3 -0
@@ -106,6 +106,9 @@ extern unsigned long end_iomem;#define pud_newpage (x) (pud_val(x) & _PAGE_NEWPAGE)#define pud_mkuptodate (x) (pud_val(x) &= ~_PAGE_NEWPAGE) +#define p4d_newpage (x) (p4d_val(x) & _PAGE_NEWPAGE) +#define p4d_mkuptodate (x) (p4d_val(x) &= ~_PAGE_NEWPAGE) +#define pmd_page (pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)#define pte_page (x) pfn_to_page(pte_pfn(x))
arch/um/kernel/mem.c +6 -2
@@ -96,6 +96,7 @@ static void __init fixrange_init(unsigned long start, unsigned long end, pgd_t *pgd_base) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;int i, j;
@@ -107,7 +108,8 @@ static void __init fixrange_init(unsigned long start, unsigned long end, pgd = pgd_base + i;for ( ; (i <PTRS_PER_PGD ) && (vaddr < end); pgd++, i++) { - pud =pud_offset (pgd, vaddr); + p4d =p4d_offset (pgd, vaddr); + pud =pud_offset (p4d, vaddr);if (pud_none (*pud))one_md_table_init (pud); pmd =pmd_offset (pud, vaddr);
@@ -124,6 +126,7 @@ static void __init fixaddr_user_init( void)#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA long size =FIXADDR_USER_END -FIXADDR_USER_START ;pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -144,7 +147,8 @@ static void __init fixaddr_user_init( void)for ( ; size >0 ; size -=PAGE_SIZE , vaddr +=PAGE_SIZE , p +=PAGE_SIZE ) { 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);pte_set_val (*pte, p,PAGE_READONLY );
arch/um/kernel/skas/mmu.c +10 -2
@@ -19,15 +19,21 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, unsigned long kernel) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte; pgd =pgd_offset (mm, proc); - pud =pud_alloc (mm, pgd, proc); -if (!pud) + + p4d =p4d_alloc (mm, pgd, proc); +if (!p4d) goto out; + pud =pud_alloc (mm, p4d, proc); +if (!pud) + goto out_pud; + pmd =pmd_alloc (mm, pud, proc);if (!pmd) goto out_pmd;
@@ -44,6 +50,8 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,pmd_free (mm, pmd); out_pmd:pud_free (mm, pud); + out_pud: +p4d_free (mm, p4d); out:return -ENOMEM ; }
arch/um/kernel/skas/uaccess.c +6 -1
@@ -17,6 +17,7 @@pte_t *virt_to_pte (struct mm_struct *mm,unsigned long addr) {pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;
@@ -27,7 +28,11 @@ pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)if (!pgd_present (*pgd))return NULL ; - pud =pud_offset (pgd, addr); + p4d =p4d_offset (pgd, addr); +if (!p4d_present (*p4d)) +return NULL ; + + pud =pud_offset (p4d, addr);if (!pud_present (*pud))return NULL ;
arch/um/kernel/tlb.c +50 -6
104 lines not on this page · raw message
arch/um/kernel/trap.c +3 -1
@@ -28,6 +28,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,struct mm_struct *mm = current->mm;struct vm_area_struct *vma;pgd_t *pgd; +p4d_t *p4d;pud_t *pud;pmd_t *pmd;pte_t *pte;
@@ -104,7 +105,8 @@ int handle_page_fault(unsigned long address, unsigned long ip, } pgd =pgd_offset (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); }while (!pte_present (*pte));
Signature · 1 line
2.7.4
Mike Rapoport
reviewerPATCH v4 13/13 mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
There are no architectures that use include/asm-generic/4level-fixup.h therefore it can be removed along with __ARCH_HAS_4LEVEL_HACK define.
--- include/asm-generic/4level-fixup.h | 40 -------------------------------------- include/asm-generic/tlb.h | 2 -- include/linux/mm.h | 10 +++++----- mm/memory.c | 8 -------- 4 files changed, 5 insertions(+), 55 deletions(-) delete mode 100644 include/asm-generic/4level-fixup.h
include/asm-generic/4level-fixup.h deleted +0 -40
@@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _4LEVEL_FIXUP_H -#define _4LEVEL_FIXUP_H - -#define __ARCH_HAS_4LEVEL_HACK -#define __PAGETABLE_PUD_FOLDED 1 - -#define PUD_SHIFT PGDIR_SHIFT -#define PUD_SIZE PGDIR_SIZE -#define PUD_MASK PGDIR_MASK -#define PTRS_PER_PUD 1 - -#define pud_t pgd_t - -#define pmd_alloc (mm, pud, address) \ - ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \ - NULL: pmd_offset(pud, address)) - -#define pud_offset (pgd, start) (pgd) -#define pud_none (pud) 0 -#define pud_bad (pud) 0 -#define pud_present (pud) 1 -#define pud_ERROR (pud) do { } while (0) -#define pud_clear (pud) pgd_clear(pud) -#define pud_val (pud) pgd_val(pud) -#define pud_populate (mm, pud, pmd) pgd_populate(mm, pud, pmd) -#define pud_page (pud) pgd_page(pud) -#define pud_page_vaddr (pud) pgd_page_vaddr(pud) - -#undef pud_free_tlb -#define pud_free_tlb (tlb, x, addr) do { } while (0) -#define pud_free (mm, x) do { } while (0) -#define __pud_free_tlb (tlb, x, addr) do { } while (0) - -#undef pud_addr_end -#define pud_addr_end (addr, end) (end) - -#include <asm-generic/5level-fixup.h> - -#endif
include/asm-generic/tlb.h +0 -2
@@ -584,7 +584,6 @@ static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vm } while (0)#endif -#ifndef __ARCH_HAS_4LEVEL_HACK#ifndef pud_free_tlb#define pud_free_tlb (tlb, pudp, address) \ do { \
@@ -594,7 +593,6 @@ static inline void tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vm__pud_free_tlb (tlb, pudp, address); \ } while (0) #endif -#endif #ifndef __ARCH_HAS_5LEVEL_HACK#ifndef p4d_free_tlb
include/linux/mm.h +5 -5
@@ -1850,12 +1850,12 @@ static inline void mm_dec_nr_ptes(struct mm_struct *mm) {}int __pte_alloc (struct mm_struct *mm,pmd_t *pmd);int __pte_alloc_kernel (pmd_t *pmd); +#if defined(CONFIG_MMU ) +/* -* The following ifdef needed to get the 4level-fixup.h header to work. -* Remove it when 4level-fixup.h has been removed. +* The following ifdef needed to get the 5level-fixup.h header to work. +* Remove it when 5level-fixup.h has been removed. */ -#if defined(CONFIG_MMU ) && !defined(__ARCH_HAS_4LEVEL_HACK) -#ifndef __ARCH_HAS_5LEVEL_HACKstatic inline p4d_t *p4d_alloc (struct mm_struct *mm,pgd_t *pgd,unsigned long address)
@@ -1877,7 +1877,7 @@ static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long areturn (unlikely (pud_none (*pud)) &&__pmd_alloc (mm, pud, address))? NULL: pmd_offset(pud, address); } -#endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */ +#endif /* CONFIG_MMU */ #if USE_SPLIT_PTE_PTLOCKS #if ALLOC_SPLIT_PTLOCKS
mm/memory.c +0 -8
@@ -4095,19 +4095,11 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)smp_wmb ();/* See comment in __pte_alloc */ ptl =pud_lock (mm, pud); -#ifndef __ARCH_HAS_4LEVEL_HACKif (!pud_present (*pud)) {mm_inc_nr_pmds (mm);pud_populate (mm, pud, new); }else /* Another has populated it */ pmd_free (mm, new); -#else -if (!pgd_present (*pud)) { -mm_inc_nr_pmds (mm); -pgd_populate (mm, pud, new); - }else /* Another has populated it */ -pmd_free (mm, new); -#endif /* __ARCH_HAS_4LEVEL_HACK */ spin_unlock (ptl);return 0 ; }
Signature · 1 line
2.7.4
Andrew Morton
maintainerRe: [PATCH v4 13/13] mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h
Quoted 2 lines · On Tue, 5 Nov 2019 09:15:35 +0200 Mike Rapoport <[email protected]> wrote:
There are no architectures that use
include/asm-generic/4level-fixup.htherefore it can be removed along with__ARCH_HAS_4LEVEL_HACKdefine.
Conflicts a bit with Vineet's "asm-generic/tlb: stub out pud_free_tlb() if nopud ...", from
http://lkml.kernel.org/r/[email protected]
I fixed it up by removing include/asm-generic/4level-fixup.h anyway and removing the removal of "#ifndef __ARCH_HAS_4LEVEL_HAC" from include/asm-generic/tlb.h.
Quoted 19 lines · Mike Rapoport
From: Mike Rapoport <[email protected]>
Hi,
These patches convert several architectures to use page table folding and remove
__ARCH_HAS_4LEVEL_HACKalong withinclude/asm-generic/4level-fixup.h.For the nommu configurations the folding is already implemented by the generic code so the only change was to use the appropriate header file.
As for the rest, the changes are mostly about mechanical replacement of pgd accessors with pud/pmd ones and the addition of higher levels to page table traversals.
With Vineet's patches from "elide extraneous generated code for folded p4d/pud/pmd" series [1] there is a small shrink of the kernel size of about -0.01% for the defconfig builds.
Quoted 5 lines
The set is boot-tested on UML, qemu-{alpha,sparc} and aranym.
v4 changes:
* m68k: fixsun3x_defconfigbuild and reorder ifdefs as per Geert's suggestion
Mike,
tested your patch series on a debian sid/unstable sparc64 LDOM running on a T5-2 sparc server - it boots for me.