Commit 3a2cba99 authored by David Miller's avatar David Miller Committed by Linus Torvalds

Quicklist support for sparc64

I ported this to sparc64 as per the patch below, tested on UP SunBlade1500 and
24 cpu Niagara T1000.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6225e937
...@@ -34,6 +34,10 @@ config MMU ...@@ -34,6 +34,10 @@ config MMU
bool bool
default y default y
config QUICKLIST
bool
default y
config STACKTRACE_SUPPORT config STACKTRACE_SUPPORT
bool bool
default y default y
......
...@@ -164,30 +164,6 @@ unsigned long sparc64_kern_sec_context __read_mostly; ...@@ -164,30 +164,6 @@ unsigned long sparc64_kern_sec_context __read_mostly;
int bigkernel = 0; int bigkernel = 0;
struct kmem_cache *pgtable_cache __read_mostly;
static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
{
clear_page(addr);
}
extern void tsb_cache_init(void);
void pgtable_cache_init(void)
{
pgtable_cache = kmem_cache_create("pgtable_cache",
PAGE_SIZE, PAGE_SIZE,
SLAB_HWCACHE_ALIGN |
SLAB_MUST_HWCACHE_ALIGN,
zero_ctor,
NULL);
if (!pgtable_cache) {
prom_printf("Could not create pgtable_cache\n");
prom_halt();
}
tsb_cache_init();
}
#ifdef CONFIG_DEBUG_DCFLUSH #ifdef CONFIG_DEBUG_DCFLUSH
atomic_t dcpage_flushes = ATOMIC_INIT(0); atomic_t dcpage_flushes = ATOMIC_INIT(0);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
......
...@@ -252,7 +252,7 @@ static const char *tsb_cache_names[8] = { ...@@ -252,7 +252,7 @@ static const char *tsb_cache_names[8] = {
"tsb_1MB", "tsb_1MB",
}; };
void __init tsb_cache_init(void) void __init pgtable_cache_init(void)
{ {
unsigned long i; unsigned long i;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/quicklist.h>
#include <asm/spitfire.h> #include <asm/spitfire.h>
#include <asm/cpudata.h> #include <asm/cpudata.h>
...@@ -13,52 +14,50 @@ ...@@ -13,52 +14,50 @@
#include <asm/page.h> #include <asm/page.h>
/* Page table allocation/freeing. */ /* Page table allocation/freeing. */
extern struct kmem_cache *pgtable_cache;
static inline pgd_t *pgd_alloc(struct mm_struct *mm) static inline pgd_t *pgd_alloc(struct mm_struct *mm)
{ {
return kmem_cache_alloc(pgtable_cache, GFP_KERNEL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(pgd_t *pgd)
{ {
kmem_cache_free(pgtable_cache, pgd); quicklist_free(0, NULL, pgd);
} }
#define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD) #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(struct mm_struct *mm, unsigned long addr)
{ {
return kmem_cache_alloc(pgtable_cache, return quicklist_alloc(0, GFP_KERNEL, NULL);
GFP_KERNEL|__GFP_REPEAT);
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(pmd_t *pmd)
{ {
kmem_cache_free(pgtable_cache, pmd); quicklist_free(0, NULL, pmd);
} }
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
return kmem_cache_alloc(pgtable_cache, return quicklist_alloc(0, GFP_KERNEL, NULL);
GFP_KERNEL|__GFP_REPEAT);
} }
static inline struct page *pte_alloc_one(struct mm_struct *mm, static inline struct page *pte_alloc_one(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
return virt_to_page(pte_alloc_one_kernel(mm, address)); void *pg = quicklist_alloc(0, GFP_KERNEL, NULL);
return pg ? virt_to_page(pg) : NULL;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(pte_t *pte)
{ {
kmem_cache_free(pgtable_cache, pte); quicklist_free(0, NULL, pte);
} }
static inline void pte_free(struct page *ptepage) static inline void pte_free(struct page *ptepage)
{ {
pte_free_kernel(page_address(ptepage)); quicklist_free_page(0, NULL, ptepage);
} }
...@@ -66,6 +65,9 @@ static inline void pte_free(struct page *ptepage) ...@@ -66,6 +65,9 @@ static inline void pte_free(struct page *ptepage)
#define pmd_populate(MM,PMD,PTE_PAGE) \ #define pmd_populate(MM,PMD,PTE_PAGE) \
pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE)) pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE))
#define check_pgt_cache() do { } while (0) static inline void check_pgt_cache(void)
{
quicklist_trim(0, NULL, 25, 16);
}
#endif /* _SPARC64_PGALLOC_H */ #endif /* _SPARC64_PGALLOC_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment