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.194.2.2 retrieving revision 1.213 diff -u -p -r1.194.2.2 -r1.213 --- src/sys/kern/subr_pool.c 2014/05/21 20:34:38 1.194.2.2 +++ src/sys/kern/subr_pool.c 2017/11/09 15:53:40 1.213 @@ -1,13 +1,14 @@ -/* $NetBSD: subr_pool.c,v 1.194.2.2 2014/05/21 20:34:38 bouyer Exp $ */ +/* $NetBSD: subr_pool.c,v 1.213 2017/11/09 15:53:40 christos 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,20 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.194.2.2 2014/05/21 20:34:38 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.213 2017/11/09 15:53:40 christos 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 @@ -84,6 +85,17 @@ static struct pool phpool[PHPOOL_MAX]; static struct pool psppool; #endif +#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 *); @@ -94,6 +106,10 @@ struct pool_allocator pool_allocator_met .pa_pagesz = 0 }; +#define POOL_ALLOCATOR_BIG_BASE 13 +extern struct pool_allocator pool_allocator_big[]; +static int pool_bigidx(size_t); + /* # of seconds to retain page after last use */ int pool_inactive_time = 10; @@ -194,7 +210,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 *, @@ -206,143 +222,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) @@ -500,12 +386,10 @@ pr_rmpage(struct pool *pp, struct pool_i * If the page was idle, decrement the idle page count. */ if (ph->ph_nmissing == 0) { -#ifdef DIAGNOSTIC - if (pp->pr_nidle == 0) - panic("pr_rmpage: nidle inconsistent"); - if (pp->pr_nitems < pp->pr_itemsperpage) - panic("pr_rmpage: nitems inconsistent"); -#endif + KASSERT(pp->pr_nidle != 0); + KASSERTMSG((pp->pr_nitems >= pp->pr_itemsperpage), + "nitems=%u < itemsperpage=%u", + pp->pr_nitems, pp->pr_itemsperpage); pp->pr_nidle--; } @@ -584,34 +468,30 @@ pool_subsystem_init(void) * 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. */ TAILQ_FOREACH(pp1, &pool_head, pr_poollist) { if (pp == pp1) - panic("pool_init: pool %s already initialised", + panic("%s: [%s] already initialised", __func__, 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) @@ -642,14 +522,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); - - size = roundup(size, align); -#ifdef DIAGNOSTIC - if (size > palloc->pa_pagesz) - panic("pool_init: pool item size (%zu) too large", size); -#endif + prsize = size; + if ((flags & PR_NOTOUCH) == 0 && prsize < sizeof(struct pool_item)) + prsize = sizeof(struct pool_item); + + prsize = roundup(prsize, align); + KASSERTMSG((prsize <= palloc->pa_pagesz), + "%s: [%s] pool item size (%zu) larger than page size (%u)", + __func__, wchan, prsize, palloc->pa_pagesz); /* * Initialize the pool structure. @@ -665,7 +545,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; @@ -680,6 +560,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 @@ -698,9 +579,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; @@ -730,7 +612,8 @@ pool_init(struct pool *pp, size_t size, * if you see this panic, consider to tweak * PHPOOL_MAX and PHPOOL_FREELIST_NELEM. */ - panic("%s: too large itemsperpage(%d) for PR_NOTOUCH", + panic("%s: [%s] too large itemsperpage(%d) for " + "PR_NOTOUCH", __func__, pp->pr_wchan, pp->pr_itemsperpage); } pp->pr_phpool = &phpool[idx]; @@ -760,11 +643,6 @@ 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; @@ -822,15 +700,8 @@ pool_destroy(struct pool *pp) mutex_enter(&pp->pr_lock); KASSERT(pp->pr_cache == NULL); - -#ifdef DIAGNOSTIC - if (pp->pr_nout != 0) { - pr_printlog(pp, NULL, printf); - panic("pool_destroy: pool busy: still out: %u", - pp->pr_nout); - } -#endif - + KASSERTMSG((pp->pr_nout == 0), + "%s: pool busy: still out: %u", __func__, pp->pr_nout); KASSERT(LIST_EMPTY(&pp->pr_fullpages)); KASSERT(LIST_EMPTY(&pp->pr_partpages)); @@ -842,14 +713,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); } @@ -859,10 +722,8 @@ pool_set_drain_hook(struct pool *pp, voi { /* XXX no locking -- must be used just after pool_init() */ -#ifdef DIAGNOSTIC - if (pp->pr_drain_hook != NULL) - panic("pool_set_drain_hook(%s): already set", pp->pr_wchan); -#endif + KASSERTMSG((pp->pr_drain_hook == NULL), + "%s: [%s] already set", __func__, pp->pr_wchan); pp->pr_drain_hook = fn; pp->pr_drain_hook_arg = arg; } @@ -873,7 +734,7 @@ pool_alloc_item_header(struct pool *pp, struct pool_item_header *ph; if ((pp->pr_roflags & PR_PHINPAGE) != 0) - ph = (struct pool_item_header *) ((char *)storage + pp->pr_phoffset); + ph = (void *)((char *)storage + pp->pr_phoffset); else ph = pool_get(pp->pr_phpool, flags); @@ -884,45 +745,32 @@ 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; void *v; -#ifdef DIAGNOSTIC - if (pp->pr_itemsperpage == 0) - panic("pool_get: pool '%s': pr_itemsperpage is zero, " - "pool not initialized?", pp->pr_wchan); - if ((cpu_intr_p() || cpu_softintr_p()) && pp->pr_ipl == IPL_NONE && - !cold && panicstr == NULL) - panic("pool '%s' is IPL_NONE, but called from " - "interrupt context\n", pp->pr_wchan); -#endif + KASSERTMSG((pp->pr_itemsperpage != 0), + "%s: [%s] pr_itemsperpage is zero, " + "pool not initialized?", __func__, pp->pr_wchan); + KASSERTMSG((!(cpu_intr_p() || cpu_softintr_p()) + || pp->pr_ipl != IPL_NONE || cold || panicstr != NULL), + "%s: [%s] is IPL_NONE, but called from interrupt context", + __func__, pp->pr_wchan); if (flags & PR_WAITOK) { ASSERT_SLEEPABLE(); } mutex_enter(&pp->pr_lock); - pr_enter(pp, file, line); - startover: /* * Check to see if we've reached the hard limit. If we have, * and we can wait, then wait until an item has been returned to * the pool. */ -#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); - } -#endif + KASSERTMSG((pp->pr_nout <= pp->pr_hardlimit), + "%s: %s: crossed hard limit", __func__, pp->pr_wchan); if (__predict_false(pp->pr_nout == pp->pr_hardlimit)) { if (pp->pr_drain_hook != NULL) { /* @@ -930,11 +778,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; } @@ -945,9 +791,9 @@ 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); + do { + cv_wait(&pp->pr_cv, &pp->pr_lock); + } while (pp->pr_flags & PR_WANTED); goto startover; } @@ -961,8 +807,8 @@ pool_get(struct pool *pp, int flags) pp->pr_nfail++; - pr_leave(pp); mutex_exit(&pp->pr_lock); + KASSERT((flags & (PR_WAITOK|PR_NOWAIT)) == PR_NOWAIT); return (NULL); } @@ -975,25 +821,26 @@ pool_get(struct pool *pp, int flags) if ((ph = pp->pr_curpage) == NULL) { int error; -#ifdef DIAGNOSTIC - if (pp->pr_nitems != 0) { - 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"); - } -#endif + KASSERTMSG((pp->pr_nitems == 0), + "%s: [%s] curpage NULL, inconsistent nitems %u", + __func__, pp->pr_wchan, pp->pr_nitems); /* * Call the back-end page allocator for more memory. * 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) { /* + * pool_grow aborts when another thread + * is allocating a new page. Retry if it + * waited for it. + */ + if (error == ERESTART) + goto startover; + + /* * We were unable to allocate a page or item * header, but we released the lock during * allocation, so perhaps items were freed @@ -1003,8 +850,8 @@ pool_get(struct pool *pp, int flags) goto startover; pp->pr_nfail++; - pr_leave(pp); mutex_exit(&pp->pr_lock); + KASSERT((flags & (PR_WAITOK|PR_NOWAIT)) == PR_NOWAIT); return (NULL); } @@ -1012,46 +859,22 @@ pool_get(struct pool *pp, int flags) goto startover; } 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 + KASSERTMSG((ph->ph_nmissing < pp->pr_itemsperpage), + "%s: %s: page empty", __func__, pp->pr_wchan); v = pr_item_notouch_get(pp, ph); -#ifdef POOL_DIAGNOSTIC - pr_log(pp, v, PRLOG_GET, file, line); -#endif } else { v = pi = LIST_FIRST(&ph->ph_itemlist); if (__predict_false(v == NULL)) { - pr_leave(pp); - mutex_exit(&pp->pr_lock); - panic("pool_get: %s: page empty", pp->pr_wchan); - } -#ifdef DIAGNOSTIC - if (__predict_false(pp->pr_nitems == 0)) { - pr_leave(pp); mutex_exit(&pp->pr_lock); - printf("pool_get: %s: items on itemlist, nitems %u\n", - pp->pr_wchan, pp->pr_nitems); - panic("pool_get: nitems inconsistent"); + panic("%s: [%s] page empty", __func__, pp->pr_wchan); } -#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); - } -#endif + KASSERTMSG((pp->pr_nitems > 0), + "%s: [%s] nitems %u inconsistent on itemlist", + __func__, pp->pr_wchan, pp->pr_nitems); + KASSERTMSG((pi->pi_magic == PI_MAGIC), + "%s: [%s] free list modified: " + "magic=%x; page %p; item addr %p", __func__, + pp->pr_wchan, pi->pi_magic, ph->ph_page, pi); /* * Remove from item list. @@ -1061,10 +884,7 @@ pool_get(struct pool *pp, int flags) pp->pr_nitems--; pp->pr_nout++; if (ph->ph_nmissing == 0) { -#ifdef DIAGNOSTIC - if (__predict_false(pp->pr_nidle == 0)) - panic("pool_get: nidle inconsistent"); -#endif + KASSERT(pp->pr_nidle > 0); pp->pr_nidle--; /* @@ -1076,15 +896,10 @@ pool_get(struct pool *pp, int flags) } ph->ph_nmissing++; if (ph->ph_nmissing == pp->pr_itemsperpage) { -#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); - } -#endif + KASSERTMSG(((pp->pr_roflags & PR_NOTOUCH) || + LIST_EMPTY(&ph->ph_itemlist)), + "%s: [%s] nmissing (%u) inconsistent", __func__, + pp->pr_wchan, ph->ph_nmissing); /* * This page is now full. Move it to the full list * and select a new current page. @@ -1095,7 +910,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 @@ -1112,6 +926,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); } @@ -1125,20 +940,15 @@ 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); -#ifdef DIAGNOSTIC - if (__predict_false(pp->pr_nout == 0)) { - printf("pool %s: putting with none out\n", - pp->pr_wchan); - panic("pool_put"); - } -#endif + KASSERTMSG((pp->pr_nout > 0), + "%s: [%s] putting with none out", __func__, pp->pr_wchan); 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); + panic("%s: [%s] page header missing", __func__, pp->pr_wchan); } /* @@ -1226,32 +1036,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) { @@ -1266,10 +1050,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. * @@ -1283,6 +1063,23 @@ pool_grow(struct pool *pp, int flags) { struct pool_item_header *ph = NULL; char *cp; + int error; + + /* + * If there's a pool_grow in progress, wait for it to complete + * and try again from the top. + */ + if (pp->pr_flags & PR_GROWING) { + if (flags & PR_WAITOK) { + do { + cv_wait(&pp->pr_cv, &pp->pr_lock); + } while (pp->pr_flags & PR_GROWING); + return ERESTART; + } else { + return EWOULDBLOCK; + } + } + pp->pr_flags |= PR_GROWING; mutex_exit(&pp->pr_lock); cp = pool_allocator_alloc(pp, flags); @@ -1294,13 +1091,25 @@ pool_grow(struct pool *pp, int flags) pool_allocator_free(pp, cp); } mutex_enter(&pp->pr_lock); - return ENOMEM; + error = ENOMEM; + goto out; } mutex_enter(&pp->pr_lock); pool_prime_page(pp, cp, ph); pp->pr_npagealloc++; - return 0; + error = 0; + +out: + /* + * If anyone was waiting for pool_grow, notify them that we + * may have just done it. + */ + KASSERT(pp->pr_flags & PR_GROWING); + pp->pr_flags &= ~PR_GROWING; + cv_broadcast(&pp->pr_cv); + + return error; } /* @@ -1346,12 +1155,9 @@ pool_prime_page(struct pool *pp, void *s int n; KASSERT(mutex_owned(&pp->pr_lock)); - -#ifdef DIAGNOSTIC - if ((pp->pr_roflags & PR_NOALIGN) == 0 && - ((uintptr_t)cp & (pp->pr_alloc->pa_pagesz - 1)) != 0) - panic("pool_prime_page: %s: unaligned page", pp->pr_wchan); -#endif + KASSERTMSG(((pp->pr_roflags & PR_NOALIGN) || + (((uintptr_t)cp & (pp->pr_alloc->pa_pagesz - 1)) == 0)), + "%s: [%s] unaligned page: %p", __func__, pp->pr_wchan, cp); /* * Insert page header. @@ -1514,14 +1320,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; @@ -1529,9 +1331,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) { /* @@ -1561,7 +1361,6 @@ pool_reclaim(struct pool *pp) } return (0); } - pr_enter(pp, file, line); LIST_INIT(&pq); @@ -1589,7 +1388,6 @@ pool_reclaim(struct pool *pp) pr_rmpage(pp, ph, &pq); } - pr_leave(pp); mutex_exit(&pp->pr_lock); if (LIST_EMPTY(&pq)) @@ -1607,17 +1405,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)); @@ -1642,28 +1437,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); @@ -1673,18 +1446,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 *, ...)) @@ -1713,9 +1483,7 @@ pool_print_pagelist(struct pool *pp, str void (*pr)(const char *, ...)) { struct pool_item_header *ph; -#ifdef DIAGNOSTIC - struct pool_item *pi; -#endif + struct pool_item *pi __diagused; LIST_FOREACH(ph, pl, ph_pagelist) { (*pr)("\t\tpage %p, nmissing %d, time %" PRIu32 "\n", @@ -1796,11 +1564,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: @@ -1850,8 +1613,6 @@ pool_print1(struct pool *pp, const char } } #undef PR_GROUPLIST - - pr_enter_check(pp, pr); } static int @@ -1984,8 +1745,14 @@ pool_cache_bootstrap(pool_cache_t pc, si struct pool *pp; pp = &pc->pc_pool; - if (palloc == NULL && ipl == IPL_NONE) - palloc = &pool_allocator_nointr; + if (palloc == NULL && ipl == IPL_NONE) { + if (size > PAGE_SIZE) { + int bigidx = pool_bigidx(size); + + palloc = &pool_allocator_big[bigidx]; + } else + palloc = &pool_allocator_nointr; + } pool_init(pp, size, align, align_offset, flags, wchan, palloc, ipl); mutex_init(&pc->pc_lock, MUTEX_DEFAULT, ipl); @@ -2240,20 +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) { + uint64_t where; pcg_t *full, *empty, *part; - /* - * Transfer the content of the local CPU's cache back into global - * cache. Note that this does not handle objects cached for other CPUs. - * A xcall(9) must be scheduled to take care of them. - */ - pool_cache_xcall(pc); + KASSERT(!cpu_intr_p() && !cpu_softintr_p()); - /* Invalidate the global cache. */ + 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, transfer the content of the local CPU's + * cache back into global cache as only this CPU is currently + * running. + */ + pool_cache_transfer(pc); + } else { + /* + * 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_transfer, + pc, NULL); + xc_wait(where); + } + + /* Empty pool caches, then invalidate objects */ mutex_enter(&pc->pc_lock); full = pc->pc_fullgroups; empty = pc->pc_emptygroups; @@ -2285,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; @@ -2400,8 +2185,10 @@ pool_cache_get_slow(pool_cache_cpu_t *cc object = pool_get(&pc->pc_pool, flags); *objectp = object; - if (__predict_false(object == NULL)) + if (__predict_false(object == NULL)) { + KASSERT((flags & (PR_WAITOK|PR_NOWAIT)) == PR_NOWAIT); return false; + } if (__predict_false((*pc->pc_ctor)(pc->pc_arg, object, flags) != 0)) { pool_put(&pc->pc_pool, object); @@ -2421,6 +2208,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; } @@ -2440,8 +2228,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); + "%s: [%s] is IPL_NONE, but called from interrupt context", + __func__, pc->pc_pool.pr_wchan); if (flags & PR_WAITOK) { ASSERT_SLEEPABLE(); @@ -2466,6 +2254,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; } @@ -2490,12 +2279,18 @@ pool_cache_get_paddr(pool_cache_t pc, in break; } + /* + * We would like to KASSERT(object || (flags & PR_NOWAIT)), but + * pool_cache_get can fail even in the PR_WAITOK case, if the + * constructor fails. + */ return object; } 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; @@ -2506,6 +2301,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 @@ -2515,6 +2311,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; @@ -2523,7 +2329,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++; @@ -2531,7 +2336,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); @@ -2598,6 +2403,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. */ @@ -2638,13 +2444,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; @@ -2750,6 +2556,61 @@ struct pool_allocator pool_allocator_noi }; #endif /* POOL_SUBPAGE */ +struct pool_allocator pool_allocator_big[] = { + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 0), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 1), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 2), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 3), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 4), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 5), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 6), + }, + { + .pa_alloc = pool_page_alloc, + .pa_free = pool_page_free, + .pa_pagesz = 1 << (POOL_ALLOCATOR_BIG_BASE + 7), + } +}; + +static int +pool_bigidx(size_t size) +{ + int i; + + for (i = 0; i < __arraycount(pool_allocator_big); i++) { + if (1 << (i + POOL_ALLOCATOR_BIG_BASE) >= size) + return i; + } + panic("pool item size %zu too large, use a custom allocator", size); +} + static void * pool_allocator_alloc(struct pool *pp, int flags) { @@ -2819,6 +2680,120 @@ pool_page_free_meta(struct pool *pp, voi vmem_free(kmem_meta_arena, (vmem_addr_t)v, pp->pr_alloc->pa_pagesz); } +#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 (uint8_t)(((uintptr_t)p) * PRIME + >> ((sizeof(uintptr_t) - sizeof(uint8_t))) * CHAR_BIT); +} + +static void +pool_redzone_init(struct pool *pp, size_t requested_size) +{ + 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); + } +} + +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; + + /* + * 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++; + } +} + +static void +pool_redzone_check(struct pool *pp, void *p) +{ + uint8_t *cp, pat, expected; + const uint8_t *ep; + + if (!pp->pr_redzone) + return; + + 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_REDZONE */ + + #ifdef POOL_SUBPAGE /* Sub-page allocator, for machines with large hardware pages. */ void * @@ -2974,3 +2949,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); +}