linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / include / asm-sparc64 / pgalloc.h
index 9972623..a96067c 100644 (file)
@@ -2,10 +2,10 @@
 #ifndef _SPARC64_PGALLOC_H
 #define _SPARC64_PGALLOC_H
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 
 #include <asm/spitfire.h>
 #include <asm/cpudata.h>
 #include <asm/page.h>
 
 /* Page table allocation/freeing. */
-extern kmem_cache_t *pgtable_cache;
+#ifdef CONFIG_SMP
+/* Sliiiicck */
+#define pgt_quicklists local_cpu_data()
+#else
+extern struct pgtable_cache_struct {
+       unsigned long *pgd_cache;
+       unsigned long *pte_cache[2];
+       unsigned int pgcache_size;
+} pgt_quicklists;
+#endif
+#define pgd_quicklist          (pgt_quicklists.pgd_cache)
+#define pmd_quicklist          ((unsigned long *)0)
+#define pte_quicklist          (pgt_quicklists.pte_cache)
+#define pgtable_cache_size     (pgt_quicklists.pgcache_size)
+
+static __inline__ void free_pgd_fast(pgd_t *pgd)
+{
+       preempt_disable();
+       *(unsigned long *)pgd = (unsigned long) pgd_quicklist;
+       pgd_quicklist = (unsigned long *) pgd;
+       pgtable_cache_size++;
+       preempt_enable();
+}
 
-static inline pgd_t *pgd_alloc(struct mm_struct *mm)
+static __inline__ pgd_t *get_pgd_fast(void)
 {
-       return kmem_cache_alloc(pgtable_cache, GFP_KERNEL);
+       unsigned long *ret;
+
+       preempt_disable();
+       if((ret = pgd_quicklist) != NULL) {
+               pgd_quicklist = (unsigned long *)(*ret);
+               ret[0] = 0;
+               pgtable_cache_size--;
+               preempt_enable();
+       } else {
+               preempt_enable();
+               ret = (unsigned long *) __get_free_page(GFP_KERNEL|__GFP_REPEAT);
+               if(ret)
+                       memset(ret, 0, PAGE_SIZE);
+       }
+       return (pgd_t *)ret;
 }
 
-static inline void pgd_free(pgd_t *pgd)
+static __inline__ void free_pgd_slow(pgd_t *pgd)
 {
-       kmem_cache_free(pgtable_cache, pgd);
+       free_page((unsigned long)pgd);
 }
 
+#ifdef DCACHE_ALIASING_POSSIBLE
+#define VPTE_COLOR(address)            (((address) >> (PAGE_SHIFT + 10)) & 1UL)
+#define DCACHE_COLOR(address)          (((address) >> PAGE_SHIFT) & 1UL)
+#else
+#define VPTE_COLOR(address)            0
+#define DCACHE_COLOR(address)          0
+#endif
+
 #define pud_populate(MM, PUD, PMD)     pud_set(PUD, PMD)
 
-static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
+static __inline__ pmd_t *pmd_alloc_one_fast(struct mm_struct *mm, unsigned long address)
 {
-       return kmem_cache_alloc(pgtable_cache,
-                               GFP_KERNEL|__GFP_REPEAT);
+       unsigned long *ret;
+       int color = 0;
+
+       preempt_disable();
+       if (pte_quicklist[color] == NULL)
+               color = 1;
+
+       if((ret = (unsigned long *)pte_quicklist[color]) != NULL) {
+               pte_quicklist[color] = (unsigned long *)(*ret);
+               ret[0] = 0;
+               pgtable_cache_size--;
+       }
+       preempt_enable();
+
+       return (pmd_t *)ret;
 }
 
-static inline void pmd_free(pmd_t *pmd)
+static __inline__ pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-       kmem_cache_free(pgtable_cache, pmd);
+       pmd_t *pmd;
+
+       pmd = pmd_alloc_one_fast(mm, address);
+       if (!pmd) {
+               pmd = (pmd_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
+               if (pmd)
+                       memset(pmd, 0, PAGE_SIZE);
+       }
+       return pmd;
 }
 
-static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
-                                         unsigned long address)
+static __inline__ void free_pmd_fast(pmd_t *pmd)
 {
-       return kmem_cache_alloc(pgtable_cache,
-                               GFP_KERNEL|__GFP_REPEAT);
+       unsigned long color = DCACHE_COLOR((unsigned long)pmd);
+
+       preempt_disable();
+       *(unsigned long *)pmd = (unsigned long) pte_quicklist[color];
+       pte_quicklist[color] = (unsigned long *) pmd;
+       pgtable_cache_size++;
+       preempt_enable();
 }
 
-static inline struct page *pte_alloc_one(struct mm_struct *mm,
-                                        unsigned long address)
+static __inline__ void free_pmd_slow(pmd_t *pmd)
 {
-       return virt_to_page(pte_alloc_one_kernel(mm, address));
+       free_page((unsigned long)pmd);
 }
-               
-static inline void pte_free_kernel(pte_t *pte)
+
+#define pmd_populate_kernel(MM, PMD, PTE)      pmd_set(PMD, PTE)
+#define pmd_populate(MM,PMD,PTE_PAGE)          \
+       pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE))
+
+extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address);
+
+static inline struct page *
+pte_alloc_one(struct mm_struct *mm, unsigned long addr)
+{
+       pte_t *pte = pte_alloc_one_kernel(mm, addr);
+
+       if (pte)
+               return virt_to_page(pte);
+
+       return NULL;
+}
+
+static __inline__ pte_t *pte_alloc_one_fast(struct mm_struct *mm, unsigned long address)
 {
-       kmem_cache_free(pgtable_cache, pte);
+       unsigned long color = VPTE_COLOR(address);
+       unsigned long *ret;
+
+       preempt_disable();
+       if((ret = (unsigned long *)pte_quicklist[color]) != NULL) {
+               pte_quicklist[color] = (unsigned long *)(*ret);
+               ret[0] = 0;
+               pgtable_cache_size--;
+       }
+       preempt_enable();
+       return (pte_t *)ret;
 }
 
-static inline void pte_free(struct page *ptepage)
+static __inline__ void free_pte_fast(pte_t *pte)
 {
-       pte_free_kernel(page_address(ptepage));
+       unsigned long color = DCACHE_COLOR((unsigned long)pte);
+
+       preempt_disable();
+       *(unsigned long *)pte = (unsigned long) pte_quicklist[color];
+       pte_quicklist[color] = (unsigned long *) pte;
+       pgtable_cache_size++;
+       preempt_enable();
 }
 
+static __inline__ void free_pte_slow(pte_t *pte)
+{
+       free_page((unsigned long)pte);
+}
 
-#define pmd_populate_kernel(MM, PMD, PTE)      pmd_set(PMD, PTE)
-#define pmd_populate(MM,PMD,PTE_PAGE)          \
-       pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE))
+static inline void pte_free_kernel(pte_t *pte)
+{
+       free_pte_fast(pte);
+}
 
-#define check_pgt_cache()      do { } while (0)
+static inline void pte_free(struct page *ptepage)
+{
+       free_pte_fast(page_address(ptepage));
+}
 
-#define arch_add_exec_range(mm, limit)         do { ; } while (0)
-#define arch_flush_exec_range(mm)              do { ; } while (0)
-#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
+#define pmd_free(pmd)          free_pmd_fast(pmd)
+#define pgd_free(pgd)          free_pgd_fast(pgd)
+#define pgd_alloc(mm)          get_pgd_fast()
 
 #endif /* _SPARC64_PGALLOC_H */