avr32: Use a quicklist for PTE allocation as well

Using a quicklist to allocate PTEs might be slightly faster than using
the page allocator directly since we might avoid zeroing the page
after each allocation.

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

diff --git a/include/asm-avr32/pgalloc.h b/include/asm-avr32/pgalloc.h
index a291f59659cf10f6c6f7ec8306c75f3470eda19e..64082132394312a4c861abdc6b110f58517a7a40 100644 (file)
--- a/include/asm-avr32/pgalloc.h
+++ b/include/asm-avr32/pgalloc.h
@@ -13,6 +13,7 @@
 #include <asm/pgtable.h>
 
 #define QUICK_PGD      0       /* Preserve kernel mappings over free */
+#define QUICK_PT       1       /* Zero on free */
 
 static inline void pmd_populate_kernel(struct mm_struct *mm,
                                       pmd_t *pmd, pte_t *pte)
@@ -52,34 +53,34 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
 static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
                                          unsigned long address)
 {
-       pte_t *pte;
-
-       pte = (pte_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);
-
-       return pte;
+       return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
 }
 
-static inline struct page *pte_alloc_one(struct mm_struct *mm,
+static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
                                         unsigned long address)
 {
-       struct page *pte;
+       struct page *page;
+       void *pg;
 
-       pte = alloc_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO);
-       if (!pte)
+       pg = quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL);
+       if (!pg)
                return NULL;
-       pgtable_page_ctor(pte);
-       return pte;
+
+       page = virt_to_page(pg);
+       pgtable_page_ctor(page);
+
+       return page;
 }
 
 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
 {
-       free_page((unsigned long)pte);
+       quicklist_free(QUICK_PT, NULL, pte);
 }
 
 static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
 {
        pgtable_page_dtor(pte);
-       __free_page(pte);
+       quicklist_free_page(QUICK_PT, NULL, pte);
 }
 
 #define __pte_free_tlb(tlb,pte)                                \
@@ -91,6 +92,7 @@ do {                                                  \
 static inline void check_pgt_cache(void)
 {
        quicklist_trim(QUICK_PGD, NULL, 25, 16);
+       quicklist_trim(QUICK_PT, NULL, 25, 16);
 }
 
 #endif /* __ASM_AVR32_PGALLOC_H */

diff --git a/mm/Kconfig b/mm/Kconfig
index 3aa819d628c112cc185f9545c7ae5e3fb8a5c310..60b2619527834fac95d98f018f074423aa811526 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -199,7 +199,7 @@ config BOUNCE
 config NR_QUICK
        int
        depends on QUICKLIST
-       default "2" if SUPERH
+       default "2" if SUPERH || AVR32
        default "1"
 
 config VIRT_TO_BUS