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.182.2.2 retrieving revision 1.205 diff -u -p -r1.182.2.2 -r1.205 --- src/sys/kern/subr_pool.c 2010/08/17 06:47:30 1.182.2.2 +++ src/sys/kern/subr_pool.c 2015/08/24 22:50:32 1.205 @@ -1,13 +1,14 @@ -/* $NetBSD: subr_pool.c,v 1.182.2.2 2010/08/17 06:47:30 uebayasi Exp $ */ +/* $NetBSD: subr_pool.c,v 1.205 2015/08/24 22:50:32 pooka Exp $ */ /*- - * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010 + * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015 * 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, and by Andrew Doran. + * Simulation Facility, NASA Ames Research Center; by Andrew Doran, and by + * Maxime Villard. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,20 +33,21 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.182.2.2 2010/08/17 06:47:30 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.205 2015/08/24 22:50:32 pooka Exp $"); +#ifdef _KERNEL_OPT #include "opt_ddb.h" -#include "opt_pool.h" -#include "opt_poollog.h" #include "opt_lockdebug.h" +#endif #include #include +#include #include #include #include #include -#include +#include #include #include #include @@ -54,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c, #include #include -#include +#include /* * Pool resource management utility. @@ -69,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c, * an internal pool of page headers (`phpool'). */ -/* List of all pools */ -static TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); +/* List of all pools. Non static as needed by 'vmstat -i' */ +TAILQ_HEAD(, pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head); /* Private pool for page header structures */ #define PHPOOL_MAX 8 @@ -83,16 +85,25 @@ static struct pool phpool[PHPOOL_MAX]; static struct pool psppool; #endif -static SLIST_HEAD(, pool_allocator) pa_deferinitq = - SLIST_HEAD_INITIALIZER(pa_deferinitq); +#ifdef POOL_REDZONE +# define POOL_REDZONE_SIZE 2 +static void pool_redzone_init(struct pool *, size_t); +static void pool_redzone_fill(struct pool *, void *); +static void pool_redzone_check(struct pool *, void *); +#else +# define pool_redzone_init(pp, sz) /* NOTHING */ +# define pool_redzone_fill(pp, ptr) /* NOTHING */ +# define pool_redzone_check(pp, ptr) /* NOTHING */ +#endif static void *pool_page_alloc_meta(struct pool *, int); static void pool_page_free_meta(struct pool *, void *); /* allocator for pool metadata */ struct pool_allocator pool_allocator_meta = { - pool_page_alloc_meta, pool_page_free_meta, - .pa_backingmapptr = &kmem_map, + .pa_alloc = pool_page_alloc_meta, + .pa_free = pool_page_free_meta, + .pa_pagesz = 0 }; /* # of seconds to retain page after last use */ @@ -179,6 +190,8 @@ static struct pool pcg_large_pool; static struct pool cache_pool; static struct pool cache_cpu_pool; +pool_cache_t pnbuf_cache; /* pathname buffer cache */ + /* List of all caches. */ TAILQ_HEAD(,pool_cache) pool_cache_head = TAILQ_HEAD_INITIALIZER(pool_cache_head); @@ -193,7 +206,7 @@ static bool pool_cache_get_slow(pool_cac 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 void pool_cache_transfer(pool_cache_t); static int pool_catchup(struct pool *); static void pool_prime_page(struct pool *, void *, @@ -205,143 +218,13 @@ static void *pool_allocator_alloc(struct static void pool_allocator_free(struct pool *, void *); static void pool_print_pagelist(struct pool *, struct pool_pagelist *, - void (*)(const char *, ...)); + void (*)(const char *, ...) __printflike(1, 2)); static void pool_print1(struct pool *, const char *, - void (*)(const char *, ...)); + void (*)(const char *, ...) __printflike(1, 2)); static int pool_chk_page(struct pool *, const char *, struct pool_item_header *); -/* - * Pool log entry. An array of these is allocated in pool_init(). - */ -struct pool_log { - const char *pl_file; - long pl_line; - int pl_action; -#define PRLOG_GET 1 -#define PRLOG_PUT 2 - void *pl_addr; -}; - -#ifdef POOL_DIAGNOSTIC -/* Number of entries in pool log buffers */ -#ifndef POOL_LOGSIZE -#define POOL_LOGSIZE 10 -#endif - -int pool_logsize = POOL_LOGSIZE; - -static inline void -pr_log(struct pool *pp, void *v, int action, const char *file, long line) -{ - 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; - pl->pl_action = action; - pl->pl_addr = v; - if (++n >= pp->pr_logsize) - n = 0; - pp->pr_curlogentry = n; -} - -static void -pr_printlog(struct pool *pp, struct pool_item *pi, - void (*pr)(const char *, ...)) -{ - int i = pp->pr_logsize; - int n = pp->pr_curlogentry; - - if (pp->pr_log == NULL) - return; - - /* - * Print all entries in this pool's log. - */ - while (i-- > 0) { - struct pool_log *pl = &pp->pr_log[n]; - if (pl->pl_action != 0) { - if (pi == NULL || pi == pl->pl_addr) { - (*pr)("\tlog entry %d:\n", i); - (*pr)("\t\taction = %s, addr = %p\n", - pl->pl_action == PRLOG_GET ? "get" : "put", - pl->pl_addr); - (*pr)("\t\tfile: %s at line %lu\n", - pl->pl_file, pl->pl_line); - } - } - if (++n >= pp->pr_logsize) - n = 0; - } -} - -static inline void -pr_enter(struct pool *pp, const char *file, long line) -{ - - 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", - pp->pr_entered_file, pp->pr_entered_line); - panic("pr_enter"); - } - - pp->pr_entered_file = file; - pp->pr_entered_line = line; -} - -static inline void -pr_leave(struct pool *pp) -{ - - if (__predict_false(pp->pr_entered_file == NULL)) { - printf("pool %s not entered?\n", pp->pr_wchan); - panic("pr_leave"); - } - - pp->pr_entered_file = NULL; - pp->pr_entered_line = 0; -} - -static inline void -pr_enter_check(struct pool *pp, void (*pr)(const char *, ...)) -{ - - if (pp->pr_entered_file != NULL) - (*pr)("\n\tcurrently entered from file %s line %ld\n", - pp->pr_entered_file, pp->pr_entered_line); -} -#else -#define pr_log(pp, v, action, file, line) -#define pr_printlog(pp, pi, pr) -#define pr_enter(pp, file, line) -#define pr_leave(pp) -#define pr_enter_check(pp, pr) -#endif /* POOL_DIAGNOSTIC */ - static inline unsigned int pr_item_notouch_index(const struct pool *pp, const struct pool_item_header *ph, const void *v) @@ -524,125 +407,78 @@ pr_rmpage(struct pool *pp, struct pool_i pool_update_curpage(pp); } -static bool -pa_starved_p(struct pool_allocator *pa) -{ - - if (pa->pa_backingmap != NULL) { - return vm_map_starved_p(pa->pa_backingmap); - } - return false; -} - -static int -pool_reclaim_callback(struct callback_entry *ce, void *obj, void *arg) -{ - struct pool *pp = obj; - struct pool_allocator *pa = pp->pr_alloc; - - KASSERT(&pp->pr_reclaimerentry == ce); - pool_reclaim(pp); - if (!pa_starved_p(pa)) { - return CALLBACK_CHAIN_ABORT; - } - return CALLBACK_CHAIN_CONTINUE; -} - -static void -pool_reclaim_register(struct pool *pp) -{ - struct vm_map *map = pp->pr_alloc->pa_backingmap; - int s; - - if (map == NULL) { - return; - } - - s = splvm(); /* not necessary for INTRSAFE maps, but don't care. */ - callback_register(&vm_map_to_kernel(map)->vmk_reclaim_callback, - &pp->pr_reclaimerentry, pp, pool_reclaim_callback); - splx(s); - -#ifdef DIAGNOSTIC - /* Diagnostic drain attempt. */ - uvm_km_va_drain(map, 0); -#endif -} - -static void -pool_reclaim_unregister(struct pool *pp) -{ - struct vm_map *map = pp->pr_alloc->pa_backingmap; - int s; - - if (map == NULL) { - return; - } - - s = splvm(); /* not necessary for INTRSAFE maps, but don't care. */ - callback_unregister(&vm_map_to_kernel(map)->vmk_reclaim_callback, - &pp->pr_reclaimerentry); - splx(s); -} - -static void -pa_reclaim_register(struct pool_allocator *pa) -{ - struct vm_map *map = *pa->pa_backingmapptr; - struct pool *pp; - - KASSERT(pa->pa_backingmap == NULL); - if (map == NULL) { - SLIST_INSERT_HEAD(&pa_deferinitq, pa, pa_q); - return; - } - pa->pa_backingmap = map; - TAILQ_FOREACH(pp, &pa->pa_list, pr_alloc_list) { - pool_reclaim_register(pp); - } -} - /* * Initialize all the pools listed in the "pools" link set. */ void pool_subsystem_init(void) { - struct pool_allocator *pa; + size_t size; + int idx; 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); - KASSERT(*pa->pa_backingmapptr != NULL); - SLIST_REMOVE_HEAD(&pa_deferinitq, pa_q); - pa_reclaim_register(pa); + /* + * Initialize private page header pool and cache magazine pool if we + * haven't done so yet. + */ + for (idx = 0; idx < PHPOOL_MAX; idx++) { + static char phpool_names[PHPOOL_MAX][6+1+6+1]; + int nelem; + size_t sz; + + nelem = PHPOOL_FREELIST_NELEM(idx); + snprintf(phpool_names[idx], sizeof(phpool_names[idx]), + "phpool-%d", nelem); + sz = sizeof(struct pool_item_header); + if (nelem) { + sz = offsetof(struct pool_item_header, + ph_bitmap[howmany(nelem, BITMAP_SIZE)]); + } + pool_init(&phpool[idx], sz, 0, 0, 0, + phpool_names[idx], &pool_allocator_meta, IPL_VM); } +#ifdef POOL_SUBPAGE + pool_init(&psppool, POOL_SUBPAGE, POOL_SUBPAGE, 0, + PR_RECURSIVE, "psppool", &pool_allocator_meta, IPL_VM); +#endif + + 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); pool_init(&cache_pool, sizeof(struct pool_cache), coherency_unit, - 0, 0, "pcache", &pool_allocator_nointr, IPL_NONE); + 0, 0, "pcache", &pool_allocator_meta, IPL_NONE); pool_init(&cache_cpu_pool, sizeof(pool_cache_cpu_t), coherency_unit, - 0, 0, "pcachecpu", &pool_allocator_nointr, IPL_NONE); + 0, 0, "pcachecpu", &pool_allocator_meta, IPL_NONE); } /* * 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. + * static pools that must be initialized before kmem(9) is available. */ 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) { struct pool *pp1; - size_t trysize, phsize; + size_t trysize, phsize, prsize; int off, slack; #ifdef DEBUG + if (__predict_true(!cold)) + mutex_enter(&pool_head_lock); /* * Check that the pool hasn't already been initialised and * added to the list of all pools. @@ -652,14 +488,8 @@ pool_init(struct pool *pp, size_t size, panic("pool_init: pool %s already initialised", wchan); } -#endif - -#ifdef POOL_DIAGNOSTIC - /* - * Always log if POOL_DIAGNOSTIC is defined. - */ - if (pool_logsize != 0) - flags |= PR_LOGGING; + if (__predict_true(!cold)) + mutex_exit(&pool_head_lock); #endif if (palloc == NULL) @@ -683,10 +513,6 @@ pool_init(struct pool *pp, size_t size, 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); - } } if (!cold) mutex_exit(&pool_allocator_lock); @@ -694,13 +520,14 @@ pool_init(struct pool *pp, size_t size, if (align == 0) align = ALIGN(1); - if ((flags & PR_NOTOUCH) == 0 && size < sizeof(struct pool_item)) - size = sizeof(struct pool_item); + prsize = size; + if ((flags & PR_NOTOUCH) == 0 && prsize < sizeof(struct pool_item)) + prsize = sizeof(struct pool_item); - size = roundup(size, align); + prsize = roundup(prsize, align); #ifdef DIAGNOSTIC - if (size > palloc->pa_pagesz) - panic("pool_init: pool item size (%zu) too large", size); + if (prsize > palloc->pa_pagesz) + panic("pool_init: pool item size (%zu) too large", prsize); #endif /* @@ -717,7 +544,7 @@ pool_init(struct pool *pp, size_t size, pp->pr_maxpages = UINT_MAX; pp->pr_roflags = flags; pp->pr_flags = 0; - pp->pr_size = size; + pp->pr_size = prsize; pp->pr_align = align; pp->pr_wchan = wchan; pp->pr_alloc = palloc; @@ -732,6 +559,7 @@ pool_init(struct pool *pp, size_t size, pp->pr_drain_hook = NULL; pp->pr_drain_hook_arg = NULL; pp->pr_freecheck = NULL; + pool_redzone_init(pp, size); /* * Decide whether to put the page header off page to avoid @@ -750,9 +578,10 @@ pool_init(struct pool *pp, size_t size, /* See the comment below about reserved bytes. */ trysize = palloc->pa_pagesz - ((align - ioff) % align); phsize = ALIGN(sizeof(struct pool_item_header)); - if ((pp->pr_roflags & (PR_NOTOUCH | PR_NOALIGN)) == 0 && + if (pp->pr_roflags & PR_PHINPAGE || + ((pp->pr_roflags & (PR_NOTOUCH | PR_NOALIGN)) == 0 && (pp->pr_size < MIN(palloc->pa_pagesz / 16, phsize << 3) || - trysize / pp->pr_size == (trysize - phsize) / pp->pr_size)) { + trysize / pp->pr_size == (trysize - phsize) / pp->pr_size))) { /* Use the end of the page for the page header */ pp->pr_roflags |= PR_PHINPAGE; pp->pr_phoffset = off = palloc->pa_pagesz - phsize; @@ -812,54 +641,10 @@ pool_init(struct pool *pp, size_t size, pp->pr_nidle = 0; pp->pr_refcnt = 0; - pp->pr_log = NULL; - - pp->pr_entered_file = NULL; - pp->pr_entered_line = 0; - mutex_init(&pp->pr_lock, MUTEX_DEFAULT, ipl); cv_init(&pp->pr_cv, wchan); pp->pr_ipl = ipl; - /* - * Initialize private page header pool and cache magazine pool if we - * haven't done so yet. - * XXX LOCKING. - */ - if (phpool[0].pr_size == 0) { - int idx; - for (idx = 0; idx < PHPOOL_MAX; idx++) { - static char phpool_names[PHPOOL_MAX][6+1+6+1]; - int nelem; - size_t sz; - - nelem = PHPOOL_FREELIST_NELEM(idx); - snprintf(phpool_names[idx], sizeof(phpool_names[idx]), - "phpool-%d", nelem); - sz = sizeof(struct pool_item_header); - if (nelem) { - sz = offsetof(struct pool_item_header, - ph_bitmap[howmany(nelem, BITMAP_SIZE)]); - } - pool_init(&phpool[idx], sz, 0, 0, 0, - phpool_names[idx], &pool_allocator_meta, IPL_VM); - } -#ifdef POOL_SUBPAGE - pool_init(&psppool, POOL_SUBPAGE, POOL_SUBPAGE, 0, - PR_RECURSIVE, "psppool", &pool_allocator_meta, IPL_VM); -#endif - - 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. */ if (!cold) mutex_enter(&pool_head_lock); @@ -880,8 +665,6 @@ pool_init(struct pool *pp, size_t size, TAILQ_INSERT_TAIL(&palloc->pa_list, pp, pr_alloc_list); if (!cold) mutex_exit(&palloc->pa_lock); - - pool_reclaim_register(pp); } /* @@ -903,7 +686,6 @@ pool_destroy(struct pool *pp) mutex_exit(&pool_head_lock); /* Remove this pool from its allocator's list of pools. */ - pool_reclaim_unregister(pp); mutex_enter(&pp->pr_alloc->pa_lock); TAILQ_REMOVE(&pp->pr_alloc->pa_list, pp, pr_alloc_list); mutex_exit(&pp->pr_alloc->pa_lock); @@ -919,7 +701,6 @@ pool_destroy(struct pool *pp) #ifdef DIAGNOSTIC if (pp->pr_nout != 0) { - pr_printlog(pp, NULL, printf); panic("pool_destroy: pool busy: still out: %u", pp->pr_nout); } @@ -936,14 +717,6 @@ pool_destroy(struct pool *pp) mutex_exit(&pp->pr_lock); pr_pagelist_free(pp, &pq); - -#ifdef POOL_DIAGNOSTIC - 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); } @@ -978,11 +751,7 @@ pool_alloc_item_header(struct pool *pp, * Grab an item from the pool. */ void * -#ifdef POOL_DIAGNOSTIC -_pool_get(struct pool *pp, int flags, const char *file, long line) -#else pool_get(struct pool *pp, int flags) -#endif { struct pool_item *pi; struct pool_item_header *ph; @@ -1002,8 +771,6 @@ pool_get(struct pool *pp, int flags) } mutex_enter(&pp->pr_lock); - pr_enter(pp, file, line); - startover: /* * Check to see if we've reached the hard limit. If we have, @@ -1012,7 +779,6 @@ pool_get(struct pool *pp, int flags) */ #ifdef DIAGNOSTIC if (__predict_false(pp->pr_nout > pp->pr_hardlimit)) { - pr_leave(pp); mutex_exit(&pp->pr_lock); panic("pool_get: %s: crossed hard limit", pp->pr_wchan); } @@ -1024,11 +790,9 @@ pool_get(struct pool *pp, int flags) * back to the pool, unlock, call the hook, re-lock, * and check the hardlimit condition again. */ - pr_leave(pp); mutex_exit(&pp->pr_lock); (*pp->pr_drain_hook)(pp->pr_drain_hook_arg, flags); mutex_enter(&pp->pr_lock); - pr_enter(pp, file, line); if (pp->pr_nout < pp->pr_hardlimit) goto startover; } @@ -1039,9 +803,7 @@ pool_get(struct pool *pp, int flags) * it be? */ pp->pr_flags |= PR_WANTED; - pr_leave(pp); cv_wait(&pp->pr_cv, &pp->pr_lock); - pr_enter(pp, file, line); goto startover; } @@ -1055,7 +817,6 @@ pool_get(struct pool *pp, int flags) pp->pr_nfail++; - pr_leave(pp); mutex_exit(&pp->pr_lock); return (NULL); } @@ -1083,9 +844,7 @@ pool_get(struct pool *pp, int flags) * Release the pool lock, as the back-end page allocator * may block. */ - pr_leave(pp); error = pool_grow(pp, flags); - pr_enter(pp, file, line); if (error != 0) { /* * We were unable to allocate a page or item @@ -1097,7 +856,6 @@ pool_get(struct pool *pp, int flags) goto startover; pp->pr_nfail++; - pr_leave(pp); mutex_exit(&pp->pr_lock); return (NULL); } @@ -1108,25 +866,19 @@ pool_get(struct pool *pp, int flags) if (pp->pr_roflags & PR_NOTOUCH) { #ifdef DIAGNOSTIC if (__predict_false(ph->ph_nmissing == pp->pr_itemsperpage)) { - pr_leave(pp); mutex_exit(&pp->pr_lock); panic("pool_get: %s: page empty", pp->pr_wchan); } #endif v = pr_item_notouch_get(pp, ph); -#ifdef POOL_DIAGNOSTIC - pr_log(pp, v, PRLOG_GET, file, line); -#endif } else { v = pi = LIST_FIRST(&ph->ph_itemlist); if (__predict_false(v == NULL)) { - pr_leave(pp); mutex_exit(&pp->pr_lock); panic("pool_get: %s: page empty", pp->pr_wchan); } #ifdef DIAGNOSTIC if (__predict_false(pp->pr_nitems == 0)) { - pr_leave(pp); mutex_exit(&pp->pr_lock); printf("pool_get: %s: items on itemlist, nitems %u\n", pp->pr_wchan, pp->pr_nitems); @@ -1134,13 +886,8 @@ pool_get(struct pool *pp, int flags) } #endif -#ifdef POOL_DIAGNOSTIC - pr_log(pp, v, PRLOG_GET, file, line); -#endif - #ifdef DIAGNOSTIC if (__predict_false(pi->pi_magic != PI_MAGIC)) { - pr_printlog(pp, pi, printf); panic("pool_get(%s): free list modified: " "magic=%x; page %p; item addr %p\n", pp->pr_wchan, pi->pi_magic, ph->ph_page, pi); @@ -1173,7 +920,6 @@ pool_get(struct pool *pp, int flags) #ifdef DIAGNOSTIC if (__predict_false((pp->pr_roflags & PR_NOTOUCH) == 0 && !LIST_EMPTY(&ph->ph_itemlist))) { - pr_leave(pp); mutex_exit(&pp->pr_lock); panic("pool_get: %s: nmissing inconsistent", pp->pr_wchan); @@ -1189,7 +935,6 @@ pool_get(struct pool *pp, int flags) } pp->pr_nget++; - pr_leave(pp); /* * If we have a low water mark and we are now below that low @@ -1206,6 +951,7 @@ pool_get(struct pool *pp, int flags) mutex_exit(&pp->pr_lock); KASSERT((((vaddr_t)v + pp->pr_itemoffset) & (pp->pr_align - 1)) == 0); FREECHECK_OUT(&pp->pr_freecheck, v); + pool_redzone_fill(pp, v); return (v); } @@ -1219,6 +965,7 @@ pool_do_put(struct pool *pp, void *v, st struct pool_item_header *ph; KASSERT(mutex_owned(&pp->pr_lock)); + pool_redzone_check(pp, v); FREECHECK_IN(&pp->pr_freecheck, v); LOCKDEBUG_MEM_CHECK(v, pp->pr_size); @@ -1231,7 +978,6 @@ pool_do_put(struct pool *pp, void *v, st #endif if (__predict_false((ph = pr_find_pagehead(pp, v)) == NULL)) { - pr_printlog(pp, NULL, printf); panic("pool_put: %s: page header missing", pp->pr_wchan); } @@ -1320,32 +1066,6 @@ pool_do_put(struct pool *pp, void *v, st } } -/* - * Return resource to the pool. - */ -#ifdef POOL_DIAGNOSTIC -void -_pool_put(struct pool *pp, void *v, const char *file, long line) -{ - struct pool_pagelist pq; - - LIST_INIT(&pq); - - mutex_enter(&pp->pr_lock); - pr_enter(pp, file, line); - - pr_log(pp, v, PRLOG_PUT, file, line); - - pool_do_put(pp, v, &pq); - - pr_leave(pp); - mutex_exit(&pp->pr_lock); - - pr_pagelist_free(pp, &pq); -} -#undef pool_put -#endif /* POOL_DIAGNOSTIC */ - void pool_put(struct pool *pp, void *v) { @@ -1360,10 +1080,6 @@ pool_put(struct pool *pp, void *v) pr_pagelist_free(pp, &pq); } -#ifdef POOL_DIAGNOSTIC -#define pool_put(h, v) _pool_put((h), (v), __FILE__, __LINE__) -#endif - /* * pool_grow: grow a pool by a page. * @@ -1608,14 +1324,10 @@ pool_sethardlimit(struct pool *pp, int n /* * Release all complete pages that have not been used recently. * - * Might be called from interrupt context. + * Must not be called from interrupt context. */ int -#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_pagelist pq; @@ -1623,9 +1335,7 @@ pool_reclaim(struct pool *pp) bool klock; int rv; - if (cpu_intr_p() || cpu_softintr_p()) { - KASSERT(pp->pr_ipl != IPL_NONE); - } + KASSERT(!cpu_intr_p() && !cpu_softintr_p()); if (pp->pr_drain_hook != NULL) { /* @@ -1655,7 +1365,6 @@ pool_reclaim(struct pool *pp) } return (0); } - pr_enter(pp, file, line); LIST_INIT(&pq); @@ -1669,8 +1378,7 @@ pool_reclaim(struct pool *pp) break; KASSERT(ph->ph_nmissing == 0); - if (curtime - ph->ph_time < pool_inactive_time - && !pa_starved_p(pp->pr_alloc)) + if (curtime - ph->ph_time < pool_inactive_time) continue; /* @@ -1684,7 +1392,6 @@ pool_reclaim(struct pool *pp) pr_rmpage(pp, ph, &pq); } - pr_leave(pp); mutex_exit(&pp->pr_lock); if (LIST_EMPTY(&pq)) @@ -1702,17 +1409,14 @@ pool_reclaim(struct pool *pp) } /* - * 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. + * Drain pools, one at a time. The drained pool is returned within ppp. * * Note, must never be called from interrupt context. */ -void -pool_drain_start(struct pool **ppp, uint64_t *wp) +bool +pool_drain(struct pool **ppp) { + bool reclaimed; struct pool *pp; KASSERT(!TAILQ_EMPTY(&pool_head)); @@ -1737,28 +1441,6 @@ pool_drain_start(struct pool **ppp, uint 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); - } -} - -bool -pool_drain_end(struct pool *pp, uint64_t where) -{ - bool reclaimed; - - if (pp == NULL) - return false; - - 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.. */ reclaimed = pool_reclaim(pp); @@ -1768,18 +1450,15 @@ pool_drain_end(struct pool *pp, uint64_t cv_broadcast(&pool_busy); mutex_exit(&pool_head_lock); + if (ppp != NULL) + *ppp = pp; + return reclaimed; } /* * Diagnostic helpers. */ -void -pool_print(struct pool *pp, const char *modif) -{ - - pool_print1(pp, modif, printf); -} void pool_printall(const char *modif, void (*pr)(const char *, ...)) @@ -1891,11 +1570,6 @@ pool_print1(struct pool *pp, const char goto skip_log; (*pr)("\n"); - if ((pp->pr_roflags & PR_LOGGING) == 0) - (*pr)("\tno log\n"); - else { - pr_printlog(pp, NULL, pr); - } skip_log: @@ -1945,8 +1619,6 @@ pool_print1(struct pool *pp, const char } } #undef PR_GROUPLIST - - pr_enter_check(pp, pr); } static int @@ -2152,6 +1824,19 @@ pool_cache_bootstrap(pool_cache_t pc, si void pool_cache_destroy(pool_cache_t pc) { + + pool_cache_bootstrap_destroy(pc); + pool_put(&cache_pool, pc); +} + +/* + * pool_cache_bootstrap_destroy: + * + * Destroy a pool cache. + */ +void +pool_cache_bootstrap_destroy(pool_cache_t pc) +{ struct pool *pp = &pc->pc_pool; u_int i; @@ -2177,7 +1862,6 @@ pool_cache_destroy(pool_cache_t pc) /* Finally, destroy it. */ mutex_destroy(&pc->pc_lock); pool_destroy(pp); - pool_put(&cache_pool, pc); } /* @@ -2323,31 +2007,39 @@ pool_cache_invalidate_groups(pool_cache_ * 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. + * + * Invalidation is a costly process and should not be called from + * interrupt context. */ void pool_cache_invalidate(pool_cache_t pc) { - pcg_t *full, *empty, *part; -#if 0 uint64_t where; + pcg_t *full, *empty, *part; + + KASSERT(!cpu_intr_p() && !cpu_softintr_p()); if (ncpu < 2 || !mp_online) { /* * 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. + * In this case, transfer the content of the local CPU's + * cache back into global cache as only this CPU is currently + * running. */ - pool_cache_xcall(pc); + pool_cache_transfer(pc); } else { /* - * Gather all of the CPU-specific caches into the - * global cache. + * Signal all CPUs that they must transfer their local + * cache back to the global pool then wait for the xcall to + * complete. */ - where = xc_broadcast(0, (xcfunc_t)pool_cache_xcall, pc, NULL); + where = xc_broadcast(0, (xcfunc_t)pool_cache_transfer, + pc, NULL); xc_wait(where); } -#endif + + /* Empty pool caches, then invalidate objects */ mutex_enter(&pc->pc_lock); full = pc->pc_fullgroups; empty = pc->pc_emptygroups; @@ -2379,7 +2071,6 @@ pool_cache_invalidate(pool_cache_t pc) static void pool_cache_invalidate_cpu(pool_cache_t pc, u_int index) { - pool_cache_cpu_t *cc; pcg_t *pcg; @@ -2515,6 +2206,7 @@ pool_cache_get_slow(pool_cache_cpu_t *cc } FREECHECK_OUT(&pc->pc_freecheck, object); + pool_redzone_fill(&pc->pc_pool, object); return false; } @@ -2534,8 +2226,8 @@ pool_cache_get_paddr(pool_cache_t pc, in KASSERTMSG((!cpu_intr_p() && !cpu_softintr_p()) || (pc->pc_pool.pr_ipl != IPL_NONE || cold || panicstr != NULL), - ("pool '%s' is IPL_NONE, but called from interrupt context\n", - pc->pc_pool.pr_wchan)); + "pool '%s' is IPL_NONE, but called from interrupt context\n", + pc->pc_pool.pr_wchan); if (flags & PR_WAITOK) { ASSERT_SLEEPABLE(); @@ -2560,6 +2252,7 @@ pool_cache_get_paddr(pool_cache_t pc, in cc->cc_hits++; splx(s); FREECHECK_OUT(&pc->pc_freecheck, object); + pool_redzone_fill(&pc->pc_pool, object); return object; } @@ -2590,6 +2283,7 @@ pool_cache_get_paddr(pool_cache_t pc, in static bool __noinline pool_cache_put_slow(pool_cache_cpu_t *cc, int s, void *object) { + struct lwp *l = curlwp; pcg_t *pcg, *cur; uint64_t ncsw; pool_cache_t pc; @@ -2600,6 +2294,7 @@ pool_cache_put_slow(pool_cache_cpu_t *cc pc = cc->cc_cache; pcg = NULL; cc->cc_misses++; + ncsw = l->l_ncsw; /* * If there are no empty groups in the cache then allocate one @@ -2609,6 +2304,16 @@ pool_cache_put_slow(pool_cache_cpu_t *cc if (__predict_true(!pool_cache_disable)) { pcg = pool_get(pc->pc_pcgpool, PR_NOWAIT); } + /* + * If pool_get() blocked, then our view of + * the per-CPU data is invalid: retry. + */ + if (__predict_false(l->l_ncsw != ncsw)) { + if (pcg != NULL) { + pool_put(pc->pc_pcgpool, pcg); + } + return true; + } if (__predict_true(pcg != NULL)) { pcg->pcg_avail = 0; pcg->pcg_size = pc->pc_pcgsize; @@ -2617,7 +2322,6 @@ pool_cache_put_slow(pool_cache_cpu_t *cc /* Lock the cache. */ if (__predict_false(!mutex_tryenter(&pc->pc_lock))) { - ncsw = curlwp->l_ncsw; mutex_enter(&pc->pc_lock); pc->pc_contended++; @@ -2625,7 +2329,7 @@ pool_cache_put_slow(pool_cache_cpu_t *cc * If we context switched while locking, then our view of * the per-CPU data is invalid: retry. */ - if (__predict_false(curlwp->l_ncsw != ncsw)) { + if (__predict_false(l->l_ncsw != ncsw)) { mutex_exit(&pc->pc_lock); if (pcg != NULL) { pool_put(pc->pc_pcgpool, pcg); @@ -2692,6 +2396,7 @@ pool_cache_put_paddr(pool_cache_t pc, vo int s; KASSERT(object != NULL); + pool_redzone_check(&pc->pc_pool, object); FREECHECK_IN(&pc->pc_freecheck, object); /* Lock out interrupts and disable preemption. */ @@ -2732,13 +2437,13 @@ pool_cache_put_paddr(pool_cache_t pc, vo } /* - * pool_cache_xcall: + * pool_cache_transfer: * * Transfer objects from the per-CPU cache to the global cache. * Run within a cross-call thread. */ static void -pool_cache_xcall(pool_cache_t pc) +pool_cache_transfer(pool_cache_t pc) { pool_cache_cpu_t *cc; pcg_t *prev, *cur, **list; @@ -2801,28 +2506,29 @@ void pool_page_free(struct pool *, void #ifdef POOL_SUBPAGE struct pool_allocator pool_allocator_kmem_fullpage = { - pool_page_alloc, pool_page_free, 0, - .pa_backingmapptr = &kmem_map, + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 0 }; #else struct pool_allocator pool_allocator_kmem = { - pool_page_alloc, pool_page_free, 0, - .pa_backingmapptr = &kmem_map, + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 0 }; #endif -void *pool_page_alloc_nointr(struct pool *, int); -void pool_page_free_nointr(struct pool *, void *); - #ifdef POOL_SUBPAGE struct pool_allocator pool_allocator_nointr_fullpage = { - pool_page_alloc_nointr, pool_page_free_nointr, 0, - .pa_backingmapptr = &kernel_map, + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 0 }; #else struct pool_allocator pool_allocator_nointr = { - pool_page_alloc_nointr, pool_page_free_nointr, 0, - .pa_backingmapptr = &kernel_map, + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 0 }; #endif @@ -2831,16 +2537,15 @@ void *pool_subpage_alloc(struct pool *, void pool_subpage_free(struct pool *, void *); struct pool_allocator pool_allocator_kmem = { - pool_subpage_alloc, pool_subpage_free, POOL_SUBPAGE, - .pa_backingmapptr = &kmem_map, + .pa_alloc = pool_subpage_alloc, + .pa_free = pool_subpage_free, + .pa_pagesz = POOL_SUBPAGE }; -void *pool_subpage_alloc_nointr(struct pool *, int); -void pool_subpage_free_nointr(struct pool *, void *); - struct pool_allocator pool_allocator_nointr = { - pool_subpage_alloc, pool_subpage_free, POOL_SUBPAGE, - .pa_backingmapptr = &kmem_map, + .pa_alloc = pool_subpage_alloc, + .pa_free = pool_subpage_free, + .pa_pagesz = POOL_SUBPAGE }; #endif /* POOL_SUBPAGE */ @@ -2876,77 +2581,173 @@ pool_allocator_free(struct pool *pp, voi void * pool_page_alloc(struct pool *pp, int flags) { - bool waitok = (flags & PR_WAITOK) ? true : false; + const vm_flag_t vflags = (flags & PR_WAITOK) ? VM_SLEEP: VM_NOSLEEP; + vmem_addr_t va; + int ret; + + ret = uvm_km_kmem_alloc(kmem_va_arena, pp->pr_alloc->pa_pagesz, + vflags | VM_INSTANTFIT, &va); - return ((void *) uvm_km_alloc_poolpage_cache(kmem_map, waitok)); + return ret ? NULL : (void *)va; } void pool_page_free(struct pool *pp, void *v) { - uvm_km_free_poolpage_cache(kmem_map, (vaddr_t) v); + uvm_km_kmem_free(kmem_va_arena, (vaddr_t)v, pp->pr_alloc->pa_pagesz); } static void * pool_page_alloc_meta(struct pool *pp, int flags) { - bool waitok = (flags & PR_WAITOK) ? true : false; + const vm_flag_t vflags = (flags & PR_WAITOK) ? VM_SLEEP: VM_NOSLEEP; + vmem_addr_t va; + int ret; - return ((void *) uvm_km_alloc_poolpage(kmem_map, waitok)); + ret = vmem_alloc(kmem_meta_arena, pp->pr_alloc->pa_pagesz, + vflags | VM_INSTANTFIT, &va); + + return ret ? NULL : (void *)va; } static void pool_page_free_meta(struct pool *pp, void *v) { - uvm_km_free_poolpage(kmem_map, (vaddr_t) v); + vmem_free(kmem_meta_arena, (vmem_addr_t)v, pp->pr_alloc->pa_pagesz); } -#ifdef POOL_SUBPAGE -/* Sub-page allocator, for machines with large hardware pages. */ -void * -pool_subpage_alloc(struct pool *pp, int flags) +#ifdef POOL_REDZONE +#if defined(_LP64) +# define PRIME 0x9e37fffffffc0000UL +#else /* defined(_LP64) */ +# define PRIME 0x9e3779b1 +#endif /* defined(_LP64) */ +#define STATIC_BYTE 0xFE +CTASSERT(POOL_REDZONE_SIZE > 1); + +static inline uint8_t +pool_pattern_generate(const void *p) { - return pool_get(&psppool, flags); + return (uint8_t)(((uintptr_t)p) * PRIME + >> ((sizeof(uintptr_t) - sizeof(uint8_t))) * CHAR_BIT); } -void -pool_subpage_free(struct pool *pp, void *v) +static void +pool_redzone_init(struct pool *pp, size_t requested_size) { - pool_put(&psppool, v); + size_t nsz; + + if (pp->pr_roflags & PR_NOTOUCH) { + pp->pr_reqsize = 0; + pp->pr_redzone = false; + return; + } + + /* + * We may have extended the requested size earlier; check if + * there's naturally space in the padding for a red zone. + */ + if (pp->pr_size - requested_size >= POOL_REDZONE_SIZE) { + pp->pr_reqsize = requested_size; + pp->pr_redzone = true; + return; + } + + /* + * No space in the natural padding; check if we can extend a + * bit the size of the pool. + */ + nsz = roundup(pp->pr_size + POOL_REDZONE_SIZE, pp->pr_align); + if (nsz <= pp->pr_alloc->pa_pagesz) { + /* Ok, we can */ + pp->pr_size = nsz; + pp->pr_reqsize = requested_size; + pp->pr_redzone = true; + } else { + /* No space for a red zone... snif :'( */ + pp->pr_reqsize = 0; + pp->pr_redzone = false; + printf("pool redzone disabled for '%s'\n", pp->pr_wchan); + } } -/* We don't provide a real nointr allocator. Maybe later. */ -void * -pool_subpage_alloc_nointr(struct pool *pp, int flags) +static void +pool_redzone_fill(struct pool *pp, void *p) { + uint8_t *cp, pat; + const uint8_t *ep; + + if (!pp->pr_redzone) + return; + + cp = (uint8_t *)p + pp->pr_reqsize; + ep = cp + POOL_REDZONE_SIZE; - return (pool_subpage_alloc(pp, flags)); + /* + * We really don't want the first byte of the red zone to be '\0'; + * an off-by-one in a string may not be properly detected. + */ + pat = pool_pattern_generate(cp); + *cp = (pat == '\0') ? STATIC_BYTE: pat; + cp++; + + while (cp < ep) { + *cp = pool_pattern_generate(cp); + cp++; + } } -void -pool_subpage_free_nointr(struct pool *pp, void *v) +static void +pool_redzone_check(struct pool *pp, void *p) { + uint8_t *cp, pat, expected; + const uint8_t *ep; + + if (!pp->pr_redzone) + return; - pool_subpage_free(pp, v); + cp = (uint8_t *)p + pp->pr_reqsize; + ep = cp + POOL_REDZONE_SIZE; + + pat = pool_pattern_generate(cp); + expected = (pat == '\0') ? STATIC_BYTE: pat; + if (expected != *cp) { + panic("%s: %p: 0x%02x != 0x%02x\n", + __func__, cp, *cp, expected); + } + cp++; + + while (cp < ep) { + expected = pool_pattern_generate(cp); + if (*cp != expected) { + panic("%s: %p: 0x%02x != 0x%02x\n", + __func__, cp, *cp, expected); + } + cp++; + } } -#endif /* POOL_SUBPAGE */ + +#endif /* POOL_REDZONE */ + + +#ifdef POOL_SUBPAGE +/* Sub-page allocator, for machines with large hardware pages. */ void * -pool_page_alloc_nointr(struct pool *pp, int flags) +pool_subpage_alloc(struct pool *pp, int flags) { - bool waitok = (flags & PR_WAITOK) ? true : false; - - return ((void *) uvm_km_alloc_poolpage_cache(kernel_map, waitok)); + return pool_get(&psppool, flags); } void -pool_page_free_nointr(struct pool *pp, void *v) +pool_subpage_free(struct pool *pp, void *v) { - - uvm_km_free_poolpage_cache(kernel_map, (vaddr_t) v); + pool_put(&psppool, v); } +#endif /* POOL_SUBPAGE */ + #if defined(DDB) static bool pool_in_page(struct pool *pp, struct pool_item_header *ph, uintptr_t addr) @@ -3086,3 +2887,100 @@ print: } } #endif /* defined(DDB) */ + +static int +pool_sysctl(SYSCTLFN_ARGS) +{ + struct pool_sysctl data; + struct pool *pp; + struct pool_cache *pc; + pool_cache_cpu_t *cc; + int error; + size_t i, written; + + if (oldp == NULL) { + *oldlenp = 0; + TAILQ_FOREACH(pp, &pool_head, pr_poollist) + *oldlenp += sizeof(data); + return 0; + } + + memset(&data, 0, sizeof(data)); + error = 0; + written = 0; + TAILQ_FOREACH(pp, &pool_head, pr_poollist) { + if (written + sizeof(data) > *oldlenp) + break; + strlcpy(data.pr_wchan, pp->pr_wchan, sizeof(data.pr_wchan)); + data.pr_pagesize = pp->pr_alloc->pa_pagesz; + data.pr_flags = pp->pr_roflags | pp->pr_flags; +#define COPY(field) data.field = pp->field + COPY(pr_size); + + COPY(pr_itemsperpage); + COPY(pr_nitems); + COPY(pr_nout); + COPY(pr_hardlimit); + COPY(pr_npages); + COPY(pr_minpages); + COPY(pr_maxpages); + + COPY(pr_nget); + COPY(pr_nfail); + COPY(pr_nput); + COPY(pr_npagealloc); + COPY(pr_npagefree); + COPY(pr_hiwat); + COPY(pr_nidle); +#undef COPY + + data.pr_cache_nmiss_pcpu = 0; + data.pr_cache_nhit_pcpu = 0; + if (pp->pr_cache) { + pc = pp->pr_cache; + data.pr_cache_meta_size = pc->pc_pcgsize; + data.pr_cache_nfull = pc->pc_nfull; + data.pr_cache_npartial = pc->pc_npart; + data.pr_cache_nempty = pc->pc_nempty; + data.pr_cache_ncontended = pc->pc_contended; + data.pr_cache_nmiss_global = pc->pc_misses; + data.pr_cache_nhit_global = pc->pc_hits; + for (i = 0; i < pc->pc_ncpu; ++i) { + cc = pc->pc_cpus[i]; + if (cc == NULL) + continue; + data.pr_cache_nmiss_pcpu = cc->cc_misses; + data.pr_cache_nhit_pcpu = cc->cc_hits; + } + } else { + data.pr_cache_meta_size = 0; + data.pr_cache_nfull = 0; + data.pr_cache_npartial = 0; + data.pr_cache_nempty = 0; + data.pr_cache_ncontended = 0; + data.pr_cache_nmiss_global = 0; + data.pr_cache_nhit_global = 0; + } + + error = sysctl_copyout(l, &data, oldp, sizeof(data)); + if (error) + break; + written += sizeof(data); + oldp = (char *)oldp + sizeof(data); + } + + *oldlenp = written; + return error; +} + +SYSCTL_SETUP(sysctl_pool_setup, "sysctl kern.pool setup") +{ + const struct sysctlnode *rnode = NULL; + + sysctl_createv(clog, 0, NULL, &rnode, + CTLFLAG_PERMANENT, + CTLTYPE_STRUCT, "pool", + SYSCTL_DESCR("Get pool statistics"), + pool_sysctl, 0, NULL, 0, + CTL_KERN, CTL_CREATE, CTL_EOL); +}