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.21.2.1 retrieving revision 1.30.2.2 diff -u -p -r1.21.2.1 -r1.30.2.2 --- src/sys/kern/subr_pool.c 1999/04/04 17:20:14 1.21.2.1 +++ src/sys/kern/subr_pool.c 2000/11/22 16:05:24 1.30.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.21.2.1 1999/04/04 17:20:14 chs Exp $ */ +/* $NetBSD: subr_pool.c,v 1.30.2.2 2000/11/22 16:05:24 bouyer Exp $ */ /*- * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc. @@ -37,6 +37,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_pool.h" +#include "opt_poollog.h" +#include "opt_lockdebug.h" + #include #include #include @@ -47,9 +51,6 @@ #include #include -#include -#include - #include /* @@ -73,7 +74,10 @@ static struct pool phpool; int pool_inactive_time = 10; /* Next candidate for drainage (see pool_drain()) */ -static struct pool *drainpp = NULL; +static struct pool *drainpp; + +/* This spin lock protects both pool_head and drainpp. */ +struct simplelock pool_head_slock = SIMPLELOCK_INITIALIZER; struct pool_item_header { /* Page headers */ @@ -90,14 +94,14 @@ struct pool_item_header { struct pool_item { #ifdef DIAGNOSTIC int pi_magic; -#define PI_MAGIC 0xdeadbeef #endif +#define PI_MAGIC 0xdeadbeef /* Other entries use only this list entry */ TAILQ_ENTRY(pool_item) pi_list; }; -#define PR_HASH_INDEX(pp,addr) \ +#define PR_HASH_INDEX(pp,addr) \ (((u_long)(addr) >> (pp)->pr_pageshift) & (PR_HASHTABSIZE - 1)) @@ -110,11 +114,9 @@ static void pool_prime_page __P((struct static void *pool_page_alloc __P((unsigned long, int, int)); static void pool_page_free __P((void *, unsigned long, int)); -#if defined(POOL_DIAGNOSTIC) || defined(DEBUG) -static void pool_print1 __P((struct pool *, const char *)); -#endif +static void pool_print1 __P((struct pool *, const char *, + void (*)(const char *, ...))); -#ifdef POOL_DIAGNOSTIC /* * Pool log entry. An array of these is allocated in pool_create(). */ @@ -122,8 +124,8 @@ struct pool_log { const char *pl_file; long pl_line; int pl_action; -#define PRLOG_GET 1 -#define PRLOG_PUT 2 +#define PRLOG_GET 1 +#define PRLOG_PUT 2 void *pl_addr; }; @@ -134,8 +136,14 @@ struct pool_log { int pool_logsize = POOL_LOGSIZE; +#ifdef DIAGNOSTIC static void pr_log __P((struct pool *, void *, int, const char *, long)); -static void pr_printlog __P((struct pool *)); +static void pr_printlog __P((struct pool *, struct pool_item *, + void (*)(const char *, ...))); +static void pr_enter __P((struct pool *, const char *, long)); +static void pr_leave __P((struct pool *)); +static void pr_enter_check __P((struct pool *, + void (*)(const char *, ...))); static __inline__ void pr_log(pp, v, action, file, line) @@ -166,8 +174,10 @@ pr_log(pp, v, action, file, line) } static void -pr_printlog(pp) +pr_printlog(pp, pi, pr) struct pool *pp; + struct pool_item *pi; + void (*pr) __P((const char *, ...)); { int i = pp->pr_logsize; int n = pp->pr_curlogentry; @@ -175,30 +185,76 @@ pr_printlog(pp) if ((pp->pr_roflags & PR_LOGGING) == 0) return; - pool_print1(pp, "printlog"); - /* * Print all entries in this pool's log. */ while (i-- > 0) { struct pool_log *pl = &pp->pr_log[n]; if (pl->pl_action != 0) { - printf("log entry %d:\n", i); - printf("\taction = %s, addr = %p\n", - pl->pl_action == PRLOG_GET ? "get" : "put", - pl->pl_addr); - printf("\tfile: %s at line %lu\n", - pl->pl_file, pl->pl_line); + 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; } } -#else -#define pr_log(pp, v, action, file, line) -#define pr_printlog(pp) -#endif +static __inline__ void +pr_enter(pp, file, line) + 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(pp) + 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(pp, pr) + struct pool *pp; + void (*pr) __P((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 /* DIAGNOSTIC */ /* * Return the pool page header based on page address. @@ -255,8 +311,11 @@ pr_rmpage(pp, ph) pp->pr_npagefree++; if ((pp->pr_roflags & PR_PHINPAGE) == 0) { + int s; LIST_REMOVE(ph, ph_hashlist); + s = splhigh(); pool_put(&phpool, ph); + splx(s); } if (pp->pr_curpage == ph) { @@ -297,11 +356,6 @@ pool_create(size, align, ioff, nitems, w return (NULL); flags = PR_FREEHEADER; -#ifdef POOL_DIAGNOSTIC - if (pool_logsize != 0) - flags |= PR_LOGGING; -#endif - pool_init(pp, size, align, ioff, flags, wchan, pagesz, alloc, release, mtype); @@ -336,10 +390,18 @@ pool_init(pp, size, align, ioff, flags, { int off, slack, i; +#ifdef POOL_DIAGNOSTIC + /* + * Always log if POOL_DIAGNOSTIC is defined. + */ + if (pool_logsize != 0) + flags |= PR_LOGGING; +#endif + /* * Check arguments and construct default values. */ - if (!powerof2(pagesz) || pagesz > PAGE_SIZE) + if (!powerof2(pagesz)) panic("pool_init: page size invalid (%lx)\n", (u_long)pagesz); if (alloc == NULL && release == NULL) { @@ -360,10 +422,14 @@ pool_init(pp, size, align, ioff, flags, if (size < sizeof(struct pool_item)) size = sizeof(struct pool_item); + size = ALIGN(size); + if (size >= pagesz) + panic("pool_init: pool item size (%lu) too large", + (u_long)size); + /* * Initialize the pool structure. */ - TAILQ_INSERT_TAIL(&pool_head, pp, pr_poollist); TAILQ_INIT(&pp->pr_pagelist); pp->pr_curpage = NULL; pp->pr_npages = 0; @@ -372,7 +438,7 @@ pool_init(pp, size, align, ioff, flags, pp->pr_maxpages = UINT_MAX; pp->pr_roflags = flags; pp->pr_flags = 0; - pp->pr_size = ALIGN(size); + pp->pr_size = size; pp->pr_align = align; pp->pr_wchan = wchan; pp->pr_mtype = mtype; @@ -385,9 +451,10 @@ pool_init(pp, size, align, ioff, flags, pp->pr_nout = 0; pp->pr_hardlimit = UINT_MAX; pp->pr_hardlimit_warning = NULL; - pp->pr_hardlimit_ratecap = 0; - memset(&pp->pr_hardlimit_warning_last, 0, - sizeof(pp->pr_hardlimit_warning_last)); + pp->pr_hardlimit_ratecap.tv_sec = 0; + pp->pr_hardlimit_ratecap.tv_usec = 0; + pp->pr_hardlimit_warning_last.tv_sec = 0; + pp->pr_hardlimit_warning_last.tv_usec = 0; /* * Decide whether to put the page header off page to avoid @@ -436,28 +503,33 @@ pool_init(pp, size, align, ioff, flags, pp->pr_hiwat = 0; pp->pr_nidle = 0; -#ifdef POOL_DIAGNOSTIC - if ((flags & PR_LOGGING) != 0) { - pp->pr_log = malloc(pool_logsize * sizeof(struct pool_log), - M_TEMP, M_NOWAIT); - if (pp->pr_log == NULL) + 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_entered_file = NULL; + pp->pr_entered_line = 0; simple_lock_init(&pp->pr_slock); /* * Initialize private page header pool if we haven't done so yet. + * XXX LOCKING. */ if (phpool.pr_size == 0) { pool_init(&phpool, sizeof(struct pool_item_header), 0, 0, 0, "phpool", 0, 0, 0, 0); } - return; + /* Insert into the list of all pools. */ + simple_lock(&pool_head_slock); + TAILQ_INSERT_TAIL(&pool_head, pp, pr_poollist); + simple_unlock(&pool_head_slock); } /* @@ -471,7 +543,7 @@ pool_destroy(pp) #ifdef DIAGNOSTIC if (pp->pr_nout != 0) { - pr_printlog(pp); + pr_printlog(pp, NULL, printf); panic("pool_destroy: pool busy: still out: %u\n", pp->pr_nout); } @@ -483,13 +555,14 @@ pool_destroy(pp) pr_rmpage(pp, ph); /* Remove from global pool list */ + simple_lock(&pool_head_slock); TAILQ_REMOVE(&pool_head, pp, pr_poollist); + /* XXX Only clear this if we were drainpp? */ drainpp = NULL; + simple_unlock(&pool_head_slock); -#ifdef POOL_DIAGNOSTIC if ((pp->pr_roflags & PR_LOGGING) != 0) free(pp->pr_log, M_TEMP); -#endif if (pp->pr_roflags & PR_FREEHEADER) free(pp, M_POOL); @@ -499,35 +572,31 @@ pool_destroy(pp) /* * Grab an item from the pool; must be called at appropriate spl level */ -#ifdef POOL_DIAGNOSTIC void * _pool_get(pp, flags, file, line) struct pool *pp; int flags; const char *file; long line; -#else -void * -pool_get(pp, flags) - struct pool *pp; - int flags; -#endif { void *v; struct pool_item *pi; struct pool_item_header *ph; #ifdef DIAGNOSTIC - if ((pp->pr_roflags & PR_STATIC) && (flags & PR_MALLOCOK)) { - pr_printlog(pp); + if (__predict_false((pp->pr_roflags & PR_STATIC) && + (flags & PR_MALLOCOK))) { + pr_printlog(pp, NULL, printf); panic("pool_get: static"); } #endif - if (curproc == NULL && (flags & PR_WAITOK) != 0) + if (__predict_false(curproc == NULL && doing_shutdown == 0 && + (flags & PR_WAITOK) != 0)) panic("pool_get: must have NOWAIT"); simple_lock(&pp->pr_slock); + pr_enter(pp, file, line); startover: /* @@ -536,44 +605,39 @@ pool_get(pp, flags) * the pool. */ #ifdef DIAGNOSTIC - if (pp->pr_nout > pp->pr_hardlimit) { + if (__predict_false(pp->pr_nout > pp->pr_hardlimit)) { + pr_leave(pp); simple_unlock(&pp->pr_slock); panic("pool_get: %s: crossed hard limit", pp->pr_wchan); } #endif - if (pp->pr_nout == pp->pr_hardlimit) { - if (flags & PR_WAITOK) { + if (__predict_false(pp->pr_nout == pp->pr_hardlimit)) { + if ((flags & PR_WAITOK) && !(flags & PR_LIMITFAIL)) { /* * XXX: A warning isn't logged in this case. Should * it be? */ pp->pr_flags |= PR_WANTED; - simple_unlock(&pp->pr_slock); - tsleep((caddr_t)pp, PSWP, pp->pr_wchan, 0); - simple_lock(&pp->pr_slock); + pr_leave(pp); + ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock); + pr_enter(pp, file, line); goto startover; } - if (pp->pr_hardlimit_warning != NULL) { - /* - * Log a message that the hard limit has been hit. - */ - struct timeval curtime, logdiff; - int s = splclock(); - curtime = mono_time; - splx(s); - timersub(&curtime, &pp->pr_hardlimit_warning_last, - &logdiff); - if (logdiff.tv_sec >= pp->pr_hardlimit_ratecap) { - pp->pr_hardlimit_warning_last = curtime; - log(LOG_ERR, "%s\n", pp->pr_hardlimit_warning); - } - } + + /* + * Log a message that the hard limit has been hit. + */ + if (pp->pr_hardlimit_warning != NULL && + ratecheck(&pp->pr_hardlimit_warning_last, + &pp->pr_hardlimit_ratecap)) + log(LOG_ERR, "%s\n", pp->pr_hardlimit_warning); if (flags & PR_URGENT) panic("pool_get: urgent"); pp->pr_nfail++; + pr_leave(pp); simple_unlock(&pp->pr_slock); return (NULL); } @@ -601,9 +665,11 @@ pool_get(pp, flags) * Release the pool lock, as the back-end page allocator * may block. */ + pr_leave(pp); simple_unlock(&pp->pr_slock); v = (*pp->pr_alloc)(pp->pr_pagesz, flags, pp->pr_mtype); simple_lock(&pp->pr_slock); + pr_enter(pp, file, line); if (v == NULL) { /* @@ -620,6 +686,7 @@ pool_get(pp, flags) if ((flags & PR_WAITOK) == 0) { pp->pr_nfail++; + pr_leave(pp); simple_unlock(&pp->pr_slock); return (NULL); } @@ -636,9 +703,9 @@ pool_get(pp, flags) * try again? */ pp->pr_flags |= PR_WANTED; - simple_unlock(&pp->pr_slock); - tsleep((caddr_t)pp, PSWP, pp->pr_wchan, 0); - simple_lock(&pp->pr_slock); + pr_leave(pp); + ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock); + pr_enter(pp, file, line); goto startover; } @@ -650,12 +717,14 @@ pool_get(pp, flags) goto startover; } - if ((v = pi = TAILQ_FIRST(&ph->ph_itemlist)) == NULL) { + if (__predict_false((v = pi = TAILQ_FIRST(&ph->ph_itemlist)) == NULL)) { + pr_leave(pp); simple_unlock(&pp->pr_slock); panic("pool_get: %s: page empty", pp->pr_wchan); } #ifdef DIAGNOSTIC - if (pp->pr_nitems == 0) { + if (__predict_false(pp->pr_nitems == 0)) { + pr_leave(pp); simple_unlock(&pp->pr_slock); printf("pool_get: %s: items on itemlist, nitems %u\n", pp->pr_wchan, pp->pr_nitems); @@ -665,8 +734,8 @@ pool_get(pp, flags) pr_log(pp, v, PRLOG_GET, file, line); #ifdef DIAGNOSTIC - if (pi->pi_magic != PI_MAGIC) { - pr_printlog(pp); + 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); @@ -681,7 +750,7 @@ pool_get(pp, flags) pp->pr_nout++; if (ph->ph_nmissing == 0) { #ifdef DIAGNOSTIC - if (pp->pr_nidle == 0) + if (__predict_false(pp->pr_nidle == 0)) panic("pool_get: nidle inconsistent"); #endif pp->pr_nidle--; @@ -689,7 +758,8 @@ pool_get(pp, flags) ph->ph_nmissing++; if (TAILQ_FIRST(&ph->ph_itemlist) == NULL) { #ifdef DIAGNOSTIC - if (ph->ph_nmissing != pp->pr_itemsperpage) { + if (__predict_false(ph->ph_nmissing != pp->pr_itemsperpage)) { + pr_leave(pp); simple_unlock(&pp->pr_slock); panic("pool_get: %s: nmissing inconsistent", pp->pr_wchan); @@ -730,6 +800,7 @@ pool_get(pp, flags) */ } + pr_leave(pp); simple_unlock(&pp->pr_slock); return (v); } @@ -737,19 +808,12 @@ pool_get(pp, flags) /* * Return resource to the pool; must be called at appropriate spl level */ -#ifdef POOL_DIAGNOSTIC void _pool_put(pp, v, file, line) struct pool *pp; void *v; const char *file; long line; -#else -void -pool_put(pp, v) - struct pool *pp; - void *v; -#endif { struct pool_item *pi = v; struct pool_item_header *ph; @@ -759,20 +823,46 @@ pool_put(pp, v) page = (caddr_t)((u_long)v & pp->pr_pagemask); simple_lock(&pp->pr_slock); + pr_enter(pp, file, line); + +#ifdef DIAGNOSTIC + if (__predict_false(pp->pr_nout == 0)) { + printf("pool %s: putting with none out\n", + pp->pr_wchan); + panic("pool_put"); + } +#endif pr_log(pp, v, PRLOG_PUT, file, line); - if ((ph = pr_find_pagehead(pp, page)) == NULL) { - pr_printlog(pp); + if (__predict_false((ph = pr_find_pagehead(pp, page)) == NULL)) { + pr_printlog(pp, NULL, printf); panic("pool_put: %s: page header missing", pp->pr_wchan); } +#ifdef LOCKDEBUG + /* + * Check if we're freeing a locked simple lock. + */ + simple_lock_freecheck((caddr_t)pi, ((caddr_t)pi) + pp->pr_size); +#endif + /* * Return to item list. */ #ifdef DIAGNOSTIC pi->pi_magic = PI_MAGIC; #endif +#ifdef DEBUG + { + int i, *ip = v; + + for (i = 0; i < pp->pr_size / sizeof(int); i++) { + *ip++ = PI_MAGIC; + } + } +#endif + TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list); ph->ph_nmissing--; pp->pr_nput++; @@ -787,6 +877,7 @@ pool_put(pp, v) pp->pr_flags &= ~PR_WANTED; if (ph->ph_nmissing == 0) pp->pr_nidle++; + pr_leave(pp); simple_unlock(&pp->pr_slock); wakeup((caddr_t)pp); return; @@ -852,6 +943,7 @@ pool_put(pp, v) pp->pr_curpage = ph; } + pr_leave(pp); simple_unlock(&pp->pr_slock); } @@ -869,7 +961,7 @@ pool_prime(pp, n, storage) int newnitems, newpages; #ifdef DIAGNOSTIC - if (storage && !(pp->pr_roflags & PR_STATIC)) + if (__predict_false(storage && !(pp->pr_roflags & PR_STATIC))) panic("pool_prime: static"); /* !storage && static caught below */ #endif @@ -896,6 +988,7 @@ pool_prime(pp, n, storage) return (ENOMEM); } + pp->pr_npagealloc++; pool_prime_page(pp, cp); pp->pr_minpages++; } @@ -924,12 +1017,17 @@ pool_prime_page(pp, storage) caddr_t cp = storage; unsigned int align = pp->pr_align; unsigned int ioff = pp->pr_itemoffset; - int n; + int s, n; + + if (((u_long)cp & (pp->pr_pagesz - 1)) != 0) + panic("pool_prime_page: %s: unaligned page", pp->pr_wchan); if ((pp->pr_roflags & PR_PHINPAGE) != 0) { ph = (struct pool_item_header *)(cp + pp->pr_phoffset); } else { + s = splhigh(); ph = pool_get(&phpool, PR_URGENT); + splx(s); LIST_INSERT_HEAD(&pp->pr_hashtab[PR_HASH_INDEX(pp, cp)], ph, ph_hashlist); } @@ -1026,10 +1124,11 @@ pool_catchup(pp) simple_unlock(&pp->pr_slock); cp = (*pp->pr_alloc)(pp->pr_pagesz, 0, pp->pr_mtype); simple_lock(&pp->pr_slock); - if (cp == NULL) { + if (__predict_false(cp == NULL)) { error = ENOMEM; break; } + pp->pr_npagealloc++; pool_prime_page(pp, cp); } @@ -1051,7 +1150,8 @@ pool_setlowat(pp, n) : roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage; /* Make sure we're caught up with the newly-set low water mark. */ - if ((error = pool_catchup(pp)) != 0) { + if ((pp->pr_nitems < pp->pr_minitems) && + (error = pool_catchup(pp)) != 0) { /* * XXX: Should we log a warning? Should we set up a timeout * to try again in a second or so? The latter could break @@ -1089,9 +1189,9 @@ pool_sethardlimit(pp, n, warnmess, ratec pp->pr_hardlimit = n; pp->pr_hardlimit_warning = warnmess; - pp->pr_hardlimit_ratecap = ratecap; - memset(&pp->pr_hardlimit_warning_last, 0, - sizeof(pp->pr_hardlimit_warning_last)); + pp->pr_hardlimit_ratecap.tv_sec = ratecap; + pp->pr_hardlimit_warning_last.tv_sec = 0; + pp->pr_hardlimit_warning_last.tv_usec = 0; /* * In-line version of pool_sethiwat(), because we don't want to @@ -1159,8 +1259,10 @@ pool_page_free_nointr(v, sz, mtype) * Release all complete pages that have not been used recently. */ void -pool_reclaim(pp) +_pool_reclaim(pp, file, line) pool_handle_t pp; + const char *file; + long line; { struct pool_item_header *ph, *phnext; struct timeval curtime; @@ -1171,6 +1273,7 @@ pool_reclaim(pp) if (simple_lock_try(&pp->pr_slock) == 0) return; + pr_enter(pp, file, line); s = splclock(); curtime = mono_time; @@ -1201,6 +1304,7 @@ pool_reclaim(pp) } } + pr_leave(pp); simple_unlock(&pp->pr_slock); } @@ -1215,63 +1319,155 @@ pool_drain(arg) void *arg; { struct pool *pp; - int s = splimp(); + int s; - /* XXX:lock pool head */ - if (drainpp == NULL && (drainpp = TAILQ_FIRST(&pool_head)) == NULL) { - splx(s); - return; - } + s = splimp(); + simple_lock(&pool_head_slock); + + if (drainpp == NULL && (drainpp = TAILQ_FIRST(&pool_head)) == NULL) + goto out; pp = drainpp; drainpp = TAILQ_NEXT(pp, pr_poollist); - /* XXX:unlock pool head */ pool_reclaim(pp); + + out: + simple_unlock(&pool_head_slock); splx(s); } -#if defined(POOL_DIAGNOSTIC) || defined(DEBUG) /* * Diagnostic helpers. */ void -pool_print(pp, label) +pool_print(pp, modif) struct pool *pp; - const char *label; + const char *modif; { int s; s = splimp(); - simple_lock(&pp->pr_slock); - pool_print1(pp, label); + 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 +pool_printit(pp, modif, pr) + struct pool *pp; + const char *modif; + void (*pr) __P((const char *, ...)); +{ + int didlock = 0; + + if (pp == NULL) { + (*pr)("Must specify a pool to print.\n"); + 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 + didlock = 1; + + pool_print1(pp, modif, pr); + + if (didlock) + simple_unlock(&pp->pr_slock); +} + static void -pool_print1(pp, label) +pool_print1(pp, modif, pr) struct pool *pp; - const char *label; + const char *modif; + void (*pr) __P((const char *, ...)); { + struct pool_item_header *ph; +#ifdef DIAGNOSTIC + struct pool_item *pi; +#endif + int print_log = 0, print_pagelist = 0; + char c; + + while ((c = *modif++) != '\0') { + if (c == 'l') + print_log = 1; + if (c == 'p') + print_pagelist = 1; + modif++; + } + + (*pr)("POOL %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)("\tpagesz %u, mtype %d\n", pp->pr_pagesz, pp->pr_mtype); + (*pr)("\talloc %p, release %p\n", pp->pr_alloc, pp->pr_free); + (*pr)("\tminitems %u, minpages %u, maxpages %u, npages %u\n", + pp->pr_minitems, pp->pr_minpages, pp->pr_maxpages, pp->pr_npages); + (*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", + 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); + + if (print_pagelist == 0) + goto skip_pagelist; + + if ((ph = TAILQ_FIRST(&pp->pr_pagelist)) != NULL) + (*pr)("\n\tpage list:\n"); + for (; ph != NULL; ph = TAILQ_NEXT(ph, 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); +#ifdef DIAGNOSTIC + for (pi = TAILQ_FIRST(&ph->ph_itemlist); pi != NULL; + pi = TAILQ_NEXT(pi, pi_list)) { + if (pi->pi_magic != PI_MAGIC) { + (*pr)("\t\t\titem %p, magic 0x%x\n", + pi, pi->pi_magic); + } + } +#endif + } + if (pp->pr_curpage == NULL) + (*pr)("\tno current page\n"); + else + (*pr)("\tcurpage %p\n", pp->pr_curpage->ph_page); + + skip_pagelist: + + if (print_log == 0) + goto skip_log; + + (*pr)("\n"); + if ((pp->pr_roflags & PR_LOGGING) == 0) + (*pr)("\tno log\n"); + else + pr_printlog(pp, NULL, pr); - if (label != NULL) - printf("%s: ", label); + skip_log: - printf("pool %s: nalloc %lu nfree %lu npagealloc %lu npagefree %lu\n" - " npages %u minitems %u itemsperpage %u itemoffset %u\n" - " nidle %lu\n", - pp->pr_wchan, - pp->pr_nget, - pp->pr_nput, - pp->pr_npagealloc, - pp->pr_npagefree, - pp->pr_npages, - pp->pr_minitems, - pp->pr_itemsperpage, - pp->pr_itemoffset, - pp->pr_nidle); + pr_enter_check(pp, pr); } int @@ -1338,4 +1534,3 @@ out: simple_unlock(&pp->pr_slock); return (r); } -#endif /* POOL_DIAGNOSTIC || DEBUG */