Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.50.2.6 retrieving revision 1.138.4.3 diff -u -p -r1.50.2.6 -r1.138.4.3 --- src/sys/kern/subr_pool.c 2002/01/08 00:32:37 1.50.2.6 +++ src/sys/kern/subr_pool.c 2008/01/08 22:11:40 1.138.4.3 @@ -1,12 +1,12 @@ -/* $NetBSD: subr_pool.c,v 1.50.2.6 2002/01/08 00:32:37 nathanw Exp $ */ +/* $NetBSD: subr_pool.c,v 1.138.4.3 2008/01/08 22:11:40 bouyer Exp $ */ /*- - * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc. + * Copyright (c) 1997, 1999, 2000, 2002, 2007 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation * by Paul Kranenburg; by Jason R. Thorpe of the Numerical Aerospace - * Simulation Facility, NASA Ames Research Center. + * Simulation Facility, NASA Ames Research Center, and by Andrew Doran. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -38,80 +38,117 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.50.2.6 2002/01/08 00:32:37 nathanw Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.138.4.3 2008/01/08 22:11:40 bouyer Exp $"); +#include "opt_ddb.h" #include "opt_pool.h" #include "opt_poollog.h" #include "opt_lockdebug.h" #include #include +#include #include #include #include #include -#include #include #include +#include +#include +#include +#include +#include #include /* * Pool resource management utility. * - * Memory is allocated in pages which are split into pieces according - * to the pool item size. Each page is kept on a list headed by `pr_pagelist' - * in the pool structure and the individual pool items are on a linked list - * headed by `ph_itemlist' in each page header. The memory for building - * the page list is either taken from the allocated pages themselves (for - * small pool items) or taken from an internal pool of page headers (`phpool'). + * Memory is allocated in pages which are split into pieces according to + * the pool item size. Each page is kept on one of three lists in the + * pool structure: `pr_emptypages', `pr_fullpages' and `pr_partpages', + * for empty, full and partially-full pages respectively. The individual + * pool items are on a linked list headed by `ph_itemlist' in each page + * header. The memory for building the page list is either taken from + * the allocated pages themselves (for small pool items) or taken from + * an internal pool of page headers (`phpool'). */ /* List of all pools */ TAILQ_HEAD(,pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); /* Private pool for page header structures */ -static struct pool phpool; +#define PHPOOL_MAX 8 +static struct pool phpool[PHPOOL_MAX]; +#define PHPOOL_FREELIST_NELEM(idx) \ + (((idx) == 0) ? 0 : BITMAP_SIZE * (1 << (idx))) #ifdef POOL_SUBPAGE /* Pool of subpages for use by normal pools. */ static struct pool psppool; #endif +static SLIST_HEAD(, pool_allocator) pa_deferinitq = + SLIST_HEAD_INITIALIZER(pa_deferinitq); + +static void *pool_page_alloc_meta(struct pool *, int); +static void pool_page_free_meta(struct pool *, void *); + +/* allocator for pool metadata */ +struct pool_allocator pool_allocator_meta = { + pool_page_alloc_meta, pool_page_free_meta, + .pa_backingmapptr = &kmem_map, +}; + /* # of seconds to retain page after last use */ int pool_inactive_time = 10; /* Next candidate for drainage (see pool_drain()) */ static struct pool *drainpp; -/* This spin lock protects both pool_head and drainpp. */ -struct simplelock pool_head_slock = SIMPLELOCK_INITIALIZER; +/* This lock protects both pool_head and drainpp. */ +static kmutex_t pool_head_lock; +static kcondvar_t pool_busy; + +typedef uint32_t pool_item_bitmap_t; +#define BITMAP_SIZE (CHAR_BIT * sizeof(pool_item_bitmap_t)) +#define BITMAP_MASK (BITMAP_SIZE - 1) struct pool_item_header { /* Page headers */ - TAILQ_ENTRY(pool_item_header) - ph_pagelist; /* pool page list */ - TAILQ_HEAD(,pool_item) ph_itemlist; /* chunk list for this page */ LIST_ENTRY(pool_item_header) - ph_hashlist; /* Off-page page headers */ - int ph_nmissing; /* # of chunks in use */ - caddr_t ph_page; /* this page's address */ + ph_pagelist; /* pool page list */ + SPLAY_ENTRY(pool_item_header) + ph_node; /* Off-page page headers */ + void * ph_page; /* this page's address */ struct timeval ph_time; /* last referenced */ + uint16_t ph_nmissing; /* # of chunks in use */ + uint16_t ph_off; /* start offset in page */ + union { + /* !PR_NOTOUCH */ + struct { + LIST_HEAD(, pool_item) + phu_itemlist; /* chunk list for this page */ + } phu_normal; + /* PR_NOTOUCH */ + struct { + pool_item_bitmap_t phu_bitmap[1]; + } phu_notouch; + } ph_u; }; -TAILQ_HEAD(pool_pagelist,pool_item_header); +#define ph_itemlist ph_u.phu_normal.phu_itemlist +#define ph_bitmap ph_u.phu_notouch.phu_bitmap struct pool_item { #ifdef DIAGNOSTIC - int pi_magic; + u_int pi_magic; #endif -#define PI_MAGIC 0xdeadbeef +#define PI_MAGIC 0xdeaddeadU /* Other entries use only this list entry */ - TAILQ_ENTRY(pool_item) pi_list; + LIST_ENTRY(pool_item) pi_list; }; -#define PR_HASH_INDEX(pp,addr) \ - (((u_long)(addr) >> (pp)->pr_pageshift) & (PR_HASHTABSIZE - 1)) - #define POOL_NEEDS_CATCHUP(pp) \ ((pp)->pr_nitems < (pp)->pr_minitems) @@ -123,52 +160,60 @@ struct pool_item { * needless object construction/destruction; it is deferred until absolutely * necessary. * - * Caches are grouped into cache groups. Each cache group references - * up to 16 constructed objects. When a cache allocates an object - * from the pool, it calls the object's constructor and places it into - * a cache group. When a cache group frees an object back to the pool, - * it first calls the object's destructor. This allows the object to - * persist in constructed form while freed to the cache. - * - * Multiple caches may exist for each pool. This allows a single - * object type to have multiple constructed forms. The pool references - * each cache, so that when a pool is drained by the pagedaemon, it can - * drain each individual cache as well. Each time a cache is drained, - * the most idle cache group is freed to the pool in its entirety. + * Caches are grouped into cache groups. Each cache group references up + * to PCG_NUMOBJECTS constructed objects. When a cache allocates an + * object from the pool, it calls the object's constructor and places it + * into a cache group. When a cache group frees an object back to the + * pool, it first calls the object's destructor. This allows the object + * to persist in constructed form while freed to the cache. + * + * The pool references each cache, so that when a pool is drained by the + * pagedaemon, it can drain each individual cache as well. Each time a + * cache is drained, the most idle cache group is freed to the pool in + * its entirety. * * Pool caches are layed on top of pools. By layering them, we can avoid * the complexity of cache management for pools which would not benefit * from it. */ -/* The cache group pool. */ -static struct pool pcgpool; - -/* The pool cache group. */ -#define PCG_NOBJECTS 16 -struct pool_cache_group { - TAILQ_ENTRY(pool_cache_group) - pcg_list; /* link in the pool cache's group list */ - u_int pcg_avail; /* # available objects */ - /* pointers to the objects */ - void *pcg_objects[PCG_NOBJECTS]; -}; - -static void pool_cache_reclaim(struct pool_cache *); +static struct pool pcg_normal_pool; +static struct pool pcg_large_pool; +static struct pool cache_pool; +static struct pool cache_cpu_pool; + +/* List of all caches. */ +TAILQ_HEAD(,pool_cache) pool_cache_head = + TAILQ_HEAD_INITIALIZER(pool_cache_head); + +int pool_cache_disable; + + +static pool_cache_cpu_t *pool_cache_put_slow(pool_cache_cpu_t *, int *, + void *, paddr_t); +static pool_cache_cpu_t *pool_cache_get_slow(pool_cache_cpu_t *, int *, + void **, paddr_t *, int); +static void pool_cache_cpu_init1(struct cpu_info *, pool_cache_t); +static void pool_cache_invalidate_groups(pool_cache_t, pcg_t *); +static void pool_cache_xcall(pool_cache_t); static int pool_catchup(struct pool *); -static void pool_prime_page(struct pool *, caddr_t, +static void pool_prime_page(struct pool *, void *, struct pool_item_header *); -static void *pool_page_alloc(unsigned long, int, int); -static void pool_page_free(void *, unsigned long, int); -#ifdef POOL_SUBPAGE -static void *pool_subpage_alloc(unsigned long, int, int); -static void pool_subpage_free(void *, unsigned long, int); -#endif +static void pool_update_curpage(struct pool *); +static int pool_grow(struct pool *, int); +static void *pool_allocator_alloc(struct pool *, int); +static void pool_allocator_free(struct pool *, void *); + +static void pool_print_pagelist(struct pool *, struct pool_pagelist *, + void (*)(const char *, ...)); static void pool_print1(struct pool *, const char *, void (*)(const char *, ...)); +static int pool_chk_page(struct pool *, const char *, + struct pool_item_header *); + /* * Pool log entry. An array of these is allocated in pool_init(). */ @@ -181,6 +226,7 @@ struct pool_log { void *pl_addr; }; +#ifdef POOL_DIAGNOSTIC /* Number of entries in pool log buffers */ #ifndef POOL_LOGSIZE #define POOL_LOGSIZE 10 @@ -188,8 +234,7 @@ struct pool_log { int pool_logsize = POOL_LOGSIZE; -#ifdef POOL_DIAGNOSTIC -static __inline void +static inline void pr_log(struct pool *pp, void *v, int action, const char *file, long line) { int n = pp->pr_curlogentry; @@ -242,7 +287,7 @@ pr_printlog(struct pool *pp, struct pool } } -static __inline void +static inline void pr_enter(struct pool *pp, const char *file, long line) { @@ -258,7 +303,7 @@ pr_enter(struct pool *pp, const char *fi pp->pr_entered_line = line; } -static __inline void +static inline void pr_leave(struct pool *pp) { @@ -271,7 +316,7 @@ pr_leave(struct pool *pp) pp->pr_entered_line = 0; } -static __inline void +static inline void pr_enter_check(struct pool *pp, void (*pr)(const char *, ...)) { @@ -287,34 +332,158 @@ pr_enter_check(struct pool *pp, void (*p #define pr_enter_check(pp, pr) #endif /* POOL_DIAGNOSTIC */ +static inline unsigned int +pr_item_notouch_index(const struct pool *pp, const struct pool_item_header *ph, + const void *v) +{ + const char *cp = v; + unsigned int idx; + + KASSERT(pp->pr_roflags & PR_NOTOUCH); + idx = (cp - (char *)ph->ph_page - ph->ph_off) / pp->pr_size; + KASSERT(idx < pp->pr_itemsperpage); + return idx; +} + +static inline void +pr_item_notouch_put(const struct pool *pp, struct pool_item_header *ph, + void *obj) +{ + unsigned int idx = pr_item_notouch_index(pp, ph, obj); + pool_item_bitmap_t *bitmap = ph->ph_bitmap + (idx / BITMAP_SIZE); + pool_item_bitmap_t mask = 1 << (idx & BITMAP_MASK); + + KASSERT((*bitmap & mask) == 0); + *bitmap |= mask; +} + +static inline void * +pr_item_notouch_get(const struct pool *pp, struct pool_item_header *ph) +{ + pool_item_bitmap_t *bitmap = ph->ph_bitmap; + unsigned int idx; + int i; + + for (i = 0; ; i++) { + int bit; + + KASSERT((i * BITMAP_SIZE) < pp->pr_itemsperpage); + bit = ffs32(bitmap[i]); + if (bit) { + pool_item_bitmap_t mask; + + bit--; + idx = (i * BITMAP_SIZE) + bit; + mask = 1 << bit; + KASSERT((bitmap[i] & mask) != 0); + bitmap[i] &= ~mask; + break; + } + } + KASSERT(idx < pp->pr_itemsperpage); + return (char *)ph->ph_page + ph->ph_off + idx * pp->pr_size; +} + +static inline void +pr_item_notouch_init(const struct pool *pp, struct pool_item_header *ph) +{ + pool_item_bitmap_t *bitmap = ph->ph_bitmap; + const int n = howmany(pp->pr_itemsperpage, BITMAP_SIZE); + int i; + + for (i = 0; i < n; i++) { + bitmap[i] = (pool_item_bitmap_t)-1; + } +} + +static inline int +phtree_compare(struct pool_item_header *a, struct pool_item_header *b) +{ + + /* + * we consider pool_item_header with smaller ph_page bigger. + * (this unnatural ordering is for the benefit of pr_find_pagehead.) + */ + + if (a->ph_page < b->ph_page) + return (1); + else if (a->ph_page > b->ph_page) + return (-1); + else + return (0); +} + +SPLAY_PROTOTYPE(phtree, pool_item_header, ph_node, phtree_compare); +SPLAY_GENERATE(phtree, pool_item_header, ph_node, phtree_compare); + +static inline struct pool_item_header * +pr_find_pagehead_noalign(struct pool *pp, void *v) +{ + struct pool_item_header *ph, tmp; + + tmp.ph_page = (void *)(uintptr_t)v; + ph = SPLAY_FIND(phtree, &pp->pr_phtree, &tmp); + if (ph == NULL) { + ph = SPLAY_ROOT(&pp->pr_phtree); + if (ph != NULL && phtree_compare(&tmp, ph) >= 0) { + ph = SPLAY_NEXT(phtree, &pp->pr_phtree, ph); + } + KASSERT(ph == NULL || phtree_compare(&tmp, ph) < 0); + } + + return ph; +} + /* - * Return the pool page header based on page address. + * Return the pool page header based on item address. */ -static __inline struct pool_item_header * -pr_find_pagehead(struct pool *pp, caddr_t page) +static inline struct pool_item_header * +pr_find_pagehead(struct pool *pp, void *v) { - struct pool_item_header *ph; + struct pool_item_header *ph, tmp; - if ((pp->pr_roflags & PR_PHINPAGE) != 0) - return ((struct pool_item_header *)(page + pp->pr_phoffset)); + if ((pp->pr_roflags & PR_NOALIGN) != 0) { + ph = pr_find_pagehead_noalign(pp, v); + } else { + void *page = + (void *)((uintptr_t)v & pp->pr_alloc->pa_pagemask); + + if ((pp->pr_roflags & PR_PHINPAGE) != 0) { + ph = (struct pool_item_header *)((char *)page + pp->pr_phoffset); + } else { + tmp.ph_page = page; + ph = SPLAY_FIND(phtree, &pp->pr_phtree, &tmp); + } + } + + KASSERT(ph == NULL || ((pp->pr_roflags & PR_PHINPAGE) != 0) || + ((char *)ph->ph_page <= (char *)v && + (char *)v < (char *)ph->ph_page + pp->pr_alloc->pa_pagesz)); + return ph; +} + +static void +pr_pagelist_free(struct pool *pp, struct pool_pagelist *pq) +{ + struct pool_item_header *ph; - for (ph = LIST_FIRST(&pp->pr_hashtab[PR_HASH_INDEX(pp, page)]); - ph != NULL; - ph = LIST_NEXT(ph, ph_hashlist)) { - if (ph->ph_page == page) - return (ph); + while ((ph = LIST_FIRST(pq)) != NULL) { + LIST_REMOVE(ph, ph_pagelist); + pool_allocator_free(pp, ph->ph_page); + if ((pp->pr_roflags & PR_PHINPAGE) == 0) + pool_put(pp->pr_phpool, ph); } - return (NULL); } /* * Remove a page from the pool. */ -static __inline void +static inline void pr_rmpage(struct pool *pp, struct pool_item_header *ph, struct pool_pagelist *pq) { - int s; + + KASSERT(mutex_owned(&pp->pr_lock)); /* * If the page was idle, decrement the idle page count. @@ -332,35 +501,122 @@ pr_rmpage(struct pool *pp, struct pool_i pp->pr_nitems -= pp->pr_itemsperpage; /* - * Unlink a page from the pool and release it (or queue it for release). + * Unlink the page from the pool and queue it for release. */ - TAILQ_REMOVE(&pp->pr_pagelist, ph, ph_pagelist); - if (pq) { - TAILQ_INSERT_HEAD(pq, ph, ph_pagelist); - } else { - (*pp->pr_free)(ph->ph_page, pp->pr_pagesz, pp->pr_mtype); - if ((pp->pr_roflags & PR_PHINPAGE) == 0) { - LIST_REMOVE(ph, ph_hashlist); - s = splhigh(); - pool_put(&phpool, ph); - splx(s); - } - } + LIST_REMOVE(ph, ph_pagelist); + if ((pp->pr_roflags & PR_PHINPAGE) == 0) + SPLAY_REMOVE(phtree, &pp->pr_phtree, ph); + LIST_INSERT_HEAD(pq, ph, ph_pagelist); + pp->pr_npages--; pp->pr_npagefree++; - if (pp->pr_curpage == ph) { - /* - * Find a new non-empty page header, if any. - * Start search from the page head, to increase the - * chance for "high water" pages to be freed. - */ - TAILQ_FOREACH(ph, &pp->pr_pagelist, ph_pagelist) - if (TAILQ_FIRST(&ph->ph_itemlist) != NULL) - break; + pool_update_curpage(pp); +} - pp->pr_curpage = ph; +static bool +pa_starved_p(struct pool_allocator *pa) +{ + + if (pa->pa_backingmap != NULL) { + return vm_map_starved_p(pa->pa_backingmap); + } + return false; +} + +static int +pool_reclaim_callback(struct callback_entry *ce, void *obj, void *arg) +{ + struct pool *pp = obj; + struct pool_allocator *pa = pp->pr_alloc; + + KASSERT(&pp->pr_reclaimerentry == ce); + pool_reclaim(pp); + if (!pa_starved_p(pa)) { + return CALLBACK_CHAIN_ABORT; + } + return CALLBACK_CHAIN_CONTINUE; +} + +static void +pool_reclaim_register(struct pool *pp) +{ + struct vm_map *map = pp->pr_alloc->pa_backingmap; + int s; + + if (map == NULL) { + return; + } + + s = splvm(); /* not necessary for INTRSAFE maps, but don't care. */ + callback_register(&vm_map_to_kernel(map)->vmk_reclaim_callback, + &pp->pr_reclaimerentry, pp, pool_reclaim_callback); + splx(s); +} + +static void +pool_reclaim_unregister(struct pool *pp) +{ + struct vm_map *map = pp->pr_alloc->pa_backingmap; + int s; + + if (map == NULL) { + return; + } + + s = splvm(); /* not necessary for INTRSAFE maps, but don't care. */ + callback_unregister(&vm_map_to_kernel(map)->vmk_reclaim_callback, + &pp->pr_reclaimerentry); + splx(s); +} + +static void +pa_reclaim_register(struct pool_allocator *pa) +{ + struct vm_map *map = *pa->pa_backingmapptr; + struct pool *pp; + + KASSERT(pa->pa_backingmap == NULL); + if (map == NULL) { + SLIST_INSERT_HEAD(&pa_deferinitq, pa, pa_q); + return; + } + pa->pa_backingmap = map; + TAILQ_FOREACH(pp, &pa->pa_list, pr_alloc_list) { + pool_reclaim_register(pp); + } +} + +/* + * Initialize all the pools listed in the "pools" link set. + */ +void +pool_subsystem_init(void) +{ + struct pool_allocator *pa; + __link_set_decl(pools, struct link_pool_init); + struct link_pool_init * const *pi; + + mutex_init(&pool_head_lock, MUTEX_DEFAULT, IPL_NONE); + cv_init(&pool_busy, "poolbusy"); + + __link_set_foreach(pi, pools) + pool_init((*pi)->pp, (*pi)->size, (*pi)->align, + (*pi)->align_offset, (*pi)->flags, (*pi)->wchan, + (*pi)->palloc, (*pi)->ipl); + + while ((pa = SLIST_FIRST(&pa_deferinitq)) != NULL) { + KASSERT(pa->pa_backingmapptr != NULL); + KASSERT(*pa->pa_backingmapptr != NULL); + SLIST_REMOVE_HEAD(&pa_deferinitq, pa_q); + pa_reclaim_register(pa); } + + pool_init(&cache_pool, sizeof(struct pool_cache), CACHE_LINE_SIZE, + 0, 0, "pcache", &pool_allocator_nointr, IPL_NONE); + + pool_init(&cache_cpu_pool, sizeof(pool_cache_cpu_t), CACHE_LINE_SIZE, + 0, 0, "pcachecpu", &pool_allocator_nointr, IPL_NONE); } /* @@ -371,12 +627,23 @@ pr_rmpage(struct pool *pp, struct pool_i */ void pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags, - const char *wchan, size_t pagesz, - void *(*alloc)(unsigned long, int, int), - void (*release)(void *, unsigned long, int), - int mtype) + const char *wchan, struct pool_allocator *palloc, int ipl) { - int off, slack, i; + struct pool *pp1; + size_t trysize, phsize; + int off, slack; + +#ifdef DEBUG + /* + * Check that the pool hasn't already been initialised and + * added to the list of all pools. + */ + TAILQ_FOREACH(pp1, &pool_head, pr_poollist) { + if (pp == pp1) + panic("pool_init: pool %s already initialised", + wchan); + } +#endif #ifdef POOL_DIAGNOSTIC /* @@ -386,51 +653,51 @@ pool_init(struct pool *pp, size_t size, flags |= PR_LOGGING; #endif - /* - * Check arguments and construct default values. - */ - if (!powerof2(pagesz)) - panic("pool_init: page size invalid (%lx)\n", (u_long)pagesz); - - if (alloc == NULL && release == NULL) { + if (palloc == NULL) + palloc = &pool_allocator_kmem; #ifdef POOL_SUBPAGE - alloc = pool_subpage_alloc; - release = pool_subpage_free; - pagesz = POOL_SUBPAGE; -#else - alloc = pool_page_alloc; - release = pool_page_free; - pagesz = PAGE_SIZE; /* Rounds to PAGE_SIZE anyhow. */ -#endif - } else if ((alloc != NULL && release != NULL) == 0) { - /* If you specifiy one, must specify both. */ - panic("pool_init: must specify alloc and release together"); + if (size > palloc->pa_pagesz) { + if (palloc == &pool_allocator_kmem) + palloc = &pool_allocator_kmem_fullpage; + else if (palloc == &pool_allocator_nointr) + palloc = &pool_allocator_nointr_fullpage; + } +#endif /* POOL_SUBPAGE */ + if ((palloc->pa_flags & PA_INITIALIZED) == 0) { + if (palloc->pa_pagesz == 0) + palloc->pa_pagesz = PAGE_SIZE; + + TAILQ_INIT(&palloc->pa_list); + + mutex_init(&palloc->pa_lock, MUTEX_DEFAULT, IPL_VM); + palloc->pa_pagemask = ~(palloc->pa_pagesz - 1); + palloc->pa_pageshift = ffs(palloc->pa_pagesz) - 1; + + if (palloc->pa_backingmapptr != NULL) { + pa_reclaim_register(palloc); + } + palloc->pa_flags |= PA_INITIALIZED; } -#ifdef POOL_SUBPAGE - else if (alloc == pool_page_alloc_nointr && - release == pool_page_free_nointr) - pagesz = POOL_SUBPAGE; -#endif - - if (pagesz == 0) - pagesz = PAGE_SIZE; if (align == 0) align = ALIGN(1); - if (size < sizeof(struct pool_item)) + if ((flags & PR_NOTOUCH) == 0 && size < sizeof(struct pool_item)) size = sizeof(struct pool_item); - size = ALIGN(size); - if (size > pagesz) - panic("pool_init: pool item size (%lu) too large", - (u_long)size); + size = roundup(size, align); +#ifdef DIAGNOSTIC + if (size > palloc->pa_pagesz) + panic("pool_init: pool item size (%zu) too large", size); +#endif /* * Initialize the pool structure. */ - TAILQ_INIT(&pp->pr_pagelist); - TAILQ_INIT(&pp->pr_cachelist); + LIST_INIT(&pp->pr_emptypages); + LIST_INIT(&pp->pr_fullpages); + LIST_INIT(&pp->pr_partpages); + pp->pr_cache = NULL; pp->pr_curpage = NULL; pp->pr_npages = 0; pp->pr_minitems = 0; @@ -441,12 +708,7 @@ pool_init(struct pool *pp, size_t size, pp->pr_size = size; pp->pr_align = align; pp->pr_wchan = wchan; - pp->pr_mtype = mtype; - pp->pr_alloc = alloc; - pp->pr_free = release; - pp->pr_pagesz = pagesz; - pp->pr_pagemask = ~(pagesz - 1); - pp->pr_pageshift = ffs(pagesz) - 1; + pp->pr_alloc = palloc; pp->pr_nitems = 0; pp->pr_nout = 0; pp->pr_hardlimit = UINT_MAX; @@ -455,38 +717,71 @@ pool_init(struct pool *pp, size_t size, pp->pr_hardlimit_ratecap.tv_usec = 0; pp->pr_hardlimit_warning_last.tv_sec = 0; pp->pr_hardlimit_warning_last.tv_usec = 0; + pp->pr_drain_hook = NULL; + pp->pr_drain_hook_arg = NULL; + pp->pr_freecheck = NULL; /* * Decide whether to put the page header off page to avoid - * wasting too large a part of the page. Off-page page headers - * go on a hash table, so we can match a returned item - * with its header based on the page address. - * We use 1/16 of the page size as the threshold (XXX: tune) + * wasting too large a part of the page or too big item. + * Off-page page headers go on a hash table, so we can match + * a returned item with its header based on the page address. + * We use 1/16 of the page size and about 8 times of the item + * size as the threshold (XXX: tune) + * + * However, we'll put the header into the page if we can put + * it without wasting any items. + * + * Silently enforce `0 <= ioff < align'. */ - if (pp->pr_size < pagesz/16) { + pp->pr_itemoffset = ioff %= align; + /* See the comment below about reserved bytes. */ + trysize = palloc->pa_pagesz - ((align - ioff) % align); + phsize = ALIGN(sizeof(struct pool_item_header)); + if ((pp->pr_roflags & (PR_NOTOUCH | PR_NOALIGN)) == 0 && + (pp->pr_size < MIN(palloc->pa_pagesz / 16, phsize << 3) || + trysize / pp->pr_size == (trysize - phsize) / pp->pr_size)) { /* Use the end of the page for the page header */ pp->pr_roflags |= PR_PHINPAGE; - pp->pr_phoffset = off = - pagesz - ALIGN(sizeof(struct pool_item_header)); + pp->pr_phoffset = off = palloc->pa_pagesz - phsize; } else { /* The page header will be taken from our page header pool */ pp->pr_phoffset = 0; - off = pagesz; - for (i = 0; i < PR_HASHTABSIZE; i++) { - LIST_INIT(&pp->pr_hashtab[i]); - } + off = palloc->pa_pagesz; + SPLAY_INIT(&pp->pr_phtree); } /* * Alignment is to take place at `ioff' within the item. This means * we must reserve up to `align - 1' bytes on the page to allow * appropriate positioning of each item. - * - * Silently enforce `0 <= ioff < align'. */ - pp->pr_itemoffset = ioff = ioff % align; pp->pr_itemsperpage = (off - ((align - ioff) % align)) / pp->pr_size; KASSERT(pp->pr_itemsperpage != 0); + if ((pp->pr_roflags & PR_NOTOUCH)) { + int idx; + + for (idx = 0; pp->pr_itemsperpage > PHPOOL_FREELIST_NELEM(idx); + idx++) { + /* nothing */ + } + if (idx >= PHPOOL_MAX) { + /* + * if you see this panic, consider to tweak + * PHPOOL_MAX and PHPOOL_FREELIST_NELEM. + */ + panic("%s: too large itemsperpage(%d) for PR_NOTOUCH", + pp->pr_wchan, pp->pr_itemsperpage); + } + pp->pr_phpool = &phpool[idx]; + } else if ((pp->pr_roflags & PR_PHINPAGE) == 0) { + pp->pr_phpool = &phpool[0]; + } +#if defined(DIAGNOSTIC) + else { + pp->pr_phpool = NULL; + } +#endif /* * Use the slack between the chunks and the page header @@ -503,6 +798,7 @@ pool_init(struct pool *pp, size_t size, pp->pr_npagefree = 0; pp->pr_hiwat = 0; pp->pr_nidle = 0; + pp->pr_refcnt = 0; #ifdef POOL_DIAGNOSTIC if (flags & PR_LOGGING) { @@ -518,32 +814,78 @@ pool_init(struct pool *pp, size_t size, pp->pr_entered_file = NULL; pp->pr_entered_line = 0; - simple_lock_init(&pp->pr_slock); + /* + * XXXAD hack to prevent IP input processing from blocking. + */ + if (ipl == IPL_SOFTNET) { + mutex_init(&pp->pr_lock, MUTEX_DEFAULT, IPL_VM); + } else { + mutex_init(&pp->pr_lock, MUTEX_DEFAULT, ipl); + } + cv_init(&pp->pr_cv, wchan); + pp->pr_ipl = ipl; /* * Initialize private page header pool and cache magazine pool if we * haven't done so yet. * XXX LOCKING. */ - if (phpool.pr_size == 0) { + if (phpool[0].pr_size == 0) { + int idx; + for (idx = 0; idx < PHPOOL_MAX; idx++) { + static char phpool_names[PHPOOL_MAX][6+1+6+1]; + int nelem; + size_t sz; + + nelem = PHPOOL_FREELIST_NELEM(idx); + snprintf(phpool_names[idx], sizeof(phpool_names[idx]), + "phpool-%d", nelem); + sz = sizeof(struct pool_item_header); + if (nelem) { + sz = offsetof(struct pool_item_header, + ph_bitmap[howmany(nelem, BITMAP_SIZE)]); + } + pool_init(&phpool[idx], sz, 0, 0, 0, + phpool_names[idx], &pool_allocator_meta, IPL_VM); + } #ifdef POOL_SUBPAGE - pool_init(&phpool, sizeof(struct pool_item_header), 0, 0, 0, - "phpool", PAGE_SIZE, pool_page_alloc, pool_page_free, 0); pool_init(&psppool, POOL_SUBPAGE, POOL_SUBPAGE, 0, - PR_RECURSIVE, "psppool", PAGE_SIZE, - pool_page_alloc, pool_page_free, 0); -#else - pool_init(&phpool, sizeof(struct pool_item_header), 0, 0, - 0, "phpool", 0, 0, 0, 0); + PR_RECURSIVE, "psppool", &pool_allocator_meta, IPL_VM); #endif - pool_init(&pcgpool, sizeof(struct pool_cache_group), 0, 0, - 0, "pcgpool", 0, 0, 0, 0); + + size = sizeof(pcg_t) + + (PCG_NOBJECTS_NORMAL - 1) * sizeof(pcgpair_t); + pool_init(&pcg_normal_pool, size, CACHE_LINE_SIZE, 0, 0, + "pcgnormal", &pool_allocator_meta, IPL_VM); + + size = sizeof(pcg_t) + + (PCG_NOBJECTS_LARGE - 1) * sizeof(pcgpair_t); + pool_init(&pcg_large_pool, size, CACHE_LINE_SIZE, 0, 0, + "pcglarge", &pool_allocator_meta, IPL_VM); } /* Insert into the list of all pools. */ - simple_lock(&pool_head_slock); - TAILQ_INSERT_TAIL(&pool_head, pp, pr_poollist); - simple_unlock(&pool_head_slock); + if (__predict_true(!cold)) + mutex_enter(&pool_head_lock); + TAILQ_FOREACH(pp1, &pool_head, pr_poollist) { + if (strcmp(pp1->pr_wchan, pp->pr_wchan) > 0) + break; + } + if (pp1 == NULL) + TAILQ_INSERT_TAIL(&pool_head, pp, pr_poollist); + else + TAILQ_INSERT_BEFORE(pp1, pp, pr_poollist); + if (__predict_true(!cold)) + mutex_exit(&pool_head_lock); + + /* Insert this into the list of pools using this allocator. */ + if (__predict_true(!cold)) + mutex_enter(&palloc->pa_lock); + TAILQ_INSERT_TAIL(&palloc->pa_list, pp, pr_alloc_list); + if (__predict_true(!cold)) + mutex_exit(&palloc->pa_lock); + + pool_reclaim_register(pp); } /* @@ -552,64 +894,85 @@ pool_init(struct pool *pp, size_t size, void pool_destroy(struct pool *pp) { + struct pool_pagelist pq; struct pool_item_header *ph; - struct pool_cache *pc; - /* Destroy all caches for this pool. */ - while ((pc = TAILQ_FIRST(&pp->pr_cachelist)) != NULL) - pool_cache_destroy(pc); + /* Remove from global pool list */ + mutex_enter(&pool_head_lock); + while (pp->pr_refcnt != 0) + cv_wait(&pool_busy, &pool_head_lock); + TAILQ_REMOVE(&pool_head, pp, pr_poollist); + if (drainpp == pp) + drainpp = NULL; + mutex_exit(&pool_head_lock); + + /* Remove this pool from its allocator's list of pools. */ + pool_reclaim_unregister(pp); + mutex_enter(&pp->pr_alloc->pa_lock); + TAILQ_REMOVE(&pp->pr_alloc->pa_list, pp, pr_alloc_list); + mutex_exit(&pp->pr_alloc->pa_lock); + + mutex_enter(&pp->pr_lock); + + KASSERT(pp->pr_cache == NULL); #ifdef DIAGNOSTIC if (pp->pr_nout != 0) { pr_printlog(pp, NULL, printf); - panic("pool_destroy: pool busy: still out: %u\n", + panic("pool_destroy: pool busy: still out: %u", pp->pr_nout); } #endif + KASSERT(LIST_EMPTY(&pp->pr_fullpages)); + KASSERT(LIST_EMPTY(&pp->pr_partpages)); + /* Remove all pages */ - if ((pp->pr_roflags & PR_STATIC) == 0) - while ((ph = TAILQ_FIRST(&pp->pr_pagelist)) != NULL) - pr_rmpage(pp, ph, NULL); + LIST_INIT(&pq); + while ((ph = LIST_FIRST(&pp->pr_emptypages)) != NULL) + pr_rmpage(pp, ph, &pq); - /* Remove from global pool list */ - simple_lock(&pool_head_slock); - TAILQ_REMOVE(&pool_head, pp, pr_poollist); - if (drainpp == pp) { - drainpp = NULL; - } - simple_unlock(&pool_head_slock); + mutex_exit(&pp->pr_lock); + + pr_pagelist_free(pp, &pq); #ifdef POOL_DIAGNOSTIC if ((pp->pr_roflags & PR_LOGGING) != 0) free(pp->pr_log, M_TEMP); #endif - if (pp->pr_roflags & PR_FREEHEADER) - free(pp, M_POOL); + cv_destroy(&pp->pr_cv); + mutex_destroy(&pp->pr_lock); } -static __inline struct pool_item_header * -pool_alloc_item_header(struct pool *pp, caddr_t storage, int flags) +void +pool_set_drain_hook(struct pool *pp, void (*fn)(void *, int), void *arg) { - struct pool_item_header *ph; - int s; - LOCK_ASSERT(simple_lock_held(&pp->pr_slock) == 0); + /* XXX no locking -- must be used just after pool_init() */ +#ifdef DIAGNOSTIC + if (pp->pr_drain_hook != NULL) + panic("pool_set_drain_hook(%s): already set", pp->pr_wchan); +#endif + pp->pr_drain_hook = fn; + pp->pr_drain_hook_arg = arg; +} + +static struct pool_item_header * +pool_alloc_item_header(struct pool *pp, void *storage, int flags) +{ + struct pool_item_header *ph; if ((pp->pr_roflags & PR_PHINPAGE) != 0) - ph = (struct pool_item_header *) (storage + pp->pr_phoffset); - else { - s = splhigh(); - ph = pool_get(&phpool, flags); - splx(s); - } + ph = (struct pool_item_header *) ((char *)storage + pp->pr_phoffset); + else + ph = pool_get(pp->pr_phpool, flags); return (ph); } /* - * Grab an item from the pool; must be called at appropriate spl level + * Grab an item from the pool. */ void * #ifdef POOL_DIAGNOSTIC @@ -623,23 +986,20 @@ pool_get(struct pool *pp, int flags) void *v; #ifdef DIAGNOSTIC - if (__predict_false((pp->pr_roflags & PR_STATIC) && - (flags & PR_MALLOCOK))) { - pr_printlog(pp, NULL, printf); - panic("pool_get: static"); - } - - if (__predict_false(curproc == NULL && doing_shutdown == 0 && + if (__predict_false(pp->pr_itemsperpage == 0)) + panic("pool_get: pool %p: pr_itemsperpage is zero, " + "pool not initialized?", pp); + if (__predict_false(curlwp == NULL && doing_shutdown == 0 && (flags & PR_WAITOK) != 0)) - panic("pool_get: must have NOWAIT"); + panic("pool_get: %s: must have NOWAIT", pp->pr_wchan); +#endif /* DIAGNOSTIC */ #ifdef LOCKDEBUG if (flags & PR_WAITOK) - simple_lock_only_held(NULL, "pool_get(PR_WAITOK)"); + ASSERT_SLEEPABLE(NULL, "pool_get(PR_WAITOK)"); #endif -#endif /* DIAGNOSTIC */ - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pr_enter(pp, file, line); startover: @@ -651,11 +1011,26 @@ pool_get(struct pool *pp, int flags) #ifdef DIAGNOSTIC if (__predict_false(pp->pr_nout > pp->pr_hardlimit)) { pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); panic("pool_get: %s: crossed hard limit", pp->pr_wchan); } #endif if (__predict_false(pp->pr_nout == pp->pr_hardlimit)) { + if (pp->pr_drain_hook != NULL) { + /* + * Since the drain hook is going to free things + * back to the pool, unlock, call the hook, re-lock, + * and check the hardlimit condition again. + */ + pr_leave(pp); + mutex_exit(&pp->pr_lock); + (*pp->pr_drain_hook)(pp->pr_drain_hook_arg, flags); + mutex_enter(&pp->pr_lock); + pr_enter(pp, file, line); + if (pp->pr_nout < pp->pr_hardlimit) + goto startover; + } + if ((flags & PR_WAITOK) && !(flags & PR_LIMITFAIL)) { /* * XXX: A warning isn't logged in this case. Should @@ -663,7 +1038,7 @@ pool_get(struct pool *pp, int flags) */ pp->pr_flags |= PR_WANTED; pr_leave(pp); - ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock); + cv_wait(&pp->pr_cv, &pp->pr_lock); pr_enter(pp, file, line); goto startover; } @@ -676,13 +1051,10 @@ pool_get(struct pool *pp, int flags) &pp->pr_hardlimit_ratecap)) log(LOG_ERR, "%s\n", pp->pr_hardlimit_warning); - if (flags & PR_URGENT) - panic("pool_get: urgent"); - pp->pr_nfail++; pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); return (NULL); } @@ -693,12 +1065,14 @@ pool_get(struct pool *pp, int flags) * has no items in its bucket. */ if ((ph = pp->pr_curpage) == NULL) { + int error; + #ifdef DIAGNOSTIC if (pp->pr_nitems != 0) { - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); printf("pool_get: %s: curpage NULL, nitems %u\n", pp->pr_wchan, pp->pr_nitems); - panic("pool_get: nitems inconsistent\n"); + panic("pool_get: nitems inconsistent"); } #endif @@ -708,17 +1082,9 @@ pool_get(struct pool *pp, int flags) * may block. */ pr_leave(pp); - simple_unlock(&pp->pr_slock); - v = (*pp->pr_alloc)(pp->pr_pagesz, flags, pp->pr_mtype); - if (__predict_true(v != NULL)) - ph = pool_alloc_item_header(pp, v, flags); - simple_lock(&pp->pr_slock); + error = pool_grow(pp, flags); pr_enter(pp, file, line); - - if (__predict_false(v == NULL || ph == NULL)) { - if (v != NULL) - (*pp->pr_free)(v, pp->pr_pagesz, pp->pr_mtype); - + if (error != 0) { /* * We were unable to allocate a page or item * header, but we released the lock during @@ -728,74 +1094,62 @@ pool_get(struct pool *pp, int flags) if (pp->pr_curpage != NULL) goto startover; - if (flags & PR_URGENT) - panic("pool_get: urgent"); - - if ((flags & PR_WAITOK) == 0) { - pp->pr_nfail++; - pr_leave(pp); - simple_unlock(&pp->pr_slock); - return (NULL); - } - - /* - * Wait for items to be returned to this pool. - * - * XXX: we actually want to wait just until - * the page allocator has memory again. Depending - * on this pool's usage, we might get stuck here - * for a long time. - * - * XXX: maybe we should wake up once a second and - * try again? - */ - pp->pr_flags |= PR_WANTED; + pp->pr_nfail++; pr_leave(pp); - ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock); - pr_enter(pp, file, line); - goto startover; + mutex_exit(&pp->pr_lock); + return (NULL); } - /* We have more memory; add it to the pool */ - pool_prime_page(pp, v, ph); - pp->pr_npagealloc++; - /* Start the allocation process over. */ goto startover; } - - if (__predict_false((v = pi = TAILQ_FIRST(&ph->ph_itemlist)) == NULL)) { - pr_leave(pp); - simple_unlock(&pp->pr_slock); - panic("pool_get: %s: page empty", pp->pr_wchan); - } + if (pp->pr_roflags & PR_NOTOUCH) { #ifdef DIAGNOSTIC - if (__predict_false(pp->pr_nitems == 0)) { - pr_leave(pp); - simple_unlock(&pp->pr_slock); - printf("pool_get: %s: items on itemlist, nitems %u\n", - pp->pr_wchan, pp->pr_nitems); - panic("pool_get: nitems inconsistent\n"); - } + if (__predict_false(ph->ph_nmissing == pp->pr_itemsperpage)) { + pr_leave(pp); + mutex_exit(&pp->pr_lock); + panic("pool_get: %s: page empty", pp->pr_wchan); + } +#endif + v = pr_item_notouch_get(pp, ph); +#ifdef POOL_DIAGNOSTIC + pr_log(pp, v, PRLOG_GET, file, line); +#endif + } else { + v = pi = LIST_FIRST(&ph->ph_itemlist); + if (__predict_false(v == NULL)) { + pr_leave(pp); + mutex_exit(&pp->pr_lock); + panic("pool_get: %s: page empty", pp->pr_wchan); + } +#ifdef DIAGNOSTIC + if (__predict_false(pp->pr_nitems == 0)) { + pr_leave(pp); + mutex_exit(&pp->pr_lock); + printf("pool_get: %s: items on itemlist, nitems %u\n", + pp->pr_wchan, pp->pr_nitems); + panic("pool_get: nitems inconsistent"); + } #endif #ifdef POOL_DIAGNOSTIC - pr_log(pp, v, PRLOG_GET, file, line); + pr_log(pp, v, PRLOG_GET, file, line); #endif #ifdef DIAGNOSTIC - if (__predict_false(pi->pi_magic != PI_MAGIC)) { - pr_printlog(pp, pi, printf); - panic("pool_get(%s): free list modified: magic=%x; page %p;" - " item addr %p\n", - pp->pr_wchan, pi->pi_magic, ph->ph_page, pi); - } + if (__predict_false(pi->pi_magic != PI_MAGIC)) { + pr_printlog(pp, pi, printf); + panic("pool_get(%s): free list modified: " + "magic=%x; page %p; item addr %p\n", + pp->pr_wchan, pi->pi_magic, ph->ph_page, pi); + } #endif - /* - * Remove from item list. - */ - TAILQ_REMOVE(&ph->ph_itemlist, pi, pi_list); + /* + * Remove from item list. + */ + LIST_REMOVE(pi, pi_list); + } pp->pr_nitems--; pp->pr_nout++; if (ph->ph_nmissing == 0) { @@ -804,38 +1158,36 @@ pool_get(struct pool *pp, int flags) panic("pool_get: nidle inconsistent"); #endif pp->pr_nidle--; + + /* + * This page was previously empty. Move it to the list of + * partially-full pages. This page is already curpage. + */ + LIST_REMOVE(ph, ph_pagelist); + LIST_INSERT_HEAD(&pp->pr_partpages, ph, ph_pagelist); } ph->ph_nmissing++; - if (TAILQ_FIRST(&ph->ph_itemlist) == NULL) { + if (ph->ph_nmissing == pp->pr_itemsperpage) { #ifdef DIAGNOSTIC - if (__predict_false(ph->ph_nmissing != pp->pr_itemsperpage)) { + if (__predict_false((pp->pr_roflags & PR_NOTOUCH) == 0 && + !LIST_EMPTY(&ph->ph_itemlist))) { pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); panic("pool_get: %s: nmissing inconsistent", pp->pr_wchan); } #endif /* - * Find a new non-empty page header, if any. - * Start search from the page head, to increase - * the chance for "high water" pages to be freed. - * - * Migrate empty pages to the end of the list. This - * will speed the update of curpage as pages become - * idle. Empty pages intermingled with idle pages - * is no big deal. As soon as a page becomes un-empty, - * it will move back to the head of the list. + * This page is now full. Move it to the full list + * and select a new current page. */ - TAILQ_REMOVE(&pp->pr_pagelist, ph, ph_pagelist); - TAILQ_INSERT_TAIL(&pp->pr_pagelist, ph, ph_pagelist); - TAILQ_FOREACH(ph, &pp->pr_pagelist, ph_pagelist) - if (TAILQ_FIRST(&ph->ph_itemlist) != NULL) - break; - - pp->pr_curpage = ph; + LIST_REMOVE(ph, ph_pagelist); + LIST_INSERT_HEAD(&pp->pr_fullpages, ph, ph_pagelist); + pool_update_curpage(pp); } pp->pr_nget++; + pr_leave(pp); /* * If we have a low water mark and we are now below that low @@ -849,8 +1201,9 @@ pool_get(struct pool *pp, int flags) */ } - pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); + KASSERT((((vaddr_t)v + pp->pr_itemoffset) & (pp->pr_align - 1)) == 0); + FREECHECK_OUT(&pp->pr_freecheck, v); return (v); } @@ -858,16 +1211,14 @@ pool_get(struct pool *pp, int flags) * Internal version of pool_put(). Pool is already locked/entered. */ static void -pool_do_put(struct pool *pp, void *v) +pool_do_put(struct pool *pp, void *v, struct pool_pagelist *pq) { struct pool_item *pi = v; struct pool_item_header *ph; - caddr_t page; - int s; - LOCK_ASSERT(simple_lock_held(&pp->pr_slock)); - - page = (caddr_t)((u_long)v & pp->pr_pagemask); + KASSERT(mutex_owned(&pp->pr_lock)); + FREECHECK_IN(&pp->pr_freecheck, v); + LOCKDEBUG_MEM_CHECK(v, pp->pr_size); #ifdef DIAGNOSTIC if (__predict_false(pp->pr_nout == 0)) { @@ -877,35 +1228,33 @@ pool_do_put(struct pool *pp, void *v) } #endif - if (__predict_false((ph = pr_find_pagehead(pp, page)) == NULL)) { + if (__predict_false((ph = pr_find_pagehead(pp, v)) == NULL)) { pr_printlog(pp, NULL, printf); panic("pool_put: %s: page header missing", pp->pr_wchan); } -#ifdef LOCKDEBUG - /* - * Check if we're freeing a locked simple lock. - */ - simple_lock_freecheck((caddr_t)pi, ((caddr_t)pi) + pp->pr_size); -#endif - /* * Return to item list. */ + if (pp->pr_roflags & PR_NOTOUCH) { + pr_item_notouch_put(pp, ph, v); + } else { #ifdef DIAGNOSTIC - pi->pi_magic = PI_MAGIC; + pi->pi_magic = PI_MAGIC; #endif #ifdef DEBUG - { - int i, *ip = v; + { + int i, *ip = v; - for (i = 0; i < pp->pr_size / sizeof(int); i++) { - *ip++ = PI_MAGIC; + for (i = 0; i < pp->pr_size / sizeof(int); i++) { + *ip++ = PI_MAGIC; + } } - } #endif - TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list); + LIST_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list); + } + KDASSERT(ph->ph_nmissing != 0); ph->ph_nmissing--; pp->pr_nput++; pp->pr_nitems++; @@ -919,31 +1268,32 @@ pool_do_put(struct pool *pp, void *v) pp->pr_flags &= ~PR_WANTED; if (ph->ph_nmissing == 0) pp->pr_nidle++; - wakeup((caddr_t)pp); + cv_broadcast(&pp->pr_cv); return; } /* - * If this page is now complete, do one of two things: + * If this page is now empty, do one of two things: + * + * (1) If we have more pages than the page high water mark, + * free the page back to the system. ONLY CONSIDER + * FREEING BACK A PAGE IF WE HAVE MORE THAN OUR MINIMUM PAGE + * CLAIM. * - * (1) If we have more pages than the page high water - * mark, free the page back to the system. + * (2) Otherwise, move the page to the empty page list. * - * (2) Move it to the end of the page list, so that - * we minimize our chances of fragmenting the - * pool. Idle pages migrate to the end (along with - * completely empty pages, so that we find un-empty - * pages more quickly when we update curpage) of the - * list so they can be more easily swept up by - * the pagedaemon when pages are scarce. + * Either way, select a new current page (so we use a partially-full + * page if one is available). */ if (ph->ph_nmissing == 0) { pp->pr_nidle++; - if (pp->pr_npages > pp->pr_maxpages) { - pr_rmpage(pp, ph, NULL); + if (pp->pr_npages > pp->pr_minpages && + (pp->pr_npages > pp->pr_maxpages || + pa_starved_p(pp->pr_alloc))) { + pr_rmpage(pp, ph, pq); } else { - TAILQ_REMOVE(&pp->pr_pagelist, ph, ph_pagelist); - TAILQ_INSERT_TAIL(&pp->pr_pagelist, ph, ph_pagelist); + LIST_REMOVE(ph, ph_pagelist); + LIST_INSERT_HEAD(&pp->pr_emptypages, ph, ph_pagelist); /* * Update the timestamp on the page. A page must @@ -951,55 +1301,46 @@ pool_do_put(struct pool *pp, void *v) * be reclaimed by the pagedaemon. This minimizes * ping-pong'ing for memory. */ - s = splclock(); - ph->ph_time = mono_time; - splx(s); - - /* - * Update the current page pointer. Just look for - * the first page with any free items. - * - * XXX: Maybe we want an option to look for the - * page with the fewest available items, to minimize - * fragmentation? - */ - TAILQ_FOREACH(ph, &pp->pr_pagelist, ph_pagelist) - if (TAILQ_FIRST(&ph->ph_itemlist) != NULL) - break; - - pp->pr_curpage = ph; + getmicrotime(&ph->ph_time); } + pool_update_curpage(pp); } + /* - * If the page has just become un-empty, move it to the head of - * the list, and make it the current page. The next allocation - * will get the item from this page, instead of further fragmenting - * the pool. + * If the page was previously completely full, move it to the + * partially-full list and make it the current page. The next + * allocation will get the item from this page, instead of + * further fragmenting the pool. */ else if (ph->ph_nmissing == (pp->pr_itemsperpage - 1)) { - TAILQ_REMOVE(&pp->pr_pagelist, ph, ph_pagelist); - TAILQ_INSERT_HEAD(&pp->pr_pagelist, ph, ph_pagelist); + LIST_REMOVE(ph, ph_pagelist); + LIST_INSERT_HEAD(&pp->pr_partpages, ph, ph_pagelist); pp->pr_curpage = ph; } } /* - * Return resource to the pool; must be called at appropriate spl level + * Return resource to the pool. */ #ifdef POOL_DIAGNOSTIC void _pool_put(struct pool *pp, void *v, const char *file, long line) { + struct pool_pagelist pq; + + LIST_INIT(&pq); - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pr_enter(pp, file, line); pr_log(pp, v, PRLOG_PUT, file, line); - pool_do_put(pp, v); + pool_do_put(pp, v, &pq); pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); + + pr_pagelist_free(pp, &pq); } #undef pool_put #endif /* POOL_DIAGNOSTIC */ @@ -1007,12 +1348,15 @@ _pool_put(struct pool *pp, void *v, cons void pool_put(struct pool *pp, void *v) { + struct pool_pagelist pq; - simple_lock(&pp->pr_slock); + LIST_INIT(&pq); - pool_do_put(pp, v); + mutex_enter(&pp->pr_lock); + pool_do_put(pp, v, &pq); + mutex_exit(&pp->pr_lock); - simple_unlock(&pp->pr_slock); + pr_pagelist_free(pp, &pq); } #ifdef POOL_DIAGNOSTIC @@ -1020,43 +1364,64 @@ pool_put(struct pool *pp, void *v) #endif /* + * pool_grow: grow a pool by a page. + * + * => called with pool locked. + * => unlock and relock the pool. + * => return with pool locked. + */ + +static int +pool_grow(struct pool *pp, int flags) +{ + struct pool_item_header *ph = NULL; + char *cp; + + mutex_exit(&pp->pr_lock); + cp = pool_allocator_alloc(pp, flags); + if (__predict_true(cp != NULL)) { + ph = pool_alloc_item_header(pp, cp, flags); + } + if (__predict_false(cp == NULL || ph == NULL)) { + if (cp != NULL) { + pool_allocator_free(pp, cp); + } + mutex_enter(&pp->pr_lock); + return ENOMEM; + } + + mutex_enter(&pp->pr_lock); + pool_prime_page(pp, cp, ph); + pp->pr_npagealloc++; + return 0; +} + +/* * Add N items to the pool. */ int pool_prime(struct pool *pp, int n) { - struct pool_item_header *ph; - caddr_t cp; - int newpages, error = 0; + int newpages; + int error = 0; - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); newpages = roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; while (newpages-- > 0) { - simple_unlock(&pp->pr_slock); - cp = (*pp->pr_alloc)(pp->pr_pagesz, PR_NOWAIT, pp->pr_mtype); - if (__predict_true(cp != NULL)) - ph = pool_alloc_item_header(pp, cp, PR_NOWAIT); - simple_lock(&pp->pr_slock); - - if (__predict_false(cp == NULL || ph == NULL)) { - error = ENOMEM; - if (cp != NULL) - (*pp->pr_free)(cp, pp->pr_pagesz, pp->pr_mtype); + error = pool_grow(pp, PR_NOWAIT); + if (error) { break; } - - pool_prime_page(pp, cp, ph); - pp->pr_npagealloc++; pp->pr_minpages++; } if (pp->pr_minpages >= pp->pr_maxpages) pp->pr_maxpages = pp->pr_minpages + 1; /* XXX */ - simple_unlock(&pp->pr_slock); - return (0); + mutex_exit(&pp->pr_lock); + return error; } /* @@ -1065,36 +1430,40 @@ pool_prime(struct pool *pp, int n) * Note, we must be called with the pool descriptor LOCKED. */ static void -pool_prime_page(struct pool *pp, caddr_t storage, struct pool_item_header *ph) +pool_prime_page(struct pool *pp, void *storage, struct pool_item_header *ph) { struct pool_item *pi; - caddr_t cp = storage; - unsigned int align = pp->pr_align; - unsigned int ioff = pp->pr_itemoffset; + void *cp = storage; + const unsigned int align = pp->pr_align; + const unsigned int ioff = pp->pr_itemoffset; int n; - if (((u_long)cp & (pp->pr_pagesz - 1)) != 0) - panic("pool_prime_page: %s: unaligned page", pp->pr_wchan); + KASSERT(mutex_owned(&pp->pr_lock)); - if ((pp->pr_roflags & PR_PHINPAGE) == 0) - LIST_INSERT_HEAD(&pp->pr_hashtab[PR_HASH_INDEX(pp, cp)], - ph, ph_hashlist); +#ifdef DIAGNOSTIC + if ((pp->pr_roflags & PR_NOALIGN) == 0 && + ((uintptr_t)cp & (pp->pr_alloc->pa_pagesz - 1)) != 0) + panic("pool_prime_page: %s: unaligned page", pp->pr_wchan); +#endif /* * Insert page header. */ - TAILQ_INSERT_HEAD(&pp->pr_pagelist, ph, ph_pagelist); - TAILQ_INIT(&ph->ph_itemlist); + LIST_INSERT_HEAD(&pp->pr_emptypages, ph, ph_pagelist); + LIST_INIT(&ph->ph_itemlist); ph->ph_page = storage; ph->ph_nmissing = 0; - memset(&ph->ph_time, 0, sizeof(ph->ph_time)); + getmicrotime(&ph->ph_time); + if ((pp->pr_roflags & PR_PHINPAGE) == 0) + SPLAY_INSERT(phtree, &pp->pr_phtree, ph); pp->pr_nidle++; /* * Color this page. */ - cp = (caddr_t)(cp + pp->pr_curcolor); + ph->ph_off = pp->pr_curcolor; + cp = (char *)cp + ph->ph_off; if ((pp->pr_curcolor += align) > pp->pr_maxcolor) pp->pr_curcolor = 0; @@ -1102,7 +1471,9 @@ pool_prime_page(struct pool *pp, caddr_t * Adjust storage to apply aligment to `pr_itemoffset' in each item. */ if (ioff != 0) - cp = (caddr_t)(cp + (align - ioff)); + cp = (char *)cp + align - ioff; + + KASSERT((((vaddr_t)cp + ioff) & (align - 1)) == 0); /* * Insert remaining chunks on the bucket list. @@ -1110,15 +1481,23 @@ pool_prime_page(struct pool *pp, caddr_t n = pp->pr_itemsperpage; pp->pr_nitems += n; - while (n--) { - pi = (struct pool_item *)cp; + if (pp->pr_roflags & PR_NOTOUCH) { + pr_item_notouch_init(pp, ph); + } else { + while (n--) { + pi = (struct pool_item *)cp; + + KASSERT(((((vaddr_t)pi) + ioff) & (align - 1)) == 0); - /* Insert on page list */ - TAILQ_INSERT_TAIL(&ph->ph_itemlist, pi, pi_list); + /* Insert on page list */ + LIST_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list); #ifdef DIAGNOSTIC - pi->pi_magic = PI_MAGIC; + pi->pi_magic = PI_MAGIC; #endif - cp = (caddr_t)(cp + pp->pr_size); + cp = (char *)cp + pp->pr_size; + + KASSERT((((vaddr_t)cp + ioff) & (align - 1)) == 0); + } } /* @@ -1133,65 +1512,42 @@ pool_prime_page(struct pool *pp, caddr_t /* * Used by pool_get() when nitems drops below the low water mark. This - * is used to catch up nitmes with the low water mark. + * is used to catch up pr_nitems with the low water mark. * * Note 1, we never wait for memory here, we let the caller decide what to do. * - * Note 2, this doesn't work with static pools. - * - * Note 3, we must be called with the pool already locked, and we return + * Note 2, we must be called with the pool already locked, and we return * with it locked. */ static int pool_catchup(struct pool *pp) { - struct pool_item_header *ph; - caddr_t cp; int error = 0; - if (pp->pr_roflags & PR_STATIC) { - /* - * We dropped below the low water mark, and this is not a - * good thing. Log a warning. - * - * XXX: rate-limit this? - */ - printf("WARNING: static pool `%s' dropped below low water " - "mark\n", pp->pr_wchan); - return (0); - } - while (POOL_NEEDS_CATCHUP(pp)) { - /* - * Call the page back-end allocator for more memory. - * - * XXX: We never wait, so should we bother unlocking - * the pool descriptor? - */ - simple_unlock(&pp->pr_slock); - cp = (*pp->pr_alloc)(pp->pr_pagesz, PR_NOWAIT, pp->pr_mtype); - if (__predict_true(cp != NULL)) - ph = pool_alloc_item_header(pp, cp, PR_NOWAIT); - simple_lock(&pp->pr_slock); - if (__predict_false(cp == NULL || ph == NULL)) { - if (cp != NULL) - (*pp->pr_free)(cp, pp->pr_pagesz, pp->pr_mtype); - error = ENOMEM; + error = pool_grow(pp, PR_NOWAIT); + if (error) { break; } - pool_prime_page(pp, cp, ph); - pp->pr_npagealloc++; } + return error; +} + +static void +pool_update_curpage(struct pool *pp) +{ - return (error); + pp->pr_curpage = LIST_FIRST(&pp->pr_partpages); + if (pp->pr_curpage == NULL) { + pp->pr_curpage = LIST_FIRST(&pp->pr_emptypages); + } } void pool_setlowat(struct pool *pp, int n) { - int error; - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pp->pr_minitems = n; pp->pr_minpages = (n == 0) @@ -1199,7 +1555,7 @@ pool_setlowat(struct pool *pp, int n) : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; /* Make sure we're caught up with the newly-set low water mark. */ - if (POOL_NEEDS_CATCHUP(pp) && (error = pool_catchup(pp) != 0)) { + if (POOL_NEEDS_CATCHUP(pp) && pool_catchup(pp) != 0) { /* * XXX: Should we log a warning? Should we set up a timeout * to try again in a second or so? The latter could break @@ -1207,27 +1563,27 @@ pool_setlowat(struct pool *pp, int n) */ } - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); } void pool_sethiwat(struct pool *pp, int n) { - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pp->pr_maxpages = (n == 0) ? 0 : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); } void pool_sethardlimit(struct pool *pp, int n, const char *warnmess, int ratecap) { - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pp->pr_hardlimit = n; pp->pr_hardlimit_warning = warnmess; @@ -1243,88 +1599,13 @@ pool_sethardlimit(struct pool *pp, int n ? 0 : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; - simple_unlock(&pp->pr_slock); -} - -/* - * Default page allocator. - */ -static void * -pool_page_alloc(unsigned long sz, int flags, int mtype) -{ - boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; - - return ((void *)uvm_km_alloc_poolpage(waitok)); -} - -static void -pool_page_free(void *v, unsigned long sz, int mtype) -{ - - uvm_km_free_poolpage((vaddr_t)v); -} - -#ifdef POOL_SUBPAGE -/* - * Sub-page allocator, for machines with large hardware pages. - */ -static void * -pool_subpage_alloc(unsigned long sz, int flags, int mtype) -{ - - return pool_get(&psppool, flags); -} - -static void -pool_subpage_free(void *v, unsigned long sz, int mtype) -{ - - pool_put(&psppool, v); -} -#endif - -#ifdef POOL_SUBPAGE -/* We don't provide a real nointr allocator. Maybe later. */ -void * -pool_page_alloc_nointr(unsigned long sz, int flags, int mtype) -{ - - return pool_subpage_alloc(sz, flags, mtype); -} - -void -pool_page_free_nointr(void *v, unsigned long sz, int mtype) -{ - - pool_subpage_free(v, sz, mtype); -} -#else -/* - * Alternate pool page allocator for pools that know they will - * never be accessed in interrupt context. - */ -void * -pool_page_alloc_nointr(unsigned long sz, int flags, int mtype) -{ - boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; - - return ((void *)uvm_km_alloc_poolpage1(kernel_map, uvm.kernel_object, - waitok)); -} - -void -pool_page_free_nointr(void *v, unsigned long sz, int mtype) -{ - - uvm_km_free_poolpage1(kernel_map, (vaddr_t)v); + mutex_exit(&pp->pr_lock); } -#endif - /* * Release all complete pages that have not been used recently. */ -void +int #ifdef POOL_DIAGNOSTIC _pool_reclaim(struct pool *pp, const char *file, long line) #else @@ -1332,99 +1613,153 @@ pool_reclaim(struct pool *pp) #endif { struct pool_item_header *ph, *phnext; - struct pool_cache *pc; - struct timeval curtime; struct pool_pagelist pq; - int s; + struct timeval curtime, diff; + bool klock; + int rv; - if (pp->pr_roflags & PR_STATIC) - return; - - if (simple_lock_try(&pp->pr_slock) == 0) - return; - pr_enter(pp, file, line); - TAILQ_INIT(&pq); + if (pp->pr_drain_hook != NULL) { + /* + * The drain hook must be called with the pool unlocked. + */ + (*pp->pr_drain_hook)(pp->pr_drain_hook_arg, PR_NOWAIT); + } /* - * Reclaim items from the pool's caches. + * XXXSMP Because mutexes at IPL_SOFTXXX are still spinlocks, + * and we are called from the pagedaemon without kernel_lock. + * Does not apply to IPL_SOFTBIO. */ - TAILQ_FOREACH(pc, &pp->pr_cachelist, pc_poollist) - pool_cache_reclaim(pc); + if (pp->pr_ipl == IPL_SOFTNET || pp->pr_ipl == IPL_SOFTCLOCK || + pp->pr_ipl == IPL_SOFTSERIAL) { + KERNEL_LOCK(1, NULL); + klock = true; + } else + klock = false; - s = splclock(); - curtime = mono_time; - splx(s); + /* Reclaim items from the pool's cache (if any). */ + if (pp->pr_cache != NULL) + pool_cache_invalidate(pp->pr_cache); - for (ph = TAILQ_FIRST(&pp->pr_pagelist); ph != NULL; ph = phnext) { - phnext = TAILQ_NEXT(ph, ph_pagelist); + if (mutex_tryenter(&pp->pr_lock) == 0) { + if (klock) { + KERNEL_UNLOCK_ONE(NULL); + } + return (0); + } + pr_enter(pp, file, line); + + LIST_INIT(&pq); + + getmicrotime(&curtime); + + for (ph = LIST_FIRST(&pp->pr_emptypages); ph != NULL; ph = phnext) { + phnext = LIST_NEXT(ph, ph_pagelist); /* Check our minimum page claim */ if (pp->pr_npages <= pp->pr_minpages) break; - if (ph->ph_nmissing == 0) { - struct timeval diff; - timersub(&curtime, &ph->ph_time, &diff); - if (diff.tv_sec < pool_inactive_time) - continue; + KASSERT(ph->ph_nmissing == 0); + timersub(&curtime, &ph->ph_time, &diff); + if (diff.tv_sec < pool_inactive_time + && !pa_starved_p(pp->pr_alloc)) + continue; - /* - * If freeing this page would put us below - * the low water mark, stop now. - */ - if ((pp->pr_nitems - pp->pr_itemsperpage) < - pp->pr_minitems) - break; + /* + * If freeing this page would put us below + * the low water mark, stop now. + */ + if ((pp->pr_nitems - pp->pr_itemsperpage) < + pp->pr_minitems) + break; - pr_rmpage(pp, ph, &pq); - } + pr_rmpage(pp, ph, &pq); } pr_leave(pp); - simple_unlock(&pp->pr_slock); - if (TAILQ_EMPTY(&pq)) { - return; + mutex_exit(&pp->pr_lock); + + if (LIST_EMPTY(&pq)) + rv = 0; + else { + pr_pagelist_free(pp, &pq); + rv = 1; } - while ((ph = TAILQ_FIRST(&pq)) != NULL) { - TAILQ_REMOVE(&pq, ph, ph_pagelist); - (*pp->pr_free)(ph->ph_page, pp->pr_pagesz, pp->pr_mtype); - if (pp->pr_roflags & PR_PHINPAGE) { - continue; - } - LIST_REMOVE(ph, ph_hashlist); - s = splhigh(); - pool_put(&phpool, ph); - splx(s); + + if (klock) { + KERNEL_UNLOCK_ONE(NULL); } -} + return (rv); +} /* - * Drain pools, one at a time. + * Drain pools, one at a time. This is a two stage process; + * drain_start kicks off a cross call to drain CPU-level caches + * if the pool has an associated pool_cache. drain_end waits + * for those cross calls to finish, and then drains the cache + * (if any) and pool. * - * Note, we must never be called from an interrupt context. + * Note, must never be called from interrupt context. */ void -pool_drain(void *arg) +pool_drain_start(struct pool **ppp, uint64_t *wp) { struct pool *pp; - int s; + + KASSERT(!TAILQ_EMPTY(&pool_head)); pp = NULL; - s = splvm(); - simple_lock(&pool_head_slock); - if (drainpp == NULL) { - drainpp = TAILQ_FIRST(&pool_head); - } - if (drainpp) { - pp = drainpp; - drainpp = TAILQ_NEXT(pp, pr_poollist); + + /* Find next pool to drain, and add a reference. */ + mutex_enter(&pool_head_lock); + do { + if (drainpp == NULL) { + drainpp = TAILQ_FIRST(&pool_head); + } + if (drainpp != NULL) { + pp = drainpp; + drainpp = TAILQ_NEXT(pp, pr_poollist); + } + /* + * Skip completely idle pools. We depend on at least + * one pool in the system being active. + */ + } while (pp == NULL || pp->pr_npages == 0); + pp->pr_refcnt++; + mutex_exit(&pool_head_lock); + + /* If there is a pool_cache, drain CPU level caches. */ + *ppp = pp; + if (pp->pr_cache != NULL) { + *wp = xc_broadcast(0, (xcfunc_t)pool_cache_xcall, + pp->pr_cache, NULL); } - simple_unlock(&pool_head_slock); - pool_reclaim(pp); - splx(s); } +void +pool_drain_end(struct pool *pp, uint64_t where) +{ + + if (pp == NULL) + return; + + KASSERT(pp->pr_refcnt > 0); + + /* Wait for remote draining to complete. */ + if (pp->pr_cache != NULL) + xc_wait(where); + + /* Drain the cache (if any) and pool.. */ + pool_reclaim(pp); + + /* Finally, unlock the pool. */ + mutex_enter(&pool_head_lock); + pp->pr_refcnt--; + cv_broadcast(&pool_busy); + mutex_exit(&pool_head_lock); +} /* * Diagnostic helpers. @@ -1432,59 +1767,67 @@ pool_drain(void *arg) void pool_print(struct pool *pp, const char *modif) { - int s; - s = splvm(); - if (simple_lock_try(&pp->pr_slock) == 0) { - printf("pool %s is locked; try again later\n", - pp->pr_wchan); - splx(s); - return; - } pool_print1(pp, modif, printf); - simple_unlock(&pp->pr_slock); - splx(s); +} + +void +pool_printall(const char *modif, void (*pr)(const char *, ...)) +{ + struct pool *pp; + + TAILQ_FOREACH(pp, &pool_head, pr_poollist) { + pool_printit(pp, modif, pr); + } } void pool_printit(struct pool *pp, const char *modif, void (*pr)(const char *, ...)) { - int didlock = 0; if (pp == NULL) { (*pr)("Must specify a pool to print.\n"); return; } - /* - * Called from DDB; interrupts should be blocked, and all - * other processors should be paused. We can skip locking - * the pool in this case. - * - * We do a simple_lock_try() just to print the lock - * status, however. - */ - - if (simple_lock_try(&pp->pr_slock) == 0) - (*pr)("WARNING: pool %s is locked\n", pp->pr_wchan); - else - didlock = 1; - pool_print1(pp, modif, pr); - - if (didlock) - simple_unlock(&pp->pr_slock); } static void -pool_print1(struct pool *pp, const char *modif, void (*pr)(const char *, ...)) +pool_print_pagelist(struct pool *pp, struct pool_pagelist *pl, + void (*pr)(const char *, ...)) { struct pool_item_header *ph; - struct pool_cache *pc; - struct pool_cache_group *pcg; #ifdef DIAGNOSTIC struct pool_item *pi; #endif + + LIST_FOREACH(ph, pl, ph_pagelist) { + (*pr)("\t\tpage %p, nmissing %d, time %lu,%lu\n", + ph->ph_page, ph->ph_nmissing, + (u_long)ph->ph_time.tv_sec, + (u_long)ph->ph_time.tv_usec); +#ifdef DIAGNOSTIC + if (!(pp->pr_roflags & PR_NOTOUCH)) { + LIST_FOREACH(pi, &ph->ph_itemlist, pi_list) { + if (pi->pi_magic != PI_MAGIC) { + (*pr)("\t\t\titem %p, magic 0x%x\n", + pi, pi->pi_magic); + } + } + } +#endif + } +} + +static void +pool_print1(struct pool *pp, const char *modif, void (*pr)(const char *, ...)) +{ + struct pool_item_header *ph; + pool_cache_t pc; + pcg_t *pcg; + pool_cache_cpu_t *cc; + uint64_t cpuhit, cpumiss; int i, print_log = 0, print_pagelist = 0, print_cache = 0; char c; @@ -1495,20 +1838,24 @@ pool_print1(struct pool *pp, const char print_pagelist = 1; if (c == 'c') print_cache = 1; - modif++; } - (*pr)("POOL %s: size %u, align %u, ioff %u, roflags 0x%08x\n", + if ((pc = pp->pr_cache) != NULL) { + (*pr)("POOL CACHE"); + } else { + (*pr)("POOL"); + } + + (*pr)(" %s: size %u, align %u, ioff %u, roflags 0x%08x\n", pp->pr_wchan, pp->pr_size, pp->pr_align, pp->pr_itemoffset, pp->pr_roflags); - (*pr)("\tpagesz %u, mtype %d\n", pp->pr_pagesz, pp->pr_mtype); - (*pr)("\talloc %p, release %p\n", pp->pr_alloc, pp->pr_free); + (*pr)("\talloc %p\n", pp->pr_alloc); (*pr)("\tminitems %u, minpages %u, maxpages %u, npages %u\n", pp->pr_minitems, pp->pr_minpages, pp->pr_maxpages, pp->pr_npages); (*pr)("\titemsperpage %u, nitems %u, nout %u, hardlimit %u\n", pp->pr_itemsperpage, pp->pr_nitems, pp->pr_nout, pp->pr_hardlimit); - (*pr)("\n\tnget %lu, nfail %lu, nput %lu\n", + (*pr)("\tnget %lu, nfail %lu, nput %lu\n", pp->pr_nget, pp->pr_nfail, pp->pr_nput); (*pr)("\tnpagealloc %lu, npagefree %lu, hiwat %u, nidle %lu\n", pp->pr_npagealloc, pp->pr_npagefree, pp->pr_hiwat, pp->pr_nidle); @@ -1516,74 +1863,93 @@ pool_print1(struct pool *pp, const char if (print_pagelist == 0) goto skip_pagelist; - if ((ph = TAILQ_FIRST(&pp->pr_pagelist)) != NULL) - (*pr)("\n\tpage list:\n"); - for (; ph != NULL; ph = TAILQ_NEXT(ph, ph_pagelist)) { - (*pr)("\t\tpage %p, nmissing %d, time %lu,%lu\n", - ph->ph_page, ph->ph_nmissing, - (u_long)ph->ph_time.tv_sec, - (u_long)ph->ph_time.tv_usec); -#ifdef DIAGNOSTIC - TAILQ_FOREACH(pi, &ph->ph_itemlist, pi_list) { - if (pi->pi_magic != PI_MAGIC) { - (*pr)("\t\t\titem %p, magic 0x%x\n", - pi, pi->pi_magic); - } - } -#endif - } + if ((ph = LIST_FIRST(&pp->pr_emptypages)) != NULL) + (*pr)("\n\tempty page list:\n"); + pool_print_pagelist(pp, &pp->pr_emptypages, pr); + if ((ph = LIST_FIRST(&pp->pr_fullpages)) != NULL) + (*pr)("\n\tfull page list:\n"); + pool_print_pagelist(pp, &pp->pr_fullpages, pr); + if ((ph = LIST_FIRST(&pp->pr_partpages)) != NULL) + (*pr)("\n\tpartial-page list:\n"); + pool_print_pagelist(pp, &pp->pr_partpages, pr); + if (pp->pr_curpage == NULL) (*pr)("\tno current page\n"); else (*pr)("\tcurpage %p\n", pp->pr_curpage->ph_page); skip_pagelist: - if (print_log == 0) goto skip_log; (*pr)("\n"); if ((pp->pr_roflags & PR_LOGGING) == 0) (*pr)("\tno log\n"); - else + else { pr_printlog(pp, NULL, pr); + } skip_log: - if (print_cache == 0) - goto skip_cache; - - TAILQ_FOREACH(pc, &pp->pr_cachelist, pc_poollist) { - (*pr)("\tcache %p: allocfrom %p freeto %p\n", pc, - pc->pc_allocfrom, pc->pc_freeto); - (*pr)("\t hits %lu misses %lu ngroups %lu nitems %lu\n", - pc->pc_hits, pc->pc_misses, pc->pc_ngroups, pc->pc_nitems); - TAILQ_FOREACH(pcg, &pc->pc_grouplist, pcg_list) { - (*pr)("\t\tgroup %p: avail %d\n", pcg, pcg->pcg_avail); - for (i = 0; i < PCG_NOBJECTS; i++) - (*pr)("\t\t\t%p\n", pcg->pcg_objects[i]); +#define PR_GROUPLIST(pcg) \ + (*pr)("\t\tgroup %p: avail %d\n", pcg, pcg->pcg_avail); \ + for (i = 0; i < pcg->pcg_size; i++) { \ + if (pcg->pcg_objects[i].pcgo_pa != \ + POOL_PADDR_INVALID) { \ + (*pr)("\t\t\t%p, 0x%llx\n", \ + pcg->pcg_objects[i].pcgo_va, \ + (unsigned long long) \ + pcg->pcg_objects[i].pcgo_pa); \ + } else { \ + (*pr)("\t\t\t%p\n", \ + pcg->pcg_objects[i].pcgo_va); \ + } \ + } + + if (pc != NULL) { + cpuhit = 0; + cpumiss = 0; + for (i = 0; i < MAXCPUS; i++) { + if ((cc = pc->pc_cpus[i]) == NULL) + continue; + cpuhit += cc->cc_hits; + cpumiss += cc->cc_misses; + } + (*pr)("\tcpu layer hits %llu misses %llu\n", cpuhit, cpumiss); + (*pr)("\tcache layer hits %llu misses %llu\n", + pc->pc_hits, pc->pc_misses); + (*pr)("\tcache layer entry uncontended %llu contended %llu\n", + pc->pc_hits + pc->pc_misses - pc->pc_contended, + pc->pc_contended); + (*pr)("\tcache layer empty groups %u full groups %u\n", + pc->pc_nempty, pc->pc_nfull); + if (print_cache) { + (*pr)("\tfull cache groups:\n"); + for (pcg = pc->pc_fullgroups; pcg != NULL; + pcg = pcg->pcg_next) { + PR_GROUPLIST(pcg); + } + (*pr)("\tempty cache groups:\n"); + for (pcg = pc->pc_emptygroups; pcg != NULL; + pcg = pcg->pcg_next) { + PR_GROUPLIST(pcg); + } } } - - skip_cache: +#undef PR_GROUPLIST pr_enter_check(pp, pr); } -int -pool_chk(struct pool *pp, const char *label) +static int +pool_chk_page(struct pool *pp, const char *label, struct pool_item_header *ph) { - struct pool_item_header *ph; - int r = 0; - - simple_lock(&pp->pr_slock); - - TAILQ_FOREACH(ph, &pp->pr_pagelist, ph_pagelist) { - struct pool_item *pi; - int n; - caddr_t page; + struct pool_item *pi; + void *page; + int n; - page = (caddr_t)((u_long)ph & pp->pr_pagemask); + if ((pp->pr_roflags & PR_NOALIGN) == 0) { + page = (void *)((uintptr_t)ph & pp->pr_alloc->pa_pagemask); if (page != ph->ph_page && (pp->pr_roflags & PR_PHINPAGE) != 0) { if (label != NULL) @@ -1592,42 +1958,75 @@ pool_chk(struct pool *pp, const char *la " at page head addr %p (p %p)\n", pp, pp->pr_wchan, ph->ph_page, ph, page); - r++; - goto out; + return 1; } + } - for (pi = TAILQ_FIRST(&ph->ph_itemlist), n = 0; - pi != NULL; - pi = TAILQ_NEXT(pi,pi_list), n++) { + if ((pp->pr_roflags & PR_NOTOUCH) != 0) + return 0; -#ifdef DIAGNOSTIC - if (pi->pi_magic != PI_MAGIC) { - if (label != NULL) - printf("%s: ", label); - printf("pool(%s): free list modified: magic=%x;" - " page %p; item ordinal %d;" - " addr %p (p %p)\n", - pp->pr_wchan, pi->pi_magic, ph->ph_page, - n, pi, page); - panic("pool"); - } -#endif - page = (caddr_t)((u_long)pi & pp->pr_pagemask); - if (page == ph->ph_page) - continue; + for (pi = LIST_FIRST(&ph->ph_itemlist), n = 0; + pi != NULL; + pi = LIST_NEXT(pi,pi_list), n++) { +#ifdef DIAGNOSTIC + if (pi->pi_magic != PI_MAGIC) { if (label != NULL) printf("%s: ", label); - printf("pool(%p:%s): page inconsistency: page %p;" - " item ordinal %d; addr %p (p %p)\n", pp, - pp->pr_wchan, ph->ph_page, - n, pi, page); - r++; - goto out; + printf("pool(%s): free list modified: magic=%x;" + " page %p; item ordinal %d; addr %p\n", + pp->pr_wchan, pi->pi_magic, ph->ph_page, + n, pi); + panic("pool"); + } +#endif + if ((pp->pr_roflags & PR_NOALIGN) != 0) { + continue; } + page = (void *)((uintptr_t)pi & pp->pr_alloc->pa_pagemask); + if (page == ph->ph_page) + continue; + + if (label != NULL) + printf("%s: ", label); + printf("pool(%p:%s): page inconsistency: page %p;" + " item ordinal %d; addr %p (p %p)\n", pp, + pp->pr_wchan, ph->ph_page, + n, pi, page); + return 1; } + return 0; +} + + +int +pool_chk(struct pool *pp, const char *label) +{ + struct pool_item_header *ph; + int r = 0; + + mutex_enter(&pp->pr_lock); + LIST_FOREACH(ph, &pp->pr_emptypages, ph_pagelist) { + r = pool_chk_page(pp, label, ph); + if (r) { + goto out; + } + } + LIST_FOREACH(ph, &pp->pr_fullpages, ph_pagelist) { + r = pool_chk_page(pp, label, ph); + if (r) { + goto out; + } + } + LIST_FOREACH(ph, &pp->pr_partpages, ph_pagelist) { + r = pool_chk_page(pp, label, ph); + if (r) { + goto out; + } + } + out: - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); return (r); } @@ -1635,38 +2034,112 @@ out: * pool_cache_init: * * Initialize a pool cache. + */ +pool_cache_t +pool_cache_init(size_t size, u_int align, u_int align_offset, u_int flags, + const char *wchan, struct pool_allocator *palloc, int ipl, + int (*ctor)(void *, void *, int), void (*dtor)(void *, void *), void *arg) +{ + pool_cache_t pc; + + pc = pool_get(&cache_pool, PR_WAITOK); + if (pc == NULL) + return NULL; + + pool_cache_bootstrap(pc, size, align, align_offset, flags, wchan, + palloc, ipl, ctor, dtor, arg); + + return pc; +} + +/* + * pool_cache_bootstrap: * - * NOTE: If the pool must be protected from interrupts, we expect - * to be called at the appropriate interrupt priority level. + * Kernel-private version of pool_cache_init(). The caller + * provides initial storage. */ void -pool_cache_init(struct pool_cache *pc, struct pool *pp, - int (*ctor)(void *, void *, int), - void (*dtor)(void *, void *), +pool_cache_bootstrap(pool_cache_t pc, size_t size, u_int align, + u_int align_offset, u_int flags, const char *wchan, + struct pool_allocator *palloc, int ipl, + int (*ctor)(void *, void *, int), void (*dtor)(void *, void *), void *arg) { + CPU_INFO_ITERATOR cii; + pool_cache_t pc1; + struct cpu_info *ci; + struct pool *pp; + + pp = &pc->pc_pool; + if (palloc == NULL && ipl == IPL_NONE) + palloc = &pool_allocator_nointr; + pool_init(pp, size, align, align_offset, flags, wchan, palloc, ipl); - TAILQ_INIT(&pc->pc_grouplist); - simple_lock_init(&pc->pc_slock); + /* + * XXXAD hack to prevent IP input processing from blocking. + */ + if (ipl == IPL_SOFTNET) { + mutex_init(&pc->pc_lock, MUTEX_DEFAULT, IPL_VM); + } else { + mutex_init(&pc->pc_lock, MUTEX_DEFAULT, ipl); + } - pc->pc_allocfrom = NULL; - pc->pc_freeto = NULL; - pc->pc_pool = pp; + if (ctor == NULL) { + ctor = (int (*)(void *, void *, int))nullop; + } + if (dtor == NULL) { + dtor = (void (*)(void *, void *))nullop; + } + pc->pc_emptygroups = NULL; + pc->pc_fullgroups = NULL; + pc->pc_partgroups = NULL; pc->pc_ctor = ctor; pc->pc_dtor = dtor; pc->pc_arg = arg; - - pc->pc_hits = 0; + pc->pc_hits = 0; pc->pc_misses = 0; + pc->pc_nempty = 0; + pc->pc_npart = 0; + pc->pc_nfull = 0; + pc->pc_contended = 0; + pc->pc_refcnt = 0; + pc->pc_freecheck = NULL; - pc->pc_ngroups = 0; + if ((flags & PR_LARGECACHE) != 0) { + pc->pc_pcgsize = PCG_NOBJECTS_LARGE; + } else { + pc->pc_pcgsize = PCG_NOBJECTS_NORMAL; + } - pc->pc_nitems = 0; + /* Allocate per-CPU caches. */ + memset(pc->pc_cpus, 0, sizeof(pc->pc_cpus)); + pc->pc_ncpu = 0; + if (ncpu < 2) { + /* XXX For sparc: boot CPU is not attached yet. */ + pool_cache_cpu_init1(curcpu(), pc); + } else { + for (CPU_INFO_FOREACH(cii, ci)) { + pool_cache_cpu_init1(ci, pc); + } + } - simple_lock(&pp->pr_slock); - TAILQ_INSERT_TAIL(&pp->pr_cachelist, pc, pc_poollist); - simple_unlock(&pp->pr_slock); + /* Add to list of all pools. */ + if (__predict_true(!cold)) + mutex_enter(&pool_head_lock); + TAILQ_FOREACH(pc1, &pool_cache_head, pc_cachelist) { + if (strcmp(pc1->pc_pool.pr_wchan, pc->pc_pool.pr_wchan) > 0) + break; + } + if (pc1 == NULL) + TAILQ_INSERT_TAIL(&pool_cache_head, pc, pc_cachelist); + else + TAILQ_INSERT_BEFORE(pc1, pc, pc_cachelist); + if (__predict_true(!cold)) + mutex_exit(&pool_head_lock); + + membar_sync(); + pp->pr_cache = pc; } /* @@ -1675,240 +2148,932 @@ pool_cache_init(struct pool_cache *pc, s * Destroy a pool cache. */ void -pool_cache_destroy(struct pool_cache *pc) +pool_cache_destroy(pool_cache_t pc) { - struct pool *pp = pc->pc_pool; + struct pool *pp = &pc->pc_pool; + pool_cache_cpu_t *cc; + pcg_t *pcg; + int i; + + /* Remove it from the global list. */ + mutex_enter(&pool_head_lock); + while (pc->pc_refcnt != 0) + cv_wait(&pool_busy, &pool_head_lock); + TAILQ_REMOVE(&pool_cache_head, pc, pc_cachelist); + mutex_exit(&pool_head_lock); /* First, invalidate the entire cache. */ pool_cache_invalidate(pc); - /* ...and remove it from the pool's cache list. */ - simple_lock(&pp->pr_slock); - TAILQ_REMOVE(&pp->pr_cachelist, pc, pc_poollist); - simple_unlock(&pp->pr_slock); + /* Disassociate it from the pool. */ + mutex_enter(&pp->pr_lock); + pp->pr_cache = NULL; + mutex_exit(&pp->pr_lock); + + /* Destroy per-CPU data */ + for (i = 0; i < MAXCPUS; i++) { + if ((cc = pc->pc_cpus[i]) == NULL) + continue; + if ((pcg = cc->cc_current) != NULL) { + pcg->pcg_next = NULL; + pool_cache_invalidate_groups(pc, pcg); + } + if ((pcg = cc->cc_previous) != NULL) { + pcg->pcg_next = NULL; + pool_cache_invalidate_groups(pc, pcg); + } + if (cc != &pc->pc_cpu0) + pool_put(&cache_cpu_pool, cc); + } + + /* Finally, destroy it. */ + mutex_destroy(&pc->pc_lock); + pool_destroy(pp); + pool_put(&cache_pool, pc); } -static __inline void * -pcg_get(struct pool_cache_group *pcg) +/* + * pool_cache_cpu_init1: + * + * Called for each pool_cache whenever a new CPU is attached. + */ +static void +pool_cache_cpu_init1(struct cpu_info *ci, pool_cache_t pc) { - void *object; - u_int idx; + pool_cache_cpu_t *cc; + int index; - KASSERT(pcg->pcg_avail <= PCG_NOBJECTS); - KASSERT(pcg->pcg_avail != 0); - idx = --pcg->pcg_avail; + index = ci->ci_index; - KASSERT(pcg->pcg_objects[idx] != NULL); - object = pcg->pcg_objects[idx]; - pcg->pcg_objects[idx] = NULL; + KASSERT(index < MAXCPUS); + KASSERT(((uintptr_t)pc->pc_cpus & (CACHE_LINE_SIZE - 1)) == 0); + + if ((cc = pc->pc_cpus[index]) != NULL) { + KASSERT(cc->cc_cpuindex == index); + return; + } - return (object); + /* + * The first CPU is 'free'. This needs to be the case for + * bootstrap - we may not be able to allocate yet. + */ + if (pc->pc_ncpu == 0) { + cc = &pc->pc_cpu0; + pc->pc_ncpu = 1; + } else { + mutex_enter(&pc->pc_lock); + pc->pc_ncpu++; + mutex_exit(&pc->pc_lock); + cc = pool_get(&cache_cpu_pool, PR_WAITOK); + } + + cc->cc_ipl = pc->pc_pool.pr_ipl; + cc->cc_iplcookie = makeiplcookie(cc->cc_ipl); + cc->cc_cache = pc; + cc->cc_cpuindex = index; + cc->cc_hits = 0; + cc->cc_misses = 0; + cc->cc_current = NULL; + cc->cc_previous = NULL; + + pc->pc_cpus[index] = cc; } -static __inline void -pcg_put(struct pool_cache_group *pcg, void *object) +/* + * pool_cache_cpu_init: + * + * Called whenever a new CPU is attached. + */ +void +pool_cache_cpu_init(struct cpu_info *ci) { - u_int idx; + pool_cache_t pc; + + mutex_enter(&pool_head_lock); + TAILQ_FOREACH(pc, &pool_cache_head, pc_cachelist) { + pc->pc_refcnt++; + mutex_exit(&pool_head_lock); - KASSERT(pcg->pcg_avail < PCG_NOBJECTS); - idx = pcg->pcg_avail++; + pool_cache_cpu_init1(ci, pc); - KASSERT(pcg->pcg_objects[idx] == NULL); - pcg->pcg_objects[idx] = object; + mutex_enter(&pool_head_lock); + pc->pc_refcnt--; + cv_broadcast(&pool_busy); + } + mutex_exit(&pool_head_lock); } /* - * pool_cache_get: + * pool_cache_reclaim: * - * Get an object from a pool cache. + * Reclaim memory from a pool cache. */ -void * -pool_cache_get(struct pool_cache *pc, int flags) +bool +pool_cache_reclaim(pool_cache_t pc) +{ + + return pool_reclaim(&pc->pc_pool); +} + +static void +pool_cache_destruct_object1(pool_cache_t pc, void *object) +{ + + (*pc->pc_dtor)(pc->pc_arg, object); + pool_put(&pc->pc_pool, object); +} + +/* + * pool_cache_destruct_object: + * + * Force destruction of an object and its release back into + * the pool. + */ +void +pool_cache_destruct_object(pool_cache_t pc, void *object) +{ + + FREECHECK_IN(&pc->pc_freecheck, object); + + pool_cache_destruct_object1(pc, object); +} + +/* + * pool_cache_invalidate_groups: + * + * Invalidate a chain of groups and destruct all objects. + */ +static void +pool_cache_invalidate_groups(pool_cache_t pc, pcg_t *pcg) { - struct pool_cache_group *pcg; void *object; + pcg_t *next; + int i; -#ifdef LOCKDEBUG - if (flags & PR_WAITOK) - simple_lock_only_held(NULL, "pool_cache_get(PR_WAITOK)"); -#endif + for (; pcg != NULL; pcg = next) { + next = pcg->pcg_next; - simple_lock(&pc->pc_slock); + for (i = 0; i < pcg->pcg_avail; i++) { + object = pcg->pcg_objects[i].pcgo_va; + pool_cache_destruct_object1(pc, object); + } - if ((pcg = pc->pc_allocfrom) == NULL) { - TAILQ_FOREACH(pcg, &pc->pc_grouplist, pcg_list) { - if (pcg->pcg_avail != 0) { - pc->pc_allocfrom = pcg; - goto have_group; - } + if (pcg->pcg_size == PCG_NOBJECTS_LARGE) { + pool_put(&pcg_large_pool, pcg); + } else { + KASSERT(pcg->pcg_size == PCG_NOBJECTS_NORMAL); + pool_put(&pcg_normal_pool, pcg); } + } +} + +/* + * pool_cache_invalidate: + * + * Invalidate a pool cache (destruct and release all of the + * cached objects). Does not reclaim objects from the pool. + */ +void +pool_cache_invalidate(pool_cache_t pc) +{ + pcg_t *full, *empty, *part; + + mutex_enter(&pc->pc_lock); + full = pc->pc_fullgroups; + empty = pc->pc_emptygroups; + part = pc->pc_partgroups; + pc->pc_fullgroups = NULL; + pc->pc_emptygroups = NULL; + pc->pc_partgroups = NULL; + pc->pc_nfull = 0; + pc->pc_nempty = 0; + pc->pc_npart = 0; + mutex_exit(&pc->pc_lock); + + pool_cache_invalidate_groups(pc, full); + pool_cache_invalidate_groups(pc, empty); + pool_cache_invalidate_groups(pc, part); +} + +void +pool_cache_set_drain_hook(pool_cache_t pc, void (*fn)(void *, int), void *arg) +{ + + pool_set_drain_hook(&pc->pc_pool, fn, arg); +} + +void +pool_cache_setlowat(pool_cache_t pc, int n) +{ + + pool_setlowat(&pc->pc_pool, n); +} + +void +pool_cache_sethiwat(pool_cache_t pc, int n) +{ + + pool_sethiwat(&pc->pc_pool, n); +} + +void +pool_cache_sethardlimit(pool_cache_t pc, int n, const char *warnmess, int ratecap) +{ + + pool_sethardlimit(&pc->pc_pool, n, warnmess, ratecap); +} + +static inline pool_cache_cpu_t * +pool_cache_cpu_enter(pool_cache_t pc, int *s) +{ + pool_cache_cpu_t *cc; + + /* + * Prevent other users of the cache from accessing our + * CPU-local data. To avoid touching shared state, we + * pull the neccessary information from CPU local data. + */ + crit_enter(); + cc = pc->pc_cpus[curcpu()->ci_index]; + KASSERT(cc->cc_cache == pc); + if (cc->cc_ipl != IPL_NONE) { + *s = splraiseipl(cc->cc_iplcookie); + } + KASSERT(((uintptr_t)cc & (CACHE_LINE_SIZE - 1)) == 0); + + return cc; +} + +static inline void +pool_cache_cpu_exit(pool_cache_cpu_t *cc, int *s) +{ + + /* No longer need exclusive access to the per-CPU data. */ + if (cc->cc_ipl != IPL_NONE) { + splx(*s); + } + crit_exit(); +} + +#if __GNUC_PREREQ__(3, 0) +__attribute ((noinline)) +#endif +pool_cache_cpu_t * +pool_cache_get_slow(pool_cache_cpu_t *cc, int *s, void **objectp, + paddr_t *pap, int flags) +{ + pcg_t *pcg, *cur; + uint64_t ncsw; + pool_cache_t pc; + void *object; + + pc = cc->cc_cache; + cc->cc_misses++; + + /* + * Nothing was available locally. Try and grab a group + * from the cache. + */ + if (!mutex_tryenter(&pc->pc_lock)) { + ncsw = curlwp->l_ncsw; + mutex_enter(&pc->pc_lock); + pc->pc_contended++; /* - * No groups with any available objects. Allocate - * a new object, construct it, and return it to - * the caller. We will allocate a group, if necessary, - * when the object is freed back to the cache. + * If we context switched while locking, then + * our view of the per-CPU data is invalid: + * retry. */ - pc->pc_misses++; - simple_unlock(&pc->pc_slock); - object = pool_get(pc->pc_pool, flags); - if (object != NULL && pc->pc_ctor != NULL) { - if ((*pc->pc_ctor)(pc->pc_arg, object, flags) != 0) { - pool_put(pc->pc_pool, object); - return (NULL); - } + if (curlwp->l_ncsw != ncsw) { + mutex_exit(&pc->pc_lock); + pool_cache_cpu_exit(cc, s); + return pool_cache_cpu_enter(pc, s); } - return (object); } - have_group: - pc->pc_hits++; - pc->pc_nitems--; - object = pcg_get(pcg); - - if (pcg->pcg_avail == 0) - pc->pc_allocfrom = NULL; + if ((pcg = pc->pc_fullgroups) != NULL) { + /* + * If there's a full group, release our empty + * group back to the cache. Install the full + * group as cc_current and return. + */ + if ((cur = cc->cc_current) != NULL) { + KASSERT(cur->pcg_avail == 0); + cur->pcg_next = pc->pc_emptygroups; + pc->pc_emptygroups = cur; + pc->pc_nempty++; + } + KASSERT(pcg->pcg_avail == pcg->pcg_size); + cc->cc_current = pcg; + pc->pc_fullgroups = pcg->pcg_next; + pc->pc_hits++; + pc->pc_nfull--; + mutex_exit(&pc->pc_lock); + return cc; + } - simple_unlock(&pc->pc_slock); + /* + * Nothing available locally or in cache. Take the slow + * path: fetch a new object from the pool and construct + * it. + */ + pc->pc_misses++; + mutex_exit(&pc->pc_lock); + pool_cache_cpu_exit(cc, s); + + object = pool_get(&pc->pc_pool, flags); + *objectp = object; + if (object == NULL) + return NULL; + + if ((*pc->pc_ctor)(pc->pc_arg, object, flags) != 0) { + pool_put(&pc->pc_pool, object); + *objectp = NULL; + return NULL; + } + + KASSERT((((vaddr_t)object + pc->pc_pool.pr_itemoffset) & + (pc->pc_pool.pr_align - 1)) == 0); + + if (pap != NULL) { +#ifdef POOL_VTOPHYS + *pap = POOL_VTOPHYS(object); +#else + *pap = POOL_PADDR_INVALID; +#endif + } - return (object); + FREECHECK_OUT(&pc->pc_freecheck, object); + return NULL; } /* - * pool_cache_put: + * pool_cache_get{,_paddr}: * - * Put an object back to the pool cache. + * Get an object from a pool cache (optionally returning + * the physical address of the object). */ -void -pool_cache_put(struct pool_cache *pc, void *object) +void * +pool_cache_get_paddr(pool_cache_t pc, int flags, paddr_t *pap) { - struct pool_cache_group *pcg; + pool_cache_cpu_t *cc; + pcg_t *pcg; + void *object; int s; - simple_lock(&pc->pc_slock); +#ifdef LOCKDEBUG + if (flags & PR_WAITOK) + ASSERT_SLEEPABLE(NULL, "pool_cache_get(PR_WAITOK)"); +#endif - if ((pcg = pc->pc_freeto) == NULL) { - TAILQ_FOREACH(pcg, &pc->pc_grouplist, pcg_list) { - if (pcg->pcg_avail != PCG_NOBJECTS) { - pc->pc_freeto = pcg; - goto have_group; - } + cc = pool_cache_cpu_enter(pc, &s); + do { + /* Try and allocate an object from the current group. */ + pcg = cc->cc_current; + if (pcg != NULL && pcg->pcg_avail > 0) { + object = pcg->pcg_objects[--pcg->pcg_avail].pcgo_va; + if (pap != NULL) + *pap = pcg->pcg_objects[pcg->pcg_avail].pcgo_pa; + pcg->pcg_objects[pcg->pcg_avail].pcgo_va = NULL; + KASSERT(pcg->pcg_avail <= pcg->pcg_size); + KASSERT(object != NULL); + cc->cc_hits++; + pool_cache_cpu_exit(cc, &s); + FREECHECK_OUT(&pc->pc_freecheck, object); + return object; } /* - * No empty groups to free the object to. Attempt to - * allocate one. + * That failed. If the previous group isn't empty, swap + * it with the current group and allocate from there. */ - simple_unlock(&pc->pc_slock); - s = splvm(); - pcg = pool_get(&pcgpool, PR_NOWAIT); - splx(s); - if (pcg != NULL) { - memset(pcg, 0, sizeof(*pcg)); - simple_lock(&pc->pc_slock); - pc->pc_ngroups++; - TAILQ_INSERT_TAIL(&pc->pc_grouplist, pcg, pcg_list); - if (pc->pc_freeto == NULL) - pc->pc_freeto = pcg; - goto have_group; + pcg = cc->cc_previous; + if (pcg != NULL && pcg->pcg_avail > 0) { + cc->cc_previous = cc->cc_current; + cc->cc_current = pcg; + continue; } /* - * Unable to allocate a cache group; destruct the object - * and free it back to the pool. + * Can't allocate from either group: try the slow path. + * If get_slow() allocated an object for us, or if + * no more objects are available, it will return NULL. + * Otherwise, we need to retry. */ - pool_cache_destruct_object(pc, object); - return; + cc = pool_cache_get_slow(cc, &s, &object, pap, flags); + } while (cc != NULL); + + return object; +} + +#if __GNUC_PREREQ__(3, 0) +__attribute ((noinline)) +#endif +pool_cache_cpu_t * +pool_cache_put_slow(pool_cache_cpu_t *cc, int *s, void *object, paddr_t pa) +{ + pcg_t *pcg, *cur; + uint64_t ncsw; + pool_cache_t pc; + u_int nobj; + + pc = cc->cc_cache; + cc->cc_misses++; + + /* + * No free slots locally. Try to grab an empty, unused + * group from the cache. + */ + if (!mutex_tryenter(&pc->pc_lock)) { + ncsw = curlwp->l_ncsw; + mutex_enter(&pc->pc_lock); + pc->pc_contended++; + + /* + * If we context switched while locking, then + * our view of the per-CPU data is invalid: + * retry. + */ + if (curlwp->l_ncsw != ncsw) { + mutex_exit(&pc->pc_lock); + pool_cache_cpu_exit(cc, s); + return pool_cache_cpu_enter(pc, s); + } } - have_group: - pc->pc_nitems++; - pcg_put(pcg, object); + if ((pcg = pc->pc_emptygroups) != NULL) { + /* + * If there's a empty group, release our full + * group back to the cache. Install the empty + * group and return. + */ + KASSERT(pcg->pcg_avail == 0); + pc->pc_emptygroups = pcg->pcg_next; + if (cc->cc_previous == NULL) { + cc->cc_previous = pcg; + } else { + if ((cur = cc->cc_current) != NULL) { + KASSERT(cur->pcg_avail == pcg->pcg_size); + cur->pcg_next = pc->pc_fullgroups; + pc->pc_fullgroups = cur; + pc->pc_nfull++; + } + cc->cc_current = pcg; + } + pc->pc_hits++; + pc->pc_nempty--; + mutex_exit(&pc->pc_lock); + return cc; + } - if (pcg->pcg_avail == PCG_NOBJECTS) - pc->pc_freeto = NULL; + /* + * Nothing available locally or in cache. Take the + * slow path and try to allocate a new group that we + * can release to. + */ + pc->pc_misses++; + mutex_exit(&pc->pc_lock); + pool_cache_cpu_exit(cc, s); - simple_unlock(&pc->pc_slock); -} + /* + * If we can't allocate a new group, just throw the + * object away. + */ + nobj = pc->pc_pcgsize; + if (pool_cache_disable) { + pcg = NULL; + } else if (nobj == PCG_NOBJECTS_LARGE) { + pcg = pool_get(&pcg_large_pool, PR_NOWAIT); + } else { + pcg = pool_get(&pcg_normal_pool, PR_NOWAIT); + } + if (pcg == NULL) { + pool_cache_destruct_object(pc, object); + return NULL; + } + pcg->pcg_avail = 0; + pcg->pcg_size = nobj; + + /* + * Add the empty group to the cache and try again. + */ + mutex_enter(&pc->pc_lock); + pcg->pcg_next = pc->pc_emptygroups; + pc->pc_emptygroups = pcg; + pc->pc_nempty++; + mutex_exit(&pc->pc_lock); + + return pool_cache_cpu_enter(pc, s); +} /* - * pool_cache_destruct_object: + * pool_cache_put{,_paddr}: * - * Force destruction of an object and its release back into - * the pool. + * Put an object back to the pool cache (optionally caching the + * physical address of the object). */ void -pool_cache_destruct_object(struct pool_cache *pc, void *object) +pool_cache_put_paddr(pool_cache_t pc, void *object, paddr_t pa) { + pool_cache_cpu_t *cc; + pcg_t *pcg; + int s; + + FREECHECK_IN(&pc->pc_freecheck, object); + + cc = pool_cache_cpu_enter(pc, &s); + do { + /* If the current group isn't full, release it there. */ + pcg = cc->cc_current; + if (pcg != NULL && pcg->pcg_avail < pcg->pcg_size) { + pcg->pcg_objects[pcg->pcg_avail].pcgo_va = object; + pcg->pcg_objects[pcg->pcg_avail].pcgo_pa = pa; + pcg->pcg_avail++; + cc->cc_hits++; + pool_cache_cpu_exit(cc, &s); + return; + } + + /* + * That failed. If the previous group is empty, swap + * it with the current group and try again. + */ + pcg = cc->cc_previous; + if (pcg != NULL && pcg->pcg_avail == 0) { + cc->cc_previous = cc->cc_current; + cc->cc_current = pcg; + continue; + } - if (pc->pc_dtor != NULL) - (*pc->pc_dtor)(pc->pc_arg, object); - pool_put(pc->pc_pool, object); + /* + * Can't free to either group: try the slow path. + * If put_slow() releases the object for us, it + * will return NULL. Otherwise we need to retry. + */ + cc = pool_cache_put_slow(cc, &s, object, pa); + } while (cc != NULL); } /* - * pool_cache_do_invalidate: + * pool_cache_xcall: * - * This internal function implements pool_cache_invalidate() and - * pool_cache_reclaim(). + * Transfer objects from the per-CPU cache to the global cache. + * Run within a cross-call thread. */ static void -pool_cache_do_invalidate(struct pool_cache *pc, int free_groups, - void (*putit)(struct pool *, void *)) +pool_cache_xcall(pool_cache_t pc) { - struct pool_cache_group *pcg, *npcg; - void *object; - int s; - - for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL; - pcg = npcg) { - npcg = TAILQ_NEXT(pcg, pcg_list); - while (pcg->pcg_avail != 0) { - pc->pc_nitems--; - object = pcg_get(pcg); - if (pcg->pcg_avail == 0 && pc->pc_allocfrom == pcg) - pc->pc_allocfrom = NULL; - if (pc->pc_dtor != NULL) - (*pc->pc_dtor)(pc->pc_arg, object); - (*putit)(pc->pc_pool, object); - } - if (free_groups) { - pc->pc_ngroups--; - TAILQ_REMOVE(&pc->pc_grouplist, pcg, pcg_list); - if (pc->pc_freeto == pcg) - pc->pc_freeto = NULL; - s = splvm(); - pool_put(&pcgpool, pcg); - splx(s); + pool_cache_cpu_t *cc; + pcg_t *prev, *cur, **list; + int s = 0; /* XXXgcc */ + + cc = pool_cache_cpu_enter(pc, &s); + cur = cc->cc_current; + cc->cc_current = NULL; + prev = cc->cc_previous; + cc->cc_previous = NULL; + pool_cache_cpu_exit(cc, &s); + + /* + * XXXSMP Go to splvm to prevent kernel_lock from being taken, + * because locks at IPL_SOFTXXX are still spinlocks. Does not + * apply to IPL_SOFTBIO. Cross-call threads do not take the + * kernel_lock. + */ + s = splvm(); + mutex_enter(&pc->pc_lock); + if (cur != NULL) { + if (cur->pcg_avail == cur->pcg_size) { + list = &pc->pc_fullgroups; + pc->pc_nfull++; + } else if (cur->pcg_avail == 0) { + list = &pc->pc_emptygroups; + pc->pc_nempty++; + } else { + list = &pc->pc_partgroups; + pc->pc_npart++; + } + cur->pcg_next = *list; + *list = cur; + } + if (prev != NULL) { + if (prev->pcg_avail == prev->pcg_size) { + list = &pc->pc_fullgroups; + pc->pc_nfull++; + } else if (prev->pcg_avail == 0) { + list = &pc->pc_emptygroups; + pc->pc_nempty++; + } else { + list = &pc->pc_partgroups; + pc->pc_npart++; } + prev->pcg_next = *list; + *list = prev; } + mutex_exit(&pc->pc_lock); + splx(s); } /* - * pool_cache_invalidate: + * Pool backend allocators. * - * Invalidate a pool cache (destruct and release all of the - * cached objects). + * Each pool has a backend allocator that handles allocation, deallocation, + * and any additional draining that might be needed. + * + * We provide two standard allocators: + * + * pool_allocator_kmem - the default when no allocator is specified + * + * pool_allocator_nointr - used for pools that will not be accessed + * in interrupt context. */ +void *pool_page_alloc(struct pool *, int); +void pool_page_free(struct pool *, void *); + +#ifdef POOL_SUBPAGE +struct pool_allocator pool_allocator_kmem_fullpage = { + pool_page_alloc, pool_page_free, 0, + .pa_backingmapptr = &kmem_map, +}; +#else +struct pool_allocator pool_allocator_kmem = { + pool_page_alloc, pool_page_free, 0, + .pa_backingmapptr = &kmem_map, +}; +#endif + +void *pool_page_alloc_nointr(struct pool *, int); +void pool_page_free_nointr(struct pool *, void *); + +#ifdef POOL_SUBPAGE +struct pool_allocator pool_allocator_nointr_fullpage = { + pool_page_alloc_nointr, pool_page_free_nointr, 0, + .pa_backingmapptr = &kernel_map, +}; +#else +struct pool_allocator pool_allocator_nointr = { + pool_page_alloc_nointr, pool_page_free_nointr, 0, + .pa_backingmapptr = &kernel_map, +}; +#endif + +#ifdef POOL_SUBPAGE +void *pool_subpage_alloc(struct pool *, int); +void pool_subpage_free(struct pool *, void *); + +struct pool_allocator pool_allocator_kmem = { + pool_subpage_alloc, pool_subpage_free, POOL_SUBPAGE, + .pa_backingmapptr = &kmem_map, +}; + +void *pool_subpage_alloc_nointr(struct pool *, int); +void pool_subpage_free_nointr(struct pool *, void *); + +struct pool_allocator pool_allocator_nointr = { + pool_subpage_alloc, pool_subpage_free, POOL_SUBPAGE, + .pa_backingmapptr = &kmem_map, +}; +#endif /* POOL_SUBPAGE */ + +static void * +pool_allocator_alloc(struct pool *pp, int flags) +{ + struct pool_allocator *pa = pp->pr_alloc; + void *res; + + res = (*pa->pa_alloc)(pp, flags); + if (res == NULL && (flags & PR_WAITOK) == 0) { + /* + * We only run the drain hook here if PR_NOWAIT. + * In other cases, the hook will be run in + * pool_reclaim(). + */ + if (pp->pr_drain_hook != NULL) { + (*pp->pr_drain_hook)(pp->pr_drain_hook_arg, flags); + res = (*pa->pa_alloc)(pp, flags); + } + } + return res; +} + +static void +pool_allocator_free(struct pool *pp, void *v) +{ + struct pool_allocator *pa = pp->pr_alloc; + + (*pa->pa_free)(pp, v); +} + +void * +pool_page_alloc(struct pool *pp, int flags) +{ + bool waitok = (flags & PR_WAITOK) ? true : false; + + return ((void *) uvm_km_alloc_poolpage_cache(kmem_map, waitok)); +} + void -pool_cache_invalidate(struct pool_cache *pc) +pool_page_free(struct pool *pp, void *v) { - simple_lock(&pc->pc_slock); - pool_cache_do_invalidate(pc, 0, pool_put); - simple_unlock(&pc->pc_slock); + uvm_km_free_poolpage_cache(kmem_map, (vaddr_t) v); +} + +static void * +pool_page_alloc_meta(struct pool *pp, int flags) +{ + bool waitok = (flags & PR_WAITOK) ? true : false; + + return ((void *) uvm_km_alloc_poolpage(kmem_map, waitok)); } -/* - * pool_cache_reclaim: - * - * Reclaim a pool cache for pool_reclaim(). - */ static void -pool_cache_reclaim(struct pool_cache *pc) +pool_page_free_meta(struct pool *pp, void *v) +{ + + uvm_km_free_poolpage(kmem_map, (vaddr_t) v); +} + +#ifdef POOL_SUBPAGE +/* Sub-page allocator, for machines with large hardware pages. */ +void * +pool_subpage_alloc(struct pool *pp, int flags) +{ + return pool_get(&psppool, flags); +} + +void +pool_subpage_free(struct pool *pp, void *v) +{ + pool_put(&psppool, v); +} + +/* We don't provide a real nointr allocator. Maybe later. */ +void * +pool_subpage_alloc_nointr(struct pool *pp, int flags) +{ + + return (pool_subpage_alloc(pp, flags)); +} + +void +pool_subpage_free_nointr(struct pool *pp, void *v) +{ + + pool_subpage_free(pp, v); +} +#endif /* POOL_SUBPAGE */ +void * +pool_page_alloc_nointr(struct pool *pp, int flags) +{ + bool waitok = (flags & PR_WAITOK) ? true : false; + + return ((void *) uvm_km_alloc_poolpage_cache(kernel_map, waitok)); +} + +void +pool_page_free_nointr(struct pool *pp, void *v) { - simple_lock(&pc->pc_slock); - pool_cache_do_invalidate(pc, 1, pool_do_put); - simple_unlock(&pc->pc_slock); + uvm_km_free_poolpage_cache(kernel_map, (vaddr_t) v); +} + +#if defined(DDB) +static bool +pool_in_page(struct pool *pp, struct pool_item_header *ph, uintptr_t addr) +{ + + return (uintptr_t)ph->ph_page <= addr && + addr < (uintptr_t)ph->ph_page + pp->pr_alloc->pa_pagesz; +} + +static bool +pool_in_item(struct pool *pp, void *item, uintptr_t addr) +{ + + return (uintptr_t)item <= addr && addr < (uintptr_t)item + pp->pr_size; +} + +static bool +pool_in_cg(struct pool *pp, struct pool_cache_group *pcg, uintptr_t addr) +{ + int i; + + if (pcg == NULL) { + return false; + } + for (i = 0; i < pcg->pcg_avail; i++) { + if (pool_in_item(pp, pcg->pcg_objects[i].pcgo_va, addr)) { + return true; + } + } + return false; +} + +static bool +pool_allocated(struct pool *pp, struct pool_item_header *ph, uintptr_t addr) +{ + + if ((pp->pr_roflags & PR_NOTOUCH) != 0) { + unsigned int idx = pr_item_notouch_index(pp, ph, (void *)addr); + pool_item_bitmap_t *bitmap = + ph->ph_bitmap + (idx / BITMAP_SIZE); + pool_item_bitmap_t mask = 1 << (idx & BITMAP_MASK); + + return (*bitmap & mask) == 0; + } else { + struct pool_item *pi; + + LIST_FOREACH(pi, &ph->ph_itemlist, pi_list) { + if (pool_in_item(pp, pi, addr)) { + return false; + } + } + return true; + } +} + +void +pool_whatis(uintptr_t addr, void (*pr)(const char *, ...)) +{ + struct pool *pp; + + TAILQ_FOREACH(pp, &pool_head, pr_poollist) { + struct pool_item_header *ph; + uintptr_t item; + bool allocated = true; + bool incache = false; + bool incpucache = false; + char cpucachestr[32]; + + if ((pp->pr_roflags & PR_PHINPAGE) != 0) { + LIST_FOREACH(ph, &pp->pr_fullpages, ph_pagelist) { + if (pool_in_page(pp, ph, addr)) { + goto found; + } + } + LIST_FOREACH(ph, &pp->pr_partpages, ph_pagelist) { + if (pool_in_page(pp, ph, addr)) { + allocated = + pool_allocated(pp, ph, addr); + goto found; + } + } + LIST_FOREACH(ph, &pp->pr_emptypages, ph_pagelist) { + if (pool_in_page(pp, ph, addr)) { + allocated = false; + goto found; + } + } + continue; + } else { + ph = pr_find_pagehead_noalign(pp, (void *)addr); + if (ph == NULL || !pool_in_page(pp, ph, addr)) { + continue; + } + allocated = pool_allocated(pp, ph, addr); + } +found: + if (allocated && pp->pr_cache) { + pool_cache_t pc = pp->pr_cache; + struct pool_cache_group *pcg; + int i; + + for (pcg = pc->pc_fullgroups; pcg != NULL; + pcg = pcg->pcg_next) { + if (pool_in_cg(pp, pcg, addr)) { + incache = true; + goto print; + } + } + for (i = 0; i < MAXCPUS; i++) { + pool_cache_cpu_t *cc; + + if ((cc = pc->pc_cpus[i]) == NULL) { + continue; + } + if (pool_in_cg(pp, cc->cc_current, addr) || + pool_in_cg(pp, cc->cc_previous, addr)) { + struct cpu_info *ci = + cpu_lookup_byindex(i); + + incpucache = true; + snprintf(cpucachestr, + sizeof(cpucachestr), + "cached by CPU %u", + (u_int)ci->ci_cpuid); + goto print; + } + } + } +print: + item = (uintptr_t)ph->ph_page + ph->ph_off; + item = item + rounddown(addr - item, pp->pr_size); + (*pr)("%p is %p+%zu in POOL '%s' (%s)\n", + (void *)addr, item, (size_t)(addr - item), + pp->pr_wchan, + incpucache ? cpucachestr : + incache ? "cached" : allocated ? "allocated" : "free"); + } } +#endif /* defined(DDB) */