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.128.2.1 retrieving revision 1.179 diff -u -p -r1.128.2.1 -r1.179 --- src/sys/kern/subr_pool.c 2007/03/13 16:51:56 1.128.2.1 +++ src/sys/kern/subr_pool.c 2010/01/02 15:20:39 1.179 @@ -1,12 +1,12 @@ -/* $NetBSD: subr_pool.c,v 1.128.2.1 2007/03/13 16:51:56 ad Exp $ */ +/* $NetBSD: subr_pool.c,v 1.179 2010/01/02 15:20:39 mlelstv Exp $ */ /*- - * Copyright (c) 1997, 1999, 2000, 2002 The NetBSD Foundation, Inc. + * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008 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 @@ -16,13 +16,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -38,22 +31,27 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.128.2.1 2007/03/13 16:51:56 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.179 2010/01/02 15:20:39 mlelstv 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 @@ -71,12 +69,13 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c, */ /* List of all pools */ -LIST_HEAD(,pool) pool_head = LIST_HEAD_INITIALIZER(pool_head); +static TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); /* Private pool for page header structures */ #define PHPOOL_MAX 8 static struct pool phpool[PHPOOL_MAX]; -#define PHPOOL_FREELIST_NELEM(idx) (((idx) == 0) ? 0 : (1 << (idx))) +#define PHPOOL_FREELIST_NELEM(idx) \ + (((idx) == 0) ? 0 : BITMAP_SIZE * (1 << (idx))) #ifdef POOL_SUBPAGE /* Pool of subpages for use by normal pools. */ @@ -90,7 +89,7 @@ static void *pool_page_alloc_meta(struct static void pool_page_free_meta(struct pool *, void *); /* allocator for pool metadata */ -static struct pool_allocator pool_allocator_meta = { +struct pool_allocator pool_allocator_meta = { pool_page_alloc_meta, pool_page_free_meta, .pa_backingmapptr = &kmem_map, }; @@ -101,10 +100,16 @@ 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; - -typedef uint8_t pool_item_freelist_t; +/* This lock protects both pool_head and drainpp. */ +static kmutex_t pool_head_lock; +static kcondvar_t pool_busy; + +/* This lock protects initialization of a potentially shared pool allocator */ +static kmutex_t pool_allocator_lock; + +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 */ @@ -113,7 +118,9 @@ struct pool_item_header { SPLAY_ENTRY(pool_item_header) ph_node; /* Off-page page headers */ void * ph_page; /* this page's address */ - struct timeval ph_time; /* last referenced */ + uint32_t ph_time; /* last referenced */ + uint16_t ph_nmissing; /* # of chunks in use */ + uint16_t ph_off; /* start offset in page */ union { /* !PR_NOTOUCH */ struct { @@ -122,27 +129,18 @@ struct pool_item_header { } phu_normal; /* PR_NOTOUCH */ struct { - uint16_t - phu_off; /* start offset in page */ - pool_item_freelist_t - phu_firstfree; /* first free item */ - /* - * XXX it might be better to use - * a simple bitmap and ffs(3) - */ + pool_item_bitmap_t phu_bitmap[1]; } phu_notouch; } ph_u; - uint16_t ph_nmissing; /* # of chunks in use */ }; #define ph_itemlist ph_u.phu_normal.phu_itemlist -#define ph_off ph_u.phu_notouch.phu_off -#define ph_firstfree ph_u.phu_notouch.phu_firstfree +#define ph_bitmap ph_u.phu_notouch.phu_bitmap struct pool_item { #ifdef DIAGNOSTIC u_int pi_magic; #endif -#define PI_MAGIC 0xdeadbeefU +#define PI_MAGIC 0xdeaddeadU /* Other entries use only this list entry */ LIST_ENTRY(pool_item) pi_list; }; @@ -158,30 +156,43 @@ 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; - -static void pool_cache_reclaim(struct pool_cache *, struct pool_pagelist *, - struct pool_cache_grouplist *); -static void pcg_grouplist_free(struct pool_cache_grouplist *); +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; /* global disable for caching */ +static const pcg_t pcg_dummy; /* zero sized: always empty, yet always full */ + +static bool pool_cache_put_slow(pool_cache_cpu_t *, int, + void *); +static bool 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_invalidate_cpu(pool_cache_t, u_int); +static void pool_cache_xcall(pool_cache_t); static int pool_catchup(struct pool *); static void pool_prime_page(struct pool *, void *, @@ -223,16 +234,28 @@ int pool_logsize = POOL_LOGSIZE; static inline void pr_log(struct pool *pp, void *v, int action, const char *file, long line) { - int n = pp->pr_curlogentry; + int n; struct pool_log *pl; if ((pp->pr_roflags & PR_LOGGING) == 0) return; + if (pp->pr_log == NULL) { + if (kmem_map != NULL) + pp->pr_log = malloc( + pool_logsize * sizeof(struct pool_log), + M_TEMP, M_NOWAIT | M_ZERO); + if (pp->pr_log == NULL) + return; + pp->pr_curlogentry = 0; + pp->pr_logsize = pool_logsize; + } + /* * Fill in the current entry. Wrap around and overwrite * the oldest entry if necessary. */ + n = pp->pr_curlogentry; pl = &pp->pr_log[n]; pl->pl_file = file; pl->pl_line = line; @@ -250,7 +273,7 @@ pr_printlog(struct pool *pp, struct pool int i = pp->pr_logsize; int n = pp->pr_curlogentry; - if ((pp->pr_roflags & PR_LOGGING) == 0) + if (pp->pr_log == NULL) return; /* @@ -318,12 +341,12 @@ pr_enter_check(struct pool *pp, void (*p #define pr_enter_check(pp, pr) #endif /* POOL_DIAGNOSTIC */ -static inline int +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; - int idx; + unsigned int idx; KASSERT(pp->pr_roflags & PR_NOTOUCH); idx = (cp - (char *)ph->ph_page - ph->ph_off) / pp->pr_size; @@ -331,35 +354,55 @@ pr_item_notouch_index(const struct pool return idx; } -#define PR_FREELIST_ALIGN(p) \ - roundup((uintptr_t)(p), sizeof(pool_item_freelist_t)) -#define PR_FREELIST(ph) ((pool_item_freelist_t *)PR_FREELIST_ALIGN((ph) + 1)) -#define PR_INDEX_USED ((pool_item_freelist_t)-1) -#define PR_INDEX_EOL ((pool_item_freelist_t)-2) - static inline void pr_item_notouch_put(const struct pool *pp, struct pool_item_header *ph, void *obj) { - int idx = pr_item_notouch_index(pp, ph, obj); - pool_item_freelist_t *freelist = PR_FREELIST(ph); + 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(freelist[idx] == PR_INDEX_USED); - freelist[idx] = ph->ph_firstfree; - ph->ph_firstfree = idx; + KASSERT((*bitmap & mask) == 0); + *bitmap |= mask; } static inline void * pr_item_notouch_get(const struct pool *pp, struct pool_item_header *ph) { - int idx = ph->ph_firstfree; - pool_item_freelist_t *freelist = PR_FREELIST(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; +} - KASSERT(freelist[idx] != PR_INDEX_USED); - ph->ph_firstfree = freelist[idx]; - freelist[idx] = PR_INDEX_USED; +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; - return (char *)ph->ph_page + ph->ph_off + idx * pp->pr_size; + for (i = 0; i < n; i++) { + bitmap[i] = (pool_item_bitmap_t)-1; + } } static inline int @@ -382,6 +425,24 @@ phtree_compare(struct pool_item_header * 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 item address. */ @@ -391,15 +452,7 @@ pr_find_pagehead(struct pool *pp, void * struct pool_item_header *ph, tmp; if ((pp->pr_roflags & PR_NOALIGN) != 0) { - 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); - } + ph = pr_find_pagehead_noalign(pp, v); } else { void *page = (void *)((uintptr_t)v & pp->pr_alloc->pa_pagemask); @@ -422,16 +475,12 @@ static void pr_pagelist_free(struct pool *pp, struct pool_pagelist *pq) { struct pool_item_header *ph; - int s; 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) { - s = splvm(); + if ((pp->pr_roflags & PR_PHINPAGE) == 0) pool_put(pp->pr_phpool, ph); - splx(s); - } } } @@ -443,7 +492,7 @@ pr_rmpage(struct pool *pp, struct pool_i struct pool_pagelist *pq) { - LOCK_ASSERT(simple_lock_held(&pp->pr_slock)); + KASSERT(mutex_owned(&pp->pr_lock)); /* * If the page was idle, decrement the idle page count. @@ -554,13 +603,10 @@ void pool_subsystem_init(void) { struct pool_allocator *pa; - __link_set_decl(pools, struct link_pool_init); - struct link_pool_init * const *pi; - __link_set_foreach(pi, pools) - pool_init((*pi)->pp, (*pi)->size, (*pi)->align, - (*pi)->align_offset, (*pi)->flags, (*pi)->wchan, - (*pi)->palloc, (*pi)->ipl); + mutex_init(&pool_head_lock, MUTEX_DEFAULT, IPL_NONE); + mutex_init(&pool_allocator_lock, MUTEX_DEFAULT, IPL_NONE); + cv_init(&pool_busy, "poolbusy"); while ((pa = SLIST_FIRST(&pa_deferinitq)) != NULL) { KASSERT(pa->pa_backingmapptr != NULL); @@ -568,6 +614,12 @@ pool_subsystem_init(void) SLIST_REMOVE_HEAD(&pa_deferinitq, pa_q); pa_reclaim_register(pa); } + + pool_init(&cache_pool, sizeof(struct pool_cache), coherency_unit, + 0, 0, "pcache", &pool_allocator_nointr, IPL_NONE); + + pool_init(&cache_cpu_pool, sizeof(pool_cache_cpu_t), coherency_unit, + 0, 0, "pcachecpu", &pool_allocator_nointr, IPL_NONE); } /* @@ -580,21 +632,16 @@ void pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags, const char *wchan, struct pool_allocator *palloc, int ipl) { -#ifdef DEBUG struct pool *pp1; -#endif size_t trysize, phsize; - int off, slack, s; - - KASSERT((1UL << (CHAR_BIT * sizeof(pool_item_freelist_t))) - 2 >= - PHPOOL_FREELIST_NELEM(PHPOOL_MAX - 1)); + int off, slack; #ifdef DEBUG /* * Check that the pool hasn't already been initialised and * added to the list of all pools. */ - LIST_FOREACH(pp1, &pool_head, pr_poollist) { + TAILQ_FOREACH(pp1, &pool_head, pr_poollist) { if (pp == pp1) panic("pool_init: pool %s already initialised", wchan); @@ -619,21 +666,22 @@ pool_init(struct pool *pp, size_t size, palloc = &pool_allocator_nointr_fullpage; } #endif /* POOL_SUBPAGE */ - if ((palloc->pa_flags & PA_INITIALIZED) == 0) { + mutex_enter(&pool_allocator_lock); + if (palloc->pa_refcnt++ == 0) { if (palloc->pa_pagesz == 0) palloc->pa_pagesz = PAGE_SIZE; TAILQ_INIT(&palloc->pa_list); - simple_lock_init(&palloc->pa_slock); + 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; } + mutex_exit(&pool_allocator_lock); if (align == 0) align = ALIGN(1); @@ -653,7 +701,7 @@ pool_init(struct pool *pp, size_t size, LIST_INIT(&pp->pr_emptypages); LIST_INIT(&pp->pr_fullpages); LIST_INIT(&pp->pr_partpages); - LIST_INIT(&pp->pr_cachelist); + pp->pr_cache = NULL; pp->pr_curpage = NULL; pp->pr_npages = 0; pp->pr_minitems = 0; @@ -754,22 +802,16 @@ 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) { - if (kmem_map == NULL || - (pp->pr_log = malloc(pool_logsize * sizeof(struct pool_log), - M_TEMP, M_NOWAIT)) == NULL) - pp->pr_roflags &= ~PR_LOGGING; - pp->pr_curlogentry = 0; - pp->pr_logsize = pool_logsize; - } -#endif + pp->pr_log = NULL; pp->pr_entered_file = NULL; pp->pr_entered_line = 0; - simple_lock_init(&pp->pr_slock); + 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 @@ -788,8 +830,8 @@ pool_init(struct pool *pp, size_t size, "phpool-%d", nelem); sz = sizeof(struct pool_item_header); if (nelem) { - sz = PR_FREELIST_ALIGN(sz) - + nelem * sizeof(pool_item_freelist_t); + 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); @@ -798,21 +840,39 @@ pool_init(struct pool *pp, size_t size, pool_init(&psppool, POOL_SUBPAGE, POOL_SUBPAGE, 0, PR_RECURSIVE, "psppool", &pool_allocator_meta, IPL_VM); #endif - pool_init(&pcgpool, sizeof(struct pool_cache_group), 0, 0, - 0, "pcgpool", &pool_allocator_meta, IPL_VM); + + size = sizeof(pcg_t) + + (PCG_NOBJECTS_NORMAL - 1) * sizeof(pcgpair_t); + pool_init(&pcg_normal_pool, size, coherency_unit, 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, coherency_unit, 0, 0, + "pcglarge", &pool_allocator_meta, IPL_VM); } /* Insert into the list of all pools. */ - simple_lock(&pool_head_slock); - LIST_INSERT_HEAD(&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. */ - s = splvm(); - simple_lock(&palloc->pa_slock); + if (__predict_true(!cold)) + mutex_enter(&palloc->pa_lock); TAILQ_INSERT_TAIL(&palloc->pa_list, pp, pr_alloc_list); - simple_unlock(&palloc->pa_slock); - splx(s); + if (__predict_true(!cold)) + mutex_exit(&palloc->pa_lock); + pool_reclaim_register(pp); } @@ -824,27 +884,30 @@ pool_destroy(struct pool *pp) { struct pool_pagelist pq; struct pool_item_header *ph; - int s; /* Remove from global pool list */ - simple_lock(&pool_head_slock); - LIST_REMOVE(pp, pr_poollist); + 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; - simple_unlock(&pool_head_slock); + mutex_exit(&pool_head_lock); /* Remove this pool from its allocator's list of pools. */ pool_reclaim_unregister(pp); - s = splvm(); - simple_lock(&pp->pr_alloc->pa_slock); + mutex_enter(&pp->pr_alloc->pa_lock); TAILQ_REMOVE(&pp->pr_alloc->pa_list, pp, pr_alloc_list); - simple_unlock(&pp->pr_alloc->pa_slock); - splx(s); + mutex_exit(&pp->pr_alloc->pa_lock); - s = splvm(); - simple_lock(&pp->pr_slock); + mutex_enter(&pool_allocator_lock); + if (--pp->pr_alloc->pa_refcnt == 0) + mutex_destroy(&pp->pr_alloc->pa_lock); + mutex_exit(&pool_allocator_lock); - KASSERT(LIST_EMPTY(&pp->pr_cachelist)); + mutex_enter(&pp->pr_lock); + + KASSERT(pp->pr_cache == NULL); #ifdef DIAGNOSTIC if (pp->pr_nout != 0) { @@ -862,15 +925,19 @@ pool_destroy(struct pool *pp) while ((ph = LIST_FIRST(&pp->pr_emptypages)) != NULL) pr_rmpage(pp, ph, &pq); - simple_unlock(&pp->pr_slock); - splx(s); + mutex_exit(&pp->pr_lock); pr_pagelist_free(pp, &pq); #ifdef POOL_DIAGNOSTIC - if ((pp->pr_roflags & PR_LOGGING) != 0) + if (pp->pr_log != NULL) { free(pp->pr_log, M_TEMP); + pp->pr_log = NULL; + } #endif + + cv_destroy(&pp->pr_cv); + mutex_destroy(&pp->pr_lock); } void @@ -890,23 +957,17 @@ static struct pool_item_header * pool_alloc_item_header(struct pool *pp, void *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 *) ((char *)storage + pp->pr_phoffset); - else { - s = splvm(); + else ph = pool_get(pp->pr_phpool, flags); - splx(s); - } 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 @@ -929,11 +990,12 @@ pool_get(struct pool *pp, int flags) #endif /* DIAGNOSTIC */ #ifdef LOCKDEBUG - if (flags & PR_WAITOK) - ASSERT_SLEEPABLE(NULL, "pool_get(PR_WAITOK)"); + if (flags & PR_WAITOK) { + ASSERT_SLEEPABLE(); + } #endif - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pr_enter(pp, file, line); startover: @@ -945,7 +1007,7 @@ 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 @@ -957,9 +1019,9 @@ pool_get(struct pool *pp, int flags) * and check the hardlimit condition again. */ pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); (*pp->pr_drain_hook)(pp->pr_drain_hook_arg, flags); - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pr_enter(pp, file, line); if (pp->pr_nout < pp->pr_hardlimit) goto startover; @@ -972,7 +1034,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; } @@ -988,7 +1050,7 @@ pool_get(struct pool *pp, int flags) pp->pr_nfail++; pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); return (NULL); } @@ -1003,7 +1065,7 @@ pool_get(struct pool *pp, int flags) #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"); @@ -1030,7 +1092,7 @@ pool_get(struct pool *pp, int flags) pp->pr_nfail++; pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); return (NULL); } @@ -1041,7 +1103,7 @@ pool_get(struct pool *pp, int flags) #ifdef DIAGNOSTIC if (__predict_false(ph->ph_nmissing == pp->pr_itemsperpage)) { pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); panic("pool_get: %s: page empty", pp->pr_wchan); } #endif @@ -1053,13 +1115,13 @@ pool_get(struct pool *pp, int flags) v = pi = LIST_FIRST(&ph->ph_itemlist); if (__predict_false(v == NULL)) { pr_leave(pp); - simple_unlock(&pp->pr_slock); + 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); - simple_unlock(&pp->pr_slock); + 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"); @@ -1106,7 +1168,7 @@ pool_get(struct pool *pp, int flags) 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); } @@ -1135,7 +1197,7 @@ pool_get(struct pool *pp, int flags) */ } - 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); @@ -1150,8 +1212,9 @@ pool_do_put(struct pool *pp, void *v, st struct pool_item *pi = v; struct pool_item_header *ph; - LOCK_ASSERT(simple_lock_held(&pp->pr_slock)); + 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)) { @@ -1166,13 +1229,6 @@ pool_do_put(struct pool *pp, void *v, st panic("pool_put: %s: page header missing", pp->pr_wchan); } -#ifdef LOCKDEBUG - /* - * Check if we're freeing a locked simple lock. - */ - simple_lock_freecheck(pi, (char *)pi + pp->pr_size); -#endif - /* * Return to item list. */ @@ -1206,10 +1262,7 @@ pool_do_put(struct pool *pp, void *v, st if (pp->pr_flags & PR_WANTED) { pp->pr_flags &= ~PR_WANTED; - if (ph->ph_nmissing == 0) - pp->pr_nidle++; - wakeup((void *)pp); - return; + cv_broadcast(&pp->pr_cv); } /* @@ -1228,8 +1281,7 @@ pool_do_put(struct pool *pp, void *v, st if (ph->ph_nmissing == 0) { pp->pr_nidle++; if (pp->pr_npages > pp->pr_minpages && - (pp->pr_npages > pp->pr_maxpages || - pa_starved_p(pp->pr_alloc))) { + pp->pr_npages > pp->pr_maxpages) { pr_rmpage(pp, ph, pq); } else { LIST_REMOVE(ph, ph_pagelist); @@ -1240,8 +1292,11 @@ pool_do_put(struct pool *pp, void *v, st * be idle for some period of time before it can * be reclaimed by the pagedaemon. This minimizes * ping-pong'ing for memory. + * + * note for 64-bit time_t: truncating to 32-bit is not + * a problem for our usage. */ - getmicrotime(&ph->ph_time); + ph->ph_time = time_uptime; } pool_update_curpage(pp); } @@ -1260,7 +1315,7 @@ pool_do_put(struct pool *pp, void *v, st } /* - * Return resource to the pool; must be called at appropriate spl level + * Return resource to the pool. */ #ifdef POOL_DIAGNOSTIC void @@ -1270,7 +1325,7 @@ _pool_put(struct pool *pp, void *v, cons 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); @@ -1278,7 +1333,7 @@ _pool_put(struct pool *pp, void *v, cons pool_do_put(pp, v, &pq); pr_leave(pp); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); pr_pagelist_free(pp, &pq); } @@ -1292,9 +1347,9 @@ pool_put(struct pool *pp, void *v) LIST_INIT(&pq); - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pool_do_put(pp, v, &pq); - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); pr_pagelist_free(pp, &pq); } @@ -1317,7 +1372,7 @@ pool_grow(struct pool *pp, int flags) struct pool_item_header *ph = NULL; char *cp; - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); cp = pool_allocator_alloc(pp, flags); if (__predict_true(cp != NULL)) { ph = pool_alloc_item_header(pp, cp, flags); @@ -1326,11 +1381,11 @@ pool_grow(struct pool *pp, int flags) if (cp != NULL) { pool_allocator_free(pp, cp); } - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); return ENOMEM; } - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pool_prime_page(pp, cp, ph); pp->pr_npagealloc++; return 0; @@ -1345,7 +1400,7 @@ pool_prime(struct pool *pp, int n) int newpages; int error = 0; - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); newpages = roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; @@ -1360,7 +1415,7 @@ pool_prime(struct pool *pp, int n) if (pp->pr_minpages >= pp->pr_maxpages) pp->pr_maxpages = pp->pr_minpages + 1; /* XXX */ - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); return error; } @@ -1378,7 +1433,7 @@ pool_prime_page(struct pool *pp, void *s const unsigned int ioff = pp->pr_itemoffset; int n; - LOCK_ASSERT(simple_lock_held(&pp->pr_slock)); + KASSERT(mutex_owned(&pp->pr_lock)); #ifdef DIAGNOSTIC if ((pp->pr_roflags & PR_NOALIGN) == 0 && @@ -1393,7 +1448,7 @@ pool_prime_page(struct pool *pp, void *s LIST_INIT(&ph->ph_itemlist); ph->ph_page = storage; ph->ph_nmissing = 0; - getmicrotime(&ph->ph_time); + ph->ph_time = time_uptime; if ((pp->pr_roflags & PR_PHINPAGE) == 0) SPLAY_INSERT(phtree, &pp->pr_phtree, ph); @@ -1402,7 +1457,8 @@ pool_prime_page(struct pool *pp, void *s /* * Color this page. */ - cp = (char *)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; @@ -1421,14 +1477,7 @@ pool_prime_page(struct pool *pp, void *s pp->pr_nitems += n; if (pp->pr_roflags & PR_NOTOUCH) { - pool_item_freelist_t *freelist = PR_FREELIST(ph); - int i; - - ph->ph_off = (char *)cp - (char *)storage; - ph->ph_firstfree = 0; - for (i = 0; i < n - 1; i++) - freelist[i] = i + 1; - freelist[n - 1] = PR_INDEX_EOL; + pr_item_notouch_init(pp, ph); } else { while (n--) { pi = (struct pool_item *)cp; @@ -1487,13 +1536,15 @@ pool_update_curpage(struct pool *pp) if (pp->pr_curpage == NULL) { pp->pr_curpage = LIST_FIRST(&pp->pr_emptypages); } + KASSERT((pp->pr_curpage == NULL && pp->pr_nitems == 0) || + (pp->pr_curpage != NULL && pp->pr_nitems > 0)); } void pool_setlowat(struct pool *pp, int n) { - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); pp->pr_minitems = n; pp->pr_minpages = (n == 0) @@ -1509,27 +1560,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; @@ -1545,7 +1596,7 @@ pool_sethardlimit(struct pool *pp, int n ? 0 : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); } /* @@ -1559,10 +1610,10 @@ pool_reclaim(struct pool *pp) #endif { struct pool_item_header *ph, *phnext; - struct pool_cache *pc; struct pool_pagelist pq; - struct pool_cache_grouplist pcgl; - struct timeval curtime, diff; + uint32_t curtime; + bool klock; + int rv; if (pp->pr_drain_hook != NULL) { /* @@ -1571,20 +1622,32 @@ pool_reclaim(struct pool *pp) (*pp->pr_drain_hook)(pp->pr_drain_hook_arg, PR_NOWAIT); } - if (simple_lock_try(&pp->pr_slock) == 0) + /* + * XXXSMP Because we do not want to cause non-MPSAFE code + * to block. + */ + 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; + + /* Reclaim items from the pool's cache (if any). */ + if (pp->pr_cache != NULL) + pool_cache_invalidate(pp->pr_cache); + + if (mutex_tryenter(&pp->pr_lock) == 0) { + if (klock) { + KERNEL_UNLOCK_ONE(NULL); + } return (0); + } pr_enter(pp, file, line); LIST_INIT(&pq); - LIST_INIT(&pcgl); - /* - * Reclaim items from the pool's caches. - */ - LIST_FOREACH(pc, &pp->pr_cachelist, pc_poollist) - pool_cache_reclaim(pc, &pq, &pcgl); - - getmicrotime(&curtime); + curtime = time_uptime; for (ph = LIST_FIRST(&pp->pr_emptypages); ph != NULL; ph = phnext) { phnext = LIST_NEXT(ph, ph_pagelist); @@ -1594,8 +1657,7 @@ pool_reclaim(struct pool *pp) break; KASSERT(ph->ph_nmissing == 0); - timersub(&curtime, &ph->ph_time, &diff); - if (diff.tv_sec < pool_inactive_time + if (curtime - ph->ph_time < pool_inactive_time && !pa_starved_p(pp->pr_alloc)) continue; @@ -1611,40 +1673,87 @@ pool_reclaim(struct pool *pp) } pr_leave(pp); - simple_unlock(&pp->pr_slock); - if (LIST_EMPTY(&pq) && LIST_EMPTY(&pcgl)) - return 0; + mutex_exit(&pp->pr_lock); - pr_pagelist_free(pp, &pq); - pcg_grouplist_free(&pcgl); - return (1); + if (LIST_EMPTY(&pq)) + rv = 0; + else { + pr_pagelist_free(pp, &pq); + rv = 1; + } + + 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 = LIST_FIRST(&pool_head); - } - if (drainpp) { - pp = drainpp; - drainpp = LIST_NEXT(pp, pr_poollist); - } - simple_unlock(&pool_head_slock); - if (pp) - pool_reclaim(pp); - splx(s); + + /* 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); + } +} + +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); } /* @@ -1653,18 +1762,8 @@ 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 @@ -1672,13 +1771,7 @@ pool_printall(const char *modif, void (* { struct pool *pp; - if (simple_lock_try(&pool_head_slock) == 0) { - (*pr)("WARNING: pool_head_slock is locked\n"); - } else { - simple_unlock(&pool_head_slock); - } - - LIST_FOREACH(pp, &pool_head, pr_poollist) { + TAILQ_FOREACH(pp, &pool_head, pr_poollist) { pool_printit(pp, modif, pr); } } @@ -1692,20 +1785,6 @@ pool_printit(struct pool *pp, const char 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 - simple_unlock(&pp->pr_slock); - pool_print1(pp, modif, pr); } @@ -1719,10 +1798,8 @@ pool_print_pagelist(struct pool *pp, str #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); + (*pr)("\t\tpage %p, nmissing %d, time %" PRIu32 "\n", + ph->ph_page, ph->ph_nmissing, ph->ph_time); #ifdef DIAGNOSTIC if (!(pp->pr_roflags & PR_NOTOUCH)) { LIST_FOREACH(pi, &ph->ph_itemlist, pi_list) { @@ -1740,8 +1817,10 @@ static void 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; + 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; @@ -1754,7 +1833,13 @@ pool_print1(struct pool *pp, const char print_cache = 1; } - (*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)("\talloc %p\n", pp->pr_alloc); @@ -1763,7 +1848,7 @@ pool_print1(struct pool *pp, const char (*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); @@ -1798,12 +1883,10 @@ pool_print1(struct pool *pp, const char } skip_log: - if (print_cache == 0) - goto skip_cache; #define PR_GROUPLIST(pcg) \ (*pr)("\t\tgroup %p: avail %d\n", pcg, pcg->pcg_avail); \ - for (i = 0; i < PCG_NOBJECTS; i++) { \ + 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", \ @@ -1816,26 +1899,38 @@ pool_print1(struct pool *pp, const char } \ } - LIST_FOREACH(pc, &pp->pr_cachelist, pc_poollist) { - (*pr)("\tcache %p\n", pc); - (*pr)("\t hits %lu misses %lu ngroups %lu nitems %lu\n", - pc->pc_hits, pc->pc_misses, pc->pc_ngroups, pc->pc_nitems); - (*pr)("\t full groups:\n"); - LIST_FOREACH(pcg, &pc->pc_fullgroups, pcg_list) { - PR_GROUPLIST(pcg); - } - (*pr)("\t partial groups:\n"); - LIST_FOREACH(pcg, &pc->pc_partgroups, pcg_list) { - PR_GROUPLIST(pcg); - } - (*pr)("\t empty groups:\n"); - LIST_FOREACH(pcg, &pc->pc_emptygroups, pcg_list) { - PR_GROUPLIST(pcg); + 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); + } } } #undef PR_GROUPLIST - skip_cache: pr_enter_check(pp, pr); } @@ -1903,7 +1998,7 @@ pool_chk(struct pool *pp, const char *la struct pool_item_header *ph; int r = 0; - simple_lock(&pp->pr_slock); + mutex_enter(&pp->pr_lock); LIST_FOREACH(ph, &pp->pr_emptypages, ph_pagelist) { r = pool_chk_page(pp, label, ph); if (r) { @@ -1924,7 +2019,7 @@ pool_chk(struct pool *pp, const char *la } out: - simple_unlock(&pp->pr_slock); + mutex_exit(&pp->pr_lock); return (r); } @@ -1932,38 +2027,106 @@ 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; - LIST_INIT(&pc->pc_emptygroups); - LIST_INIT(&pc->pc_fullgroups); - LIST_INIT(&pc->pc_partgroups); - simple_lock_init(&pc->pc_slock); - - pc->pc_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); + mutex_init(&pc->pc_lock, MUTEX_DEFAULT, ipl); + + 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; + + if ((flags & PR_LARGECACHE) != 0) { + pc->pc_pcgsize = PCG_NOBJECTS_LARGE; + pc->pc_pcgpool = &pcg_large_pool; + } else { + pc->pc_pcgsize = PCG_NOBJECTS_NORMAL; + pc->pc_pcgpool = &pcg_normal_pool; + } - pc->pc_ngroups = 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); + } + } - pc->pc_nitems = 0; + /* 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); - simple_lock(&pp->pr_slock); - LIST_INSERT_HEAD(&pp->pr_cachelist, pc, pc_poollist); - simple_unlock(&pp->pr_slock); + membar_sync(); + pp->pr_cache = pc; } /* @@ -1972,306 +2135,633 @@ 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; + u_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); - LIST_REMOVE(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++) + pool_cache_invalidate_cpu(pc, i); + + /* 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, paddr_t *pap) +/* + * 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; + + index = ci->ci_index; + + KASSERT(index < MAXCPUS); + + if ((cc = pc->pc_cpus[index]) != NULL) { + KASSERT(cc->cc_cpuindex == index); + return; + } - KASSERT(pcg->pcg_avail <= PCG_NOBJECTS); - KASSERT(pcg->pcg_avail != 0); - idx = --pcg->pcg_avail; - - KASSERT(pcg->pcg_objects[idx].pcgo_va != NULL); - object = pcg->pcg_objects[idx].pcgo_va; - if (pap != NULL) - *pap = pcg->pcg_objects[idx].pcgo_pa; - pcg->pcg_objects[idx].pcgo_va = NULL; + /* + * 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 = __UNCONST(&pcg_dummy); + cc->cc_previous = __UNCONST(&pcg_dummy); - return (object); + pc->pc_cpus[index] = cc; } -static inline void -pcg_put(struct pool_cache_group *pcg, void *object, paddr_t pa) +/* + * 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; - KASSERT(pcg->pcg_avail < PCG_NOBJECTS); - idx = pcg->pcg_avail++; + mutex_enter(&pool_head_lock); + TAILQ_FOREACH(pc, &pool_cache_head, pc_cachelist) { + pc->pc_refcnt++; + mutex_exit(&pool_head_lock); - KASSERT(pcg->pcg_objects[idx].pcgo_va == NULL); - pcg->pcg_objects[idx].pcgo_va = object; - pcg->pcg_objects[idx].pcgo_pa = pa; + pool_cache_cpu_init1(ci, pc); + + mutex_enter(&pool_head_lock); + pc->pc_refcnt--; + cv_broadcast(&pool_busy); + } + mutex_exit(&pool_head_lock); +} + +/* + * pool_cache_reclaim: + * + * Reclaim memory from a pool cache. + */ +bool +pool_cache_reclaim(pool_cache_t pc) +{ + + return pool_reclaim(&pc->pc_pool); } static void -pcg_grouplist_free(struct pool_cache_grouplist *pcgl) +pool_cache_destruct_object1(pool_cache_t pc, void *object) { - struct pool_cache_group *pcg; - int s; - s = splvm(); - while ((pcg = LIST_FIRST(pcgl)) != NULL) { - LIST_REMOVE(pcg, pcg_list); - pool_put(&pcgpool, pcg); - } - splx(s); + (*pc->pc_dtor)(pc->pc_arg, object); + pool_put(&pc->pc_pool, object); } /* - * pool_cache_get{,_paddr}: + * pool_cache_destruct_object: * - * Get an object from a pool cache (optionally returning - * the physical address of the object). + * Force destruction of an object and its release back into + * the pool. */ -void * -pool_cache_get_paddr(struct pool_cache *pc, int flags, paddr_t *pap) +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) - ASSERT_SLEEPABLE(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); + } - pcg = LIST_FIRST(&pc->pc_partgroups); - if (pcg == NULL) { - pcg = LIST_FIRST(&pc->pc_fullgroups); - if (pcg != NULL) { - LIST_REMOVE(pcg, pcg_list); - LIST_INSERT_HEAD(&pc->pc_partgroups, pcg, pcg_list); + 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); } } - if (pcg == NULL) { +} +/* + * pool_cache_invalidate: + * + * Invalidate a pool cache (destruct and release all of the + * cached objects). Does not reclaim objects from the pool. + * + * Note: For pool caches that provide constructed objects, there + * is an assumption that another level of synchronization is occurring + * between the input to the constructor and the cache invalidation. + */ +void +pool_cache_invalidate(pool_cache_t pc) +{ + pcg_t *full, *empty, *part; + uint64_t where; + + if (ncpu < 2 || !mp_online) { /* - * 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. + * We might be called early enough in the boot process + * for the CPU data structures to not be fully initialized. + * In this case, simply gather the local CPU's cache now + * since it will be the only one running. */ - 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); - } - } - KASSERT((((vaddr_t)object + pc->pc_pool->pr_itemoffset) & - (pc->pc_pool->pr_align - 1)) == 0); - if (object != NULL && pap != NULL) { -#ifdef POOL_VTOPHYS - *pap = POOL_VTOPHYS(object); -#else - *pap = POOL_PADDR_INVALID; -#endif - } - - FREECHECK_OUT(&pc->pc_freecheck, object); - return (object); + pool_cache_xcall(pc); + } else { + /* + * Gather all of the CPU-specific caches into the + * global cache. + */ + where = xc_broadcast(0, (xcfunc_t)pool_cache_xcall, pc, NULL); + xc_wait(where); } - pc->pc_hits++; - pc->pc_nitems--; - object = pcg_get(pcg, pap); + 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); +} - if (pcg->pcg_avail == 0) { - LIST_REMOVE(pcg, pcg_list); - LIST_INSERT_HEAD(&pc->pc_emptygroups, pcg, pcg_list); +/* + * pool_cache_invalidate_cpu: + * + * Invalidate all CPU-bound cached objects in pool cache, the CPU being + * identified by its associated index. + * It is caller's responsibility to ensure that no operation is + * taking place on this pool cache while doing this invalidation. + * WARNING: as no inter-CPU locking is enforced, trying to invalidate + * pool cached objects from a CPU different from the one currently running + * may result in an undefined behaviour. + */ +static void +pool_cache_invalidate_cpu(pool_cache_t pc, u_int index) +{ + + pool_cache_cpu_t *cc; + pcg_t *pcg; + + if ((cc = pc->pc_cpus[index]) == NULL) + return; + + if ((pcg = cc->cc_current) != &pcg_dummy) { + pcg->pcg_next = NULL; + pool_cache_invalidate_groups(pc, pcg); + } + if ((pcg = cc->cc_previous) != &pcg_dummy) { + pcg->pcg_next = NULL; + pool_cache_invalidate_groups(pc, pcg); } - simple_unlock(&pc->pc_slock); + if (cc != &pc->pc_cpu0) + pool_put(&cache_cpu_pool, cc); - KASSERT((((vaddr_t)object + pc->pc_pool->pr_itemoffset) & - (pc->pc_pool->pr_align - 1)) == 0); - FREECHECK_OUT(&pc->pc_freecheck, object); - return (object); } -/* - * pool_cache_put{,_paddr}: - * - * Put an object back to the pool cache (optionally caching the - * physical address of the object). - */ void -pool_cache_put_paddr(struct pool_cache *pc, void *object, paddr_t pa) +pool_cache_set_drain_hook(pool_cache_t pc, void (*fn)(void *, int), void *arg) { - struct pool_cache_group *pcg; - int s; - FREECHECK_IN(&pc->pc_freecheck, object); + pool_set_drain_hook(&pc->pc_pool, fn, arg); +} - if (__predict_false((pc->pc_pool->pr_flags & PR_WANTED) != 0)) { - goto destruct; - } +void +pool_cache_setlowat(pool_cache_t pc, int n) +{ + + pool_setlowat(&pc->pc_pool, n); +} - simple_lock(&pc->pc_slock); +void +pool_cache_sethiwat(pool_cache_t pc, int n) +{ - pcg = LIST_FIRST(&pc->pc_partgroups); - if (pcg == NULL) { - pcg = LIST_FIRST(&pc->pc_emptygroups); - if (pcg != NULL) { - LIST_REMOVE(pcg, pcg_list); - LIST_INSERT_HEAD(&pc->pc_partgroups, pcg, pcg_list); + 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 bool __noinline +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; + + KASSERT(cc->cc_current->pcg_avail == 0); + KASSERT(cc->cc_previous->pcg_avail == 0); + + pc = cc->cc_cache; + cc->cc_misses++; + + /* + * Nothing was available locally. Try and grab a group + * from the cache. + */ + if (__predict_false(!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); + return true; } } - if (pcg == NULL) { + if (__predict_true((pcg = pc->pc_fullgroups) != NULL)) { /* - * No empty groups to free the object to. Attempt to - * allocate one. + * If there's a full group, release our empty + * group back to the cache. Install the full + * group as cc_current and return. */ - simple_unlock(&pc->pc_slock); - s = splvm(); - pcg = pool_get(&pcgpool, PR_NOWAIT); - splx(s); - if (pcg == NULL) { -destruct: + if (__predict_true((cur = cc->cc_current) != &pcg_dummy)) { + 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 true; + } - /* - * Unable to allocate a cache group; destruct the object - * and free it back to the pool. - */ - pool_cache_destruct_object(pc, object); - return; - } - memset(pcg, 0, sizeof(*pcg)); - simple_lock(&pc->pc_slock); - pc->pc_ngroups++; - LIST_INSERT_HEAD(&pc->pc_partgroups, pcg, pcg_list); + /* + * 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); + splx(s); + + object = pool_get(&pc->pc_pool, flags); + *objectp = object; + if (__predict_false(object == NULL)) + return false; + + if (__predict_false((*pc->pc_ctor)(pc->pc_arg, object, flags) != 0)) { + pool_put(&pc->pc_pool, object); + *objectp = NULL; + return false; } - pc->pc_nitems++; - pcg_put(pcg, object, pa); + KASSERT((((vaddr_t)object + pc->pc_pool.pr_itemoffset) & + (pc->pc_pool.pr_align - 1)) == 0); - if (pcg->pcg_avail == PCG_NOBJECTS) { - LIST_REMOVE(pcg, pcg_list); - LIST_INSERT_HEAD(&pc->pc_fullgroups, pcg, pcg_list); + if (pap != NULL) { +#ifdef POOL_VTOPHYS + *pap = POOL_VTOPHYS(object); +#else + *pap = POOL_PADDR_INVALID; +#endif } - simple_unlock(&pc->pc_slock); + + FREECHECK_OUT(&pc->pc_freecheck, object); + return false; } /* - * pool_cache_destruct_object: + * pool_cache_get{,_paddr}: * - * Force destruction of an object and its release back into - * the pool. + * Get an object from a pool cache (optionally returning + * the physical address of the object). */ -void -pool_cache_destruct_object(struct pool_cache *pc, void *object) +void * +pool_cache_get_paddr(pool_cache_t pc, int flags, paddr_t *pap) { + pool_cache_cpu_t *cc; + pcg_t *pcg; + void *object; + int s; - if (pc->pc_dtor != NULL) - (*pc->pc_dtor)(pc->pc_arg, object); - pool_put(pc->pc_pool, object); -} +#ifdef LOCKDEBUG + if (flags & PR_WAITOK) { + ASSERT_SLEEPABLE(); + } +#endif -static void -pool_do_cache_invalidate_grouplist(struct pool_cache_grouplist *pcgsl, - struct pool_cache *pc, struct pool_pagelist *pq, - struct pool_cache_grouplist *pcgdl) -{ - struct pool_cache_group *pcg, *npcg; - void *object; + /* Lock out interrupts and disable preemption. */ + s = splvm(); + while (/* CONSTCOND */ true) { + /* Try and allocate an object from the current group. */ + cc = pc->pc_cpus[curcpu()->ci_index]; + KASSERT(cc->cc_cache == pc); + pcg = cc->cc_current; + if (__predict_true(pcg->pcg_avail > 0)) { + object = pcg->pcg_objects[--pcg->pcg_avail].pcgo_va; + if (__predict_false(pap != NULL)) + *pap = pcg->pcg_objects[pcg->pcg_avail].pcgo_pa; +#if defined(DIAGNOSTIC) + pcg->pcg_objects[pcg->pcg_avail].pcgo_va = NULL; + KASSERT(pcg->pcg_avail < pcg->pcg_size); + KASSERT(object != NULL); +#endif + cc->cc_hits++; + splx(s); + FREECHECK_OUT(&pc->pc_freecheck, object); + return object; + } + + /* + * That failed. If the previous group isn't empty, swap + * it with the current group and allocate from there. + */ + pcg = cc->cc_previous; + if (__predict_true(pcg->pcg_avail > 0)) { + cc->cc_previous = cc->cc_current; + cc->cc_current = pcg; + continue; + } - for (pcg = LIST_FIRST(pcgsl); pcg != NULL; pcg = npcg) { - npcg = LIST_NEXT(pcg, pcg_list); - while (pcg->pcg_avail != 0) { - pc->pc_nitems--; - object = pcg_get(pcg, NULL); - if (pc->pc_dtor != NULL) - (*pc->pc_dtor)(pc->pc_arg, object); - pool_do_put(pc->pc_pool, object, pq); - } - pc->pc_ngroups--; - LIST_REMOVE(pcg, pcg_list); - LIST_INSERT_HEAD(pcgdl, pcg, pcg_list); + /* + * 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 false. + * Otherwise, we need to retry. + */ + if (!pool_cache_get_slow(cc, s, &object, pap, flags)) + break; } + + return object; } -static void -pool_do_cache_invalidate(struct pool_cache *pc, struct pool_pagelist *pq, - struct pool_cache_grouplist *pcgl) +static bool __noinline +pool_cache_put_slow(pool_cache_cpu_t *cc, int s, void *object) { + pcg_t *pcg, *cur; + uint64_t ncsw; + pool_cache_t pc; - LOCK_ASSERT(simple_lock_held(&pc->pc_slock)); - LOCK_ASSERT(simple_lock_held(&pc->pc_pool->pr_slock)); + KASSERT(cc->cc_current->pcg_avail == cc->cc_current->pcg_size); + KASSERT(cc->cc_previous->pcg_avail == cc->cc_previous->pcg_size); - pool_do_cache_invalidate_grouplist(&pc->pc_fullgroups, pc, pq, pcgl); - pool_do_cache_invalidate_grouplist(&pc->pc_partgroups, pc, pq, pcgl); + pc = cc->cc_cache; + pcg = NULL; + cc->cc_misses++; - KASSERT(LIST_EMPTY(&pc->pc_partgroups)); - KASSERT(LIST_EMPTY(&pc->pc_fullgroups)); - KASSERT(pc->pc_nitems == 0); -} + /* + * If there are no empty groups in the cache then allocate one + * while still unlocked. + */ + if (__predict_false(pc->pc_emptygroups == NULL)) { + if (__predict_true(!pool_cache_disable)) { + pcg = pool_get(pc->pc_pcgpool, PR_NOWAIT); + } + if (__predict_true(pcg != NULL)) { + pcg->pcg_avail = 0; + pcg->pcg_size = pc->pc_pcgsize; + } + } + + /* Lock the cache. */ + if (__predict_false(!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 (__predict_false(curlwp->l_ncsw != ncsw)) { + mutex_exit(&pc->pc_lock); + if (pcg != NULL) { + pool_put(pc->pc_pcgpool, pcg); + } + return true; + } + } + + /* If there are no empty groups in the cache then allocate one. */ + if (pcg == NULL && pc->pc_emptygroups != NULL) { + pcg = pc->pc_emptygroups; + pc->pc_emptygroups = pcg->pcg_next; + pc->pc_nempty--; + } + + /* + * If there's a empty group, release our full group back + * to the cache. Install the empty group to the local CPU + * and return. + */ + if (pcg != NULL) { + KASSERT(pcg->pcg_avail == 0); + if (__predict_false(cc->cc_previous == &pcg_dummy)) { + cc->cc_previous = pcg; + } else { + cur = cc->cc_current; + if (__predict_true(cur != &pcg_dummy)) { + KASSERT(cur->pcg_avail == cur->pcg_size); + cur->pcg_next = pc->pc_fullgroups; + pc->pc_fullgroups = cur; + pc->pc_nfull++; + } + cc->cc_current = pcg; + } + pc->pc_hits++; + mutex_exit(&pc->pc_lock); + return true; + } + + /* + * Nothing available locally or in cache, and we didn't + * allocate an empty group. Take the slow path and destroy + * the object here and now. + */ + pc->pc_misses++; + mutex_exit(&pc->pc_lock); + splx(s); + pool_cache_destruct_object(pc, object); + + return false; +} /* - * pool_cache_invalidate: + * pool_cache_put{,_paddr}: * - * Invalidate a pool cache (destruct and release all of the - * cached objects). + * Put an object back to the pool cache (optionally caching the + * physical address of the object). */ void -pool_cache_invalidate(struct pool_cache *pc) +pool_cache_put_paddr(pool_cache_t pc, void *object, paddr_t pa) { - struct pool_pagelist pq; - struct pool_cache_grouplist pcgl; - - LIST_INIT(&pq); - LIST_INIT(&pcgl); + pool_cache_cpu_t *cc; + pcg_t *pcg; + int s; - simple_lock(&pc->pc_slock); - simple_lock(&pc->pc_pool->pr_slock); + KASSERT(object != NULL); + FREECHECK_IN(&pc->pc_freecheck, object); - pool_do_cache_invalidate(pc, &pq, &pcgl); + /* Lock out interrupts and disable preemption. */ + s = splvm(); + while (/* CONSTCOND */ true) { + /* If the current group isn't full, release it there. */ + cc = pc->pc_cpus[curcpu()->ci_index]; + KASSERT(cc->cc_cache == pc); + pcg = cc->cc_current; + if (__predict_true(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++; + splx(s); + return; + } - simple_unlock(&pc->pc_pool->pr_slock); - simple_unlock(&pc->pc_slock); + /* + * That failed. If the previous group isn't full, swap + * it with the current group and try again. + */ + pcg = cc->cc_previous; + if (__predict_true(pcg->pcg_avail < pcg->pcg_size)) { + cc->cc_previous = cc->cc_current; + cc->cc_current = pcg; + continue; + } - pr_pagelist_free(pc->pc_pool, &pq); - pcg_grouplist_free(&pcgl); + /* + * Can't free to either group: try the slow path. + * If put_slow() releases the object for us, it + * will return false. Otherwise we need to retry. + */ + if (!pool_cache_put_slow(cc, s, object)) + break; + } } /* - * pool_cache_reclaim: + * pool_cache_xcall: * - * Reclaim a pool cache for pool_reclaim(). + * Transfer objects from the per-CPU cache to the global cache. + * Run within a cross-call thread. */ static void -pool_cache_reclaim(struct pool_cache *pc, struct pool_pagelist *pq, - struct pool_cache_grouplist *pcgl) +pool_cache_xcall(pool_cache_t pc) { + pool_cache_cpu_t *cc; + pcg_t *prev, *cur, **list; + int s; - /* - * We're locking in the wrong order (normally pool_cache -> pool, - * but the pool is already locked when we get here), so we have - * to use trylock. If we can't lock the pool_cache, it's not really - * a big deal here. - */ - if (simple_lock_try(&pc->pc_slock) == 0) - return; - - pool_do_cache_invalidate(pc, pq, pcgl); - - simple_unlock(&pc->pc_slock); + s = splvm(); + mutex_enter(&pc->pc_lock); + cc = pc->pc_cpus[curcpu()->ci_index]; + cur = cc->cc_current; + cc->cc_current = __UNCONST(&pcg_dummy); + prev = cc->cc_previous; + cc->cc_previous = __UNCONST(&pcg_dummy); + if (cur != &pcg_dummy) { + 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 != &pcg_dummy) { + 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); } /* @@ -2341,8 +2831,6 @@ pool_allocator_alloc(struct pool *pp, in struct pool_allocator *pa = pp->pr_alloc; void *res; - LOCK_ASSERT(!simple_lock_held(&pp->pr_slock)); - res = (*pa->pa_alloc)(pp, flags); if (res == NULL && (flags & PR_WAITOK) == 0) { /* @@ -2363,8 +2851,6 @@ pool_allocator_free(struct pool *pp, voi { struct pool_allocator *pa = pp->pr_alloc; - LOCK_ASSERT(!simple_lock_held(&pp->pr_slock)); - (*pa->pa_free)(pp, v); } @@ -2403,21 +2889,13 @@ pool_page_free_meta(struct pool *pp, voi void * pool_subpage_alloc(struct pool *pp, int flags) { - void *v; - int s; - s = splvm(); - v = pool_get(&psppool, flags); - splx(s); - return v; + return pool_get(&psppool, flags); } void pool_subpage_free(struct pool *pp, void *v) { - int s; - s = splvm(); pool_put(&psppool, v); - splx(s); } /* We don't provide a real nointr allocator. Maybe later. */ @@ -2449,3 +2927,143 @@ pool_page_free_nointr(struct pool *pp, v 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(i); + + incpucache = true; + snprintf(cpucachestr, + sizeof(cpucachestr), + "cached by CPU %u", + ci->ci_index); + 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) */