mm: consolidate definitions of page table accessors
Subsystems (105)
Mike Rapoport
maintainerPATCH v2 8/12 mm: pgtable: add shortcuts for accessing kernel PMD and PTE
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
The powerpc 32-bit implementation of pgtable has nice shortcuts for accessing kernel PMD and PTE for a given virtual address. Make this helpers available for all architectures.
--- arch/arc/mm/highmem.c | 10 +------- arch/arm/mach-sa1100/assabet.c | 2 +- arch/arm/mm/highmem.c | 4 ++-- arch/arm/mm/ioremap.c | 31 ++++-------------------- arch/arm/mm/mm.h | 5 ---- arch/arm/mm/mmu.c | 7 +----- arch/hexagon/include/asm/fixmap.h | 4 ---- arch/m68k/mm/motorola.c | 26 ++++---------------- arch/microblaze/kernel/signal.c | 8 +------ arch/microblaze/mm/init.c | 9 ------- arch/mips/include/asm/fixmap.h | 3 --- arch/mips/mm/c-r3k.c | 10 ++------ arch/mips/mm/c-r4k.c | 10 ++------ arch/mips/mm/c-tx39.c | 10 ++------ arch/mips/mm/highmem.c | 2 +- arch/nds32/include/asm/pgtable.h | 2 -- arch/nds32/mm/init.c | 13 ++-------- arch/nds32/mm/proc.c | 6 +---- arch/parisc/mm/fixmap.c | 6 +---- arch/powerpc/include/asm/pgtable.h | 19 --------------- arch/powerpc/mm/book3s32/mmu.c | 2 +- arch/powerpc/mm/book3s32/tlb.c | 4 ++-- arch/powerpc/mm/kasan/kasan_init_32.c | 8 +++---- arch/powerpc/mm/nohash/40x.c | 4 ++-- arch/powerpc/mm/pgtable_32.c | 2 +- arch/s390/mm/pageattr.c | 10 +------- arch/sh/mm/cache-sh4.c | 8 +------ arch/sh/mm/kmap.c | 5 +--- arch/sparc/mm/highmem.c | 12 ++-------- arch/sparc/mm/init_64.c | 6 +---- arch/sparc/mm/io-unit.c | 10 ++------ arch/sparc/mm/iommu.c | 8 +------ arch/sparc/mm/srmmu.c | 34 +++------------------------ arch/um/kernel/mem.c | 10 +------- arch/um/kernel/trap.c | 8 +------ arch/unicore32/mm/mm.h | 10 -------- arch/x86/mm/init_32.c | 26 +++----------------- arch/xtensa/include/asm/fixmap.h | 8 ------- arch/xtensa/mm/highmem.c | 2 +- arch/xtensa/mm/kasan_init.c | 10 ++------ arch/xtensa/mm/mmu.c | 5 +--- include/linux/pgtable.h | 24 +++++++++++++++++++ 42 files changed, 80 insertions(+), 323 deletions(-)
arch/arc/mm/highmem.c +1 -9
@@ -92,17 +92,9 @@ EXPORT_SYMBOL(kunmap_atomic_high); static noinline pte_t * __init alloc_kmap_pgtable(unsigned long kvaddr) { -pgd_t *pgd_k; -p4d_t *p4d_k; -pud_t *pud_k; -pmd_t *pmd_k; +pmd_t *pmd_k =pmd_off_k (kvaddr);pte_t *pte_k; - pgd_k =pgd_offset_k (kvaddr); - p4d_k =p4d_offset (pgd_k, kvaddr); - pud_k =pud_offset (p4d_k, kvaddr); - pmd_k =pmd_offset (pud_k, kvaddr); - pte_k = (pte_t *)memblock_alloc_low (PAGE_SIZE ,PAGE_SIZE );if (!pte_k) panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
arch/arm/mach-sa1100/assabet.c +1 -1
@@ -632,7 +632,7 @@ static void __init map_sa1100_gpio_regs( void )int prot =PMD_TYPE_SECT |PMD_SECT_AP_WRITE |PMD_DOMAIN (DOMAIN_IO );pmd_t *pmd; - pmd =pmd_offset (pud_offset (p4d_offset (pgd_offset_k (virt), virt), virt), virt); + pmd =pmd_off_k (virt); *pmd =__pmd (phys | prot);flush_pmd_entry (pmd); }
arch/arm/mm/highmem.c +2 -2
@@ -18,7 +18,7 @@static inline void set_fixmap_pte (int idx,pte_t pte) {unsigned long vaddr =__fix_to_virt (idx); -pte_t *ptep =pte_offset_kernel (pmd_off_k (vaddr), vaddr); +pte_t *ptep =virt_to_kpte (vaddr);set_pte_ext (ptep, pte,0 );local_flush_tlb_kernel_page (vaddr);
@@ -26,7 +26,7 @@ static inline void set_fixmap_pte(int idx, pte_t pte)static inline pte_t get_fixmap_pte (unsigned long vaddr) { -pte_t *ptep =pte_offset_kernel (pmd_off_k (vaddr), vaddr); +pte_t *ptep =virt_to_kpte (vaddr);return *ptep; }
arch/arm/mm/ioremap.c +4 -27
@@ -141,16 +141,8 @@ void __check_vmalloc_seq(struct mm_struct *mm)static void unmap_area_sections (unsigned long virt,unsigned long size) {unsigned long addr = virt, end = virt + (size & ~(SZ_1M -1 )); -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud; -pmd_t *pmdp; - -flush_cache_vunmap (addr, end); - pgd =pgd_offset_k (addr); - p4d =p4d_offset (pgd, addr); - pud =pud_offset (p4d, addr); - pmdp =pmd_offset (pud, addr); +pmd_t *pmdp =pmd_off_k (addr); + do { pmd_t pmd = *pmdp;
@@ -191,10 +183,7 @@ remap_area_sections(unsigned long virt, unsigned long pfn, size_t size, const struct mem_type *type) { unsigned long addr = virt, end = virt + size; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud; -pmd_t *pmd; +pmd_t *pmd =pmd_off_k (addr);/* * Remove and free any PTE-based mapping, and
@@ -202,10 +191,6 @@ remap_area_sections(unsigned long virt, unsigned long pfn,*/ unmap_area_sections (virt, size); - pgd =pgd_offset_k (addr); - p4d =p4d_offset (pgd, addr); - pud =pud_offset (p4d, addr); - pmd =pmd_offset (pud, addr); do { pmd[0] = __pmd(__pfn_to_phys(pfn) | type->prot_sect); pfn += SZ_1M >> PAGE_SHIFT;
@@ -225,21 +210,13 @@ remap_area_supersections(unsigned long virt, unsigned long pfn, size_t size, const struct mem_type *type) { unsigned long addr = virt, end = virt + size; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud; -pmd_t *pmd; +pmd_t *pmd =pmd_off_k (addr);/* * Remove and free any PTE-based mapping, and * sync the current kernel mapping. */ unmap_area_sections (virt, size); - - pgd =pgd_offset_k (virt); - p4d =p4d_offset (pgd, addr); - pud =pud_offset (p4d, addr); - pmd =pmd_offset (pud, addr); do { unsigned long super_pmd_val, i;
arch/arm/mm/mm.h +0 -5
@@ -35,11 +35,6 @@ static inline pte_t get_top_pte(unsigned long va)return *ptep; } -static inline pmd_t *pmd_off_k (unsigned long virt) -{ -return pmd_offset (pud_offset (p4d_offset (pgd_offset_k (virt), virt), virt), virt); -} -struct mem_type {pteval_t prot_pte;pteval_t prot_pte_s2;
arch/arm/mm/mmu.c +1 -6
@@ -356,12 +356,7 @@ static pte_t *pte_offset_late_fixmap(pmd_t *dir, unsigned long addr)static inline pmd_t *__init fixmap_pmd (unsigned long addr) { -pgd_t *pgd =pgd_offset_k (addr); -p4d_t *p4d =p4d_offset (pgd, addr); -pud_t *pud =pud_offset (p4d, addr); -pmd_t *pmd =pmd_offset (pud, addr); - -return pmd; +return pmd_off_k (addr); }void __init early_fixmap_init (void )
arch/hexagon/include/asm/fixmap.h +0 -4
@@ -15,8 +15,4 @@#include <asm-generic/fixmap.h> -#define kmap_get_fixmap_pte (vaddr) \ - pte_offset_kernel(pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), \ - (vaddr)), (vaddr)), (vaddr)), (vaddr)) -#endif
arch/m68k/mm/motorola.c +4 -22
@@ -54,17 +54,8 @@ static inline void nocache_page(void *vaddr)unsigned long addr = (unsigned long )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); - p4dp =p4d_offset (dir, addr); - pudp =pud_offset (p4dp, addr); - pmdp =pmd_offset (pudp, addr); - ptep =pte_offset_kernel (pmdp, addr); +pte_t *ptep =virt_to_kpte (addr); + *ptep =pte_mknocache (*ptep); } }
@@ -74,17 +65,8 @@ static inline void cache_page(void *vaddr)unsigned long addr = (unsigned long )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); - p4dp =p4d_offset (dir, addr); - pudp =pud_offset (p4dp, addr); - pmdp =pmd_offset (pudp, addr); - ptep =pte_offset_kernel (pmdp, addr); +pte_t *ptep =virt_to_kpte (addr); + *ptep =pte_mkcache (*ptep); } }
arch/microblaze/kernel/signal.c +1 -7
@@ -159,9 +159,6 @@ 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
@@ -197,10 +194,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, address = ((unsigned long )frame->tramp);#ifdef CONFIG_MMU - pgdp =pgd_offset (current->mm, address); - p4dp =p4d_offset (pgdp, address); - pudp =pud_offset (p4dp, address); - pmdp =pmd_offset (pudp, address); + pmdp =pmd_off_k (address);preempt_disable (); ptep =pte_offset_map (pmdp, address);
arch/microblaze/mm/init.c +0 -9
@@ -50,15 +50,6 @@ unsigned long lowmem_size;pte_t *kmap_pte;EXPORT_SYMBOL (kmap_pte); -static inline pte_t *virt_to_kpte (unsigned long 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 ) {pr_debug ("%x\n" , (u32 )PKMAP_BASE );
arch/mips/include/asm/fixmap.h +0 -3
@@ -69,9 +69,6 @@ enum fixed_addresses {#include <asm-generic/fixmap.h> -#define kmap_get_fixmap_pte (vaddr) \ - pte_offset_kernel(pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)), (vaddr)) -/* * Called from pgtable_init() */
arch/mips/mm/c-r3k.c +2 -8
@@ -239,9 +239,6 @@ static void r3k_flush_cache_page(struct vm_area_struct *vma,unsigned long kaddr =KSEG0ADDR (pfn <<PAGE_SHIFT );int exec = vma->vm_flags &VM_EXEC ;struct mm_struct *mm = vma->vm_mm; -pgd_t *pgdp; -p4d_t *p4dp; -pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -252,11 +249,8 @@ static void r3k_flush_cache_page(struct vm_area_struct *vma,if (cpu_context (smp_processor_id (), mm) ==0 )return ; - pgdp =pgd_offset (mm, addr); - p4dp =p4d_offset (pgdp, addr); - pudp =pud_offset (p4dp, addr); - pmdp =pmd_offset (pudp, addr); - ptep =pte_offset (pmdp, addr); + pmdp =pmd_off (mm, addr); + ptep =pte_offset_kernel (pmdp, addr);/* Invalid => no such page in the cache. */ if (!(pte_val (*ptep) & _PAGE_PRESENT))
arch/mips/mm/c-r4k.c +2 -8
@@ -652,9 +652,6 @@ static inline void local_r4k_flush_cache_page(void *args)int exec = vma->vm_flags &VM_EXEC ;struct mm_struct *mm = vma->vm_mm;int map_coherent =0 ; -pgd_t *pgdp; -p4d_t *p4dp; -pud_t *pudp;pmd_t *pmdp;pte_t *ptep;void *vaddr;
@@ -667,11 +664,8 @@ static inline void local_r4k_flush_cache_page(void *args)return ; addr &=PAGE_MASK ; - pgdp =pgd_offset (mm, addr); - p4dp =p4d_offset (pgdp, addr); - pudp =pud_offset (p4dp, addr); - pmdp =pmd_offset (pudp, addr); - ptep =pte_offset (pmdp, addr); + pmdp =pmd_off (mm, addr); + ptep =pte_offset_kernel (pmdp, addr);/* * If the page isn't marked valid, the page cannot possibly be
arch/mips/mm/c-tx39.c +2 -8
@@ -168,9 +168,6 @@ static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long page {int exec = vma->vm_flags &VM_EXEC ;struct mm_struct *mm = vma->vm_mm; -pgd_t *pgdp; -p4d_t *p4dp; -pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -182,11 +179,8 @@ static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long pagereturn ; page &=PAGE_MASK ; - pgdp =pgd_offset (mm, page); - p4dp =p4d_offset (pgdp, page); - pudp =pud_offset (p4dp, page); - pmdp =pmd_offset (pudp, page); - ptep =pte_offset (pmdp, page); + pmdp =pmd_off (mm, page); + ptep =pte_offset_kernel (pmdp, page);/* * If the page isn't marked valid, the page cannot possibly be
arch/mips/mm/highmem.c +1 -1
@@ -93,5 +93,5 @@ void __init kmap_init(void)/* cache the first kmap pte */ kmap_vstart =__fix_to_virt (FIX_KMAP_BEGIN ); - kmap_pte =kmap_get_fixmap_pte (kmap_vstart); + kmap_pte =virt_to_kpte (kmap_vstart); }
arch/nds32/include/asm/pgtable.h +0 -2
@@ -195,8 +195,6 @@ extern void paging_init(void);#define pte_unmap (pte) do { } while (0)#define pte_unmap_nested (pte) do { } while (0) -#define pmd_off_k (address) pmd_offset(pud_offset(p4d_offset(pgd_offset_k(address), (address)), (address)), (address)) -#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval)/* * Set a level 1 translation table entry, and clean it out of
arch/nds32/mm/init.c +2 -11
@@ -98,9 +98,6 @@ static pmd_t *fixmap_pmd_p;static void __init fixedrange_init (void ) {unsigned long vaddr; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud;pmd_t *pmd;#ifdef CONFIG_HIGHMEM pte_t *pte;
@@ -110,10 +107,7 @@ static void __init fixedrange_init(void)* Fixed mappings: */ vaddr =__fix_to_virt (__end_of_fixed_addresses -1 ); - pgd = swapper_pg_dir +pgd_index (vaddr); - p4d =p4d_offset (pgd, vaddr); - pud =pud_offset (p4d, vaddr); - pmd =pmd_offset (pud, vaddr); + pmd =pmd_off_k (vaddr); fixmap_pmd_p =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!fixmap_pmd_p) panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
@@ -126,10 +120,7 @@ static void __init fixedrange_init(void)*/ vaddr =PKMAP_BASE ; - pgd = swapper_pg_dir +pgd_index (vaddr); - p4d =p4d_offset (pgd, vaddr); - pud =pud_offset (p4d, vaddr); - pmd =pmd_offset (pud, vaddr); + pmd =pmd_off_k (vaddr); pte =memblock_alloc (PAGE_SIZE ,PAGE_SIZE );if (!pte) panic("%s: Failed to allocate %lu bytes align=0x%lx\n",
arch/nds32/mm/proc.c +1 -5
@@ -15,14 +15,10 @@ 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; - p4d =p4d_offset (pgd_offset_k (addr), addr); - pud =pud_offset (p4d, addr); - pmd =pmd_offset (pud, addr); + pmd =pmd_off_k (addr);if (!pmd_none (*pmd)) { ptep =pte_offset_map (pmd, addr); pte = *ptep;
arch/parisc/mm/fixmap.c +1 -5
@@ -33,11 +33,7 @@ void notrace set_fixmap(enum fixed_addresses idx, phys_addr_t phys) void notrace clear_fixmap(enum fixed_addresses idx) {unsigned long vaddr =__fix_to_virt (idx); -pgd_t *pgd =pgd_offset_k (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); +pte_t *pte =virt_to_kpte (vaddr);if (WARN_ON (pte_none (*pte)))return ;
arch/powerpc/include/asm/pgtable.h +0 -19
@@ -41,25 +41,6 @@ struct mm_struct;#ifndef __ASSEMBLY__ -#ifdef CONFIG_PPC32 -static inline pmd_t *pmd_ptr (struct mm_struct *mm,unsigned long va) -{ -return pmd_offset (pud_offset (p4d_offset (pgd_offset (mm, va), va), va), va); -} - -static inline pmd_t *pmd_ptr_k (unsigned long va) -{ -return pmd_offset (pud_offset (p4d_offset (pgd_offset_k (va), va), va), va); -} - -static inline pte_t *virt_to_kpte (unsigned long vaddr) -{ -pmd_t *pmd =pmd_ptr_k (vaddr); - -return pmd_none (*pmd) ?NULL :pte_offset_kernel (pmd, vaddr); -} -#endif -#include <asm/tlbflush.h> /* Keep these as a macros to avoid include dependency mess */
arch/powerpc/mm/book3s32/mmu.c +1 -1
@@ -312,7 +312,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea)if (!Hash)return ; - pmd =pmd_ptr (mm, ea); + pmd =pmd_off (mm, ea);if (!pmd_none (*pmd))add_hash_page (mm->context.id, ea,pmd_val (*pmd)); }
arch/powerpc/mm/book3s32/tlb.c +2 -2
@@ -90,7 +90,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start,if (start >= end)return ; end = (end -1 ) | ~PAGE_MASK ; - pmd =pmd_ptr (mm, start); + pmd =pmd_off (mm, start);for (;;) { pmd_end = ((start +PGDIR_SIZE ) &PGDIR_MASK ) -1 ;if (pmd_end > end)
@@ -148,7 +148,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr)return ; } mm = (vmaddr <TASK_SIZE )? vma->vm_mm: &init_mm; - pmd =pmd_ptr (mm, vmaddr); + pmd =pmd_off (mm, vmaddr);if (!pmd_none (*pmd))flush_hash_pages (mm->context.id, vmaddr,pmd_val (*pmd),1 ); }
arch/powerpc/mm/kasan/kasan_init_32.c +4 -4
@@ -36,7 +36,7 @@ static int __init kasan_init_shadow_page_tables(unsigned long k_start, unsignedunsigned long k_cur, k_next;pte_t *new =NULL ; - pmd =pmd_ptr_k (k_start); + pmd =pmd_off_k (k_start);for (k_cur = k_start; k_cur != k_end; k_cur = k_next, pmd++) { k_next =pgd_addr_end (k_cur, k_end);
@@ -78,7 +78,7 @@ static int __init kasan_init_region(void *start, size_t size) block =memblock_alloc (k_end - k_start,PAGE_SIZE );for (k_cur = k_start &PAGE_MASK ; k_cur < k_end; k_cur +=PAGE_SIZE ) { -pmd_t *pmd =pmd_ptr_k (k_cur); +pmd_t *pmd =pmd_off_k (k_cur);void *va = block + k_cur - k_start;pte_t pte =pfn_pte (PHYS_PFN (__pa (va)),PAGE_KERNEL );
@@ -102,7 +102,7 @@ static void __init kasan_remap_early_shadow_ro(void)kasan_populate_pte (kasan_early_shadow_pte, prot);for (k_cur = k_start &PAGE_MASK ; k_cur != k_end; k_cur +=PAGE_SIZE ) { -pmd_t *pmd =pmd_ptr_k (k_cur); +pmd_t *pmd =pmd_off_k (k_cur);pte_t *ptep =pte_offset_kernel (pmd, k_cur);if ((pte_val (*ptep) &PTE_RPN_MASK ) != pa)
@@ -196,7 +196,7 @@ void __init kasan_early_init(void)unsigned long addr =KASAN_SHADOW_START ;unsigned long end =KASAN_SHADOW_END ;unsigned long next; -pmd_t *pmd =pmd_ptr_k (addr); +pmd_t *pmd =pmd_off_k (addr);BUILD_BUG_ON (KASAN_SHADOW_START & ~PGDIR_MASK );
arch/powerpc/mm/nohash/40x.c +2 -2
@@ -103,7 +103,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)pmd_t *pmdp;unsigned long val = p | _PMD_SIZE_16M | _PAGE_EXEC | _PAGE_HWWRITE; - pmdp =pmd_ptr_k (v); + pmdp =pmd_off_k (v); *pmdp++ =__pmd (val); *pmdp++ =__pmd (val); *pmdp++ =__pmd (val);
@@ -118,7 +118,7 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)pmd_t *pmdp;unsigned long val = p | _PMD_SIZE_4M | _PAGE_EXEC | _PAGE_HWWRITE; - pmdp =pmd_ptr_k (v); + pmdp =pmd_off_k (v); *pmdp =__pmd (val); v +=LARGE_PAGE_SIZE_4M ;
arch/powerpc/mm/pgtable_32.c +1 -1
@@ -62,7 +62,7 @@ int __ref map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot)int err = -ENOMEM ;/* Use upper 10 bits of VA to index the first level map */ - pd =pmd_ptr_k (va); + pd =pmd_off_k (va);/* Use middle 10 bits of VA to index the second-level map */ if (likely (slab_is_available ())) pg =pte_alloc_kernel (pd, va);
arch/s390/mm/pageattr.c +1 -9
@@ -337,19 +337,11 @@ void __kernel_map_pages(struct page *page, int numpages, int enable) {unsigned long address;int nr, i, j; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud; -pmd_t *pmd;pte_t *pte;for (i =0 ; i < numpages;) { address =page_to_phys (page + i); - pgd =pgd_offset_k (address); - p4d =p4d_offset (pgd, address); - pud =pud_offset (p4d, address); - pmd =pmd_offset (pud, address); - pte =pte_offset_kernel (pmd, address); + pte =virt_to_kpte (address); nr = (unsigned long )pte >>ilog2 (sizeof (long )); nr =PTRS_PER_PTE - (nr & (PTRS_PER_PTE -1 )); nr =min (numpages - i, nr);
arch/sh/mm/cache-sh4.c +1 -7
@@ -207,9 +207,6 @@ static void sh4_flush_cache_page(void *args)struct page *page;unsigned long address, pfn, phys;int map_coherent =0 ; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud;pmd_t *pmd;pte_t *pte;void *vaddr;
@@ -223,10 +220,7 @@ static void sh4_flush_cache_page(void *args)if (cpu_context (smp_processor_id (), vma->vm_mm) ==NO_CONTEXT )return ; - pgd =pgd_offset (vma->vm_mm, address); - p4d =p4d_offset (pgd, address); - pud =pud_offset (p4d, address); - pmd =pmd_offset (pud, address); + pmd =pmd_off (vma->vm_mm, address); pte =pte_offset_kernel (pmd, address);/* If the page isn't present, there is nothing to do here. */
arch/sh/mm/kmap.c +1 -4
@@ -14,9 +14,6 @@#include <asm/mmu_context.h> #include <asm/cacheflush.h> -#define kmap_get_fixmap_pte (vaddr) \ - pte_offset_kernel(pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr)), (vaddr)), vaddr) -static pte_t *kmap_coherent_pte;void __init kmap_coherent_init (void )
@@ -25,7 +22,7 @@ void __init kmap_coherent_init(void)/* cache the first coherent kmap pte */ vaddr =__fix_to_virt (FIX_CMAP_BEGIN ); - kmap_coherent_pte =kmap_get_fixmap_pte (vaddr); + kmap_coherent_pte =virt_to_kpte (vaddr); }void *kmap_coherent (struct page *page,unsigned long addr)
arch/sparc/mm/highmem.c +2 -10
@@ -36,18 +36,10 @@ 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 ); - p4d =p4d_offset (pgd_offset_k (address), address); - pud =pud_offset (p4d, address); - dir =pmd_offset (pud, address); +unsigned long address =__fix_to_virt (FIX_KMAP_BEGIN );/* cache the first kmap pte */ - kmap_pte =pte_offset_kernel (dir, address); + kmap_pte =virt_to_kpte (address); }void *kmap_atomic_high_prot (struct page *page,pgprot_t prot)
arch/sparc/mm/init_64.c +1 -5
@@ -503,11 +503,7 @@ void __kprobes flush_icache_range(unsigned long start, unsigned long end)if (kaddr >=PAGE_OFFSET ) paddr = kaddr & mask;else { -pgd_t *pgdp =pgd_offset_k (kaddr); -p4d_t *p4dp =p4d_offset (pgdp, kaddr); -pud_t *pudp =pud_offset (p4dp, kaddr); -pmd_t *pmdp =pmd_offset (pudp, kaddr); -pte_t *ptep =pte_offset_kernel (pmdp, kaddr); +pte_t *ptep =virt_to_kpte (kaddr); paddr =pte_val (*ptep) & mask; }
arch/sparc/mm/io-unit.c +2 -8
@@ -240,21 +240,15 @@ static void *iounit_alloc(struct device *dev, size_t len,while (addr < end) { 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); - p4dp =p4d_offset (pgdp, addr); - pudp =pud_offset (p4dp, addr); - pmdp =pmd_offset (pudp, addr); + pmdp =pmd_off_k (addr); ptep =pte_offset_map (pmdp, addr);set_pte (ptep,mk_pte (virt_to_page (page), dvma_prot)); - + i = ((addr -IOUNIT_DMA_BASE ) >>PAGE_SHIFT ); iopte = iounit->page_table + i;
arch/sparc/mm/iommu.c +1 -7
@@ -348,9 +348,6 @@ static void *sbus_iommu_alloc(struct device *dev, size_t len,while (addr < end) { page = va; { -pgd_t *pgdp; -p4d_t *p4dp; -pud_t *pudp;pmd_t *pmdp;pte_t *ptep;
@@ -361,10 +358,7 @@ static void *sbus_iommu_alloc(struct device *dev, size_t len,else __flush_page_to_ram (page); - pgdp =pgd_offset (&init_mm, addr); - p4dp =p4d_offset (pgdp, addr); - pudp =pud_offset (p4dp, addr); - pmdp =pmd_offset (pudp, addr); + pmdp =pmd_off_k (addr); ptep =pte_offset_map (pmdp, addr);set_pte (ptep,mk_pte (virt_to_page (page), dvma_prot));
arch/sparc/mm/srmmu.c +3 -31
@@ -518,19 +518,10 @@ void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm,static inline void srmmu_mapioaddr (unsigned long physaddr,unsigned long virt_addr,int bus_type) { -pgd_t *pgdp; -p4d_t *p4dp; -pud_t *pudp; -pmd_t *pmdp; -pte_t *ptep; +pte_t *ptep =virt_to_kpte (virt_addr);unsigned long tmp; physaddr &=PAGE_MASK ; - pgdp =pgd_offset_k (virt_addr); - p4dp =p4d_offset (pgdp, virt_addr); - pudp =pud_offset (p4dp, virt_addr); - pmdp =pmd_offset (pudp, virt_addr); - ptep =pte_offset_kernel (pmdp, virt_addr); tmp = (physaddr >>4 ) |SRMMU_ET_PTE ;/* I need to test whether this is consistent over all
@@ -557,18 +548,7 @@ void srmmu_mapiorange(unsigned int bus, unsigned long xpa,static inline void srmmu_unmapioaddr (unsigned long virt_addr) { -pgd_t *pgdp; -p4d_t *p4dp; -pud_t *pudp; -pmd_t *pmdp; -pte_t *ptep; - - - pgdp =pgd_offset_k (virt_addr); - p4dp =p4d_offset (pgdp, virt_addr); - pudp =pud_offset (p4dp, virt_addr); - pmdp =pmd_offset (pudp, virt_addr); - ptep =pte_offset_kernel (pmdp, virt_addr); +pte_t *ptep =virt_to_kpte (virt_addr);/* No need to flush uncacheable page. */ __pte_clear (ptep);
@@ -929,10 +909,6 @@ void __init srmmu_paging_init(void)int i;phandle cpunode;char node_str[128 ]; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud; -pmd_t *pmd;pte_t *pte;unsigned long pages_avail;
@@ -992,11 +968,7 @@ void __init srmmu_paging_init(void) __fix_to_virt(__end_of_fixed_addresses - 1), FIXADDR_TOP);srmmu_allocate_ptable_skeleton (PKMAP_BASE ,PKMAP_END ); - pgd =pgd_offset_k (PKMAP_BASE ); - p4d =p4d_offset (pgd,PKMAP_BASE ); - pud =pud_offset (p4d,PKMAP_BASE ); - pmd =pmd_offset (pud,PKMAP_BASE ); - pte =pte_offset_kernel (pmd,PKMAP_BASE ); + pte =virt_to_kpte (PKMAP_BASE ); pkmap_page_table = pte;flush_cache_all ();
arch/um/kernel/mem.c +1 -9
@@ -125,10 +125,6 @@ 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;phys_t p;unsigned long v, vaddr =FIXADDR_USER_START ;
@@ -146,11 +142,7 @@ static void __init fixaddr_user_init( void) p =__pa (v);for ( ; size >0 ; size -=PAGE_SIZE , vaddr +=PAGE_SIZE , p +=PAGE_SIZE ) { - pgd = swapper_pg_dir +pgd_index (vaddr); - p4d =p4d_offset (pgd, vaddr); - pud =pud_offset (p4d, vaddr); - pmd =pmd_offset (pud, vaddr); - pte =pte_offset_kernel (pmd, vaddr); + pte =virt_to_kpte (vaddr);pte_set_val (*pte, p,PAGE_READONLY ); }#endif
arch/um/kernel/trap.c +1 -7
@@ -26,9 +26,6 @@ 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;int err = -EFAULT ;
@@ -102,10 +99,7 @@ int handle_page_fault(unsigned long address, unsigned long ip, } } - pgd =pgd_offset (mm, address); - p4d =p4d_offset (pgd, address); - pud =pud_offset (p4d, address); - pmd =pmd_offset (pud, address); + pmd =pmd_off (mm, address); pte =pte_offset_kernel (pmd, address); }while (!pte_present (*pte)); err =0 ;
arch/unicore32/mm/mm.h +0 -10
@@ -14,16 +14,6 @@ extern int sysctl_overcommit_memory;#define TOP_PTE (x) pte_offset_kernel(top_pmd, x) -static inline pmd_t *pmd_off (pgd_t *pgd,unsigned long virt) -{ -return pmd_offset ((pud_t *)pgd, virt); -} - -static inline pmd_t *pmd_off_k (unsigned long virt) -{ -return pmd_off (pgd_offset_k (virt), virt); -} -struct mem_type {unsigned int prot_pte;unsigned int prot_l1;
arch/x86/mm/init_32.c +3 -23
@@ -395,15 +395,6 @@ kernel_physical_mapping_init(unsigned long start,pte_t *kmap_pte; -static inline pte_t *kmap_get_fixmap_pte (unsigned long vaddr) -{ -pgd_t *pgd =pgd_offset_k (vaddr); -p4d_t *p4d =p4d_offset (pgd, vaddr); -pud_t *pud =pud_offset (p4d, vaddr); -pmd_t *pmd =pmd_offset (pud, vaddr); -return pte_offset_kernel (pmd, vaddr); -} -static void __init kmap_init (void ) {unsigned long kmap_vstart;
@@ -412,28 +403,17 @@ static void __init kmap_init(void)* Cache the first kmap pte: */ kmap_vstart =__fix_to_virt (FIX_KMAP_BEGIN ); - kmap_pte =kmap_get_fixmap_pte (kmap_vstart); + kmap_pte =virt_to_kpte (kmap_vstart); }#ifdef CONFIG_HIGHMEM static void __init permanent_kmaps_init (pgd_t *pgd_base) { -unsigned long vaddr; -pgd_t *pgd; -p4d_t *p4d; -pud_t *pud; -pmd_t *pmd; -pte_t *pte; +unsigned long vaddr =PKMAP_BASE ; - vaddr =PKMAP_BASE ;page_table_range_init (vaddr, vaddr +PAGE_SIZE *LAST_PKMAP , pgd_base); - pgd = swapper_pg_dir +pgd_index (vaddr); - p4d =p4d_offset (pgd, vaddr); - pud =pud_offset (p4d, vaddr); - pmd =pmd_offset (pud, vaddr); - pte =pte_offset_kernel (pmd, vaddr); - pkmap_page_table = pte; + pkmap_page_table =virt_to_kpte (vaddr); } void __init add_highpages_with_active_regions(int nid,
arch/xtensa/include/asm/fixmap.h +0 -8
@@ -76,12 +76,4 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)#endif -#define kmap_get_fixmap_pte (vaddr) \ - pte_offset_kernel( \ - pmd_offset(pud_offset(p4d_offset(pgd_offset_k(vaddr), \ - (vaddr)), \ - (vaddr)), \ - (vaddr)), \ - (vaddr)) -#endif
arch/xtensa/mm/highmem.c +1 -1
@@ -86,6 +86,6 @@ void __init kmap_init(void)BUILD_BUG_ON (PKMAP_BASE <TLBTEMP_BASE_1 +TLBTEMP_SIZE );/* cache the first kmap pte */ kmap_vstart =__fix_to_virt (FIX_KMAP_BEGIN ); - kmap_pte =kmap_get_fixmap_pte (kmap_vstart); + kmap_pte =virt_to_kpte (kmap_vstart);kmap_waitqueues_init (); }
arch/xtensa/mm/kasan_init.c +2 -8
@@ -19,10 +19,7 @@void __init kasan_early_init (void ) {unsigned long vaddr =KASAN_SHADOW_START ; -pgd_t *pgd =pgd_offset_k (vaddr); -p4d_t *p4d =p4d_offset (pgd, vaddr); -pud_t *pud =pud_offset (p4d, vaddr); -pmd_t *pmd =pmd_offset (pud, vaddr); +pmd_t *pmd =pmd_off_k (vaddr);int i;for (i =0 ; i <PTRS_PER_PTE ; ++i)
@@ -43,10 +40,7 @@ static void __init populate(void *start, void *end)unsigned long n_pmds = n_pages /PTRS_PER_PTE ;unsigned long i, j;unsigned long vaddr = (unsigned long )start; -pgd_t *pgd =pgd_offset_k (vaddr); -p4d_t *p4d =p4d_offset (pgd, vaddr); -pud_t *pud =pud_offset (p4d, vaddr); -pmd_t *pmd =pmd_offset (pud, vaddr); +pmd_t *pmd =pmd_off_k (vaddr);pte_t *pte =memblock_alloc (n_pages *sizeof (pte_t),PAGE_SIZE );if (!pte)
arch/xtensa/mm/mmu.c +1 -4
@@ -21,10 +21,7 @@#if defined(CONFIG_HIGHMEM )static void *__init init_pmd (unsigned long vaddr,unsigned long n_pages) { -pgd_t *pgd =pgd_offset_k (vaddr); -p4d_t *p4d =p4d_offset (pgd, vaddr); -pud_t *pud =pud_offset (p4d, vaddr); -pmd_t *pmd =pmd_offset (pud, vaddr); +pmd_t *pmd =pmd_off_k (vaddr);pte_t *pte;unsigned long i;
include/linux/pgtable.h +24 -0
@@ -28,6 +28,30 @@#define USER_PGTABLES_CEILING 0UL#endif +/* +* In many cases it is known that a virtual address is mapped at PMD or PTE +* level, so instead of traversing all the page table levels, we can get a +* pointer to the PMD entry in user or kernel page table or translate a virtual +* address to the pointer in the PTE in the kernel page tables with simple +* helpers. +*/ +static inline pmd_t *pmd_off (struct mm_struct *mm,unsigned long va) +{ +return pmd_offset (pud_offset (p4d_offset (pgd_offset (mm, va), va), va), va); +} + +static inline pmd_t *pmd_off_k (unsigned long va) +{ +return pmd_offset (pud_offset (p4d_offset (pgd_offset_k (va), va), va), va); +} + +static inline pte_t *virt_to_kpte (unsigned long vaddr) +{ +pmd_t *pmd =pmd_off_k (vaddr); + +return pmd_none (*pmd) ?NULL :pte_offset_kernel (pmd, vaddr); +} +#ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS extern int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address, pte_t *ptep,
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 9/12 mm: consolidate pte_index() and pte_offset_*() definitions
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
All architectures define pte_index() as
(address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)
and all architectures define pte_offset_kernel() as an entry in the array of PTEs indexed by the pte_index().
For the most architectures the pte_offset_kernel() implementation relies on the availability of pmd_page_vaddr() that converts a PMD entry value to the virtual address of the page containing PTEs array.
Let's move x86 definitions of the PTE accessors to the generic place in <linux/pgtable.h> and then simply drop the respective definitions from the other architectures.
The architectures that didn't provide pmd_page_vaddr() are updated to have that defined.
The generic implementation of pte_offset_kernel() can be overridden by an architecture and alpha makes use of this because it has special ordering requirements for its version of pte_offset_kernel().
--- arch/alpha/include/asm/pgtable.h | 4 +-- arch/arc/include/asm/pgtable.h | 15 ---------- arch/arm/include/asm/pgtable.h | 15 ---------- arch/arm64/include/asm/pgtable.h | 10 +++---- arch/csky/include/asm/pgtable.h | 16 ----------- arch/hexagon/include/asm/pgtable.h | 25 +++-------------- arch/ia64/include/asm/pgtable.h | 9 ------ arch/m68k/include/asm/mcf_pgtable.h | 12 +------- arch/m68k/include/asm/motorola_pgalloc.h | 2 +- arch/m68k/include/asm/motorola_pgtable.h | 11 +------- arch/m68k/include/asm/sun3_pgtable.h | 15 ++++------ arch/m68k/mm/init.c | 2 +- arch/microblaze/include/asm/pgtable.h | 13 +++------ arch/mips/include/asm/pgtable-32.h | 12 -------- arch/mips/include/asm/pgtable-64.h | 11 -------- arch/mips/kvm/mmu.c | 20 +++++++------- arch/mips/kvm/trap_emul.c | 2 +- arch/nds32/include/asm/pgtable.h | 12 +++----- arch/nios2/include/asm/pgtable.h | 14 +++------- arch/openrisc/include/asm/pgtable.h | 23 ++++------------ arch/parisc/include/asm/pgtable.h | 15 +++------- arch/powerpc/include/asm/book3s/32/pgtable.h | 13 ++------- arch/powerpc/include/asm/book3s/64/pgtable.h | 8 ------ arch/powerpc/include/asm/nohash/32/pgtable.h | 13 ++------- arch/powerpc/include/asm/nohash/64/pgtable.h | 7 ----- arch/powerpc/include/asm/pgtable.h | 7 +++++ arch/riscv/include/asm/pgtable.h | 10 ------- arch/riscv/mm/init.c | 6 ++-- arch/s390/include/asm/pgtable.h | 10 ++----- arch/s390/mm/pageattr.c | 2 +- arch/sh/include/asm/pgtable_32.h | 15 ++++------ arch/sh/include/asm/pgtable_64.h | 12 -------- arch/sparc/include/asm/pgalloc_64.h | 2 +- arch/sparc/include/asm/pgtable_32.h | 15 ++++------ arch/sparc/include/asm/pgtable_64.h | 12 ++------ arch/sparc/mm/srmmu.c | 10 ------- arch/um/include/asm/pgtable.h | 13 --------- arch/unicore32/include/asm/pgtable.h | 9 ------ arch/x86/include/asm/pgtable.h | 19 ------------- arch/x86/include/asm/pgtable_32.h | 11 -------- arch/x86/include/asm/pgtable_64.h | 4 --- arch/xtensa/include/asm/pgtable.h | 10 +------ include/linux/pgtable.h | 29 ++++++++++++++++++++ 43 files changed, 113 insertions(+), 382 deletions(-)
arch/alpha/include/asm/pgtable.h +1 -3
@@ -314,9 +314,7 @@ extern inline pte_t * pte_offset_kernel(pmd_t * dir, unsigned long address)smp_read_barrier_depends ();/* see above */ return ret; } - -#define pte_offset_map (dir,addr) pte_offset_kernel((dir),(addr)) -#define pte_unmap (pte) do { } while (0) +#define pte_offset_kernel pte_offset_kernelextern pgd_t swapper_pg_dir[1024 ];
arch/arc/include/asm/pgtable.h +0 -15
@@ -248,9 +248,6 @@extern char empty_zero_page[PAGE_SIZE ];#define ZERO_PAGE (vaddr) (virt_to_page(empty_zero_page)) -#define pte_unmap (pte) do { } while (0) -#define pte_unmap_nested (pte) do { } while (0) -#define set_pte (pteptr, pteval) ((*(pteptr)) = (pteval))#define set_pmd (pmdptr, pmdval) (*(pmdptr) = pmdval)
@@ -282,18 +279,6 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep)/* Don't use virt_to_pfn for macros below: could cause truncations for PAE40*/ #define pte_pfn (pte) (pte_val(pte) >> PAGE_SHIFT) -#define __pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) - -/* -* pte_offset gets a @ptr to PMD entry (PGD in our 2-tier paging system) -* and returns ptr to PTE entry corresponding to @addr -*/ -#define pte_offset (dir, addr) ((pte_t *)(pmd_page_vaddr(*dir)) +\ - __pte_index(addr)) - -/* No mapping of Page Tables in high mem etc, so following same as above */ -#define pte_offset_kernel (dir, addr) pte_offset(dir, addr) -#define pte_offset_map (dir, addr) pte_offset(dir, addr)/* Zoo of pte_xxx function */ #define pte_read (pte) (pte_val(pte) & _PAGE_READ)
arch/arm/include/asm/pgtable.h +0 -15
@@ -183,21 +183,6 @@ static inline pte_t *pmd_page_vaddr(pmd_t pmd)#define pmd_page (pmd) pfn_to_page(__phys_to_pfn(pmd_val(pmd) & PHYS_MASK)) -#ifndef CONFIG_HIGHPTE -#define __pte_map (pmd) pmd_page_vaddr(*(pmd)) -#define __pte_unmap (pte) do { } while (0) -#else -#define __pte_map (pmd) (pte_t *)kmap_atomic(pmd_page(*(pmd))) -#define __pte_unmap (pte) kunmap_atomic(pte) -#endif - -#define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) - -#define pte_offset_kernel (pmd,addr) (pmd_page_vaddr(*(pmd)) + pte_index(addr)) - -#define pte_offset_map (pmd,addr) (__pte_map(pmd) + pte_index(addr)) -#define pte_unmap (pte) __pte_unmap(pte) -#define pte_pfn (pte) ((pte_val(pte) & PHYS_MASK) >> PAGE_SHIFT)#define pfn_pte (pfn,prot) __pte(__pfn_to_phys(pfn) | pgprot_val(prot))
arch/arm64/include/asm/pgtable.h +4 -6
@@ -506,15 +506,13 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd)return __pmd_to_phys (pmd); } -static inline void pte_unmap (pte_t *pte) { } +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return (unsigned long )__va (pmd_page_paddr (pmd)); +}/* Find an entry in the third-level page table. */ -#define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_phys (dir,addr) (pmd_page_paddr(READ_ONCE(*(dir))) + pte_index(addr) * sizeof(pte_t)) -#define pte_offset_kernel (dir,addr) ((pte_t *)__va(pte_offset_phys((dir), (addr)))) - -#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr))#define pte_set_fixmap (addr) ((pte_t *)set_fixmap_offset(FIX_PTE, addr))#define pte_set_fixmap_offset (pmd, addr) pte_set_fixmap(pte_offset_phys(pmd, addr))
arch/csky/include/asm/pgtable.h +0 -16
@@ -32,13 +32,6 @@#define pgd_ERROR (e) \ pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) -/* Find an entry in the third-level page table.. */ -#define __pte_offset_t (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, address) \ - (pmd_page_vaddr(*(dir)) + __pte_offset_t(address)) -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset_t(address))#define pmd_page (pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))#define pte_clear (mm, addr, ptep) set_pte((ptep), \ (((unsigned int) addr & PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0)))
@@ -54,8 +47,6 @@#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED | \ _CACHE_MASK) -#define pte_unmap (pte) ((void)(pte)) -#define __swp_type (x) (((x).val >> 4) & 0xff)#define __swp_offset (x) ((x).val >> 12)#define __swp_entry (type, offset) ((swp_entry_t) {((type) << 4) | \
@@ -286,13 +277,6 @@ static inline pgd_t *pgd_offset(struct mm_struct *mm, unsigned long address)return mm->pgd +pgd_index (address); } -/* Find an entry in the third-level page table.. */ -static inline pte_t *pte_offset (pmd_t *dir,unsigned long address) -{ -return (pte_t *) (pmd_page_vaddr (*dir)) + - ((address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 )); -} -extern pgd_t swapper_pg_dir[PTRS_PER_PGD ];extern void paging_init (void );
arch/hexagon/include/asm/pgtable.h +4 -21
@@ -403,31 +403,14 @@ static inline int pte_exec(pte_t pte)*/ #define set_pte_at (mm, addr, ptep, pte) set_pte(ptep, pte) -/* -* May need to invoke the virtual machine as well... -*/ -#define pte_unmap (pte) do { } while (0) -#define pte_unmap_nested (pte) do { } while (0) - -/* -* pte_offset_map - returns the linear address of the page table entry -* corresponding to an address -*/ -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) - -#define pte_offset_map_nested (pmd, addr) pte_offset_map(pmd, addr) - -/* pte_offset_kernel - kernel version of pte_offset */ -#define pte_offset_kernel (dir, address) \ - ((pte_t *) (unsigned long) __va(pmd_val(*dir) & PAGE_MASK) \ - + __pte_offset(address)) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return (unsigned long )__va (pmd_val (pmd) &PAGE_MASK ); +}/* ZERO_PAGE - returns the globally shared zero page */ #define ZERO_PAGE (vaddr) (virt_to_page(&empty_zero_page)) -#define __pte_offset (address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -/* * Swap/file PTE definitions. If _PAGE_PRESENT is zero, the rest of the PTE is * interpreted as swap information. The remaining free bits are interpreted as
arch/ia64/include/asm/pgtable.h +0 -9
@@ -393,15 +393,6 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)#define pmd_offset (dir,addr) \ ((pmd_t *) pud_page_vaddr(*(dir)) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))) -/* -* Find an entry in the third-level page table. This looks more complicated than it -* should be because some platforms place page tables in high memory. -*/ -#define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir,addr) ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr)) -#define pte_offset_map (dir,addr) pte_offset_kernel(dir, addr) -#define pte_unmap (pte) do { } while (0) -/* atomic versions of the some PTE manipulations: */ static inline int
arch/m68k/include/asm/mcf_pgtable.h +1 -11
@@ -170,7 +170,7 @@ static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp) }#define __pte_page (pte) ((unsigned long) (pte_val(pte) & PAGE_MASK)) -#define __pmd_page (pmd) ((unsigned long) (pmd_val(pmd))) +#define pmd_page_vaddr (pmd) ((unsigned long) (pmd_val(pmd)))static inline int pte_none (pte_t pte) {
@@ -321,13 +321,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 third-level pagetable. -*/ -#define __pte_offset (address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, address) \ - ((pte_t *) __pmd_page(*(dir)) + __pte_offset(address)) -/* * Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */
@@ -340,9 +333,6 @@ extern pgd_t kernel_pg_dir[PTRS_PER_PGD];#define pmd_page (pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) -#define pte_offset_map (pmdp, addr) ((pte_t *)__pmd_page(*pmdp) + \ - __pte_offset(addr)) -#define pte_unmap (pte) ((void) 0)#define pfn_pte (pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))#define pte_pfn (pte) (pte_val(pte) >> PAGE_SHIFT)
arch/m68k/include/asm/motorola_pgalloc.h +1 -1
@@ -88,7 +88,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page {pmd_set (pmd, page); } -#define pmd_pgtable (pmd) ((pgtable_t)__pmd_page(pmd)) +#define pmd_pgtable (pmd) ((pgtable_t)pmd_page_vaddr(pmd))static inline void pud_populate (struct mm_struct *mm,pud_t *pud,pmd_t *pmd) {
arch/m68k/include/asm/motorola_pgtable.h +1 -10
@@ -128,7 +128,7 @@ static inline void pud_set(pud_t *pudp, pmd_t *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 pmd_page_vaddr (pmd) ((unsigned long)__va(pmd_val(pmd) & _TABLE_MASK))#define pud_page_vaddr (pud) ((unsigned long)__va(pud_val(pud) & _TABLE_MASK))
@@ -218,15 +218,6 @@ static inline pmd_t *pmd_offset(pud_t *dir, unsigned long address)return (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); } -/* Find an entry in the third-level page table.. */ -static inline pte_t *pte_offset_kernel (pmd_t *pmdp,unsigned long address) -{ -return (pte_t *)__pmd_page (*pmdp) + ((address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 )); -} - -#define pte_offset_map (pmdp,address) ((pte_t *)__pmd_page(*pmdp) + (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) -#define pte_unmap (pte) ((void)0) -/* Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */ #define __swp_type (x) (((x).val >> 4) & 0xff)#define __swp_offset (x) ((x).val >> 12)
arch/m68k/include/asm/sun3_pgtable.h +6 -9
@@ -112,8 +112,11 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define __pte_page (pte) \ ((unsigned long) __va ((pte_val (pte) & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT)) -#define __pmd_page (pmd) \ -((unsigned long) __va (pmd_val (pmd) & PAGE_MASK)) + +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return (unsigned long )__va (pmd_val (pmd) &PAGE_MASK ); +}static inline int pte_none (pte_t pte) {return !pte_val (pte); }static inline int pte_present (pte_t pte) {return pte_val (pte) &SUN3_PAGE_VALID ; }
@@ -127,7 +130,7 @@ static inline void pte_clear (struct mm_struct *mm, unsigned long addr, pte_t *p ({ pte_t __pte; pte_val(__pte) = pfn | pgprot_val(pgprot); __pte; })#define pte_page (pte) virt_to_page(__pte_page(pte)) -#define pmd_page (pmd) virt_to_page(__pmd_page(pmd)) +#define pmd_page (pmd) virt_to_page(pmd_page_vaddr(pmd))static inline int pmd_none2 (pmd_t *pmd) {return !pmd_val (*pmd); }
@@ -180,12 +183,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 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)) -#define pte_offset_map (pmd, address) ((pte_t *)page_address(pmd_page(*pmd)) + pte_index(address)) -#define pte_unmap (pte) do { } while (0) -/* Macros to (de)construct the fake PTEs representing swap pages. */ #define __swp_type (x) ((x).val & 0x7F)#define __swp_offset (x) (((x).val) >> 7)
arch/m68k/mm/init.c +1 -1
@@ -141,7 +141,7 @@ static inline void init_pointer_tables(void)if (!pmd_present (*pmd))continue ; - pte_dir = (pte_t *)__pmd_page (*pmd); + pte_dir = (pte_t *)pmd_page_vaddr (*pmd);init_pointer_table (pte_dir,TABLE_PTE ); } }
arch/microblaze/include/asm/pgtable.h +4 -9
@@ -438,7 +438,10 @@ static inline void ptep_mkdirty(struct mm_struct *mm,/* Convert pmd entry to page */ /* our pmd entry is an effective address of pte table*/ /* returns effective address of the pmd entry*/ -#define pmd_page_kernel (pmd) ((unsigned long) (pmd_val(pmd) & PAGE_MASK)) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return ((unsigned long ) (pmd_val (pmd) &PAGE_MASK )); +}/* returns struct *page of the pmd entry*/ #define pmd_page (pmd) (pfn_to_page(__pa(pmd_val(pmd)) >> PAGE_SHIFT))
@@ -451,14 +454,6 @@ static inline void ptep_mkdirty(struct mm_struct *mm,#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address))/* Find an entry in the third-level page table.. */ -#define pte_index (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, addr) \ - ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(addr)) -#define pte_offset_map (dir, addr) \ - ((pte_t *) kmap_atomic(pmd_page(*(dir))) + pte_index(addr)) - -#define pte_unmap (pte) kunmap_atomic(pte)extern pgd_t swapper_pg_dir[PTRS_PER_PGD ];
arch/mips/include/asm/pgtable-32.h +0 -12
@@ -205,18 +205,6 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)/* to find an entry in a page-table-directory */ #define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr)) -/* Find an entry in the third-level page table.. */ -#define __pte_offset (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset (dir, address) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) -#define pte_offset_kernel (dir, address) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) - -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) -#define pte_unmap (pte) ((void)(pte)) -#if defined(CONFIG_CPU_R3K_TLB )/* Swap entries must have VALID bit cleared. */
arch/mips/include/asm/pgtable-64.h +0 -11
@@ -344,17 +344,6 @@ static inline pmd_t *pmd_offset(pud_t * pud, unsigned long address) }#endif -/* Find an entry in the third-level page table.. */ -#define __pte_offset (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset (dir, address) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) -#define pte_offset_kernel (dir, address) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) -#define pte_unmap (pte) ((void)(pte)) -/* * Initialize a new pgd / pmd table with invalid pointers. */
arch/mips/kvm/mmu.c +10 -10
@@ -168,7 +168,7 @@ static pte_t *kvm_mips_walk_pgd(pgd_t *pgd, struct kvm_mmu_memory_cache *cache,clear_page (new_pte);pmd_populate_kernel (NULL , pmd, new_pte); } -return pte_offset (pmd, addr); +return pte_offset_kernel (pmd, addr); }/* Caller must hold kvm->mm_lock */
@@ -187,8 +187,8 @@ static pte_t *kvm_mips_pte_for_gpa(struct kvm *kvm,static bool kvm_mips_flush_gpa_pte (pte_t *pte,unsigned long start_gpa,unsigned long end_gpa) { -int i_min =__pte_offset (start_gpa); -int i_max =__pte_offset (end_gpa); +int i_min =pte_index (start_gpa); +int i_max =pte_index (end_gpa);bool safe_to_remove = (i_min ==0 && i_max ==PTRS_PER_PTE -1 );int i;
@@ -215,7 +215,7 @@ static bool kvm_mips_flush_gpa_pmd(pmd_t *pmd, unsigned long start_gpa,if (!pmd_present (pmd[i]))continue ; - pte =pte_offset (pmd + i,0 ); + pte =pte_offset_kernel (pmd + i,0 );if (i == i_max) end = end_gpa;
@@ -312,8 +312,8 @@ static int kvm_mips_##name##_pte(pte_t *pte, unsigned long start, \ unsigned long end) \ { \int ret =0 ; \ -int i_min =__pte_offset (start); \ -int i_max =__pte_offset (end); \ +int i_min =pte_index (start); \ +int i_max =pte_index (end); \int i; \pte_t old, new; \ \
@@ -346,7 +346,7 @@ static int kvm_mips_##name##_pmd(pmd_t *pmd, unsigned long start, \if (!pmd_present (pmd[i])) \continue ; \ \ - pte =pte_offset (pmd + i,0 ); \ + pte =pte_offset_kernel (pmd + i,0 ); \if (i == i_max) \ cur_end = end; \ \
@@ -842,8 +842,8 @@ void kvm_trap_emul_invalidate_gva(struct kvm_vcpu *vcpu, unsigned long addr,static bool kvm_mips_flush_gva_pte (pte_t *pte,unsigned long start_gva,unsigned long end_gva) { -int i_min =__pte_offset (start_gva); -int i_max =__pte_offset (end_gva); +int i_min =pte_index (start_gva); +int i_max =pte_index (end_gva);bool safe_to_remove = (i_min ==0 && i_max ==PTRS_PER_PTE -1 );int i;
@@ -877,7 +877,7 @@ static bool kvm_mips_flush_gva_pmd(pmd_t *pmd, unsigned long start_gva,if (!pmd_present (pmd[i]))continue ; - pte =pte_offset (pmd + i,0 ); + pte =pte_offset_kernel (pmd + i,0 );if (i == i_max) end = end_gva;
arch/mips/kvm/trap_emul.c +1 -1
@@ -594,7 +594,7 @@ static void kvm_mips_emul_free_gva_pt(pgd_t *pgd) pmd_va = pud_va | (k <<PMD_SHIFT );if (pmd_va >= end)break ; - pte =pte_offset (pmd + k,0 ); + pte =pte_offset_kernel (pmd + k,0 );pte_free_kernel (NULL , pte); }pmd_free (NULL , pmd);
arch/nds32/include/asm/pgtable.h +4 -8
@@ -186,14 +186,10 @@ extern void paging_init(void);#define pte_clear (mm,addr,ptep) set_pte_at((mm),(addr),(ptep), __pte(0))#define pte_page (pte) (pfn_to_page(pte_pfn(pte))) -#define pte_index (address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, address) ((pte_t *)pmd_page_kernel(*(dir)) + pte_index(address)) -#define pte_offset_map (dir, address) ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) -#define pte_offset_map_nested (dir, address) pte_offset_map(dir, address) -#define pmd_page_kernel (pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) - -#define pte_unmap (pte) do { } while (0) -#define pte_unmap_nested (pte) do { } while (0) +static unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return ((unsigned long )__va (pmd_val (pmd) &PAGE_MASK )); +}#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval)/*
arch/nios2/include/asm/pgtable.h +4 -10
@@ -236,27 +236,21 @@ static inline void pte_clear(struct mm_struct *mm,*/ #define mk_pte (page, prot) (pfn_pte(page_to_pfn(page), prot)) -#define pte_unmap (pte) do { } while (0) -/* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. */ #define pmd_phys (pmd) virt_to_phys((void *)pmd_val(pmd))#define pmd_page (pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT)) -#define pmd_page_vaddr (pmd) pmd_val(pmd) -#define pte_offset_map (dir, addr) \ - ((pte_t *) page_address(pmd_page(*dir)) + \ - (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return pmd_val (pmd); +}/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (addr) pgd_offset(&init_mm, addr) -/* Get the address to the PTE for a vaddr in specific directory */ -#define pte_offset_kernel (dir, addr) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + \ - (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %08lx.\n", \
arch/openrisc/include/asm/pgtable.h +5 -18
@@ -363,7 +363,11 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) }#define pmd_page (pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)) -#define pmd_page_kernel (pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) + +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return ((unsigned long )__va (pmd_val (pmd) &PAGE_MASK )); +}/* to find an entry in a page-table-directory. */ #define pgd_index (address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
@@ -378,23 +382,6 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep)#define __pmd_offset (address) \ (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) -/* -* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] -* -* this macro returns the index of the entry in the pte page which would -* control the given virtual address -*/ -#define __pte_offset (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, address) \ - ((pte_t *) pmd_page_kernel(*(dir)) + __pte_offset(address)) -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address)) -#define pte_offset_map_nested (dir, address) \ - pte_offset_map(dir, address) - -#define pte_unmap (pte) do { } while (0) -#define pte_unmap_nested (pte) do { } while (0)#define pte_pfn (x) ((unsigned long)(((x).pte)) >> PAGE_SHIFT)#define pfn_pte (pfn, prot) __pte((((pfn) << PAGE_SHIFT)) | pgprot_val(prot))
arch/parisc/include/asm/pgtable.h +4 -11
@@ -429,7 +429,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define pte_page (pte) (pfn_to_page(pte_pfn(pte))) -#define pmd_page_vaddr (pmd) ((unsigned long) __va(pmd_address(pmd))) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return ((unsigned long )__va (pmd_address (pmd))); +}#define __pmd_page (pmd) ((unsigned long) __va(pmd_address(pmd)))#define pmd_page (pmd) virt_to_page((void *)__pmd_page(pmd))
@@ -453,16 +456,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define pmd_offset (dir,addr) ((pmd_t *) dir)#endif -/* Find an entry in the third-level page table.. */ -#define pte_index (address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1)) -#define pte_offset_kernel (pmd, address) \ - ((pte_t *) pmd_page_vaddr(*(pmd)) + pte_index(address)) -#define pte_offset_map (pmd, address) pte_offset_kernel(pmd, address) -#define pte_unmap (pte) do { } while (0) - -#define pte_unmap (pte) do { } while (0) -#define pte_unmap_nested (pte) do { } while (0) -extern void paging_init (void );/* Used for deferring calls to flush_dcache_page() */
arch/powerpc/include/asm/book3s/32/pgtable.h +3 -10
@@ -112,6 +112,9 @@ static inline bool pte_user(pte_t pte)#define PMD_TABLE_SIZE 0#define PUD_TABLE_SIZE 0#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE) + +/* Bits to mask out from a PMD to get to the PTE page */ +#define PMD_MASKED_BITS (PTE_TABLE_SIZE - 1)#endif /* __ASSEMBLY__ */ #define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
@@ -348,8 +351,6 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,#define __HAVE_ARCH_PTE_SAME#define pte_same (A ,B ) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HASHPTE) == 0) -#define pmd_page_vaddr (pmd) \ - ((unsigned long)__va(pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1)))#define pmd_page (pmd) \ pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
@@ -360,14 +361,6 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,#define pgd_index (address) ((address) >> PGDIR_SHIFT)#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* Find an entry in the third-level page table.. */ -#define pte_index (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, addr) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr)) -#define pte_offset_map (dir, addr) pte_offset_kernel((dir), (addr)) -static inline void pte_unmap (pte_t *pte) { } -/* * Encode and decode a swap entry. * Note that the bits we use in a PTE for representing a swap entry
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -8
@@ -1005,14 +1005,12 @@ extern struct page *p4d_page(p4d_t p4d);/* Pointers in the page table tree are physical addresses */ #define __pgtable_ptr_val (ptr) __pa(ptr) -#define pmd_page_vaddr (pmd) __va(pmd_val(pmd) & ~PMD_MASKED_BITS)#define pud_page_vaddr (pud) __va(pud_val(pud) & ~PUD_MASKED_BITS)#define p4d_page_vaddr (p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS)#define pgd_index (address) (((address) >> (PGDIR_SHIFT)) & (PTRS_PER_PGD - 1))#define pud_index (address) (((address) >> (PUD_SHIFT)) & (PTRS_PER_PUD - 1))#define pmd_index (address) (((address) >> (PMD_SHIFT)) & (PTRS_PER_PMD - 1)) -#define pte_index (address) (((address) >> (PAGE_SHIFT)) & (PTRS_PER_PTE - 1))/* * Find an entry in a page-table-directory. We combine the address region
@@ -1025,12 +1023,6 @@ extern struct page *p4d_page(p4d_t p4d); (((pud_t *) p4d_page_vaddr(*(p4dp))) + pud_index(addr))#define pmd_offset (pudp,addr) \ (((pmd_t *) pud_page_vaddr(*(pudp))) + pmd_index(addr)) -#define pte_offset_kernel (dir,addr) \ - (((pte_t *) pmd_page_vaddr(*(dir))) + pte_index(addr)) - -#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr)) - -static inline void pte_unmap (pte_t *pte) { }/* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */
arch/powerpc/include/asm/nohash/32/pgtable.h +2 -11
@@ -29,6 +29,8 @@ extern int icache_44x_need_flush;#define PMD_TABLE_SIZE 0#define PUD_TABLE_SIZE 0#define PGD_TABLE_SIZE (sizeof(pgd_t) << PGD_INDEX_SIZE) + +#define PMD_MASKED_BITS (PTE_TABLE_SIZE - 1)#endif /* __ASSEMBLY__ */ #define PTRS_PER_PTE (1 << PTE_INDEX_SIZE)
@@ -347,8 +349,6 @@ static inline int pte_young(pte_t pte)* of the pte page. -- paulus */ #ifndef CONFIG_BOOKE -#define pmd_page_vaddr (pmd) \ - ((unsigned long)__va(pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1)))#define pmd_page (pmd) \ pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)#else
@@ -365,15 +365,6 @@ static inline int pte_young(pte_t pte)#define pgd_index (address) ((address) >> PGDIR_SHIFT)#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* Find an entry in the third-level page table.. */ -#define pte_index (address) \ - (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, addr) \ - (pmd_bad(*(dir)) ? NULL : (pte_t *)pmd_page_vaddr(*(dir)) + \ - pte_index(addr)) -#define pte_offset_map (dir, addr) pte_offset_kernel((dir), (addr)) -static inline void pte_unmap (pte_t *pte) { } -/* * Encode and decode a swap entry. * Note that the bits we use in a PTE for representing a swap entry
arch/powerpc/include/asm/nohash/64/pgtable.h +0 -7
@@ -193,13 +193,6 @@ static inline void p4d_set(p4d_t *p4dp, unsigned long val)#define pmd_offset (pudp,addr) \ (((pmd_t *) pud_page_vaddr(*(pudp))) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))) -#define pte_offset_kernel (dir,addr) \ - (((pte_t *) pmd_page_vaddr(*(dir))) + (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))) - -#define pte_offset_map (dir,addr) pte_offset_kernel((dir), (addr)) - -static inline void pte_unmap (pte_t *pte) { } -/* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)
arch/powerpc/include/asm/pgtable.h +7 -0
@@ -57,6 +57,13 @@ static inline pgprot_t pte_pgprot(pte_t pte)return __pgprot (pte_flags); } +#ifndef pmd_page_vaddr +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return ((unsigned long )__va (pmd_val (pmd) & ~PMD_MASKED_BITS )); +} +#define pmd_page_vaddr pmd_page_vaddr +#endif /* * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc..
arch/riscv/include/asm/pgtable.h +0 -10
@@ -209,16 +209,6 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#define mk_pte (page, prot) pfn_pte(page_to_pfn(page), prot) -#define pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) - -static inline pte_t *pte_offset_kernel (pmd_t *pmd,unsigned long addr) -{ -return (pte_t *)pmd_page_vaddr (*pmd) +pte_index (addr); -} - -#define pte_offset_map (dir, addr) pte_offset_kernel((dir), (addr)) -#define pte_unmap (pte) ((void)(pte)) -static inline int pte_present (pte_t pte) {return (pte_val (pte) & (_PAGE_PRESENT | _PAGE_PROT_NONE));
arch/riscv/mm/init.c +3 -3
@@ -235,12 +235,12 @@ static void __init create_pte_mapping(pte_t *ptep, uintptr_t va, phys_addr_t pa, phys_addr_t sz, pgprot_t prot) { - uintptr_t pte_index = pte_index(va); + uintptr_t pte_idx = pte_index(va);BUG_ON (sz !=PAGE_SIZE ); -if (pte_none (ptep[pte_index])) - ptep[pte_index] =pfn_pte (PFN_DOWN (pa), prot); +if (pte_none (ptep[pte_idx])) + ptep[pte_idx] =pfn_pte (PFN_DOWN (pa), prot); }#ifndef __PAGETABLE_PMD_FOLDED
arch/s390/include/asm/pgtable.h +2 -8
@@ -1229,7 +1229,6 @@ static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)#define p4d_index (address) (((address) >> P4D_SHIFT) & (PTRS_PER_P4D-1))#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) -#define pte_index (address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))#define pmd_deref (pmd) (pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN)#define pud_deref (pud) (pud_val(pud) & _REGION_ENTRY_ORIGIN)
@@ -1283,16 +1282,11 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)return (pmd_t *) pud; } -static inline pte_t *pte_offset (pmd_t *pmd,unsigned long address) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) { -return (pte_t *)pmd_deref (*pmd) +pte_index (address); +return (unsigned long )pmd_deref (pmd); } -#define pte_offset_kernel (pmd, address) pte_offset(pmd, address) -#define pte_offset_map (pmd, address) pte_offset_kernel(pmd, address) - -static inline void pte_unmap (pte_t *pte) { } -static inline bool gup_fast_permitted (unsigned long start,unsigned long end) {return end <= current->mm->context.asce_limit;
arch/s390/mm/pageattr.c +1 -1
@@ -85,7 +85,7 @@ static int walk_pte_level(pmd_t *pmdp, unsigned long addr, unsigned long end, {pte_t *ptep, new; - ptep =pte_offset (pmdp, addr); + ptep =pte_offset_kernel (pmdp, addr); do { new = *ptep; if (pte_none(new))
arch/sh/include/asm/pgtable_32.h +5 -10
@@ -401,7 +401,11 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)return pte; } -#define pmd_page_vaddr (pmd) ((unsigned long)pmd_val(pmd)) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) +{ +return (unsigned long )pmd_val (pmd); +} +#define pmd_page (pmd) (virt_to_page(pmd_val(pmd)))/* to find an entry in a page-table-directory. */
@@ -414,15 +418,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) -/* Find an entry in the third-level page table.. */ -#define pte_index (address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define __pte_offset (address) pte_index(address) - -#define pte_offset_kernel (dir, address) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) -#define pte_offset_map (dir, address) pte_offset_kernel(dir, address) -#define pte_unmap (pte) do { } while (0) -#ifdef CONFIG_X2TLB #define pte_ERROR (e) \ printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
arch/sh/include/asm/pgtable_64.h +0 -12
@@ -70,18 +70,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)#define pmd_page (pmd) \ (virt_to_page(pmd_val(pmd))) -/* PMD to PTE dereferencing */ -#define pte_index (address) \ - ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) - -#define __pte_offset (address) pte_index(address) - -#define pte_offset_kernel (dir, addr) \ - ((pte_t *) ((pmd_val(*(dir))) & PAGE_MASK) + pte_index((addr))) - -#define pte_offset_map (dir,addr) pte_offset_kernel(dir, addr) -#define pte_unmap (pte) do { } while (0) -#ifndef __ASSEMBLY__/* * PTEL coherent flags.
arch/sparc/include/asm/pgalloc_64.h +1 -1
@@ -67,7 +67,7 @@ void pte_free(struct mm_struct *mm, pgtable_t ptepage);#define pmd_populate_kernel (MM ,PMD ,PTE ) pmd_set(MM, PMD, PTE)#define pmd_populate (MM ,PMD ,PTE ) pmd_set(MM, PMD, PTE) -#define pmd_pgtable (PMD ) ((pte_t *)__pmd_page(PMD)) +#define pmd_pgtable (PMD ) ((pte_t *)pmd_page_vaddr(PMD))void pgtable_free (void *table,bool is_page);
arch/sparc/include/asm/pgtable_32.h +6 -9
@@ -132,6 +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 pmd_page_vaddr (pmd_t pmd) +{ +unsigned long v =pmd_val (pmd) &SRMMU_PTD_PMASK ; +return (unsigned long )__nocache_va (v <<4 ); +} +static inline unsigned long pud_page_vaddr (pud_t pud) {if (srmmu_device_memory (pud_val (pud))) {
@@ -318,15 +324,6 @@ static inline pmd_t *pmd_offset(pud_t * dir, unsigned long address) ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); } -/* Find an entry in the third-level page table.. */ -pte_t *pte_offset_kernel (pmd_t * dir,unsigned long address); - -/* -* This shortcut works on sun4m (and sun4d) because the nocache area is static. -*/ -#define pte_offset_map (d, a) pte_offset_kernel(d,a) -#define pte_unmap (pte) do{}while(0) -struct seq_file ;void mmu_info (struct seq_file *m);
arch/sparc/include/asm/pgtable_64.h +2 -10
@@ -835,7 +835,7 @@ static inline void pmd_set(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)#define pud_set (pudp, pmdp) \ (pud_val(*(pudp)) = (__pa((unsigned long) (pmdp)))) -static inline unsigned long __pmd_page (pmd_t pmd) +static inline unsigned long pmd_page_vaddr (pmd_t pmd) {pte_t pte =__pte (pmd_val (pmd));unsigned long pfn;
@@ -855,7 +855,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)return ((unsigned long )__va (pfn <<PAGE_SHIFT )); } -#define pmd_page (pmd) virt_to_page((void *)__pmd_page(pmd)) +#define pmd_page (pmd) virt_to_page((void *)pmd_page_vaddr(pmd))#define pud_page (pud) virt_to_page((void *)pud_page_vaddr(pud))#define pmd_clear (pmdp) (pmd_val(*(pmdp)) = 0UL)#define pud_present (pud) (pud_val(pud) != 0U)
@@ -906,14 +906,6 @@ static inline unsigned long pud_pfn(pud_t pud) ((pmd_t *)pud_page_vaddr (*(pudp)) + \ (((address) >>PMD_SHIFT ) & (PTRS_PER_PMD -1 ))) -/* Find an entry in the third-level page table.. */ -#define pte_index (address) \ - ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, address) \ - ((pte_t *) __pmd_page(*(dir)) + pte_index(address)) -#define pte_offset_map (dir, address) pte_offset_kernel((dir), (address)) -#define pte_unmap (pte) do { } while (0) - /* We cannot include <linux/mm_types.h> at this point yet: */extern struct mm_struct init_mm;
arch/sparc/mm/srmmu.c +0 -10
@@ -157,16 +157,6 @@ void pmd_populate(struct mm_struct *mm, pmd_t *pmdp, struct page *ptep) } } -/* Find an entry in the third-level page table.. */ -pte_t *pte_offset_kernel (pmd_t *dir,unsigned long address) -{ -void *pte; - - pte =__nocache_va ((dir->pmdv[0 ] &SRMMU_PTD_PMASK ) <<4 ); -return (pte_t *) pte + - ((address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 )); -} -/* * size: bytes to allocate in the nocache area. * align: bytes, number to align at.
arch/um/include/asm/pgtable.h +0 -13
@@ -323,19 +323,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)#define pmd_page_vaddr (pmd) \ ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) -/* -* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] -* -* this macro returns the index of the entry in the pte page which would -* control the given virtual address -*/ -#define pte_index (address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir, address) \ - ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) -#define pte_unmap (pte) do { } while (0) -struct mm_struct ;extern pte_t *virt_to_pte (struct mm_struct *mm,unsigned long addr);
arch/unicore32/include/asm/pgtable.h +0 -9
@@ -153,12 +153,6 @@ extern struct page *empty_zero_page;#define pte_none (pte) (!pte_val(pte))#define pte_clear (mm, addr, ptep) set_pte(ptep, __pte(0))#define pte_page (pte) (pfn_to_page(pte_pfn(pte))) -#define pte_offset_kernel (dir, addr) (pmd_page_vaddr(*(dir)) \ - + __pte_index(addr)) - -#define pte_offset_map (dir, addr) (pmd_page_vaddr(*(dir)) \ - + __pte_index(addr)) -#define pte_unmap (pte) do { } while (0)#define set_pte (ptep, pte) cpu_set_pte(ptep, pte)
@@ -229,9 +223,6 @@ PTE_BIT_FUNC(mkyoung, |= PTE_YOUNG);/* 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 third-level page table.. */ -#define __pte_index (addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -static inline pte_t pte_modify (pte_t pte,pgprot_t newprot) {const unsigned long mask =PTE_EXEC |PTE_WRITE |PTE_READ ;
arch/x86/include/asm/pgtable.h +0 -19
@@ -855,25 +855,6 @@ static inline unsigned long pmd_index(unsigned long address)*/ #define mk_pte (page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) -/* -* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] -* -* this function returns the index of the entry in the pte page which would -* control the given virtual address -* -* Also define macro so we can test if pte_index is defined for arch. -*/ -#define pte_index pte_index -static inline unsigned long pte_index (unsigned long address) -{ -return (address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 ); -} - -static inline pte_t *pte_offset_kernel (pmd_t *pmd,unsigned long address) -{ -return (pte_t *)pmd_page_vaddr (*pmd) +pte_index (address); -} -static inline int pmd_bad (pmd_t pmd) {return (pmd_flags (pmd) & ~_PAGE_USER) != _KERNPG_TABLE;
arch/x86/include/asm/pgtable_32.h +0 -11
@@ -45,17 +45,6 @@ void sync_initial_page_table(void);# include <asm/pgtable-2level.h> #endif -#if defined(CONFIG_HIGHPTE ) -#define pte_offset_map (dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ - pte_index((address))) -#define pte_unmap (pte) kunmap_atomic((pte)) -#else -#define pte_offset_map (dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + pte_index((address))) -#define pte_unmap (pte) do { } while (0) -#endif -/* Clear a kernel PTE and flush it from the TLB */ #define kpte_clear_flush (ptep, vaddr) \ do { \
arch/x86/include/asm/pgtable_64.h +0 -4
@@ -186,10 +186,6 @@ extern void sync_global_pgds(unsigned long start, unsigned long end);/* PTE - Level 1 access. */ -/* x86-64 always has all page tables mapped. */ -#define pte_offset_map (dir, address) pte_offset_kernel((dir), (address)) -#define pte_unmap (pte) ((void)(pte))/* NOP */ -/* * Encode and de-code a swap entry *
arch/xtensa/include/asm/pgtable.h +1 -9
@@ -267,7 +267,7 @@ static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITABLE; }static inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_young (pte_t pte) {return pte_val (pte) & _PAGE_ACCESSED; } -static inline pte_t pte_wrprotect (pte_t pte) +static inline pte_t pte_wrprotect (pte_t pte) {pte_val (pte) &= ~(_PAGE_WRITABLE | _PAGE_HW_WRITE);return pte; }static inline pte_t pte_mkclean (pte_t pte) {pte_val (pte) &= ~(_PAGE_DIRTY | _PAGE_HW_WRITE);return pte; }
@@ -367,14 +367,6 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)#define pgd_index (address) ((address) >> PGDIR_SHIFT) -/* Find an entry in the third-level page table.. */ -#define pte_index (address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) -#define pte_offset_kernel (dir,addr) \ - ((pte_t*) pmd_page_vaddr(*(dir)) + pte_index(addr)) -#define pte_offset_map (dir,addr) pte_offset_kernel((dir),(addr)) -#define pte_unmap (pte) do { } while (0) - -/* * Encode and decode a swap and file entry. */
include/linux/pgtable.h +29 -0
@@ -28,6 +28,35 @@#define USER_PGTABLES_CEILING 0UL#endif +/* +* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] +* +* this function returns the index of the entry in the pte page which would +* control the given virtual address +*/ +static inline unsigned long pte_index (unsigned long address) +{ +return (address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 ); +} + +#ifndef pte_offset_kernel +static inline pte_t *pte_offset_kernel (pmd_t *pmd,unsigned long address) +{ +return (pte_t *)pmd_page_vaddr (*pmd) +pte_index (address); +} +#define pte_offset_kernel pte_offset_kernel +#endif + +#if defined(CONFIG_HIGHPTE ) +#define pte_offset_map (dir, address) \ + ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \ + pte_index((address))) +#define pte_unmap (pte) kunmap_atomic((pte)) +#else +#define pte_offset_map (dir, address) pte_offset_kernel((dir), (address)) +#define pte_unmap (pte) ((void)(pte))/* NOP */ +#endif +/* * In many cases it is known that a virtual address is mapped at PMD or PTE * level, so instead of traversing all the page table levels, we can get a
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 10/12 mm: consolidate pmd_index() and pmd_offset() definitions
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
All architectures define pmd_index() as
(address >> PMD_SHIFT) & (PTRS_PER_PMD - 1)
and all architectures that have at least three-level page tables define pmd_offset() as an entry in the array of PMDs indexed by the pmd_index().
For the most architectures the pmd_offset() implementation relies on the availability of pud_page_vaddr() that converts a PMD entry value to the virtual address of the page containing PMD array.
Let's use such implementation as a generic and drop most of the definitions of pmd_index() and pmd_offset() in <asm/pgtable.h> files.
The architectures that didn't provide pud_page_vaddr() are updated to have that defined.
The generic implementation can be overridden by an architecture and this ability is currently in use by there architectures:
* alpha has special requirements for memory access ordering
* arm has custom definition of folded 2-level page tables
* s390 has custom definitions of all page table accessors
--- arch/alpha/include/asm/pgtable.h | 1 + arch/arm/include/asm/pgtable-2level.h | 1 + arch/arm/include/asm/pgtable-3level.h | 7 ----- arch/arm/include/asm/pgtable-nommu.h | 1 - arch/arm64/include/asm/pgtable.h | 8 ++++-- arch/c6x/include/asm/pgtable.h | 1 - arch/csky/include/asm/pgtable.h | 1 - arch/hexagon/include/asm/pgtable.h | 9 ------ arch/ia64/include/asm/pgtable.h | 4 --- arch/m68k/include/asm/motorola_pgtable.h | 7 ----- arch/microblaze/include/asm/pgtable.h | 1 - arch/mips/include/asm/pgtable-32.h | 1 - arch/mips/include/asm/pgtable-64.h | 6 ---- arch/parisc/include/asm/pgtable.h | 8 ------ arch/parisc/kernel/pci-dma.c | 2 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 3 -- arch/powerpc/include/asm/nohash/64/pgtable.h | 3 -- arch/riscv/include/asm/pgtable-64.h | 7 ----- arch/riscv/mm/init.c | 12 ++++---- arch/s390/include/asm/pgtable.h | 1 + arch/sh/include/asm/pgtable-3level.h | 7 ----- arch/sh/include/asm/pgtable_32.h | 1 - arch/sh/include/asm/pgtable_64.h | 1 - arch/sparc/include/asm/pgtable_32.h | 9 +----- arch/sparc/include/asm/pgtable_64.h | 7 +---- arch/um/include/asm/pgtable-3level.h | 4 --- arch/um/include/asm/pgtable.h | 4 --- arch/x86/include/asm/pgtable.h | 17 ------------ include/asm-generic/pgtable-nopmd.h | 1 + include/linux/pgtable.h | 29 ++++++++++++++++++-- 30 files changed, 44 insertions(+), 120 deletions(-)
arch/alpha/include/asm/pgtable.h +1 -0
@@ -305,6 +305,7 @@ extern inline pmd_t * pmd_offset(pud_t * dir, unsigned long address)smp_read_barrier_depends ();/* see above */ return ret; } +#define pmd_offset pmd_offset/* Find an entry in the third-level page table.. */ extern inline pte_t *pte_offset_kernel (pmd_t * dir,unsigned long address)
arch/arm/include/asm/pgtable-2level.h +1 -0
@@ -187,6 +187,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) {return (pmd_t *)pud; } +#define pmd_offset pmd_offset#define pmd_large (pmd) (pmd_val(pmd) & 2)#define pmd_leaf (pmd) (pmd_val(pmd) & 2)
arch/arm/include/asm/pgtable-3level.h +0 -7
@@ -133,13 +133,6 @@ static inline pmd_t *pud_page_vaddr(pud_t pud)return __va (pud_val (pud) &PHYS_MASK & (s32 )PAGE_MASK ); } -/* Find an entry in the second-level page table.. */ -#define pmd_index (addr) (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) -static inline pmd_t *pmd_offset (pud_t *pud,unsigned long addr) -{ -return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (addr); -} -#define pmd_bad (pmd) (!(pmd_val(pmd) & 2))#define copy_pmd (pmdpd,pmdps) \
arch/arm/include/asm/pgtable-nommu.h +0 -1
@@ -22,7 +22,6 @@#define pgd_bad (pgd) (0)#define pgd_clear (pgdp)#define kern_addr_valid (addr) (1) -#define pmd_offset (a, b) ((void *)0)/* FIXME */ /* * PMD_SHIFT determines the size of the area a second-level page table can map
arch/arm64/include/asm/pgtable.h +5 -3
@@ -566,11 +566,13 @@ static inline phys_addr_t pud_page_paddr(pud_t pud)return __pud_to_phys (pud); } -/* Find an entry in the second-level page table. */ -#define pmd_index (addr) (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) +static inline unsigned long pud_page_vaddr (pud_t pud) +{ +return (unsigned long )__va (pud_page_paddr (pud)); +} +/* Find an entry in the second-level page table. */ #define pmd_offset_phys (dir, addr) (pud_page_paddr(READ_ONCE(*(dir))) + pmd_index(addr) * sizeof(pmd_t)) -#define pmd_offset (dir, addr) ((pmd_t *)__va(pmd_offset_phys((dir), (addr))))#define pmd_set_fixmap (addr) ((pmd_t *)set_fixmap_offset(FIX_PMD, addr))#define pmd_set_fixmap_offset (pud, addr) pmd_set_fixmap(pmd_offset_phys(pud, addr))
arch/c6x/include/asm/pgtable.h +0 -1
@@ -26,7 +26,6 @@#define pgd_clear (pgdp)#define kern_addr_valid (addr) (1) -#define pmd_offset (a, b) ((void *)0)#define pmd_none (x) (!pmd_val(x))#define pmd_present (x) (pmd_val(x))#define pmd_clear (xp) do { set_pmd(xp, __pmd(0)); } while (0)
arch/csky/include/asm/pgtable.h +0 -1
@@ -221,7 +221,6 @@ static inline pte_t pte_mkyoung(pte_t pte) }#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)
arch/hexagon/include/asm/pgtable.h +0 -9
@@ -206,15 +206,6 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr,pte_val (*ptep) = _NULL_PTE; } -#ifdef NEED_PMD_INDEX_DESPITE_BEING_2_LEVEL -/** -* pmd_index - returns the index of the entry in the PMD page -* which would control the given virtual address -*/ -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) - -#endif -/** * pgd_index - returns the index of the entry in the PGD page * which would control the given virtual address
arch/ia64/include/asm/pgtable.h +0 -4
@@ -389,10 +389,6 @@ pgd_offset (const struct mm_struct *mm, unsigned long address) ((pud_t *) p4d_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)))#endif -/* Find an entry in the third-level page table.. */ -#define pmd_offset (dir,addr) \ - ((pmd_t *) pud_page_vaddr(*(dir)) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))) -/* atomic versions of the some PTE manipulations: */ static inline int
arch/m68k/include/asm/motorola_pgtable.h +0 -7
@@ -211,13 +211,6 @@ static inline pgd_t *pgd_offset_k(unsigned long address)return kernel_pg_dir + (address >>PGDIR_SHIFT ); } - -/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pud_t *dir,unsigned long address) -{ -return (pmd_t *)pud_page_vaddr (*dir) + ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); -} -/* Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */ #define __swp_type (x) (((x).val >> 4) & 0xff)#define __swp_offset (x) ((x).val >> 12)
arch/microblaze/include/asm/pgtable.h +0 -1
@@ -21,7 +21,6 @@ extern int mem_init_done;#define pgd_bad (pgd) (0)#define pgd_clear (pgdp)#define kern_addr_valid (addr) (1) -#define pmd_offset (a, b) ((void *) 0)#define PAGE_NONE __pgprot(0)/* these mean nothing to non MMU */ #define PAGE_SHARED __pgprot(0)/* these mean nothing to non MMU */
arch/mips/include/asm/pgtable-32.h +0 -1
@@ -200,7 +200,6 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))/* to find an entry in a page-table-directory */ #define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr))
arch/mips/include/asm/pgtable-64.h +0 -6
@@ -324,7 +324,6 @@ static inline void pud_clear(pud_t *pudp)#define pgd_offset_k (address) pgd_offset(&init_mm, address)#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))/* to find an entry in a page-table-directory */ #define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr))
@@ -337,11 +336,6 @@ static inline unsigned long pud_page_vaddr(pud_t pud)#define pud_phys (pud) virt_to_phys((void *)pud_val(pud))#define pud_page (pud) (pfn_to_page(pud_phys(pud) >> PAGE_SHIFT)) -/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pud_t * pud,unsigned long address) -{ -return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); -}#endif /*
arch/parisc/include/asm/pgtable.h +0 -8
@@ -448,14 +448,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)/* Find an entry in the second-level page table.. */ -#if CONFIG_PGTABLE_LEVELS ==3 -#define pmd_index (addr) (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) -#define pmd_offset (dir,address) \ -((pmd_t *) pud_page_vaddr(*(dir)) + pmd_index(address)) -#else -#define pmd_offset (dir,addr) ((pmd_t *) dir) -#endif -extern void paging_init (void );/* Used for deferring calls to flush_dcache_page() */
arch/parisc/kernel/pci-dma.c +1 -1
@@ -201,7 +201,7 @@ static inline void unmap_uncached_pmd(pgd_t * dir, unsigned long vaddr,pgd_clear (dir);return ; } - pmd =pmd_offset (dir, vaddr); + pmd =pmd_offset (pud_offset (p4d_offset (dir, vaddr), vaddr), vaddr); vaddr &= ~PGDIR_MASK ; end = vaddr + size;if (end >PGDIR_SIZE )
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -3
@@ -1010,7 +1010,6 @@ extern struct page *p4d_page(p4d_t p4d);#define pgd_index (address) (((address) >> (PGDIR_SHIFT)) & (PTRS_PER_PGD - 1))#define pud_index (address) (((address) >> (PUD_SHIFT)) & (PTRS_PER_PUD - 1)) -#define pmd_index (address) (((address) >> (PMD_SHIFT)) & (PTRS_PER_PMD - 1))/* * Find an entry in a page-table-directory. We combine the address region
@@ -1021,8 +1020,6 @@ extern struct page *p4d_page(p4d_t p4d);#define pud_offset (p4dp, addr) \ (((pud_t *) p4d_page_vaddr(*(p4dp))) + pud_index(addr)) -#define pmd_offset (pudp,addr) \ - (((pmd_t *) pud_page_vaddr(*(pudp))) + pmd_index(addr))/* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */
arch/powerpc/include/asm/nohash/64/pgtable.h +0 -3
@@ -190,9 +190,6 @@ static inline void p4d_set(p4d_t *p4dp, unsigned long val)#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -#define pmd_offset (pudp,addr) \ - (((pmd_t *) pud_page_vaddr(*(pudp))) + (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))) -/* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)
arch/riscv/include/asm/pgtable-64.h +0 -7
@@ -70,13 +70,6 @@ static inline struct page *pud_page(pud_t pud)return pfn_to_page (pud_val (pud) >> _PAGE_PFN_SHIFT); } -#define pmd_index (addr) (((addr) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) - -static inline pmd_t *pmd_offset (pud_t *pud,unsigned long addr) -{ -return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (addr); -} -static inline pmd_t pfn_pmd (unsigned long pfn,pgprot_t prot) {return __pmd ((pfn << _PAGE_PFN_SHIFT) |pgprot_val (prot));
arch/riscv/mm/init.c +6 -6
@@ -283,21 +283,21 @@ static void __init create_pmd_mapping(pmd_t *pmdp, {pte_t *ptep;phys_addr_t pte_phys; -uintptr_t pmd_index =pmd_index (va); +uintptr_t pmd_idx =pmd_index (va);if (sz ==PMD_SIZE ) { -if (pmd_none (pmdp[pmd_index])) - pmdp[pmd_index] =pfn_pmd (PFN_DOWN (pa), prot); +if (pmd_none (pmdp[pmd_idx])) + pmdp[pmd_idx] =pfn_pmd (PFN_DOWN (pa), prot);return ; } -if (pmd_none (pmdp[pmd_index])) { +if (pmd_none (pmdp[pmd_idx])) { pte_phys =alloc_pte (va); - pmdp[pmd_index] =pfn_pmd (PFN_DOWN (pte_phys),PAGE_TABLE ); + pmdp[pmd_idx] =pfn_pmd (PFN_DOWN (pte_phys),PAGE_TABLE ); ptep =get_pte_virt (pte_phys);memset (ptep,0 ,PAGE_SIZE ); }else { - pte_phys =PFN_PHYS (_pmd_pfn (pmdp[pmd_index])); + pte_phys =PFN_PHYS (_pmd_pfn (pmdp[pmd_idx])); ptep =get_pte_virt (pte_phys); }
arch/s390/include/asm/pgtable.h +1 -0
@@ -1281,6 +1281,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)return (pmd_t *)pud_deref (*pud) +pmd_index (address);return (pmd_t *) pud; } +#define pmd_offset pmd_offsetstatic inline unsigned long pmd_page_vaddr (pmd_t pmd) {
arch/sh/include/asm/pgtable-3level.h +0 -7
@@ -39,13 +39,6 @@ static inline unsigned long pud_page_vaddr(pud_t pud)/* only used by the stubbed out hugetlb gup code, should never be called */ #define pud_page (pud) NULL - -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) -static inline pmd_t *pmd_offset (pud_t *pud,unsigned long address) -{ -return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); -} -#define pud_none (x) (!pud_val(x))#define pud_present (x) (pud_val(x))#define pud_clear (xp) do { set_pud(xp, __pud(0)); } while (0)
arch/sh/include/asm/pgtable_32.h +0 -1
@@ -416,7 +416,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)#define pgd_offset_k (address) pgd_offset(&init_mm, address)#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))#ifdef CONFIG_X2TLB #define pte_ERROR (e) \
arch/sh/include/asm/pgtable_64.h +0 -1
@@ -52,7 +52,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)#define pgd_offset_k (address) pgd_offset(&init_mm, address)#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -/* #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) */ /* * PMD level access routines. Same notes as above.
arch/sparc/include/asm/pgtable_32.h +1 -8
@@ -317,13 +317,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)/* to find an entry in a kernel page-table-directory */ #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 (pud_t * dir,unsigned long address) -{ -return (pmd_t *)pud_page_vaddr (*dir) + - ((address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 )); -} -struct seq_file ;void mmu_info (struct seq_file *m);
@@ -412,7 +405,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,return remap_pfn_range (vma, from, phys_base >>PAGE_SHIFT , size, prot); } -#define io_remap_pfn_range io_remap_pfn_range +#define io_remap_pfn_range io_remap_pfn_range#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS#define ptep_set_access_flags (__vma, __address, __ptep, __entry, __dirty) \
arch/sparc/include/asm/pgtable_64.h +1 -6
@@ -901,11 +901,6 @@ static inline unsigned long pud_pfn(pud_t pud)#define pud_offset (p4dp, address) \ ((pud_t *) p4d_page_vaddr(*(p4dp)) + pud_index(address)) -/* Find an entry in the second-level page table.. */ -#define pmd_offset (pudp, address) \ - ((pmd_t *) pud_page_vaddr(*(pudp)) + \ - (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))) -/* We cannot include <linux/mm_types.h> at this point yet: */ extern struct mm_struct init_mm;
@@ -1070,7 +1065,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,return remap_pfn_range (vma, from, phys_base >>PAGE_SHIFT , size, prot); } -#define io_remap_pfn_range io_remap_pfn_range +#define io_remap_pfn_range io_remap_pfn_rangestatic inline unsigned long __untagged_addr (unsigned long start) {
arch/um/include/asm/pgtable-3level.h +0 -4
@@ -89,10 +89,6 @@ static inline void pud_clear (pud_t *pud)#define pud_page (pud) phys_to_page(pud_val(pud) & PAGE_MASK)#define pud_page_vaddr (pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK)) -/* Find an entry in the second-level page table.. */ -#define pmd_offset (pud, address) ((pmd_t *) pud_page_vaddr(*(pud)) + \ - pmd_index(address)) -static inline unsigned long pte_pfn (pte_t pte) {return phys_to_pfn (pte_val (pte));
arch/um/include/asm/pgtable.h +0 -4
@@ -318,10 +318,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)* control the given virtual address */ #define pmd_page_vaddr (pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) -#define pmd_index (address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) - -#define pmd_page_vaddr (pmd) \ - ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))struct mm_struct ;extern pte_t *virt_to_pte (struct mm_struct *mm,unsigned long addr);
arch/x86/include/asm/pgtable.h +0 -17
@@ -835,17 +835,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)*/ #define pmd_page (pmd) pfn_to_page(pmd_pfn(pmd)) -/* -* the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] -* -* this macro returns the index of the entry in the pmd page which would -* control the given virtual address -*/ -static inline unsigned long pmd_index (unsigned long address) -{ -return (address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 ); -} -/* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to.
@@ -887,12 +876,6 @@ static inline unsigned long pud_page_vaddr(pud_t pud)*/ #define pud_page (pud) pfn_to_page(pud_pfn(pud)) -/* Find an entry in the second-level page table.. */ -static inline pmd_t *pmd_offset (pud_t *pud,unsigned long address) -{ -return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); -} -#define pud_leaf pud_largestatic inline int pud_large (pud_t pud) {
include/asm-generic/pgtable-nopmd.h +1 -0
@@ -45,6 +45,7 @@ static inline pmd_t * pmd_offset(pud_t * pud, unsigned long address) {return (pmd_t *)pud; } +#define pmd_offset pmd_offset#define pmd_val (x) (pud_val((x).pud))#define __pmd (x) ((pmd_t) { __pud(x) } )
include/linux/pgtable.h +26 -3
@@ -29,16 +29,30 @@#endif /* -* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] +* A page table page can be thought of an array like this: pXd_t[PTRS_PER_PxD] * -* this function returns the index of the entry in the pte page which would -* control the given virtual address +* The pXx_index() functions return the index of the entry in the page +* table page which would control the given virtual address +* +* As these functions may be used by the same code for different levels of +* the page table folding, they are always available, regardless of +* CONFIG_PGTABLE_LEVELS value. For the folded levels they simply return 0 +* because in such cases PTRS_PER_PxD equals 1. */ +static inline unsigned long pte_index (unsigned long address) {return (address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 ); } +#ifndef pmd_index +static inline unsigned long pmd_index (unsigned long address) +{ +return (address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 ); +} +#define pmd_index pmd_index +#endif +#ifndef pte_offset_kernelstatic inline pte_t *pte_offset_kernel (pmd_t *pmd,unsigned long address) {
@@ -57,6 +71,15 @@ static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)#define pte_unmap (pte) ((void)(pte))/* NOP */ #endif +/* Find an entry in the second-level page table.. */ +#ifndef pmd_offset +static inline pmd_t *pmd_offset (pud_t *pud,unsigned long address) +{ +return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); +} +#define pmd_offset pmd_offset +#endif +/* * In many cases it is known that a virtual address is mapped at PMD or PTE * level, so instead of traversing all the page table levels, we can get a
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 11/12 mm: consolidate pud_index() and pud_offset() definitions
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
All architectures that have at least four-level page tables define pud_offset() as an entry in the array of PUDs indexed by the pud_index(), where pud_index() is
(address >> PUD_SHIFT) & (PTRS_PER_PUD - 1)
For the most architectures the pud_offset() implementation relies on the availability of pud_page_vaddr() that converts a PUD entry value to the virtual address of the page containing PUD array.
Let's use such implementation as a generic and drop most of the definitions of pud_index() and pud_offset() in <asm/pgtable.h> files.
The architectures that didn't provide pud_page_vaddr() are updated to have that defined.
The generic implementation can be overridden by an architecture and this ability is currently in use by there architectures:
* s390 has custom definitions of all page table accessors
--- arch/arm64/include/asm/pgtable.h | 8 +++++--- arch/csky/include/asm/pgtable.h | 2 -- arch/ia64/include/asm/pgtable.h | 6 ------ arch/mips/include/asm/pgtable-32.h | 1 - arch/mips/include/asm/pgtable-64.h | 7 ------- arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ---- arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 4 ---- arch/s390/include/asm/pgtable.h | 1 + arch/sh/include/asm/pgtable_32.h | 2 -- arch/sh/include/asm/pgtable_64.h | 2 -- arch/sparc/include/asm/pgtable_64.h | 5 ----- arch/x86/include/asm/pgtable.h | 11 ----------- include/asm-generic/pgtable-nopud.h | 1 + include/linux/pgtable.h | 16 ++++++++++++++++ 14 files changed, 23 insertions(+), 47 deletions(-)
arch/arm64/include/asm/pgtable.h +5 -3
@@ -626,11 +626,13 @@ static inline phys_addr_t p4d_page_paddr(p4d_t p4d)return __p4d_to_phys (p4d); } -/* Find an entry in the frst-level page table. */ -#define pud_index (addr) (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)) +static inline unsigned long p4d_page_vaddr (p4d_t p4d) +{ +return (unsigned long )__va (p4d_page_paddr (p4d)); +} +/* Find an entry in the frst-level page table. */ #define pud_offset_phys (dir, addr) (p4d_page_paddr(READ_ONCE(*(dir))) + pud_index(addr) * sizeof(pud_t)) -#define pud_offset (dir, addr) ((pud_t *)__va(pud_offset_phys((dir), (addr))))#define pud_set_fixmap (addr) ((pud_t *)set_fixmap_offset(FIX_PUD, addr))#define pud_set_fixmap_offset (p4d, addr) pud_set_fixmap(pud_offset_phys(p4d, addr))
arch/csky/include/asm/pgtable.h +0 -2
@@ -220,8 +220,6 @@ static inline pte_t pte_mkyoung(pte_t pte)return pte; } -#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)
arch/ia64/include/asm/pgtable.h +0 -6
@@ -383,12 +383,6 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)here. */ #define pgd_offset_gate (mm, addr) pgd_offset_k(addr) -#if CONFIG_PGTABLE_LEVELS ==4 -/* Find an entry in the second-level page table.. */ -#define pud_offset (dir,addr) \ - ((pud_t *) p4d_page_vaddr(*(dir)) + (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) -#endif -/* atomic versions of the some PTE manipulations: */ static inline int
arch/mips/include/asm/pgtable-32.h +0 -1
@@ -199,7 +199,6 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#define pgd_offset_k (address) pgd_offset(&init_mm, address)#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) -#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))/* to find an entry in a page-table-directory */ #define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr))
arch/mips/include/asm/pgtable-64.h +0 -7
@@ -172,8 +172,6 @@extern pte_t invalid_pte_table[PTRS_PER_PTE ]; -#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)) -#ifndef __PAGETABLE_PUD_FOLDED/* * For 4-level pagetables we defines these ourselves, for 3-level the
@@ -222,11 +220,6 @@ static inline unsigned long p4d_page_vaddr(p4d_t p4d)#define p4d_index (address) (((address) >> P4D_SHIFT) & (PTRS_PER_P4D - 1)) -static inline pud_t *pud_offset (p4d_t *p4d,unsigned long address) -{ -return (pud_t *)p4d_page_vaddr (*p4d) +pud_index (address); -} -static inline void set_p4d (p4d_t *p4d,p4d_t p4dval) { *p4d = p4dval;
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -4
@@ -1009,7 +1009,6 @@ extern struct page *p4d_page(p4d_t p4d);#define p4d_page_vaddr (p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS)#define pgd_index (address) (((address) >> (PGDIR_SHIFT)) & (PTRS_PER_PGD - 1)) -#define pud_index (address) (((address) >> (PUD_SHIFT)) & (PTRS_PER_PUD - 1))/* * Find an entry in a page-table-directory. We combine the address region
@@ -1018,9 +1017,6 @@ extern struct page *p4d_page(p4d_t p4d);#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -#define pud_offset (p4dp, addr) \ - (((pud_t *) p4d_page_vaddr(*(p4dp))) + pud_index(addr)) -/* to find an entry in a kernel page-table-directory */ /* This now only contains the vmalloc pages */ #define pgd_offset_k (address) pgd_offset(&init_mm, address)
arch/powerpc/include/asm/nohash/64/pgtable-4k.h +0 -4
@@ -78,10 +78,6 @@ extern struct page *p4d_page(p4d_t p4d);#endif /* !__ASSEMBLY__ */ -#define pud_offset (p4dp, addr) \ - (((pud_t *) p4d_page_vaddr(*(p4dp))) + \ - (((addr) >> PUD_SHIFT) & (PTRS_PER_PUD - 1))) -#define pud_ERROR (e) \ pr_err("%s:%d: bad pud %08lx.\n", __FILE__, __LINE__, pud_val(e))
arch/s390/include/asm/pgtable.h +1 -0
@@ -1274,6 +1274,7 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)return (pud_t *)p4d_deref (*p4d) +pud_index (address);return (pud_t *) p4d; } +#define pud_offset pud_offsetstatic inline pmd_t *pmd_offset (pud_t *pud,unsigned long address) {
arch/sh/include/asm/pgtable_32.h +0 -2
@@ -415,8 +415,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, address) -#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -#ifdef CONFIG_X2TLB #define pte_ERROR (e) \ printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
arch/sh/include/asm/pgtable_64.h +0 -2
@@ -51,8 +51,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval)/* To find an entry in a kernel PGD. */ #define pgd_offset_k (address) pgd_offset(&init_mm, address) -#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1)) -/* * PMD level access routines. Same notes as above. */
arch/sparc/include/asm/pgtable_64.h +0 -5
@@ -896,11 +896,6 @@ static inline unsigned long pud_pfn(pud_t pud)/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* Find an entry in the third-level page table.. */ -#define pud_index (address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)) -#define pud_offset (p4dp, address) \ - ((pud_t *) p4d_page_vaddr(*(p4dp)) + pud_index(address)) -/* We cannot include <linux/mm_types.h> at this point yet: */ extern struct mm_struct init_mm;
arch/x86/include/asm/pgtable.h +0 -11
@@ -895,11 +895,6 @@ static inline int pud_large(pud_t pud) }#endif /* CONFIG_PGTABLE_LEVELS > 2 */ -static inline unsigned long pud_index (unsigned long address) -{ -return (address >>PUD_SHIFT ) & (PTRS_PER_PUD -1 ); -} -#if CONFIG_PGTABLE_LEVELS >3 static inline int p4d_none (p4d_t p4d) {
@@ -922,12 +917,6 @@ static inline unsigned long p4d_page_vaddr(p4d_t p4d)*/ #define p4d_page (p4d) pfn_to_page(p4d_pfn(p4d)) -/* Find an entry in the third-level page table.. */ -static inline pud_t *pud_offset (p4d_t *p4d,unsigned long address) -{ -return (pud_t *)p4d_page_vaddr (*p4d) +pud_index (address); -} -static inline int p4d_bad (p4d_t p4d) {unsigned long ignore_flags = _KERNPG_TABLE | _PAGE_USER;
include/asm-generic/pgtable-nopud.h +1 -0
@@ -43,6 +43,7 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address) {return (pud_t *)p4d; } +#define pud_offset pud_offset#define pud_val (x) (p4d_val((x).p4d))#define __pud (x) ((pud_t) { __p4d(x) })
include/linux/pgtable.h +16 -0
@@ -53,6 +53,14 @@ static inline unsigned long pmd_index(unsigned long address)#define pmd_index pmd_index#endif +#ifndef pud_index +static inline unsigned long pud_index (unsigned long address) +{ +return (address >>PUD_SHIFT ) & (PTRS_PER_PUD -1 ); +} +#define pud_index pud_index +#endif +#ifndef pte_offset_kernelstatic inline pte_t *pte_offset_kernel (pmd_t *pmd,unsigned long address) {
@@ -80,6 +88,14 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)#define pmd_offset pmd_offset#endif +#ifndef pud_offset +static inline pud_t *pud_offset (p4d_t *p4d,unsigned long address) +{ +return (pud_t *)p4d_page_vaddr (*p4d) +pud_index (address); +} +#define pud_offset pud_offset +#endif +/* * In many cases it is known that a virtual address is mapped at PMD or PTE * level, so instead of traversing all the page table levels, we can get a
Signature · 1 line
2.26.2
Mike Rapoport
maintainerPATCH v2 12/12 mm: consolidate pgd_index() and pgd_offset{_k}() definitions
In reply to Mike RapoportFrom: Mike Rapoport <[email protected]>
All architectures tables define pgd_offset() as an entry in the array of PGDs indexed by the pgd_index(), where pgd_index() is
(address >> PGD_SHIFT) & (PTRS_PER_PGD - 1)
For the most cases, the pgd_offset() uses mm->pgd as the pointer to the top-level page directory and the pgd_offset_k() is a helper that presumes that mm == &init_mm.
Use x86 implementation as the generic one and remove redundant definitions of PGD accessors in most of arch/*/include/asm/pgtable.h
The generic implementation can be overridden by an architecture and this ability is currently in use by there architectures:
* ia64 has custom implementation of pgd_index()
* s390 has custom definitions of all page table accessors
--- arch/alpha/include/asm/pgtable.h | 9 ---- arch/arc/include/asm/pgtable.h | 7 --- arch/arm/include/asm/pgtable.h | 8 ---- arch/arm64/include/asm/pgtable.h | 10 ---- arch/arm64/kernel/hibernate.c | 4 +- arch/arm64/mm/kasan_init.c | 2 +- arch/arm64/mm/mmu.c | 8 ++-- arch/csky/include/asm/pgtable.h | 11 ----- arch/hexagon/include/asm/pgtable.h | 18 ------- arch/ia64/include/asm/pgtable.h | 14 +----- arch/m68k/include/asm/mcf_pgtable.h | 11 ----- arch/m68k/include/asm/motorola_pgtable.h | 16 ------- arch/m68k/include/asm/sun3_pgtable.h | 9 ---- arch/microblaze/include/asm/pgtable.h | 7 --- arch/mips/include/asm/pgtable-32.h | 8 ---- arch/mips/include/asm/pgtable-64.h | 8 ---- arch/nds32/include/asm/pgtable.h | 6 --- arch/nios2/include/asm/pgtable.h | 8 ---- arch/openrisc/include/asm/pgtable.h | 10 ---- arch/parisc/include/asm/pgtable.h | 9 ---- arch/powerpc/include/asm/book3s/32/pgtable.h | 7 --- arch/powerpc/include/asm/book3s/64/pgtable.h | 13 ----- arch/powerpc/include/asm/nohash/32/pgtable.h | 7 --- arch/powerpc/include/asm/nohash/64/pgtable.h | 12 ----- arch/riscv/include/asm/pgtable.h | 10 ---- arch/riscv/mm/init.c | 12 ++--- arch/s390/include/asm/pgtable.h | 1 - arch/sh/include/asm/pgtable_32.h | 7 --- arch/sh/include/asm/pgtable_64.h | 11 ----- arch/sparc/include/asm/pgtable_32.h | 8 ---- arch/sparc/include/asm/pgtable_64.h | 7 --- arch/um/include/asm/pgtable.h | 50 ++++++-------------- arch/unicore32/include/asm/pgtable.h | 8 ---- arch/x86/include/asm/pgtable.h | 24 ---------- arch/xtensa/include/asm/pgtable.h | 8 ---- include/linux/pgtable.h | 26 ++++++++++ 36 files changed, 55 insertions(+), 339 deletions(-)
arch/alpha/include/asm/pgtable.h +0 -9
@@ -276,15 +276,6 @@ extern inline pte_t pte_mkwrite(pte_t pte) { pte_val(pte) &= ~_PAGE_FOW; returnextern inline pte_t pte_mkdirty (pte_t pte) {pte_val (pte) |= __DIRTY_BITS;return pte; }extern inline pte_t pte_mkyoung (pte_t pte) {pte_val (pte) |= __ACCESS_BITS;return pte; } -#define PAGE_DIR_OFFSET (tsk,address) pgd_offset((tsk),(address)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, (address)) - -/* to find an entry in a page-table-directory. */ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) -#define pgd_offset (mm, address) ((mm)->pgd+pgd_index(address)) -/* * The smp_read_barrier_depends() in the following functions are required to * order the load of *dir (the pointer in the top level page table) with any
arch/arc/include/asm/pgtable.h +0 -7
@@ -316,13 +316,6 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,set_pte (ptep, pteval); } -/* -* All kernel related VM pages are in init's mm. -*/ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -#define pgd_index (addr) ((addr) >> PGDIR_SHIFT) -#define pgd_offset (mm, addr) (((mm)->pgd)+pgd_index(addr)) -/* * Macro to quickly access the PGD entry, utlising the fact that some * arch may cache the pointer to Page Directory of "current" task
arch/arm/include/asm/pgtable.h +0 -8
@@ -166,14 +166,6 @@ extern struct page *empty_zero_page;extern pgd_t swapper_pg_dir[PTRS_PER_PGD ]; -/* to find an entry in a page-table-directory */ -#define pgd_index (addr) ((addr) >> PGDIR_SHIFT) - -#define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (addr) pgd_offset(&init_mm, addr) -#define pmd_none (pmd) (!pmd_val(pmd))static inline pte_t *pmd_page_vaddr (pmd_t pmd)
arch/arm64/include/asm/pgtable.h +0 -10
@@ -659,16 +659,6 @@ static inline unsigned long p4d_page_vaddr(p4d_t p4d)#define pgd_ERROR (pgd) __pgd_error(__FILE__, __LINE__, pgd_val(pgd)) -/* to find an entry in a page-table-directory */ -#define pgd_index (addr) (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) - -#define pgd_offset_raw (pgd, addr) ((pgd) + pgd_index(addr)) - -#define pgd_offset (mm, addr) (pgd_offset_raw((mm)->pgd, (addr))) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (addr) pgd_offset(&init_mm, addr) -#define pgd_set_fixmap (addr) ((pgd_t *)set_fixmap_offset(FIX_PGD, addr))#define pgd_clear_fixmap () clear_fixmap(FIX_PGD)
arch/arm64/kernel/hibernate.c +2 -2
@@ -188,7 +188,7 @@ static int trans_pgd_map_page(pgd_t *trans_pgd, void *page,pmd_t *pmdp;pte_t *ptep; - pgdp =pgd_offset_raw (trans_pgd, dst_addr); + pgdp =pgd_offset_pgd (trans_pgd, dst_addr);if (pgd_none (READ_ONCE (*pgdp))) { pudp = (void *)get_safe_page (GFP_ATOMIC );if (!pudp)
@@ -490,7 +490,7 @@ static int copy_page_tables(pgd_t *dst_pgdp, unsigned long start,unsigned long addr = start;pgd_t *src_pgdp =pgd_offset_k (start); - dst_pgdp =pgd_offset_raw (dst_pgdp, start); + dst_pgdp =pgd_offset_pgd (dst_pgdp, start); do { next = pgd_addr_end(addr, end); if (pgd_none(READ_ONCE(*src_pgdp)))
arch/arm64/mm/kasan_init.c +1 -1
@@ -190,7 +190,7 @@ void __init kasan_copy_shadow(pgd_t *pgdir) pgdp =pgd_offset_k (KASAN_SHADOW_START ); pgdp_end =pgd_offset_k (KASAN_SHADOW_END ); - pgdp_new =pgd_offset_raw (pgdir,KASAN_SHADOW_START ); + pgdp_new =pgd_offset_pgd (pgdir,KASAN_SHADOW_START );do {set_pgd (pgdp_new,READ_ONCE (*pgdp)); }while (pgdp++, pgdp_new++, pgdp != pgdp_end);
arch/arm64/mm/mmu.c +4 -4
@@ -341,7 +341,7 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, int flags) {unsigned long addr, end, next; -pgd_t *pgdp =pgd_offset_raw (pgdir, virt); +pgd_t *pgdp =pgd_offset_pgd (pgdir, virt);/* * If the virtual and physical address don't have the same offset
@@ -663,13 +663,13 @@ static void __init map_kernel(pgd_t *pgdp) &vmlinux_initdata, 0, VM_NO_GUARD);map_kernel_segment (pgdp, _data, _end,PAGE_KERNEL , &vmlinux_data,0 ,0 ); -if (!READ_ONCE (pgd_val (*pgd_offset_raw (pgdp,FIXADDR_START )))) { +if (!READ_ONCE (pgd_val (*pgd_offset_pgd (pgdp,FIXADDR_START )))) {/* * The fixmap falls in a separate pgd to the kernel, and doesn't * live in the carveout for the swapper_pg_dir. We can simply * re-use the existing dir for the fixmap. */ -set_pgd (pgd_offset_raw (pgdp,FIXADDR_START ), +set_pgd (pgd_offset_pgd (pgdp,FIXADDR_START ),READ_ONCE (*pgd_offset_k (FIXADDR_START ))); }else if (CONFIG_PGTABLE_LEVELS >3 ) {pgd_t *bm_pgdp;
@@ -682,7 +682,7 @@ static void __init map_kernel(pgd_t *pgdp)* entry instead. */ BUG_ON (!IS_ENABLED (CONFIG_ARM64_16K_PAGES )); - bm_pgdp =pgd_offset_raw (pgdp,FIXADDR_START ); + bm_pgdp =pgd_offset_pgd (pgdp,FIXADDR_START ); bm_p4dp =p4d_offset (bm_pgdp,FIXADDR_START ); bm_pudp =pud_set_fixmap_offset (bm_p4dp,FIXADDR_START );pud_populate (&init_mm, bm_pudp,lm_alias (bm_pmd));
arch/csky/include/asm/pgtable.h +0 -11
@@ -220,11 +220,6 @@ static inline pte_t pte_mkyoung(pte_t pte)return pte; } -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -#define pgd_index (address) ((address) >> PGDIR_SHIFT) -#define __HAVE_PHYS_MEM_ACCESS_PROTstruct file ; extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
@@ -268,12 +263,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) (pgprot_val(newprot))); } -/* to find an entry in a page-table-directory */ -static inline pgd_t *pgd_offset (struct mm_struct *mm,unsigned long address) -{ -return mm->pgd +pgd_index (address); -} -extern pgd_t swapper_pg_dir[PTRS_PER_PGD ];extern void paging_init (void );
arch/hexagon/include/asm/pgtable.h +0 -18
@@ -206,24 +206,6 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr,pte_val (*ptep) = _NULL_PTE; } -/** -* pgd_index - returns the index of the entry in the PGD page -* which would control the given virtual address -* -* This returns the *index* for the address in the pgd_t -*/ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) - -/* -* pgd_offset - find an offset in a page-table-directory -*/ -#define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr)) - -/* -* pgd_offset_k - get kernel (init_mm) pgd entry pointer for addr -*/ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/** * pmd_none - check if pmd_entry is mapped * @pmd_entry: pmd entry
arch/ia64/include/asm/pgtable.h +1 -13
@@ -364,19 +364,7 @@ pgd_index (unsigned long address)return (region << (PAGE_SHIFT -6 )) | l1index; } - -/* The offset in the 1-level directory is given by the 3 region bits -(61..63) and the level-1 bits. */ -static inline pgd_t * -pgd_offset (const struct mm_struct *mm,unsigned long address) -{ -return mm->pgd +pgd_index (address); -} - -/* In the kernel's mapped region we completely ignore the region number -(since we know it's in region number 5). */ -#define pgd_offset_k (addr) \ - (init_mm.pgd + (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))) +#define pgd_index pgd_index/* Look up a pgd entry in the gate area. On IA-64, the gate-area resides in the kernel-mapped segment, hence we use pgd_offset_k()
arch/m68k/include/asm/mcf_pgtable.h +0 -11
@@ -310,17 +310,6 @@ static inline pte_t pte_mkcache(pte_t pte)#define swapper_pg_dir kernel_pg_dirextern pgd_t kernel_pg_dir[PTRS_PER_PGD ]; -/* -* Find an entry in a pagetable directory. -*/ -#define pgd_index (address) ((address) >> PGDIR_SHIFT) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* -* Find an entry in a kernel pagetable directory. -*/ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* * Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */
arch/m68k/include/asm/motorola_pgtable.h +0 -16
@@ -192,25 +192,9 @@ static inline pte_t pte_mkcache(pte_t pte)return pte; } -#define PAGE_DIR_OFFSET (tsk,address) pgd_offset((tsk),(address)) - -#define pgd_index (address) ((address) >> PGDIR_SHIFT) - -/* to find an entry in a page-table-directory */ -static inline pgd_t *pgd_offset (const struct mm_struct *mm, -unsigned long address) -{ -return mm->pgd +pgd_index (address); -} -#define swapper_pg_dir kernel_pg_dirextern pgd_t kernel_pg_dir[128 ]; -static inline pgd_t *pgd_offset_k (unsigned long address) -{ -return kernel_pg_dir + (address >>PGDIR_SHIFT ); -} -/* Encode and de-code a swap entry (must be !pte_none(e) && !pte_present(e)) */ #define __swp_type (x) (((x).val >> 4) & 0xff)#define __swp_offset (x) ((x).val >> 12)
arch/m68k/include/asm/sun3_pgtable.h +0 -9
@@ -174,15 +174,6 @@ static inline pte_t pte_mkcache(pte_t pte) { return pte; }extern pgd_t swapper_pg_dir[PTRS_PER_PGD ];extern pgd_t kernel_pg_dir[PTRS_PER_PGD ]; -/* Find an entry in a pagetable directory. */ -#define pgd_index (address) ((address) >> PGDIR_SHIFT) - -#define pgd_offset (mm, address) \ -((mm)->pgd + pgd_index(address)) - -/* Find an entry in a kernel pagetable directory. */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* Macros to (de)construct the fake PTEs representing swap pages. */ #define __swp_type (x) ((x).val & 0x7F)#define __swp_offset (x) (((x).val) >> 7)
arch/microblaze/include/asm/pgtable.h +0 -7
@@ -445,13 +445,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)/* returns struct *page of the pmd entry*/ #define pmd_page (pmd) (pfn_to_page(__pa(pmd_val(pmd)) >> PAGE_SHIFT)) -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -/* to find an entry in a page-table-directory */ -#define pgd_index (address) ((address) >> PGDIR_SHIFT) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* Find an entry in the third-level page table.. */ extern pgd_t swapper_pg_dir[PTRS_PER_PGD ];
arch/mips/include/asm/pgtable-32.h +0 -8
@@ -195,14 +195,6 @@ static inline pte_t pfn_pte(unsigned long pfn, pgprot_t prot)#define pte_page (x) pfn_to_page(pte_pfn(x)) -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) - -/* to find an entry in a page-table-directory */ -#define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr)) -#if defined(CONFIG_CPU_R3K_TLB )/* Swap entries must have VALID bit cleared. */
arch/mips/include/asm/pgtable-64.h +0 -8
@@ -313,14 +313,6 @@ static inline void pud_clear(pud_t *pudp)#define pfn_pmd (pfn, prot) __pmd(((pfn) << _PFN_SHIFT) | pgprot_val(prot))#endif -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) - -/* to find an entry in a page-table-directory */ -#define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr)) -#ifndef __PAGETABLE_PMD_FOLDEDstatic inline unsigned long pud_page_vaddr (pud_t pud) {
arch/nds32/include/asm/pgtable.h +0 -6
@@ -340,12 +340,6 @@ static inline pmd_t __mk_pmd(pte_t * ptep, unsigned long prot)* */ -/* to find an entry in a page-table-directory */ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (addr) pgd_offset(&init_mm, addr) -static inline pte_t pte_modify (pte_t pte,pgprot_t newprot) {const unsigned long mask =0xfff ;
arch/nios2/include/asm/pgtable.h +0 -8
@@ -102,10 +102,6 @@ static inline void set_pmd(pmd_t *pmdptr, pmd_t pmdval) *pmdptr = pmdval; } -/* to find an entry in a page-table-directory */ -#define pgd_index (addr) (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) -#define pgd_offset (mm, addr) ((mm)->pgd + pgd_index(addr)) -static inline int pte_write (pte_t pte) \ {return pte_val (pte) & _PAGE_WRITE; }static inline int pte_dirty (pte_t pte) \
@@ -248,10 +244,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)return pmd_val (pmd); } -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (addr) pgd_offset(&init_mm, addr) - -#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %08lx.\n", \ __FILE__, __LINE__, pte_val(e))
arch/openrisc/include/asm/pgtable.h +0 -10
@@ -369,16 +369,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)return ((unsigned long )__va (pmd_val (pmd) &PAGE_MASK )); } -/* to find an entry in a page-table-directory. */ -#define pgd_index (address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) - -#define __pgd_offset (address) pgd_index(address) - -#define pgd_offset (mm, address) ((mm)->pgd+pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -#define __pmd_offset (address) \ (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
arch/parisc/include/asm/pgtable.h +0 -9
@@ -437,15 +437,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)#define __pmd_page (pmd) ((unsigned long) __va(pmd_address(pmd)))#define pmd_page (pmd) virt_to_page((void *)__pmd_page(pmd)) -#define pgd_index (address) ((address) >> PGDIR_SHIFT) - -/* to find an entry in a page-table-directory */ -#define pgd_offset (mm, address) \ -((mm)->pgd + ((address) >> PGDIR_SHIFT)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* Find an entry in the second-level page table.. */ extern void paging_init (void );
arch/powerpc/include/asm/book3s/32/pgtable.h +0 -7
@@ -354,13 +354,6 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,#define pmd_page (pmd) \ pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT) -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -/* to find an entry in a page-table-directory */ -#define pgd_index (address) ((address) >> PGDIR_SHIFT) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* * Encode and decode a swap entry. * Note that the bits we use in a PTE for representing a swap entry
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -13
@@ -1008,19 +1008,6 @@ extern struct page *p4d_page(p4d_t p4d);#define pud_page_vaddr (pud) __va(pud_val(pud) & ~PUD_MASKED_BITS)#define p4d_page_vaddr (p4d) __va(p4d_val(p4d) & ~P4D_MASKED_BITS) -#define pgd_index (address) (((address) >> (PGDIR_SHIFT)) & (PTRS_PER_PGD - 1)) - -/* -* Find an entry in a page-table-directory. We combine the address region -* (the high order N bits) and the pgd portion of the address. -*/ - -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -/* This now only contains the vmalloc pages */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))#define pmd_ERROR (e) \
arch/powerpc/include/asm/nohash/32/pgtable.h +0 -7
@@ -358,13 +358,6 @@ static inline int pte_young(pte_t pte) pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT))#endif -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -/* to find an entry in a page-table-directory */ -#define pgd_index (address) ((address) >> PGDIR_SHIFT) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) -/* * Encode and decode a swap entry. * Note that the bits we use in a PTE for representing a swap entry
arch/powerpc/include/asm/nohash/64/pgtable.h +0 -12
@@ -182,18 +182,6 @@ static inline void p4d_set(p4d_t *p4dp, unsigned long val) *p4dp =__p4d (val); } -/* -* Find an entry in a page-table-directory. We combine the address region -* (the high order N bits) and the pgd portion of the address. -*/ -#define pgd_index (address) (((address) >> (PGDIR_SHIFT)) & (PTRS_PER_PGD - 1)) - -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -/* This now only contains the vmalloc pages */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* Atomic PTE updates */ static inline unsigned long pte_update(struct mm_struct *mm, unsigned long addr,
arch/riscv/include/asm/pgtable.h +0 -10
@@ -173,16 +173,6 @@ static inline unsigned long _pgd_pfn(pgd_t pgd)return pgd_val (pgd) >> _PAGE_PFN_SHIFT; } -#define pgd_index (addr) (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) - -/* Locate an entry in the page global directory */ -static inline pgd_t *pgd_offset (const struct mm_struct *mm,unsigned long addr) -{ -return mm->pgd +pgd_index (addr); -} -/* Locate an entry in the kernel page global directory */ -#define pgd_offset_k (addr) pgd_offset(&init_mm, (addr)) -static inline struct page *pmd_page (pmd_t pmd) {return pfn_to_page (pmd_val (pmd) >> _PAGE_PFN_SHIFT);
arch/riscv/mm/init.c +6 -6
@@ -325,21 +325,21 @@ static void __init create_pgd_mapping(pgd_t *pgdp, {pgd_next_t *nextp;phys_addr_t next_phys; -uintptr_t pgd_index =pgd_index (va); +uintptr_t pgd_idx =pgd_index (va);if (sz ==PGDIR_SIZE ) { -if (pgd_val (pgdp[pgd_index]) ==0 ) - pgdp[pgd_index] =pfn_pgd (PFN_DOWN (pa), prot); +if (pgd_val (pgdp[pgd_idx]) ==0 ) + pgdp[pgd_idx] =pfn_pgd (PFN_DOWN (pa), prot);return ; } -if (pgd_val (pgdp[pgd_index]) ==0 ) { +if (pgd_val (pgdp[pgd_idx]) ==0 ) { next_phys =alloc_pgd_next (va); - pgdp[pgd_index] =pfn_pgd (PFN_DOWN (next_phys),PAGE_TABLE ); + pgdp[pgd_idx] =pfn_pgd (PFN_DOWN (next_phys),PAGE_TABLE ); nextp =get_pgd_next_virt (next_phys);memset (nextp,0 ,PAGE_SIZE ); }else { - next_phys =PFN_PHYS (_pgd_pfn (pgdp[pgd_index])); + next_phys =PFN_PHYS (_pgd_pfn (pgdp[pgd_idx])); nextp =get_pgd_next_virt (next_phys); }
arch/s390/include/asm/pgtable.h +0 -1
@@ -1259,7 +1259,6 @@ static inline pgd_t *pgd_offset_raw(pgd_t *pgd, unsigned long address) }#define pgd_offset (mm, address) pgd_offset_raw(READ_ONCE((mm)->pgd), address) -#define pgd_offset_k (address) pgd_offset(&init_mm, address)static inline p4d_t *p4d_offset (pgd_t *pgd,unsigned long address) {
arch/sh/include/asm/pgtable_32.h +0 -7
@@ -408,13 +408,6 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)#define pmd_page (pmd) (virt_to_page(pmd_val(pmd))) -/* to find an entry in a page-table-directory. */ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -#ifdef CONFIG_X2TLB #define pte_ERROR (e) \ printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, \
arch/sh/include/asm/pgtable_64.h +0 -11
@@ -40,17 +40,6 @@ static __inline__ void set_pte(pte_t *pteptr, pte_t pteval) }#define set_pte_at (mm,addr,ptep,pteval) set_pte(ptep,pteval) -/* -* PGD defines. Top level. -*/ - -/* To find an entry in a generic PGD. */ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) -#define pgd_offset (mm, address) ((mm)->pgd+pgd_index(address)) - -/* To find an entry in a kernel PGD. */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* * PMD level access routines. Same notes as above. */
arch/sparc/include/asm/pgtable_32.h +0 -8
@@ -309,14 +309,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) pgprot_val(newprot)); } -#define pgd_index (address) ((address) >> PGDIR_SHIFT) - -/* to find an entry in a page-table-directory */ -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -struct seq_file ;void mmu_info (struct seq_file *m);
arch/sparc/include/asm/pgtable_64.h +0 -7
@@ -889,13 +889,6 @@ static inline unsigned long pud_pfn(pud_t pud)#define p4d_set (p4dp, pudp) \ (p4d_val(*(p4dp)) = (__pa((unsigned long) (pudp)))) -/* to find an entry in a page-table-directory. */ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) -/* We cannot include <linux/mm_types.h> at this point yet: */ extern struct mm_struct init_mm;
arch/um/include/asm/pgtable.h +15 -35
114 lines not on this page · raw message
arch/unicore32/include/asm/pgtable.h +0 -8
@@ -215,14 +215,6 @@ PTE_BIT_FUNC(mkyoung, |= PTE_YOUNG);*/ #define mk_pte (page, prot) pfn_pte(page_to_pfn(page), prot) -/* to find an entry in a page-table-directory */ -#define pgd_index (addr) ((addr) >> PGDIR_SHIFT) - -#define pgd_offset (mm, addr) ((mm)->pgd+pgd_index(addr)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (addr) pgd_offset(&init_mm, addr) -static inline pte_t pte_modify (pte_t pte,pgprot_t newprot) {const unsigned long mask =PTE_EXEC |PTE_WRITE |PTE_READ ;
arch/x86/include/asm/pgtable.h +0 -24
@@ -989,30 +989,6 @@ static inline int pgd_none(pgd_t pgd)#endif /* __ASSEMBLY__ */ -/* -* the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] -* -* this macro returns the index of the entry in the pgd page which would -* control the given virtual address -*/ -#define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) - -/* -* pgd_offset() returns a (pgd_t *) -* pgd_index() is used get the offset into the pgd page's array of pgd_t's; -*/ -#define pgd_offset_pgd (pgd, address) (pgd + pgd_index((address))) -/* -* a shortcut to get a pgd_t in a given mm -*/ -#define pgd_offset (mm, address) pgd_offset_pgd((mm)->pgd, (address)) -/* -* a shortcut which implies the use of the kernel's pgd, instead -* of a process's -*/ -#define pgd_offset_k (address) pgd_offset(&init_mm, (address)) - -#define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)#define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
arch/xtensa/include/asm/pgtable.h +0 -8
@@ -359,14 +359,6 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)update_pte (ptep,pte_wrprotect (pte)); } -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) - -/* to find an entry in a page-table-directory */ -#define pgd_offset (mm,address) ((mm)->pgd + pgd_index(address)) - -#define pgd_index (address) ((address) >> PGDIR_SHIFT) -/* * Encode and decode a swap and file entry. */
include/linux/pgtable.h +26 -0
@@ -61,6 +61,14 @@ static inline unsigned long pud_index(unsigned long address)#define pud_index pud_index#endif +#ifndef pgd_index +static inline unsigned long pgd_index (unsigned long address) +{ +return ((address >>PGDIR_SHIFT ) & (PTRS_PER_PGD -1 )); +} +#define pgd_index pgd_index +#endif +#ifndef pte_offset_kernelstatic inline pte_t *pte_offset_kernel (pmd_t *pmd,unsigned long address) {
@@ -96,6 +104,24 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)#define pud_offset pud_offset#endif +static inline pgd_t *pgd_offset_pgd (pgd_t *pgd,unsigned long address) +{ +return (pgd +pgd_index (address)); +}; + +/* +* a shortcut to get a pgd_t in a given mm +*/ +#ifndef pgd_offset +#define pgd_offset (mm, address) pgd_offset_pgd((mm)->pgd, (address)) +#endif + +/* +* a shortcut which implies the use of the kernel's pgd, instead +* of a process's +*/ +#define pgd_offset_k (address) pgd_offset(&init_mm, (address)) +/* * In many cases it is known that a virtual address is mapped at PMD or PTE * level, so instead of traversing all the page table levels, we can get a
Signature · 1 line
2.26.2
Andrew Morton
maintainerQuoted 21 lines · On Thu, 14 May 2020 20:03:15 +0300 Mike Rapoport <[email protected]> wrote:
The low level page table accessors (
pXY_index(),pXY_offset()) are duplicated across all architectures and sometimes more than once. For instance, we have 31 definition ofpgd_offset()for 25 supported architectures.Most of these definitions are actually identical and typically it boils down to, e.g.
static inline unsigned long
pmd_index(unsigned long address){ return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1); }static inline
pmd_t*pmd_offset(pud_t *pud, unsigned long address){ return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address); }These definitions can be shared among 90% of the arches provided
XYZ_SHIFT,PTRS_PER_XYZandxyz_page_vaddr()are defined.
Quoted 6 lines
For architectures that really need a custom version there is always possibility to override the generic version with the usual ifdefs magic.
These patches introduce
include/linux/pgtable.hthat replacesinclude/asm-generic/pgtable.hand add the definitions of the page table accessors to the new header.
hm,
Quoted 1 line
712 files changed, 684 insertions(+), 2021 deletions(-)
big!
There's a lot of stuff going on at present (I suspect everyone is sitting at home coding up a storm). However this all merged up fairly cleanly, haven't tried compiling it yet.