tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

CONFIG_HIGHPTE vs. sub-page page tables.

Background: I've implemented 1K/2K page tables for s390. These sub-page
page tables are required to properly support the s390 virtualization
instruction with KVM. The SIE instruction requires that the page tables
have 256 page table entries (pte) followed by 256 page status table entries
(pgste). The pgstes are only required if the process is using the SIE
instruction. The pgstes are updated by the hardware and by the hypervisor
for a number of reasons, one of them is dirty and reference bit tracking.
To avoid wasting memory the standard pte table allocation should return
1K/2K (31/64 bit) and 2K/4K if the process is using SIE.

Problem: Page size on s390 is 4K, page table size is 1K or 2K. That means
the s390 version for pte_alloc_one cannot return a pointer to a struct
page. Trouble is that with the CONFIG_HIGHPTE feature on x86 pte_alloc_one
cannot return a pointer to a pte either, since that would require more than
32 bit for the return value of pte_alloc_one (and the pte * would not be
accessible since its not kmapped).

Solution: The only solution I found to this dilemma is a new typedef: a
pgtable_t. For s390 pgtable_t will be a (pte *) - to be introduced with a
later patch. For everybody else it will be a (struct page *). The
additional problem with the initialization of the ptl lock and the
NR_PAGETABLE accounting is solved with a constructor pgtable_page_ctor and
a destructor pgtable_page_dtor. The page table allocation and free
functions need to call these two whenever a page table page is allocated or
freed. pmd_populate will get a pgtable_t instead of a struct page pointer.
To get the pgtable_t back from a pmd entry that has been installed with
pmd_populate a new function pmd_pgtable is added. It replaces the pmd_page
call in free_pte_range and apply_to_pte_range.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Martin Schwidefsky and committed by
Linus Torvalds 2f569afd 13214adf

+326 -132
+5 -3
arch/frv/mm/pgalloc.c
··· 28 28 return pte; 29 29 } 30 30 31 - struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 31 + pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 32 32 { 33 33 struct page *page; 34 34 ··· 37 37 #else 38 38 page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0); 39 39 #endif 40 - if (page) 40 + if (page) { 41 41 clear_highpage(page); 42 - flush_dcache_page(page); 42 + pgtable_page_ctor(page); 43 + flush_dcache_page(page); 44 + } 43 45 return page; 44 46 } 45 47
+8 -6
arch/powerpc/mm/pgtable_32.c
··· 107 107 return pte; 108 108 } 109 109 110 - struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 110 + pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 111 111 { 112 112 struct page *ptepage; 113 113 114 114 #ifdef CONFIG_HIGHPTE 115 - gfp_t flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT; 115 + gfp_t flags = GFP_KERNEL | __GFP_HIGHMEM | __GFP_REPEAT | __GFP_ZERO; 116 116 #else 117 - gfp_t flags = GFP_KERNEL | __GFP_REPEAT; 117 + gfp_t flags = GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO; 118 118 #endif 119 119 120 120 ptepage = alloc_pages(flags, 0); 121 - if (ptepage) 122 - clear_highpage(ptepage); 121 + if (!ptepage) 122 + return NULL; 123 + pgtable_page_ctor(ptepage); 123 124 return ptepage; 124 125 } 125 126 ··· 132 131 free_page((unsigned long)pte); 133 132 } 134 133 135 - void pte_free(struct mm_struct *mm, struct page *ptepage) 134 + void pte_free(struct mm_struct *mm, pgtable_t ptepage) 136 135 { 137 136 #ifdef CONFIG_SMP 138 137 hash_page_sync(); 139 138 #endif 139 + pgtable_page_dtor(ptepage); 140 140 __free_page(ptepage); 141 141 } 142 142
+6 -3
arch/ppc/mm/pgtable.c
··· 95 95 return pte; 96 96 } 97 97 98 - struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 98 + pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 99 99 { 100 100 struct page *ptepage; 101 101 ··· 106 106 #endif 107 107 108 108 ptepage = alloc_pages(flags, 0); 109 - if (ptepage) 109 + if (ptepage) { 110 110 clear_highpage(ptepage); 111 + pgtable_page_ctor(ptepage); 112 + } 111 113 return ptepage; 112 114 } 113 115 ··· 121 119 free_page((unsigned long)pte); 122 120 } 123 121 124 - void pte_free(struct mm_struct *mm, struct page *ptepage) 122 + void pte_free(struct mm_struct *mm, pgtable_t ptepage) 125 123 { 126 124 #ifdef CONFIG_SMP 127 125 hash_page_sync(); 128 126 #endif 127 + pgtable_page_dtor(ptepage); 129 128 __free_page(ptepage); 130 129 } 131 130
+2
arch/s390/mm/pgtable.c
··· 78 78 clear_table(table, _PAGE_TYPE_EMPTY, PAGE_SIZE); 79 79 page->index = (addr_t) table; 80 80 } 81 + pgtable_page_ctor(page); 81 82 table = (unsigned long *) page_to_phys(page); 82 83 clear_table(table, _PAGE_TYPE_EMPTY, PAGE_SIZE); 83 84 return table; ··· 88 87 { 89 88 unsigned long *shadow = get_shadow_pte(table); 90 89 90 + pgtable_page_dtor(virt_to_page(table)); 91 91 if (shadow) 92 92 free_page((unsigned long) shadow); 93 93 free_page((unsigned long) table);
+7 -3
arch/sparc/mm/srmmu.c
··· 489 489 return (pte_t *)srmmu_get_nocache(PTE_SIZE, PTE_SIZE); 490 490 } 491 491 492 - static struct page * 492 + static pgtable_t 493 493 srmmu_pte_alloc_one(struct mm_struct *mm, unsigned long address) 494 494 { 495 495 unsigned long pte; 496 + struct page *page; 496 497 497 498 if ((pte = (unsigned long)srmmu_pte_alloc_one_kernel(mm, address)) == 0) 498 499 return NULL; 499 - return pfn_to_page( __nocache_pa(pte) >> PAGE_SHIFT ); 500 + page = pfn_to_page( __nocache_pa(pte) >> PAGE_SHIFT ); 501 + pgtable_page_ctor(page); 502 + return page; 500 503 } 501 504 502 505 static void srmmu_free_pte_fast(pte_t *pte) ··· 507 504 srmmu_free_nocache((unsigned long)pte, PTE_SIZE); 508 505 } 509 506 510 - static void srmmu_pte_free(struct page *pte) 507 + static void srmmu_pte_free(pgtable_t pte) 511 508 { 512 509 unsigned long p; 513 510 511 + pgtable_page_dtor(pte); 514 512 p = (unsigned long)page_address(pte); /* Cached address (for test) */ 515 513 if (p == 0) 516 514 BUG();
+10 -4
arch/sparc/mm/sun4c.c
··· 1947 1947 return pte; 1948 1948 } 1949 1949 1950 - static struct page *sun4c_pte_alloc_one(struct mm_struct *mm, unsigned long address) 1950 + static pgtable_t sun4c_pte_alloc_one(struct mm_struct *mm, unsigned long address) 1951 1951 { 1952 - pte_t *pte = sun4c_pte_alloc_one_kernel(mm, address); 1952 + pte_t *pte; 1953 + struct page *page; 1954 + 1955 + pte = sun4c_pte_alloc_one_kernel(mm, address); 1953 1956 if (pte == NULL) 1954 1957 return NULL; 1955 - return virt_to_page(pte); 1958 + page = virt_to_page(pte); 1959 + pgtable_page_ctor(page); 1960 + return page; 1956 1961 } 1957 1962 1958 1963 static inline void sun4c_free_pte_fast(pte_t *pte) ··· 1967 1962 pgtable_cache_size++; 1968 1963 } 1969 1964 1970 - static void sun4c_pte_free(struct page *pte) 1965 + static void sun4c_pte_free(pgtable_t pte) 1971 1966 { 1967 + pgtable_page_dtor(pte); 1972 1968 sun4c_free_pte_fast(page_address(pte)); 1973 1969 } 1974 1970
+3 -1
arch/um/kernel/mem.c
··· 354 354 return pte; 355 355 } 356 356 357 - struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 357 + pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 358 358 { 359 359 struct page *pte; 360 360 361 361 pte = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); 362 + if (pte) 363 + pgtable_page_ctor(pte); 362 364 return pte; 363 365 } 364 366
+4 -1
arch/x86/mm/pgtable_32.c
··· 183 183 return (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); 184 184 } 185 185 186 - struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 186 + pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 187 187 { 188 188 struct page *pte; 189 189 ··· 192 192 #else 193 193 pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); 194 194 #endif 195 + if (pte) 196 + pgtable_page_ctor(pte); 195 197 return pte; 196 198 } 197 199 ··· 367 365 368 366 void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte) 369 367 { 368 + pgtable_page_dtor(pte); 370 369 paravirt_release_pt(page_to_pfn(pte)); 371 370 tlb_remove_page(tlb, pte); 372 371 }
+2
include/asm-alpha/page.h
··· 62 62 63 63 #endif /* STRICT_MM_TYPECHECKS */ 64 64 65 + typedef struct page *pgtable_t; 66 + 65 67 #ifdef USE_48_BIT_KSEG 66 68 #define PAGE_OFFSET 0xffff800000000000UL 67 69 #else
+14 -8
include/asm-alpha/pgalloc.h
··· 11 11 */ 12 12 13 13 static inline void 14 - pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte) 14 + pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t pte) 15 15 { 16 16 pmd_set(pmd, (pte_t *)(page_to_pa(pte) + PAGE_OFFSET)); 17 17 } 18 + #define pmd_pgtable(pmd) pmd_page(pmd) 18 19 19 20 static inline void 20 21 pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) ··· 58 57 free_page((unsigned long)pte); 59 58 } 60 59 61 - static inline struct page * 62 - pte_alloc_one(struct mm_struct *mm, unsigned long addr) 60 + static inline pgtable_t 61 + pte_alloc_one(struct mm_struct *mm, unsigned long address) 63 62 { 64 - pte_t *pte = pte_alloc_one_kernel(mm, addr); 65 - if (pte) 66 - return virt_to_page(pte); 67 - return NULL; 63 + pte_t *pte = pte_alloc_one_kernel(mm, address); 64 + struct page *page; 65 + 66 + if (!pte) 67 + return NULL; 68 + page = virt_to_page(pte); 69 + pgtable_page_ctor(page); 70 + return page; 68 71 } 69 72 70 73 static inline void 71 - pte_free(struct mm_struct *mm, struct page *page) 74 + pte_free(struct mm_struct *mm, pgtable_t page) 72 75 { 76 + pgtable_page_dtor(page); 73 77 __free_page(page); 74 78 } 75 79
+2
include/asm-arm/page.h
··· 171 171 172 172 #endif /* STRICT_MM_TYPECHECKS */ 173 173 174 + typedef struct page *pgtable_t; 175 + 174 176 #endif /* CONFIG_MMU */ 175 177 176 178 #include <asm/memory.h>
+6 -3
include/asm-arm/pgalloc.h
··· 66 66 return pte; 67 67 } 68 68 69 - static inline struct page * 69 + static inline pgtable_t 70 70 pte_alloc_one(struct mm_struct *mm, unsigned long addr) 71 71 { 72 72 struct page *pte; ··· 75 75 if (pte) { 76 76 void *page = page_address(pte); 77 77 clean_dcache_area(page, sizeof(pte_t) * PTRS_PER_PTE); 78 + pgtable_page_ctor(pte); 78 79 } 79 80 80 81 return pte; ··· 92 91 } 93 92 } 94 93 95 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 94 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 96 95 { 96 + pgtable_page_dtor(pte); 97 97 __free_page(pte); 98 98 } 99 99 ··· 125 123 } 126 124 127 125 static inline void 128 - pmd_populate(struct mm_struct *mm, pmd_t *pmdp, struct page *ptep) 126 + pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep) 129 127 { 130 128 __pmd_populate(pmdp, page_to_pfn(ptep) << PAGE_SHIFT | _PAGE_USER_TABLE); 131 129 } 130 + #define pmd_pgtable(pmd) pmd_page(pmd) 132 131 133 132 #endif /* CONFIG_MMU */ 134 133
+1
include/asm-avr32/page.h
··· 34 34 typedef struct { unsigned long pte; } pte_t; 35 35 typedef struct { unsigned long pgd; } pgd_t; 36 36 typedef struct { unsigned long pgprot; } pgprot_t; 37 + typedef struct page *pgtable_t; 37 38 38 39 #define pte_val(x) ((x).pte) 39 40 #define pgd_val(x) ((x).pgd)
+12 -4
include/asm-avr32/pgalloc.h
··· 17 17 set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte))) 18 18 19 19 static __inline__ void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 20 - struct page *pte) 20 + pgtable_t pte) 21 21 { 22 22 set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte))); 23 23 } 24 + #define pmd_pgtable(pmd) pmd_page(pmd) 24 25 25 26 /* 26 27 * Allocate and free page tables ··· 52 51 struct page *pte; 53 52 54 53 pte = alloc_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO); 55 - 54 + if (!pte) 55 + return NULL; 56 + pgtable_page_ctor(pte); 56 57 return pte; 57 58 } 58 59 ··· 63 60 free_page((unsigned long)pte); 64 61 } 65 62 66 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 63 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 67 64 { 65 + pgtable_page_dtor(pte); 68 66 __free_page(pte); 69 67 } 70 68 71 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 69 + #define __pte_free_tlb(tlb,pte) \ 70 + do { \ 71 + pgtable_page_dtor(pte); \ 72 + tlb_remove_page((tlb), pte); \ 73 + } while (0) 72 74 73 75 #define check_pgt_cache() do { } while(0) 74 76
+1
include/asm-cris/page.h
··· 26 26 typedef struct { unsigned long pte; } pte_t; 27 27 typedef struct { unsigned long pgd; } pgd_t; 28 28 typedef struct { unsigned long pgprot; } pgprot_t; 29 + typedef struct page *pgtable_t; 29 30 #endif 30 31 31 32 #define pte_val(x) ((x).pte)
+10 -4
include/asm-cris/pgalloc.h
··· 6 6 7 7 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, pte) 8 8 #define pmd_populate(mm, pmd, pte) pmd_set(pmd, page_address(pte)) 9 + #define pmd_pgtable(pmd) pmd_page(pmd) 9 10 10 11 /* 11 12 * Allocate and free page tables. ··· 28 27 return pte; 29 28 } 30 29 31 - static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 30 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 32 31 { 33 32 struct page *pte; 34 33 pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); 34 + pgtable_page_ctor(pte); 35 35 return pte; 36 36 } 37 37 ··· 41 39 free_page((unsigned long)pte); 42 40 } 43 41 44 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 42 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 45 43 { 44 + pgtable_page_dtor(pte); 46 45 __free_page(pte); 47 46 } 48 47 49 - 50 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 48 + #define __pte_free_tlb(tlb,pte) \ 49 + do { \ 50 + pgtable_page_dtor(pte); \ 51 + tlb_remove_page((tlb), pte); \ 52 + } while (0) 51 53 52 54 #define check_pgt_cache() do { } while (0) 53 55
+1
include/asm-frv/page.h
··· 25 25 typedef struct { pmd_t pue[1]; } pud_t; 26 26 typedef struct { pud_t pge[1]; } pgd_t; 27 27 typedef struct { unsigned long pgprot; } pgprot_t; 28 + typedef struct page *pgtable_t; 28 29 29 30 #define pte_val(x) ((x).pte) 30 31 #define pmd_val(x) ((x).ste[0])
+9 -3
include/asm-frv/pgalloc.h
··· 25 25 do { \ 26 26 __set_pmd((PMD), page_to_pfn(PAGE) << PAGE_SHIFT | _PAGE_TABLE); \ 27 27 } while(0) 28 + #define pmd_pgtable(pmd) pmd_page(pmd) 28 29 29 30 /* 30 31 * Allocate and free page tables. ··· 36 35 37 36 extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); 38 37 39 - extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); 38 + extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long); 40 39 41 40 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) 42 41 { 43 42 free_page((unsigned long)pte); 44 43 } 45 44 46 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 45 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 47 46 { 47 + pgtable_page_dtor(pte); 48 48 __free_page(pte); 49 49 } 50 50 51 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 51 + #define __pte_free_tlb(tlb,pte) \ 52 + do { \ 53 + pgtable_page_dtor(pte); \ 54 + tlb_remove_page((tlb),(pte)); \ 55 + } while (0) 52 56 53 57 /* 54 58 * allocating and freeing a pmd is trivial: the 1-entry pmd is
+2
include/asm-ia64/page.h
··· 185 185 #endif 186 186 typedef struct { unsigned long pgd; } pgd_t; 187 187 typedef struct { unsigned long pgprot; } pgprot_t; 188 + typedef struct page *pgtable_t; 188 189 189 190 # define pte_val(x) ((x).pte) 190 191 # define pmd_val(x) ((x).pmd) ··· 207 206 typedef unsigned long pmd_t; 208 207 typedef unsigned long pgd_t; 209 208 typedef unsigned long pgprot_t; 209 + typedef struct page *pgtable_t; 210 210 # endif 211 211 212 212 # define pte_val(x) (x)
+14 -6
include/asm-ia64/pgalloc.h
··· 70 70 #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd) 71 71 72 72 static inline void 73 - pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte) 73 + pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, pgtable_t pte) 74 74 { 75 75 pmd_val(*pmd_entry) = page_to_phys(pte); 76 76 } 77 + #define pmd_pgtable(pmd) pmd_page(pmd) 77 78 78 79 static inline void 79 80 pmd_populate_kernel(struct mm_struct *mm, pmd_t * pmd_entry, pte_t * pte) ··· 82 81 pmd_val(*pmd_entry) = __pa(pte); 83 82 } 84 83 85 - static inline struct page *pte_alloc_one(struct mm_struct *mm, 86 - unsigned long addr) 84 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr) 87 85 { 88 - void *pg = quicklist_alloc(0, GFP_KERNEL, NULL); 89 - return pg ? virt_to_page(pg) : NULL; 86 + struct page *page; 87 + void *pg; 88 + 89 + pg = quicklist_alloc(0, GFP_KERNEL, NULL); 90 + if (!pg) 91 + return NULL; 92 + page = virt_to_page(pg); 93 + pgtable_page_ctor(page); 94 + return page; 90 95 } 91 96 92 97 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, ··· 101 94 return quicklist_alloc(0, GFP_KERNEL, NULL); 102 95 } 103 96 104 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 97 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 105 98 { 99 + pgtable_page_dtor(pte); 106 100 quicklist_free_page(0, NULL, pte); 107 101 } 108 102
+1
include/asm-m32r/page.h
··· 28 28 #define PTE_MASK PAGE_MASK 29 29 30 30 typedef struct { unsigned long pgprot; } pgprot_t; 31 + typedef struct page *pgtable_t; 31 32 32 33 #define pmd_val(x) ((x).pmd) 33 34 #define pgd_val(x) ((x).pgd)
+6 -4
include/asm-m32r/pgalloc.h
··· 9 9 set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte))) 10 10 11 11 static __inline__ void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 12 - struct page *pte) 12 + pgtable_t pte) 13 13 { 14 14 set_pmd(pmd, __pmd(_PAGE_TABLE + page_to_phys(pte))); 15 15 } 16 + #define pmd_pgtable(pmd) pmd_page(pmd) 16 17 17 18 /* 18 19 * Allocate and free page tables. ··· 38 37 return pte; 39 38 } 40 39 41 - static __inline__ struct page *pte_alloc_one(struct mm_struct *mm, 40 + static __inline__ pgtable_t pte_alloc_one(struct mm_struct *mm, 42 41 unsigned long address) 43 42 { 44 43 struct page *pte = alloc_page(GFP_KERNEL|__GFP_ZERO); 45 44 46 - 45 + pgtable_page_ctor(pte); 47 46 return pte; 48 47 } 49 48 ··· 52 51 free_page((unsigned long)pte); 53 52 } 54 53 55 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 54 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 56 55 { 56 + pgtable_page_dtor(pte); 57 57 __free_page(pte); 58 58 } 59 59
+8 -6
include/asm-m68k/motorola_pgalloc.h
··· 7 7 extern pmd_t *get_pointer_table(void); 8 8 extern int free_pointer_table(pmd_t *); 9 9 10 - 11 10 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) 12 11 { 13 12 pte_t *pte; ··· 27 28 free_page((unsigned long) pte); 28 29 } 29 30 30 - static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 31 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 31 32 { 32 33 struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); 33 34 pte_t *pte; ··· 42 43 nocache_page(pte); 43 44 } 44 45 kunmap(pte); 45 - 46 + pgtable_page_ctor(page); 46 47 return page; 47 48 } 48 49 49 - static inline void pte_free(struct mm_struct *mm, struct page *page) 50 + static inline void pte_free(struct mm_struct *mm, pgtable_t page) 50 51 { 52 + pgtable_page_dtor(page); 51 53 cache_page(kmap(page)); 52 54 kunmap(page); 53 55 __free_page(page); 54 56 } 55 57 56 - static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *page) 58 + static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t page) 57 59 { 60 + pgtable_page_dtor(page); 58 61 cache_page(kmap(page)); 59 62 kunmap(page); 60 63 __free_page(page); ··· 95 94 pmd_set(pmd, pte); 96 95 } 97 96 98 - static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page) 97 + static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page) 99 98 { 100 99 pmd_set(pmd, page_address(page)); 101 100 } 101 + #define pmd_pgtable(pmd) pmd_page(pmd) 102 102 103 103 static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd) 104 104 {
+1
include/asm-m68k/page.h
··· 91 91 typedef struct { unsigned long pmd[16]; } pmd_t; 92 92 typedef struct { unsigned long pgd; } pgd_t; 93 93 typedef struct { unsigned long pgprot; } pgprot_t; 94 + typedef struct page *pgtable_t; 94 95 95 96 #define pte_val(x) ((x).pte) 96 97 #define pmd_val(x) ((&x)->pmd[0])
+12 -5
include/asm-m68k/sun3_pgalloc.h
··· 26 26 free_page((unsigned long) pte); 27 27 } 28 28 29 - static inline void pte_free(struct mm_struct *mm, struct page *page) 29 + static inline void pte_free(struct mm_struct *mm, pgtable_t page) 30 30 { 31 + pgtable_page_dtor(page); 31 32 __free_page(page); 32 33 } 33 34 34 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 35 + #define __pte_free_tlb(tlb,pte) \ 36 + do { \ 37 + pgtable_page_dtor(pte); \ 38 + tlb_remove_page((tlb), pte); \ 39 + } while (0) 35 40 36 41 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, 37 42 unsigned long address) ··· 50 45 return (pte_t *) (page); 51 46 } 52 47 53 - static inline struct page *pte_alloc_one(struct mm_struct *mm, 54 - unsigned long address) 48 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, 49 + unsigned long address) 55 50 { 56 51 struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT, 0); 57 52 ··· 59 54 return NULL; 60 55 61 56 clear_highpage(page); 57 + pgtable_page_ctor(page); 62 58 return page; 63 59 64 60 } ··· 69 63 pmd_val(*pmd) = __pa((unsigned long)pte); 70 64 } 71 65 72 - static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page) 66 + static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page) 73 67 { 74 68 pmd_val(*pmd) = __pa((unsigned long)page_address(page)); 75 69 } 70 + #define pmd_pgtable(pmd) pmd_page(pmd) 76 71 77 72 /* 78 73 * allocating and freeing a pmd is trivial: the 1-entry pmd is
+1
include/asm-mips/page.h
··· 90 90 #define pte_val(x) ((x).pte) 91 91 #define __pte(x) ((pte_t) { (x) } ) 92 92 #endif 93 + typedef struct page *pgtable_t; 93 94 94 95 /* 95 96 * For 3-level pagetables we defines these ourselves, for 2-level the
+12 -5
include/asm-mips/pgalloc.h
··· 20 20 } 21 21 22 22 static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 23 - struct page *pte) 23 + pgtable_t pte) 24 24 { 25 25 set_pmd(pmd, __pmd((unsigned long)page_address(pte))); 26 26 } 27 + #define pmd_pgtable(pmd) pmd_page(pmd) 27 28 28 29 /* 29 30 * Initialize a new pmd table with invalid pointers. ··· 80 79 struct page *pte; 81 80 82 81 pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER); 83 - if (pte) 82 + if (pte) { 84 83 clear_highpage(pte); 85 - 84 + pgtable_page_ctor(pte); 85 + } 86 86 return pte; 87 87 } 88 88 ··· 92 90 free_pages((unsigned long)pte, PTE_ORDER); 93 91 } 94 92 95 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 93 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 96 94 { 95 + pgtable_page_dtor(pte); 97 96 __free_pages(pte, PTE_ORDER); 98 97 } 99 98 100 - #define __pte_free_tlb(tlb, pte) tlb_remove_page((tlb), (pte)) 99 + #define __pte_free_tlb(tlb,pte) \ 100 + do { \ 101 + pgtable_page_dtor(pte); \ 102 + tlb_remove_page((tlb), pte); \ 103 + } while (0) 101 104 102 105 #ifdef CONFIG_32BIT 103 106
+1
include/asm-parisc/page.h
··· 91 91 92 92 #endif /* STRICT_MM_TYPECHECKS */ 93 93 94 + typedef struct page *pgtable_t; 94 95 95 96 typedef struct __physmem_range { 96 97 unsigned long start_pfn;
+9 -2
include/asm-parisc/pgalloc.h
··· 115 115 116 116 #define pmd_populate(mm, pmd, pte_page) \ 117 117 pmd_populate_kernel(mm, pmd, page_address(pte_page)) 118 + #define pmd_pgtable(pmd) pmd_page(pmd) 118 119 119 - static inline struct page * 120 + static inline pgtable_t 120 121 pte_alloc_one(struct mm_struct *mm, unsigned long address) 121 122 { 122 123 struct page *page = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); 124 + if (page) 125 + pgtable_page_ctor(page); 123 126 return page; 124 127 } 125 128 ··· 138 135 free_page((unsigned long)pte); 139 136 } 140 137 141 - #define pte_free(mm, page) pte_free_kernel(page_address(page)) 138 + static inline void pte_free_kernel(struct mm_struct *mm, struct page *pte) 139 + { 140 + pgtable_page_dtor(pte); 141 + pte_free_kernel(page_address((pte)); 142 + } 142 143 143 144 #define check_pgt_cache() do { } while (0) 144 145
+2
include/asm-powerpc/page.h
··· 190 190 191 191 struct vm_area_struct; 192 192 193 + typedef struct page *pgtable_t; 194 + 193 195 #include <asm-generic/memory_model.h> 194 196 #endif /* __ASSEMBLY__ */ 195 197
+4 -2
include/asm-powerpc/pgalloc-32.h
··· 22 22 (pmd_val(*(pmd)) = __pa(pte) | _PMD_PRESENT) 23 23 #define pmd_populate(mm, pmd, pte) \ 24 24 (pmd_val(*(pmd)) = (page_to_pfn(pte) << PAGE_SHIFT) | _PMD_PRESENT) 25 + #define pmd_pgtable(pmd) pmd_page(pmd) 25 26 #else 26 27 #define pmd_populate_kernel(mm, pmd, pte) \ 27 28 (pmd_val(*(pmd)) = (unsigned long)pte | _PMD_PRESENT) 28 29 #define pmd_populate(mm, pmd, pte) \ 29 30 (pmd_val(*(pmd)) = (unsigned long)lowmem_page_address(pte) | _PMD_PRESENT) 31 + #define pmd_pgtable(pmd) pmd_page(pmd) 30 32 #endif 31 33 32 34 extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); 33 - extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr); 35 + extern pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr); 34 36 extern void pte_free_kernel(struct mm_struct *mm, pte_t *pte); 35 - extern void pte_free(struct mm_struct *mm, struct page *pte); 37 + extern void pte_free(struct mm_struct *mm, pgtable_t pte); 36 38 37 39 #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte)) 38 40
+20 -7
include/asm-powerpc/pgalloc-64.h
··· 58 58 #define pmd_populate(mm, pmd, pte_page) \ 59 59 pmd_populate_kernel(mm, pmd, page_address(pte_page)) 60 60 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte)) 61 + #define pmd_pgtable(pmd) pmd_page(pmd) 61 62 62 63 63 64 #else /* CONFIG_PPC_64K_PAGES */ ··· 73 72 74 73 #define pmd_populate(mm, pmd, pte_page) \ 75 74 pmd_populate_kernel(mm, pmd, page_address(pte_page)) 75 + #define pmd_pgtable(pmd) pmd_page(pmd) 76 76 77 77 #endif /* CONFIG_PPC_64K_PAGES */ 78 78 ··· 94 92 return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO); 95 93 } 96 94 97 - static inline struct page *pte_alloc_one(struct mm_struct *mm, 98 - unsigned long address) 95 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, 96 + unsigned long address) 99 97 { 100 - pte_t *pte = pte_alloc_one_kernel(mm, address); 101 - return pte ? virt_to_page(pte) : NULL; 98 + struct page *page; 99 + pte_t *pte; 100 + 101 + pte = pte_alloc_one_kernel(mm, address); 102 + if (!pte) 103 + return NULL; 104 + page = virt_to_page(pte); 105 + pgtable_page_ctor(page); 106 + return page; 102 107 } 103 108 104 109 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) ··· 113 104 free_page((unsigned long)pte); 114 105 } 115 106 116 - static inline void pte_free(struct mm_struct *mm, struct page *ptepage) 107 + static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage) 117 108 { 109 + pgtable_page_dtor(ptepage); 118 110 __free_page(ptepage); 119 111 } 120 112 ··· 146 136 147 137 extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); 148 138 149 - #define __pte_free_tlb(tlb, ptepage) \ 139 + #define __pte_free_tlb(tlb,ptepage) \ 140 + do { \ 141 + pgtable_page_dtor(ptepage); \ 150 142 pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \ 151 - PTE_NONCACHE_NUM, PTE_TABLE_SIZE-1)) 143 + PTE_NONCACHE_NUM, PTE_TABLE_SIZE-1)); \ 144 + } while (0) 152 145 #define __pmd_free_tlb(tlb, pmd) \ 153 146 pgtable_free_tlb(tlb, pgtable_free_cache(pmd, \ 154 147 PMD_CACHE_NUM, PMD_TABLE_SIZE-1))
+4 -2
include/asm-ppc/pgalloc.h
··· 23 23 (pmd_val(*(pmd)) = __pa(pte) | _PMD_PRESENT) 24 24 #define pmd_populate(mm, pmd, pte) \ 25 25 (pmd_val(*(pmd)) = (page_to_pfn(pte) << PAGE_SHIFT) | _PMD_PRESENT) 26 + #define pmd_pgtable(pmd) pmd_page(pmd) 26 27 #else 27 28 #define pmd_populate_kernel(mm, pmd, pte) \ 28 29 (pmd_val(*(pmd)) = (unsigned long)pte | _PMD_PRESENT) 29 30 #define pmd_populate(mm, pmd, pte) \ 30 31 (pmd_val(*(pmd)) = (unsigned long)lowmem_page_address(pte) | _PMD_PRESENT) 32 + #define pmd_pgtable(pmd) pmd_page(pmd) 31 33 #endif 32 34 33 35 extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); 34 - extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr); 36 + extern pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr); 35 37 extern void pte_free_kernel(struct mm_struct *mm, pte_t *pte); 36 - extern void pte_free(struct mm_struct *mm, struct page *pte); 38 + extern void pte_free(struct mm_struct *mm, pgtable_t pte); 37 39 38 40 #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte)) 39 41
+2
include/asm-s390/page.h
··· 109 109 110 110 #endif /* __s390x__ */ 111 111 112 + typedef struct page *pgtable_t; 113 + 112 114 #define __pte(x) ((pte_t) { (x) } ) 113 115 #define __pmd(x) ((pmd_t) { (x) } ) 114 116 #define __pgd(x) ((pgd_t) { (x) } )
+2 -1
include/asm-s390/pgalloc.h
··· 132 132 } 133 133 134 134 static inline void 135 - pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page) 135 + pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t page) 136 136 { 137 137 pte_t *pte = (pte_t *)page_to_phys(page); 138 138 pmd_t *shadow_pmd = get_shadow_table(pmd); ··· 142 142 if (shadow_pmd && shadow_pte) 143 143 pmd_populate_kernel(mm, shadow_pmd, shadow_pte); 144 144 } 145 + #define pmd_pgtable(pmd) pmd_page(pmd) 145 146 146 147 /* 147 148 * page table entry allocation/free routines.
+1 -1
include/asm-s390/tlb.h
··· 95 95 * pte_free_tlb frees a pte table and clears the CRSTE for the 96 96 * page table from the tlb. 97 97 */ 98 - static inline void pte_free_tlb(struct mmu_gather *tlb, struct page *page) 98 + static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t page) 99 99 { 100 100 if (!tlb->fullmm) { 101 101 tlb->array[tlb->nr_ptes++] = page;
+2
include/asm-sh/page.h
··· 100 100 #define __pgd(x) ((pgd_t) { (x) } ) 101 101 #define __pgprot(x) ((pgprot_t) { (x) } ) 102 102 103 + typedef struct page *pgtable_t; 104 + 103 105 #endif /* !__ASSEMBLY__ */ 104 106 105 107 /*
+20 -7
include/asm-sh/pgalloc.h
··· 14 14 } 15 15 16 16 static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, 17 - struct page *pte) 17 + pgtable_t pte) 18 18 { 19 19 set_pmd(pmd, __pmd((unsigned long)page_address(pte))); 20 20 } 21 + #define pmd_pgtable(pmd) pmd_page(pmd) 21 22 22 23 static inline void pgd_ctor(void *x) 23 24 { ··· 48 47 return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL); 49 48 } 50 49 51 - static inline struct page *pte_alloc_one(struct mm_struct *mm, 52 - unsigned long address) 50 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, 51 + unsigned long address) 53 52 { 54 - void *pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL); 55 - return pg ? virt_to_page(pg) : NULL; 53 + struct page *page; 54 + void *pg; 55 + 56 + pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL); 57 + if (!pg) 58 + return NULL; 59 + page = virt_to_page(pg); 60 + pgtable_page_ctor(page); 61 + return page; 56 62 } 57 63 58 64 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) ··· 67 59 quicklist_free(QUICK_PT, NULL, pte); 68 60 } 69 61 70 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 62 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 71 63 { 64 + pgtable_page_dtor(pte); 72 65 quicklist_free_page(QUICK_PT, NULL, pte); 73 66 } 74 67 75 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 68 + #define __pte_free_tlb(tlb,pte) \ 69 + do { \ 70 + pgtable_page_dtor(pte); \ 71 + tlb_remove_page((tlb), (pte)); \ 72 + } while (0) 76 73 77 74 /* 78 75 * allocating and freeing a pmd is trivial: the 1-entry pmd is
+2
include/asm-sparc/page.h
··· 123 123 124 124 #endif 125 125 126 + typedef struct page *pgtable_t; 127 + 126 128 extern unsigned long sparc_unmapped_base; 127 129 128 130 BTFIXUPDEF_SETHI(sparc_unmapped_base)
+3 -2
include/asm-sparc/pgalloc.h
··· 50 50 51 51 BTFIXUPDEF_CALL(void, pmd_populate, pmd_t *, struct page *) 52 52 #define pmd_populate(MM, PMD, PTE) BTFIXUP_CALL(pmd_populate)(PMD, PTE) 53 + #define pmd_pgtable(pmd) pmd_page(pmd) 53 54 BTFIXUPDEF_CALL(void, pmd_set, pmd_t *, pte_t *) 54 55 #define pmd_populate_kernel(MM, PMD, PTE) BTFIXUP_CALL(pmd_set)(PMD, PTE) 55 56 56 - BTFIXUPDEF_CALL(struct page *, pte_alloc_one, struct mm_struct *, unsigned long) 57 + BTFIXUPDEF_CALL(pgtable_t , pte_alloc_one, struct mm_struct *, unsigned long) 57 58 #define pte_alloc_one(mm, address) BTFIXUP_CALL(pte_alloc_one)(mm, address) 58 59 BTFIXUPDEF_CALL(pte_t *, pte_alloc_one_kernel, struct mm_struct *, unsigned long) 59 60 #define pte_alloc_one_kernel(mm, addr) BTFIXUP_CALL(pte_alloc_one_kernel)(mm, addr) ··· 62 61 BTFIXUPDEF_CALL(void, free_pte_fast, pte_t *) 63 62 #define pte_free_kernel(mm, pte) BTFIXUP_CALL(free_pte_fast)(pte) 64 63 65 - BTFIXUPDEF_CALL(void, pte_free, struct page *) 64 + BTFIXUPDEF_CALL(void, pte_free, pgtable_t ) 66 65 #define pte_free(mm, pte) BTFIXUP_CALL(pte_free)(pte) 67 66 #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) 68 67
+2
include/asm-sparc64/page.h
··· 104 104 105 105 #endif /* (STRICT_MM_TYPECHECKS) */ 106 106 107 + typedef struct page *pgtable_t; 108 + 107 109 #define TASK_UNMAPPED_BASE (test_thread_flag(TIF_32BIT) ? \ 108 110 (_AC(0x0000000070000000,UL)) : \ 109 111 (_AC(0xfffff80000000000,UL) + (1UL << 32UL)))
+14 -5
include/asm-sparc64/pgalloc.h
··· 43 43 return quicklist_alloc(0, GFP_KERNEL, NULL); 44 44 } 45 45 46 - static inline struct page *pte_alloc_one(struct mm_struct *mm, 47 - unsigned long address) 46 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, 47 + unsigned long address) 48 48 { 49 - void *pg = quicklist_alloc(0, GFP_KERNEL, NULL); 50 - return pg ? virt_to_page(pg) : NULL; 49 + struct page *page; 50 + void *pg; 51 + 52 + pg = quicklist_alloc(0, GFP_KERNEL, NULL); 53 + if (!pg) 54 + return NULL; 55 + page = virt_to_page(pg); 56 + pgtable_page_ctor(page); 57 + return page; 51 58 } 52 59 53 60 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) ··· 62 55 quicklist_free(0, NULL, pte); 63 56 } 64 57 65 - static inline void pte_free(struct mm_struct *mm, struct page *ptepage) 58 + static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage) 66 59 { 60 + pgtable_page_dtor(ptepage); 67 61 quicklist_free_page(0, NULL, ptepage); 68 62 } 69 63 ··· 72 64 #define pmd_populate_kernel(MM, PMD, PTE) pmd_set(PMD, PTE) 73 65 #define pmd_populate(MM,PMD,PTE_PAGE) \ 74 66 pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE)) 67 + #define pmd_pgtable(pmd) pmd_page(pmd) 75 68 76 69 static inline void check_pgt_cache(void) 77 70 {
+2
include/asm-um/page.h
··· 79 79 80 80 typedef struct { unsigned long pgprot; } pgprot_t; 81 81 82 + typedef struct page *pgtable_t; 83 + 82 84 #define pgd_val(x) ((x).pgd) 83 85 #define pgprot_val(x) ((x).pgprot) 84 86
+9 -3
include/asm-um/pgalloc.h
··· 18 18 set_pmd(pmd, __pmd(_PAGE_TABLE + \ 19 19 ((unsigned long long)page_to_pfn(pte) << \ 20 20 (unsigned long long) PAGE_SHIFT))) 21 + #define pmd_pgtable(pmd) pmd_page(pmd) 21 22 22 23 /* 23 24 * Allocate and free page tables. ··· 27 26 extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); 28 27 29 28 extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); 30 - extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); 29 + extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long); 31 30 32 31 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) 33 32 { 34 33 free_page((unsigned long) pte); 35 34 } 36 35 37 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 36 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 38 37 { 38 + pgtable_page_dtor(pte); 39 39 __free_page(pte); 40 40 } 41 41 42 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 42 + #define __pte_free_tlb(tlb,pte) \ 43 + do { \ 44 + pgtable_page_dtor(pte); \ 45 + tlb_remove_page((tlb),(pte)); \ 46 + } while (0) 43 47 44 48 #ifdef CONFIG_3_LEVEL_PGTABLES 45 49
+2
include/asm-x86/page_32.h
··· 50 50 typedef union { pteval_t pte, pte_low; } pte_t; 51 51 typedef pte_t boot_pte_t; 52 52 53 + typedef struct page *pgtable_t; 54 + 53 55 #endif /* __ASSEMBLY__ */ 54 56 #endif /* CONFIG_X86_PAE */ 55 57
+2
include/asm-x86/page_64.h
··· 71 71 typedef unsigned long pgprotval_t; 72 72 typedef unsigned long phys_addr_t; 73 73 74 + typedef struct page *pgtable_t; 75 + 74 76 typedef struct { pteval_t pte; } pte_t; 75 77 76 78 #define vmemmap ((struct page *)VMEMMAP_START)
+4 -2
include/asm-x86/pgalloc_32.h
··· 31 31 paravirt_alloc_pt(mm, pfn); 32 32 set_pmd(pmd, __pmd(((pteval_t)pfn << PAGE_SHIFT) | _PAGE_TABLE)); 33 33 } 34 + #define pmd_pgtable(pmd) pmd_page(pmd) 34 35 35 36 /* 36 37 * Allocate and free page tables. ··· 40 39 extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); 41 40 42 41 extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); 43 - extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); 42 + extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long); 44 43 45 44 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) 46 45 { 47 46 free_page((unsigned long)pte); 48 47 } 49 48 50 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 49 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 51 50 { 51 + pgtable_page_dtor(pte); 52 52 __free_page(pte); 53 53 } 54 54
+17 -5
include/asm-x86/pgalloc_64.h
··· 12 12 #define pgd_populate(mm, pgd, pud) \ 13 13 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud))) 14 14 15 + #define pmd_pgtable(pmd) pmd_page(pmd) 16 + 15 17 static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte) 16 18 { 17 19 set_pmd(pmd, __pmd(_PAGE_TABLE | (page_to_pfn(pte) << PAGE_SHIFT))); ··· 93 91 return (pte_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); 94 92 } 95 93 96 - static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) 94 + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 97 95 { 98 - void *p = (void *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); 96 + struct page *page; 97 + void *p; 98 + 99 + p = (void *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); 99 100 if (!p) 100 101 return NULL; 101 - return virt_to_page(p); 102 + page = virt_to_page(p); 103 + pgtable_page_ctor(page); 104 + return page; 102 105 } 103 106 104 107 /* Should really implement gc for free page table pages. This could be ··· 115 108 free_page((unsigned long)pte); 116 109 } 117 110 118 - static inline void pte_free(struct mm_struct *mm, struct page *pte) 111 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 119 112 { 113 + pgtable_page_dtor(pte); 120 114 __free_page(pte); 121 115 } 122 116 123 - #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) 117 + #define __pte_free_tlb(tlb,pte) \ 118 + do { \ 119 + pgtable_page_dtor((pte)); \ 120 + tlb_remove_page((tlb), (pte)); \ 121 + } while (0) 124 122 125 123 #define __pmd_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x)) 126 124 #define __pud_free_tlb(tlb,x) tlb_remove_page((tlb),virt_to_page(x))
+1
include/asm-xtensa/page.h
··· 98 98 typedef struct { unsigned long pte; } pte_t; /* page table entry */ 99 99 typedef struct { unsigned long pgd; } pgd_t; /* PGD table entry */ 100 100 typedef struct { unsigned long pgprot; } pgprot_t; 101 + typedef struct page *pgtable_t; 101 102 102 103 #define pte_val(x) ((x).pte) 103 104 #define pgd_val(x) ((x).pgd)
+12 -5
include/asm-xtensa/pgalloc.h
··· 24 24 (pmd_val(*(pmdp)) = ((unsigned long)ptep)) 25 25 #define pmd_populate(mm, pmdp, page) \ 26 26 (pmd_val(*(pmdp)) = ((unsigned long)page_to_virt(page))) 27 + #define pmd_pgtable(pmd) pmd_page(pmd) 27 28 28 29 static inline pgd_t* 29 30 pgd_alloc(struct mm_struct *mm) ··· 47 46 return kmem_cache_alloc(pgtable_cache, GFP_KERNEL|__GFP_REPEAT); 48 47 } 49 48 50 - static inline struct page *pte_alloc_one(struct mm_struct *mm, 51 - unsigned long addr) 49 + static inline pte_token_t pte_alloc_one(struct mm_struct *mm, 50 + unsigned long addr) 52 51 { 53 - return virt_to_page(pte_alloc_one_kernel(mm, addr)); 52 + struct page *page; 53 + 54 + page = virt_to_page(pte_alloc_one_kernel(mm, addr)); 55 + pgtable_page_ctor(page); 56 + return page; 54 57 } 55 58 56 59 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) ··· 62 57 kmem_cache_free(pgtable_cache, pte); 63 58 } 64 59 65 - static inline void pte_free(struct mm_struct *mm, struct page *page) 60 + static inline void pte_free(struct mm_struct *mm, pgtable_t pte) 66 61 { 67 - kmem_cache_free(pgtable_cache, page_address(page)); 62 + pgtable_page_dtor(pte); 63 + kmem_cache_free(pgtable_cache, page_address(pte)); 68 64 } 65 + #define pmd_pgtable(pmd) pmd_page(pmd) 69 66 70 67 #endif /* __KERNEL__ */ 71 68 #endif /* _XTENSA_PGALLOC_H */
+13 -1
include/linux/mm.h
··· 894 894 #define pte_lockptr(mm, pmd) ({(void)(pmd); &(mm)->page_table_lock;}) 895 895 #endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */ 896 896 897 + static inline void pgtable_page_ctor(struct page *page) 898 + { 899 + pte_lock_init(page); 900 + inc_zone_page_state(page, NR_PAGETABLE); 901 + } 902 + 903 + static inline void pgtable_page_dtor(struct page *page) 904 + { 905 + pte_lock_deinit(page); 906 + dec_zone_page_state(page, NR_PAGETABLE); 907 + } 908 + 897 909 #define pte_offset_map_lock(mm, pmd, address, ptlp) \ 898 910 ({ \ 899 911 spinlock_t *__ptl = pte_lockptr(mm, pmd); \ ··· 1148 1136 #define FOLL_GET 0x04 /* do get_page on page */ 1149 1137 #define FOLL_ANON 0x08 /* give ZERO_PAGE if no pgtable */ 1150 1138 1151 - typedef int (*pte_fn_t)(pte_t *pte, struct page *pmd_page, unsigned long addr, 1139 + typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr, 1152 1140 void *data); 1153 1141 extern int apply_to_page_range(struct mm_struct *mm, unsigned long address, 1154 1142 unsigned long size, pte_fn_t fn, void *data);
+15 -17
mm/memory.c
··· 134 134 */ 135 135 static void free_pte_range(struct mmu_gather *tlb, pmd_t *pmd) 136 136 { 137 - struct page *page = pmd_page(*pmd); 137 + pgtable_t token = pmd_pgtable(*pmd); 138 138 pmd_clear(pmd); 139 - pte_lock_deinit(page); 140 - pte_free_tlb(tlb, page); 141 - dec_zone_page_state(page, NR_PAGETABLE); 139 + pte_free_tlb(tlb, token); 142 140 tlb->mm->nr_ptes--; 143 141 } 144 142 ··· 307 309 308 310 int __pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address) 309 311 { 310 - struct page *new = pte_alloc_one(mm, address); 312 + pgtable_t new = pte_alloc_one(mm, address); 311 313 if (!new) 312 314 return -ENOMEM; 313 315 314 - pte_lock_init(new); 315 316 spin_lock(&mm->page_table_lock); 316 - if (pmd_present(*pmd)) { /* Another has populated it */ 317 - pte_lock_deinit(new); 318 - pte_free(mm, new); 319 - } else { 317 + if (!pmd_present(*pmd)) { /* Has another populated it ? */ 320 318 mm->nr_ptes++; 321 - inc_zone_page_state(new, NR_PAGETABLE); 322 319 pmd_populate(mm, pmd, new); 320 + new = NULL; 323 321 } 324 322 spin_unlock(&mm->page_table_lock); 323 + if (new) 324 + pte_free(mm, new); 325 325 return 0; 326 326 } 327 327 ··· 330 334 return -ENOMEM; 331 335 332 336 spin_lock(&init_mm.page_table_lock); 333 - if (pmd_present(*pmd)) /* Another has populated it */ 334 - pte_free_kernel(&init_mm, new); 335 - else 337 + if (!pmd_present(*pmd)) { /* Has another populated it ? */ 336 338 pmd_populate_kernel(&init_mm, pmd, new); 339 + new = NULL; 340 + } 337 341 spin_unlock(&init_mm.page_table_lock); 342 + if (new) 343 + pte_free_kernel(&init_mm, new); 338 344 return 0; 339 345 } 340 346 ··· 1388 1390 { 1389 1391 pte_t *pte; 1390 1392 int err; 1391 - struct page *pmd_page; 1393 + pgtable_t token; 1392 1394 spinlock_t *uninitialized_var(ptl); 1393 1395 1394 1396 pte = (mm == &init_mm) ? ··· 1399 1401 1400 1402 BUG_ON(pmd_huge(*pmd)); 1401 1403 1402 - pmd_page = pmd_page(*pmd); 1404 + token = pmd_pgtable(*pmd); 1403 1405 1404 1406 do { 1405 - err = fn(pte, pmd_page, addr, data); 1407 + err = fn(pte, token, addr, data); 1406 1408 if (err) 1407 1409 break; 1408 1410 } while (pte++, addr += PAGE_SIZE, addr != end);
+1 -1
mm/vmalloc.c
··· 820 820 } 821 821 822 822 823 - static int f(pte_t *pte, struct page *pmd_page, unsigned long addr, void *data) 823 + static int f(pte_t *pte, pgtable_t table, unsigned long addr, void *data) 824 824 { 825 825 /* apply_to_page_range() does all the hard work. */ 826 826 return 0;