Module Name: src Committed By: rmind Date: Sat May 5 19:15:11 UTC 2012
Modified Files: src/sys/conf: files src/sys/kern: subr_pool.c src/sys/sys: pool.h Log Message: G/C POOL_DIAGNOSTIC option. No objection on tech-kern@. To generate a diff of this commit: cvs rdiff -u -r1.1048 -r1.1049 src/sys/conf/files cvs rdiff -u -r1.194 -r1.195 src/sys/kern/subr_pool.c cvs rdiff -u -r1.73 -r1.74 src/sys/sys/pool.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1048 src/sys/conf/files:1.1049 --- src/sys/conf/files:1.1048 Sat Apr 28 23:03:39 2012 +++ src/sys/conf/files Sat May 5 19:15:10 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1048 2012/04/28 23:03:39 rmind Exp $ +# $NetBSD: files,v 1.1049 2012/05/05 19:15:10 rmind Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -69,8 +69,6 @@ defflag opt_ntp.h PPS_SYNC NTP defflag opt_ptm.h NO_DEV_PTM COMPAT_BSDPTY defparam opt_kmempages.h NKMEMPAGES NKMEMPAGES_MIN NKMEMPAGES_MAX -defflag opt_pool.h POOL_DIAGNOSTIC -defparam opt_poollog.h POOL_LOGSIZE defflag opt_revcache.h NAMECACHE_ENTER_REVERSE Index: src/sys/kern/subr_pool.c diff -u src/sys/kern/subr_pool.c:1.194 src/sys/kern/subr_pool.c:1.195 --- src/sys/kern/subr_pool.c:1.194 Sat Feb 4 22:11:42 2012 +++ src/sys/kern/subr_pool.c Sat May 5 19:15:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.194 2012/02/04 22:11:42 para Exp $ */ +/* $NetBSD: subr_pool.c,v 1.195 2012/05/05 19:15:10 rmind Exp $ */ /*- * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010 @@ -32,11 +32,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.194 2012/02/04 22:11:42 para Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.195 2012/05/05 19:15:10 rmind Exp $"); #include "opt_ddb.h" -#include "opt_pool.h" -#include "opt_poollog.h" #include "opt_lockdebug.h" #include <sys/param.h> @@ -45,7 +43,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c, #include <sys/proc.h> #include <sys/errno.h> #include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/vmem.h> #include <sys/pool.h> #include <sys/syslog.h> @@ -213,136 +210,6 @@ static void pool_print1(struct pool *, c 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) @@ -584,7 +451,7 @@ 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, @@ -606,14 +473,6 @@ pool_init(struct pool *pp, size_t size, } #endif -#ifdef POOL_DIAGNOSTIC - /* - * Always log if POOL_DIAGNOSTIC is defined. - */ - if (pool_logsize != 0) - flags |= PR_LOGGING; -#endif - if (palloc == NULL) palloc = &pool_allocator_kmem; #ifdef POOL_SUBPAGE @@ -760,11 +619,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; @@ -825,7 +679,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); } @@ -842,14 +695,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); } @@ -884,11 +729,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; @@ -908,8 +749,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, @@ -918,7 +757,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); } @@ -930,11 +768,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 +781,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; } @@ -961,7 +795,6 @@ pool_get(struct pool *pp, int flags) pp->pr_nfail++; - pr_leave(pp); mutex_exit(&pp->pr_lock); return (NULL); } @@ -989,9 +822,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 @@ -1003,7 +834,6 @@ pool_get(struct pool *pp, int flags) goto startover; pp->pr_nfail++; - pr_leave(pp); mutex_exit(&pp->pr_lock); return (NULL); } @@ -1014,25 +844,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); @@ -1040,13 +864,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); @@ -1079,7 +898,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); @@ -1095,7 +913,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 @@ -1137,7 +954,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); } @@ -1226,32 +1042,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 +1056,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. * @@ -1517,11 +1303,7 @@ pool_sethardlimit(struct pool *pp, int n * Might 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; @@ -1561,7 +1343,6 @@ pool_reclaim(struct pool *pp) } return (0); } - pr_enter(pp, file, line); LIST_INIT(&pq); @@ -1589,7 +1370,6 @@ pool_reclaim(struct pool *pp) pr_rmpage(pp, ph, &pq); } - pr_leave(pp); mutex_exit(&pp->pr_lock); if (LIST_EMPTY(&pq)) @@ -1679,12 +1459,6 @@ pool_drain_end(struct pool *pp, uint64_t /* * 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 *, ...)) @@ -1796,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: @@ -1850,8 +1619,6 @@ pool_print1(struct pool *pp, const char } } #undef PR_GROUPLIST - - pr_enter_check(pp, pr); } static int @@ -2296,7 +2063,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; Index: src/sys/sys/pool.h diff -u src/sys/sys/pool.h:1.73 src/sys/sys/pool.h:1.74 --- src/sys/sys/pool.h:1.73 Fri Jan 27 19:48:41 2012 +++ src/sys/sys/pool.h Sat May 5 19:15:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pool.h,v 1.73 2012/01/27 19:48:41 para Exp $ */ +/* $NetBSD: pool.h,v 1.74 2012/05/05 19:15:10 rmind Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2007 The NetBSD Foundation, Inc. @@ -37,10 +37,6 @@ #define __POOL_EXPOSE #endif -#if defined(_KERNEL_OPT) -#include "opt_pool.h" -#endif - #ifdef __POOL_EXPOSE #include <sys/param.h> #include <sys/mutex.h> @@ -49,11 +45,9 @@ #include <sys/time.h> #include <sys/tree.h> #include <sys/callback.h> -#endif #define POOL_PADDR_INVALID ((paddr_t) -1) -#ifdef __POOL_EXPOSE struct pool; struct pool_allocator { @@ -159,14 +153,6 @@ struct pool { /* * Diagnostic aides. */ - struct pool_log *pr_log; - int pr_curlogentry; - int pr_logsize; - - const char *pr_entered_file; /* reentrancy check */ - long pr_entered_line; - - struct callback_entry pr_reclaimerentry; void *pr_freecheck; void *pr_qcache; }; @@ -273,18 +259,6 @@ void *pool_get(struct pool *, int); void pool_put(struct pool *, void *); int pool_reclaim(struct pool *); -#ifdef POOL_DIAGNOSTIC -/* - * These versions do reentrancy checking. - */ -void *_pool_get(struct pool *, int, const char *, long); -void _pool_put(struct pool *, void *, const char *, long); -int _pool_reclaim(struct pool *, const char *, long); -#define pool_get(h, f) _pool_get((h), (f), __FILE__, __LINE__) -#define pool_put(h, v) _pool_put((h), (v), __FILE__, __LINE__) -#define pool_reclaim(h) _pool_reclaim((h), __FILE__, __LINE__) -#endif /* POOL_DIAGNOSTIC */ - int pool_prime(struct pool *, int); void pool_setlowat(struct pool *, int); void pool_sethiwat(struct pool *, int); @@ -295,7 +269,6 @@ bool pool_drain_end(struct pool *, uint /* * Debugging and diagnostic aides. */ -void pool_print(struct pool *, const char *); void pool_printit(struct pool *, const char *, void (*)(const char *, ...) __printflike(1, 2)); void pool_printall(const char *, void (*)(const char *, ...)