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.30 retrieving revision 1.59 diff -u -p -r1.30 -r1.59 --- src/sys/kern/subr_pool.c 1999/08/29 00:26:01 1.30 +++ src/sys/kern/subr_pool.c 2001/06/05 18:51:04 1.59 @@ -1,7 +1,7 @@ -/* $NetBSD: subr_pool.c,v 1.30 1999/08/29 00:26:01 thorpej Exp $ */ +/* $NetBSD: subr_pool.c,v 1.59 2001/06/05 18:51:04 thorpej Exp $ */ /*- - * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. + * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -51,9 +51,6 @@ #include #include -#include -#include - #include /* @@ -97,31 +94,70 @@ struct pool_item_header { struct pool_item { #ifdef DIAGNOSTIC int pi_magic; -#define PI_MAGIC 0xdeadbeef #endif +#define PI_MAGIC 0xdeadbeef /* Other entries use only this list entry */ TAILQ_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) +/* + * Pool cache management. + * + * Pool caches provide a way for constructed objects to be cached by the + * pool subsystem. This can lead to performance improvements by avoiding + * 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. + * + * 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. + */ -static struct pool_item_header - *pr_find_pagehead __P((struct pool *, caddr_t)); -static void pr_rmpage __P((struct pool *, struct pool_item_header *)); -static int pool_catchup __P((struct pool *)); -static void pool_prime_page __P((struct pool *, caddr_t)); -static void *pool_page_alloc __P((unsigned long, int, int)); -static void pool_page_free __P((void *, unsigned long, int)); +/* The cache group pool. */ +static struct pool pcgpool; -static void pool_print1 __P((struct pool *, const char *, - void (*)(const char *, ...))); +/* 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 int pool_catchup(struct pool *); +static void pool_prime_page(struct pool *, caddr_t, + struct pool_item_header *); +static void *pool_page_alloc(unsigned long, int, int); +static void pool_page_free(void *, unsigned long, int); + +static void pool_print1(struct pool *, const char *, + void (*)(const char *, ...)); /* - * Pool log entry. An array of these is allocated in pool_create(). + * Pool log entry. An array of these is allocated in pool_init(). */ struct pool_log { const char *pl_file; @@ -139,22 +175,9 @@ struct pool_log { int pool_logsize = POOL_LOGSIZE; -#ifdef DIAGNOSTIC -static void pr_log __P((struct pool *, void *, int, const char *, long)); -static void pr_printlog __P((struct pool *, struct pool_item *, - void (*)(const char *, ...))); -static void pr_enter __P((struct pool *, const char *, long)); -static void pr_leave __P((struct pool *)); -static void pr_enter_check __P((struct pool *, - void (*)(const char *, ...))); - -static __inline__ void -pr_log(pp, v, action, file, line) - struct pool *pp; - void *v; - int action; - const char *file; - long line; +#ifdef POOL_DIAGNOSTIC +static __inline void +pr_log(struct pool *pp, void *v, int action, const char *file, long line) { int n = pp->pr_curlogentry; struct pool_log *pl; @@ -177,10 +200,8 @@ pr_log(pp, v, action, file, line) } static void -pr_printlog(pp, pi, pr) - struct pool *pp; - struct pool_item *pi; - void (*pr) __P((const char *, ...)); +pr_printlog(struct pool *pp, struct pool_item *pi, + void (*pr)(const char *, ...)) { int i = pp->pr_logsize; int n = pp->pr_curlogentry; @@ -208,14 +229,11 @@ pr_printlog(pp, pi, pr) } } -static __inline__ void -pr_enter(pp, file, line) - struct pool *pp; - const char *file; - long line; +static __inline void +pr_enter(struct pool *pp, const char *file, long line) { - if (pp->pr_entered_file != NULL) { + if (__predict_false(pp->pr_entered_file != NULL)) { printf("pool %s: reentrancy at file %s line %ld\n", pp->pr_wchan, file, line); printf(" previous entry at file %s line %ld\n", @@ -227,12 +245,11 @@ pr_enter(pp, file, line) pp->pr_entered_line = line; } -static __inline__ void -pr_leave(pp) - struct pool *pp; +static __inline void +pr_leave(struct pool *pp) { - if (pp->pr_entered_file == NULL) { + if (__predict_false(pp->pr_entered_file == NULL)) { printf("pool %s not entered?\n", pp->pr_wchan); panic("pr_leave"); } @@ -241,10 +258,8 @@ pr_leave(pp) pp->pr_entered_line = 0; } -static __inline__ void -pr_enter_check(pp, pr) - struct pool *pp; - void (*pr) __P((const char *, ...)); +static __inline void +pr_enter_check(struct pool *pp, void (*pr)(const char *, ...)) { if (pp->pr_entered_file != NULL) @@ -257,15 +272,13 @@ pr_enter_check(pp, pr) #define pr_enter(pp, file, line) #define pr_leave(pp) #define pr_enter_check(pp, pr) -#endif /* DIAGNOSTIC */ +#endif /* POOL_DIAGNOSTIC */ /* * Return the pool page header based on page address. */ -static __inline__ struct pool_item_header * -pr_find_pagehead(pp, page) - struct pool *pp; - caddr_t page; +static __inline struct pool_item_header * +pr_find_pagehead(struct pool *pp, caddr_t page) { struct pool_item_header *ph; @@ -284,10 +297,8 @@ pr_find_pagehead(pp, page) /* * Remove a page from the pool. */ -static __inline__ void -pr_rmpage(pp, ph) - struct pool *pp; - struct pool_item_header *ph; +static __inline void +pr_rmpage(struct pool *pp, struct pool_item_header *ph) { /* @@ -337,59 +348,17 @@ pr_rmpage(pp, ph) } /* - * Allocate and initialize a pool. - */ -struct pool * -pool_create(size, align, ioff, nitems, wchan, pagesz, alloc, release, mtype) - size_t size; - u_int align; - u_int ioff; - int nitems; - const char *wchan; - size_t pagesz; - void *(*alloc) __P((unsigned long, int, int)); - void (*release) __P((void *, unsigned long, int)); - int mtype; -{ - struct pool *pp; - int flags; - - pp = (struct pool *)malloc(sizeof(*pp), M_POOL, M_NOWAIT); - if (pp == NULL) - return (NULL); - - flags = PR_FREEHEADER; - pool_init(pp, size, align, ioff, flags, wchan, pagesz, - alloc, release, mtype); - - if (nitems != 0) { - if (pool_prime(pp, nitems, NULL) != 0) { - pool_destroy(pp); - return (NULL); - } - } - - return (pp); -} - -/* * Initialize the given pool resource structure. * * We export this routine to allow other kernel parts to declare * static pools that must be initialized before malloc() is available. */ void -pool_init(pp, size, align, ioff, flags, wchan, pagesz, alloc, release, mtype) - struct pool *pp; - size_t size; - u_int align; - u_int ioff; - int flags; - const char *wchan; - size_t pagesz; - void *(*alloc) __P((unsigned long, int, int)); - void (*release) __P((void *, unsigned long, int)); - int mtype; +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) { int off, slack, i; @@ -404,7 +373,7 @@ pool_init(pp, size, align, ioff, flags, /* * Check arguments and construct default values. */ - if (!powerof2(pagesz) || pagesz > PAGE_SIZE) + if (!powerof2(pagesz)) panic("pool_init: page size invalid (%lx)\n", (u_long)pagesz); if (alloc == NULL && release == NULL) { @@ -425,10 +394,16 @@ pool_init(pp, size, align, ioff, flags, if (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); + /* * Initialize the pool structure. */ TAILQ_INIT(&pp->pr_pagelist); + TAILQ_INIT(&pp->pr_cachelist); pp->pr_curpage = NULL; pp->pr_npages = 0; pp->pr_minitems = 0; @@ -436,7 +411,7 @@ pool_init(pp, size, align, ioff, flags, pp->pr_maxpages = UINT_MAX; pp->pr_roflags = flags; pp->pr_flags = 0; - pp->pr_size = ALIGN(size); + pp->pr_size = size; pp->pr_align = align; pp->pr_wchan = wchan; pp->pr_mtype = mtype; @@ -449,9 +424,10 @@ pool_init(pp, size, align, ioff, flags, pp->pr_nout = 0; pp->pr_hardlimit = UINT_MAX; pp->pr_hardlimit_warning = NULL; - pp->pr_hardlimit_ratecap = 0; - memset(&pp->pr_hardlimit_warning_last, 0, - sizeof(pp->pr_hardlimit_warning_last)); + pp->pr_hardlimit_ratecap.tv_sec = 0; + pp->pr_hardlimit_ratecap.tv_usec = 0; + pp->pr_hardlimit_warning_last.tv_sec = 0; + pp->pr_hardlimit_warning_last.tv_usec = 0; /* * Decide whether to put the page header off page to avoid @@ -483,6 +459,7 @@ pool_init(pp, size, align, ioff, flags, */ pp->pr_itemoffset = ioff = ioff % align; pp->pr_itemsperpage = (off - ((align - ioff) % align)) / pp->pr_size; + KASSERT(pp->pr_itemsperpage != 0); /* * Use the slack between the chunks and the page header @@ -500,6 +477,7 @@ pool_init(pp, size, align, ioff, flags, pp->pr_hiwat = 0; pp->pr_nidle = 0; +#ifdef POOL_DIAGNOSTIC if (flags & PR_LOGGING) { if (kmem_map == NULL || (pp->pr_log = malloc(pool_logsize * sizeof(struct pool_log), @@ -508,6 +486,7 @@ pool_init(pp, size, align, ioff, flags, pp->pr_curlogentry = 0; pp->pr_logsize = pool_logsize; } +#endif pp->pr_entered_file = NULL; pp->pr_entered_line = 0; @@ -515,12 +494,15 @@ pool_init(pp, size, align, ioff, flags, simple_lock_init(&pp->pr_slock); /* - * Initialize private page header pool if we haven't done so yet. + * Initialize private page header pool and cache magazine pool if we + * haven't done so yet. * XXX LOCKING. */ if (phpool.pr_size == 0) { pool_init(&phpool, sizeof(struct pool_item_header), 0, 0, - 0, "phpool", 0, 0, 0, 0); + 0, "phpool", 0, 0, 0, 0); + pool_init(&pcgpool, sizeof(struct pool_cache_group), 0, 0, + 0, "pcgpool", 0, 0, 0, 0); } /* Insert into the list of all pools. */ @@ -533,10 +515,14 @@ pool_init(pp, size, align, ioff, flags, * De-commision a pool resource. */ void -pool_destroy(pp) - struct pool *pp; +pool_destroy(struct pool *pp) { 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); #ifdef DIAGNOSTIC if (pp->pr_nout != 0) { @@ -558,38 +544,65 @@ pool_destroy(pp) drainpp = NULL; simple_unlock(&pool_head_slock); +#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); } +static __inline struct pool_item_header * +pool_alloc_item_header(struct pool *pp, caddr_t storage, int flags) +{ + struct pool_item_header *ph; + int s; + + LOCK_ASSERT(simple_lock_held(&pp->pr_slock) == 0); + + 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); + } + + return (ph); +} /* * Grab an item from the pool; must be called at appropriate spl level */ void * -_pool_get(pp, flags, file, line) - struct pool *pp; - int flags; - const char *file; - long line; +#ifdef POOL_DIAGNOSTIC +_pool_get(struct pool *pp, int flags, const char *file, long line) +#else +pool_get(struct pool *pp, int flags) +#endif { - void *v; struct pool_item *pi; struct pool_item_header *ph; + void *v; #ifdef DIAGNOSTIC - if ((pp->pr_roflags & PR_STATIC) && (flags & PR_MALLOCOK)) { + if (__predict_false((pp->pr_roflags & PR_STATIC) && + (flags & PR_MALLOCOK))) { pr_printlog(pp, NULL, printf); panic("pool_get: static"); } -#endif - if (curproc == NULL && (flags & PR_WAITOK) != 0) + if (__predict_false(curproc == NULL && doing_shutdown == 0 && + (flags & PR_WAITOK) != 0)) panic("pool_get: must have NOWAIT"); +#ifdef LOCKDEBUG + if (flags & PR_WAITOK) + simple_lock_only_held(NULL, "pool_get(PR_WAITOK)"); +#endif +#endif /* DIAGNOSTIC */ + simple_lock(&pp->pr_slock); pr_enter(pp, file, line); @@ -600,13 +613,13 @@ _pool_get(pp, flags, file, line) * the pool. */ #ifdef DIAGNOSTIC - if (pp->pr_nout > pp->pr_hardlimit) { + if (__predict_false(pp->pr_nout > pp->pr_hardlimit)) { pr_leave(pp); simple_unlock(&pp->pr_slock); panic("pool_get: %s: crossed hard limit", pp->pr_wchan); } #endif - if (pp->pr_nout == pp->pr_hardlimit) { + if (__predict_false(pp->pr_nout == pp->pr_hardlimit)) { if ((flags & PR_WAITOK) && !(flags & PR_LIMITFAIL)) { /* * XXX: A warning isn't logged in this case. Should @@ -614,27 +627,18 @@ _pool_get(pp, flags, file, line) */ pp->pr_flags |= PR_WANTED; pr_leave(pp); - simple_unlock(&pp->pr_slock); - tsleep((caddr_t)pp, PSWP, pp->pr_wchan, 0); - simple_lock(&pp->pr_slock); + ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock); pr_enter(pp, file, line); goto startover; } - if (pp->pr_hardlimit_warning != NULL) { - /* - * Log a message that the hard limit has been hit. - */ - struct timeval curtime, logdiff; - int s = splclock(); - curtime = mono_time; - splx(s); - timersub(&curtime, &pp->pr_hardlimit_warning_last, - &logdiff); - if (logdiff.tv_sec >= pp->pr_hardlimit_ratecap) { - pp->pr_hardlimit_warning_last = curtime; - log(LOG_ERR, "%s\n", pp->pr_hardlimit_warning); - } - } + + /* + * Log a message that the hard limit has been hit. + */ + if (pp->pr_hardlimit_warning != NULL && + ratecheck(&pp->pr_hardlimit_warning_last, + &pp->pr_hardlimit_ratecap)) + log(LOG_ERR, "%s\n", pp->pr_hardlimit_warning); if (flags & PR_URGENT) panic("pool_get: urgent"); @@ -653,8 +657,6 @@ _pool_get(pp, flags, file, line) * has no items in its bucket. */ if ((ph = pp->pr_curpage) == NULL) { - void *v; - #ifdef DIAGNOSTIC if (pp->pr_nitems != 0) { simple_unlock(&pp->pr_slock); @@ -672,15 +674,20 @@ _pool_get(pp, flags, file, line) 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); pr_enter(pp, file, line); - if (v == NULL) { + if (__predict_false(v == NULL || ph == NULL)) { + if (v != NULL) + (*pp->pr_free)(v, pp->pr_pagesz, pp->pr_mtype); + /* - * We were unable to allocate a page, but - * we released the lock during allocation, - * so perhaps items were freed back to the - * pool. Check for this case. + * We were unable to allocate a page or item + * header, but we released the lock during + * allocation, so perhaps items were freed + * back to the pool. Check for this case. */ if (pp->pr_curpage != NULL) goto startover; @@ -708,39 +715,36 @@ _pool_get(pp, flags, file, line) */ pp->pr_flags |= PR_WANTED; pr_leave(pp); - simple_unlock(&pp->pr_slock); - tsleep((caddr_t)pp, PSWP, pp->pr_wchan, 0); - simple_lock(&pp->pr_slock); + ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock); pr_enter(pp, file, line); goto startover; } /* We have more memory; add it to the pool */ + pool_prime_page(pp, v, ph); pp->pr_npagealloc++; - pool_prime_page(pp, v); /* Start the allocation process over. */ goto startover; } - if ((v = pi = TAILQ_FIRST(&ph->ph_itemlist)) == NULL) { + 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); } #ifdef DIAGNOSTIC - if (pp->pr_nitems == 0) { + 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"); } -#endif + pr_log(pp, v, PRLOG_GET, file, line); -#ifdef DIAGNOSTIC - if (pi->pi_magic != PI_MAGIC) { + 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", @@ -756,7 +760,7 @@ _pool_get(pp, flags, file, line) pp->pr_nout++; if (ph->ph_nmissing == 0) { #ifdef DIAGNOSTIC - if (pp->pr_nidle == 0) + if (__predict_false(pp->pr_nidle == 0)) panic("pool_get: nidle inconsistent"); #endif pp->pr_nidle--; @@ -764,7 +768,7 @@ _pool_get(pp, flags, file, line) ph->ph_nmissing++; if (TAILQ_FIRST(&ph->ph_itemlist) == NULL) { #ifdef DIAGNOSTIC - if (ph->ph_nmissing != pp->pr_itemsperpage) { + if (__predict_false(ph->ph_nmissing != pp->pr_itemsperpage)) { pr_leave(pp); simple_unlock(&pp->pr_slock); panic("pool_get: %s: nmissing inconsistent", @@ -798,7 +802,7 @@ _pool_get(pp, flags, file, line) * If we have a low water mark and we are now below that low * water mark, add more items to the pool. */ - if (pp->pr_nitems < pp->pr_minitems && 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 @@ -812,14 +816,10 @@ _pool_get(pp, flags, file, line) } /* - * Return resource to the pool; must be called at appropriate spl level + * Internal version of pool_put(). Pool is already locked/entered. */ -void -_pool_put(pp, v, file, line) - struct pool *pp; - void *v; - const char *file; - long line; +static void +pool_do_put(struct pool *pp, void *v) { struct pool_item *pi = v; struct pool_item_header *ph; @@ -828,20 +828,15 @@ _pool_put(pp, v, file, line) page = (caddr_t)((u_long)v & pp->pr_pagemask); - simple_lock(&pp->pr_slock); - pr_enter(pp, file, line); - #ifdef DIAGNOSTIC - if (pp->pr_nout == 0) { + if (__predict_false(pp->pr_nout == 0)) { printf("pool %s: putting with none out\n", pp->pr_wchan); panic("pool_put"); } #endif - pr_log(pp, v, PRLOG_PUT, file, line); - - if ((ph = pr_find_pagehead(pp, page)) == NULL) { + if (__predict_false((ph = pr_find_pagehead(pp, page)) == NULL)) { pr_printlog(pp, NULL, printf); panic("pool_put: %s: page header missing", pp->pr_wchan); } @@ -857,9 +852,18 @@ _pool_put(pp, v, file, line) * Return to item list. */ #ifdef DIAGNOSTIC - /* XXX Should fill the item. */ pi->pi_magic = PI_MAGIC; #endif +#ifdef DEBUG + { + int i, *ip = v; + + for (i = 0; i < pp->pr_size / sizeof(int); i++) { + *ip++ = PI_MAGIC; + } + } +#endif + TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list); ph->ph_nmissing--; pp->pr_nput++; @@ -874,8 +878,6 @@ _pool_put(pp, v, file, line) pp->pr_flags &= ~PR_WANTED; if (ph->ph_nmissing == 0) pp->pr_nidle++; - pr_leave(pp); - simple_unlock(&pp->pr_slock); wakeup((caddr_t)pp); return; } @@ -939,59 +941,77 @@ _pool_put(pp, v, file, line) TAILQ_INSERT_HEAD(&pp->pr_pagelist, ph, ph_pagelist); pp->pr_curpage = ph; } +} + +/* + * Return resource to the pool; must be called at appropriate spl level + */ +#ifdef POOL_DIAGNOSTIC +void +_pool_put(struct pool *pp, void *v, const char *file, long line) +{ + + simple_lock(&pp->pr_slock); + pr_enter(pp, file, line); + + pr_log(pp, v, PRLOG_PUT, file, line); + + pool_do_put(pp, v); pr_leave(pp); simple_unlock(&pp->pr_slock); +} +#undef pool_put +#endif /* POOL_DIAGNOSTIC */ + +void +pool_put(struct pool *pp, void *v) +{ + + simple_lock(&pp->pr_slock); + + pool_do_put(pp, v); + simple_unlock(&pp->pr_slock); } +#ifdef POOL_DIAGNOSTIC +#define pool_put(h, v) _pool_put((h), (v), __FILE__, __LINE__) +#endif + /* * Add N items to the pool. */ int -pool_prime(pp, n, storage) - struct pool *pp; - int n; - caddr_t storage; +pool_prime(struct pool *pp, int n) { + struct pool_item_header *ph; caddr_t cp; - int newnitems, newpages; - -#ifdef DIAGNOSTIC - if (storage && !(pp->pr_roflags & PR_STATIC)) - panic("pool_prime: static"); - /* !storage && static caught below */ -#endif + int newpages, error = 0; simple_lock(&pp->pr_slock); - newnitems = pp->pr_minitems + n; - newpages = - roundup(newnitems, pp->pr_itemsperpage) / pp->pr_itemsperpage - - pp->pr_minpages; + newpages = roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; while (newpages-- > 0) { - if (pp->pr_roflags & PR_STATIC) { - cp = storage; - storage += pp->pr_pagesz; - } else { - simple_unlock(&pp->pr_slock); - cp = (*pp->pr_alloc)(pp->pr_pagesz, 0, pp->pr_mtype); - simple_lock(&pp->pr_slock); - } + 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 (cp == NULL) { - simple_unlock(&pp->pr_slock); - return (ENOMEM); + if (__predict_false(cp == NULL || ph == NULL)) { + error = ENOMEM; + if (cp != NULL) + (*pp->pr_free)(cp, pp->pr_pagesz, pp->pr_mtype); + break; } + pool_prime_page(pp, cp, ph); pp->pr_npagealloc++; - pool_prime_page(pp, cp); pp->pr_minpages++; } - pp->pr_minitems = newnitems; - if (pp->pr_minpages >= pp->pr_maxpages) pp->pr_maxpages = pp->pr_minpages + 1; /* XXX */ @@ -1005,26 +1025,20 @@ pool_prime(pp, n, storage) * Note, we must be called with the pool descriptor LOCKED. */ static void -pool_prime_page(pp, storage) - struct pool *pp; - caddr_t storage; +pool_prime_page(struct pool *pp, caddr_t storage, struct pool_item_header *ph) { struct pool_item *pi; - struct pool_item_header *ph; caddr_t cp = storage; unsigned int align = pp->pr_align; unsigned int ioff = pp->pr_itemoffset; - int s, n; + int n; - if ((pp->pr_roflags & PR_PHINPAGE) != 0) { - ph = (struct pool_item_header *)(cp + pp->pr_phoffset); - } else { - s = splhigh(); - ph = pool_get(&phpool, PR_URGENT); - splx(s); + if (((u_long)cp & (pp->pr_pagesz - 1)) != 0) + panic("pool_prime_page: %s: unaligned page", pp->pr_wchan); + + if ((pp->pr_roflags & PR_PHINPAGE) == 0) LIST_INSERT_HEAD(&pp->pr_hashtab[PR_HASH_INDEX(pp, cp)], - ph, ph_hashlist); - } + ph, ph_hashlist); /* * Insert page header. @@ -1078,9 +1092,8 @@ pool_prime_page(pp, storage) } /* - * Like pool_prime(), except this is used by pool_get() when nitems - * drops below the low water mark. This is used to catch up nitmes - * with the low water mark. + * Used by pool_get() when nitems drops below the low water mark. This + * is used to catch up nitmes with the low water mark. * * Note 1, we never wait for memory here, we let the caller decide what to do. * @@ -1090,9 +1103,9 @@ pool_prime_page(pp, storage) * with it locked. */ static int -pool_catchup(pp) - struct pool *pp; +pool_catchup(struct pool *pp) { + struct pool_item_header *ph; caddr_t cp; int error = 0; @@ -1108,7 +1121,7 @@ pool_catchup(pp) return (0); } - while (pp->pr_nitems < pp->pr_minitems) { + while (POOL_NEEDS_CATCHUP(pp)) { /* * Call the page back-end allocator for more memory. * @@ -1116,23 +1129,25 @@ pool_catchup(pp) * the pool descriptor? */ simple_unlock(&pp->pr_slock); - cp = (*pp->pr_alloc)(pp->pr_pagesz, 0, pp->pr_mtype); + 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 (cp == NULL) { + if (__predict_false(cp == NULL || ph == NULL)) { + if (cp != NULL) + (*pp->pr_free)(cp, pp->pr_pagesz, pp->pr_mtype); error = ENOMEM; break; } + pool_prime_page(pp, cp, ph); pp->pr_npagealloc++; - pool_prime_page(pp, cp); } return (error); } void -pool_setlowat(pp, n) - pool_handle_t pp; - int n; +pool_setlowat(struct pool *pp, int n) { int error; @@ -1144,7 +1159,7 @@ pool_setlowat(pp, n) : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; /* Make sure we're caught up with the newly-set low water mark. */ - if ((error = pool_catchup(pp)) != 0) { + if (POOL_NEEDS_CATCHUP(pp) && (error = 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 @@ -1156,9 +1171,7 @@ pool_setlowat(pp, n) } void -pool_sethiwat(pp, n) - pool_handle_t pp; - int n; +pool_sethiwat(struct pool *pp, int n) { simple_lock(&pp->pr_slock); @@ -1171,20 +1184,16 @@ pool_sethiwat(pp, n) } void -pool_sethardlimit(pp, n, warnmess, ratecap) - pool_handle_t pp; - int n; - const char *warnmess; - int ratecap; +pool_sethardlimit(struct pool *pp, int n, const char *warnmess, int ratecap) { simple_lock(&pp->pr_slock); pp->pr_hardlimit = n; pp->pr_hardlimit_warning = warnmess; - pp->pr_hardlimit_ratecap = ratecap; - memset(&pp->pr_hardlimit_warning_last, 0, - sizeof(pp->pr_hardlimit_warning_last)); + pp->pr_hardlimit_ratecap.tv_sec = ratecap; + pp->pr_hardlimit_warning_last.tv_sec = 0; + pp->pr_hardlimit_warning_last.tv_usec = 0; /* * In-line version of pool_sethiwat(), because we don't want to @@ -1201,10 +1210,7 @@ pool_sethardlimit(pp, n, warnmess, ratec * Default page allocator. */ static void * -pool_page_alloc(sz, flags, mtype) - unsigned long sz; - int flags; - int mtype; +pool_page_alloc(unsigned long sz, int flags, int mtype) { boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; @@ -1212,10 +1218,7 @@ pool_page_alloc(sz, flags, mtype) } static void -pool_page_free(v, sz, mtype) - void *v; - unsigned long sz; - int mtype; +pool_page_free(void *v, unsigned long sz, int mtype) { uvm_km_free_poolpage((vaddr_t)v); @@ -1226,10 +1229,7 @@ pool_page_free(v, sz, mtype) * never be accessed in interrupt context. */ void * -pool_page_alloc_nointr(sz, flags, mtype) - unsigned long sz; - int flags; - int mtype; +pool_page_alloc_nointr(unsigned long sz, int flags, int mtype) { boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE; @@ -1238,10 +1238,7 @@ pool_page_alloc_nointr(sz, flags, mtype) } void -pool_page_free_nointr(v, sz, mtype) - void *v; - unsigned long sz; - int mtype; +pool_page_free_nointr(void *v, unsigned long sz, int mtype) { uvm_km_free_poolpage1(kernel_map, (vaddr_t)v); @@ -1252,12 +1249,14 @@ pool_page_free_nointr(v, sz, mtype) * Release all complete pages that have not been used recently. */ void -_pool_reclaim(pp, file, line) - pool_handle_t pp; - const char *file; - long line; +#ifdef POOL_DIAGNOSTIC +_pool_reclaim(struct pool *pp, const char *file, long line) +#else +pool_reclaim(struct pool *pp) +#endif { struct pool_item_header *ph, *phnext; + struct pool_cache *pc; struct timeval curtime; int s; @@ -1268,6 +1267,13 @@ _pool_reclaim(pp, file, line) return; pr_enter(pp, file, line); + /* + * Reclaim items from the pool's caches. + */ + for (pc = TAILQ_FIRST(&pp->pr_cachelist); pc != NULL; + pc = TAILQ_NEXT(pc, pc_poollist)) + pool_cache_reclaim(pc); + s = splclock(); curtime = mono_time; splx(s); @@ -1308,13 +1314,12 @@ _pool_reclaim(pp, file, line) * Note, we must never be called from an interrupt context. */ void -pool_drain(arg) - void *arg; +pool_drain(void *arg) { struct pool *pp; int s; - s = splimp(); + s = splvm(); simple_lock(&pool_head_slock); if (drainpp == NULL && (drainpp = TAILQ_FIRST(&pool_head)) == NULL) @@ -1335,13 +1340,11 @@ pool_drain(arg) * Diagnostic helpers. */ void -pool_print(pp, modif) - struct pool *pp; - const char *modif; +pool_print(struct pool *pp, const char *modif) { int s; - s = splimp(); + s = splvm(); if (simple_lock_try(&pp->pr_slock) == 0) { printf("pool %s is locked; try again later\n", pp->pr_wchan); @@ -1354,10 +1357,7 @@ pool_print(pp, modif) } void -pool_printit(pp, modif, pr) - struct pool *pp; - const char *modif; - void (*pr) __P((const char *, ...)); +pool_printit(struct pool *pp, const char *modif, void (*pr)(const char *, ...)) { int didlock = 0; @@ -1387,16 +1387,15 @@ pool_printit(pp, modif, pr) } static void -pool_print1(pp, modif, pr) - struct pool *pp; - const char *modif; - void (*pr) __P((const char *, ...)); +pool_print1(struct pool *pp, const char *modif, 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 - int print_log = 0, print_pagelist = 0; + int i, print_log = 0, print_pagelist = 0, print_cache = 0; char c; while ((c = *modif++) != '\0') { @@ -1404,6 +1403,8 @@ pool_print1(pp, modif, pr) print_log = 1; if (c == 'p') print_pagelist = 1; + if (c == 'c') + print_cache = 1; modif++; } @@ -1460,13 +1461,30 @@ pool_print1(pp, modif, pr) skip_log: + if (print_cache == 0) + goto skip_cache; + + for (pc = TAILQ_FIRST(&pp->pr_cachelist); pc != NULL; + pc = TAILQ_NEXT(pc, 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); + for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL; + pcg = TAILQ_NEXT(pcg, 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]); + } + } + + skip_cache: + pr_enter_check(pp, pr); } int -pool_chk(pp, label) - struct pool *pp; - char *label; +pool_chk(struct pool *pp, const char *label) { struct pool_item_header *ph; int r = 0; @@ -1527,3 +1545,281 @@ out: simple_unlock(&pp->pr_slock); return (r); } + +/* + * pool_cache_init: + * + * Initialize a pool cache. + * + * NOTE: If the pool must be protected from interrupts, we expect + * to be called at the appropriate interrupt priority level. + */ +void +pool_cache_init(struct pool_cache *pc, struct pool *pp, + int (*ctor)(void *, void *, int), + void (*dtor)(void *, void *), + void *arg) +{ + + TAILQ_INIT(&pc->pc_grouplist); + simple_lock_init(&pc->pc_slock); + + pc->pc_allocfrom = NULL; + pc->pc_freeto = NULL; + pc->pc_pool = pp; + + pc->pc_ctor = ctor; + pc->pc_dtor = dtor; + pc->pc_arg = arg; + + pc->pc_hits = 0; + pc->pc_misses = 0; + + pc->pc_ngroups = 0; + + pc->pc_nitems = 0; + + simple_lock(&pp->pr_slock); + TAILQ_INSERT_TAIL(&pp->pr_cachelist, pc, pc_poollist); + simple_unlock(&pp->pr_slock); +} + +/* + * pool_cache_destroy: + * + * Destroy a pool cache. + */ +void +pool_cache_destroy(struct pool_cache *pc) +{ + struct pool *pp = pc->pc_pool; + + /* 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); +} + +static __inline void * +pcg_get(struct pool_cache_group *pcg) +{ + void *object; + u_int idx; + + KASSERT(pcg->pcg_avail <= PCG_NOBJECTS); + KASSERT(pcg->pcg_avail != 0); + idx = --pcg->pcg_avail; + + KASSERT(pcg->pcg_objects[idx] != NULL); + object = pcg->pcg_objects[idx]; + pcg->pcg_objects[idx] = NULL; + + return (object); +} + +static __inline void +pcg_put(struct pool_cache_group *pcg, void *object) +{ + u_int idx; + + KASSERT(pcg->pcg_avail < PCG_NOBJECTS); + idx = pcg->pcg_avail++; + + KASSERT(pcg->pcg_objects[idx] == NULL); + pcg->pcg_objects[idx] = object; +} + +/* + * pool_cache_get: + * + * Get an object from a pool cache. + */ +void * +pool_cache_get(struct pool_cache *pc, int flags) +{ + struct pool_cache_group *pcg; + void *object; + +#ifdef LOCKDEBUG + if (flags & PR_WAITOK) + simple_lock_only_held(NULL, "pool_cache_get(PR_WAITOK)"); +#endif + + simple_lock(&pc->pc_slock); + + if ((pcg = pc->pc_allocfrom) == NULL) { + for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL; + pcg = TAILQ_NEXT(pcg, pcg_list)) { + if (pcg->pcg_avail != 0) { + pc->pc_allocfrom = pcg; + goto have_group; + } + } + + /* + * 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. + */ + 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); + } + } + return (object); + } + + have_group: + pc->pc_hits++; + pc->pc_nitems--; + object = pcg_get(pcg); + + if (pcg->pcg_avail == 0) + pc->pc_allocfrom = NULL; + + simple_unlock(&pc->pc_slock); + + return (object); +} + +/* + * pool_cache_put: + * + * Put an object back to the pool cache. + */ +void +pool_cache_put(struct pool_cache *pc, void *object) +{ + struct pool_cache_group *pcg; + + simple_lock(&pc->pc_slock); + + if ((pcg = pc->pc_freeto) == NULL) { + for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL; + pcg = TAILQ_NEXT(pcg, pcg_list)) { + if (pcg->pcg_avail != PCG_NOBJECTS) { + pc->pc_freeto = pcg; + goto have_group; + } + } + + /* + * No empty groups to free the object to. Attempt to + * allocate one. + */ + simple_unlock(&pc->pc_slock); + pcg = pool_get(&pcgpool, PR_NOWAIT); + 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; + } + + /* + * Unable to allocate a cache group; destruct the object + * and free it back to the pool. + */ + pool_cache_destruct_object(pc, object); + return; + } + + have_group: + pc->pc_nitems++; + pcg_put(pcg, object); + + if (pcg->pcg_avail == PCG_NOBJECTS) + pc->pc_freeto = NULL; + + simple_unlock(&pc->pc_slock); +} + +/* + * pool_cache_destruct_object: + * + * Force destruction of an object and its release back into + * the pool. + */ +void +pool_cache_destruct_object(struct pool_cache *pc, void *object) +{ + + if (pc->pc_dtor != NULL) + (*pc->pc_dtor)(pc->pc_arg, object); + pool_put(pc->pc_pool, object); +} + +/* + * pool_cache_do_invalidate: + * + * This internal function implements pool_cache_invalidate() and + * pool_cache_reclaim(). + */ +static void +pool_cache_do_invalidate(struct pool_cache *pc, int free_groups, + void (*putit)(struct pool *, void *)) +{ + struct pool_cache_group *pcg, *npcg; + void *object; + + 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; + pool_put(&pcgpool, pcg); + } + } +} + +/* + * pool_cache_invalidate: + * + * Invalidate a pool cache (destruct and release all of the + * cached objects). + */ +void +pool_cache_invalidate(struct pool_cache *pc) +{ + + simple_lock(&pc->pc_slock); + pool_cache_do_invalidate(pc, 0, pool_put); + simple_unlock(&pc->pc_slock); +} + +/* + * pool_cache_reclaim: + * + * Reclaim a pool cache for pool_reclaim(). + */ +static void +pool_cache_reclaim(struct pool_cache *pc) +{ + + simple_lock(&pc->pc_slock); + pool_cache_do_invalidate(pc, 1, pool_do_put); + simple_unlock(&pc->pc_slock); +}