diff options
| -rw-r--r-- | sys/dev/usb/ehci.c | 1 | ||||
| -rw-r--r-- | sys/fs/nwfs/nwfs_subr.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_lock.c | 26 | ||||
| -rw-r--r-- | sys/kern/vfs_bio.c | 14 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 6 | ||||
| -rw-r--r-- | sys/netncp/ncp_conn.h | 1 | ||||
| -rw-r--r-- | sys/netsmb/smb_conn.h | 1 | ||||
| -rw-r--r-- | sys/nfs4client/nfs4_idmap.c | 1 | ||||
| -rw-r--r-- | sys/sys/buf.h | 49 | ||||
| -rw-r--r-- | sys/sys/bufobj.h | 1 | ||||
| -rw-r--r-- | sys/sys/lockmgr.h | 45 | ||||
| -rw-r--r-- | sys/sys/mount.h | 2 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 9 |
13 files changed, 88 insertions, 70 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index bd41432..661642f 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <sys/module.h> #include <sys/bus.h> +#include <sys/lock.h> #include <sys/lockmgr.h> #if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__) #include <machine/cpu.h> diff --git a/sys/fs/nwfs/nwfs_subr.c b/sys/fs/nwfs/nwfs_subr.c index da64640..4d55972 100644 --- a/sys/fs/nwfs/nwfs_subr.c +++ b/sys/fs/nwfs/nwfs_subr.c @@ -34,7 +34,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/clock.h> +#include <sys/lock.h> #include <sys/lockmgr.h> #include <sys/malloc.h> #include <sys/clock.h> diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index d80a853..987b361 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -546,11 +546,14 @@ lockinit(lkp, prio, wmesg, timo, flags) { int iflags; + KASSERT((flags & (LK_NOWAIT | LK_SLEEPFAIL)) == 0, + ("%s: Invalid flags passed with mask 0x%x", __func__, + flags & LK_EXTFLG_MASK)); CTR5(KTR_LOCK, "lockinit(): lkp == %p, prio == %d, wmesg == \"%s\", " "timo == %d, flags = 0x%x\n", lkp, prio, wmesg, timo, flags); lkp->lk_interlock = mtx_pool_alloc(mtxpool_lockbuilder); - lkp->lk_flags = (flags & LK_EXTFLG_MASK) & ~(LK_NOWITNESS | LK_NODUP); + lkp->lk_flags = (flags & LK_EXTFLG_MASK) & ~(LK_FUNC_MASK); lkp->lk_sharecount = 0; lkp->lk_waitcount = 0; lkp->lk_exclusivecount = 0; @@ -561,8 +564,12 @@ lockinit(lkp, prio, wmesg, timo, flags) iflags = LO_RECURSABLE | LO_SLEEPABLE | LO_UPGRADABLE; if (!(flags & LK_NODUP)) iflags |= LO_DUPOK; + if (flags & LK_NOPROFILE) + iflags |= LO_NOPROFILE; if (!(flags & LK_NOWITNESS)) iflags |= LO_WITNESS; + if (flags & LK_QUIET) + iflags |= LO_QUIET; #ifdef DEBUG_LOCKS stack_zero(&lkp->lk_stack); #endif @@ -644,23 +651,6 @@ lockstatus(lkp) } /* - * Determine the number of waiters on a lock. - */ -int -lockwaiters(lkp) - struct lock *lkp; -{ - int count; - - KASSERT((lkp->lk_flags & LK_DESTROYED) == 0, - ("%s: %p lockmgr is destroyed", __func__, lkp)); - mtx_lock(lkp->lk_interlock); - count = lkp->lk_waitcount; - mtx_unlock(lkp->lk_interlock); - return (count); -} - -/* * Print out information about state of a lock. Used by VOP_PRINT * routines to display status about contained locks. */ diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index b789149..cf0ea46 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -557,6 +557,7 @@ bufinit(void) bp->b_qindex = QUEUE_EMPTY; bp->b_vflags = 0; bp->b_xflags = 0; + bp->b_waiters = 0; LIST_INIT(&bp->b_dep); BUF_LOCKINIT(bp); TAILQ_INSERT_TAIL(&bufqueues[QUEUE_EMPTY], bp, b_freelist); @@ -1195,7 +1196,7 @@ brelse(struct buf *bp) if (bp->b_bufsize) allocbuf(bp, 0); if (bp->b_vp) - brelvp(bp); + (void) brelvp(bp); } } @@ -1337,7 +1338,7 @@ brelse(struct buf *bp) if (bp->b_bufsize != 0) allocbuf(bp, 0); if (bp->b_vp != NULL) - brelvp(bp); + (void) brelvp(bp); } if (BUF_LOCKRECURSED(bp)) { @@ -1401,7 +1402,7 @@ brelse(struct buf *bp) if (bp->b_flags & B_DELWRI) bundirty(bp); if (bp->b_vp) - brelvp(bp); + (void) brelvp(bp); } /* @@ -1569,7 +1570,7 @@ vfs_vmio_release(struct buf *bp) bp->b_npages = 0; bp->b_flags &= ~B_VMIO; if (bp->b_vp) - brelvp(bp); + (void) brelvp(bp); } /* @@ -1706,6 +1707,7 @@ getnewbuf(int slpflag, int slptimeo, int size, int maxsize) struct buf *nbp; int defrag = 0; int nqindex; + int waiters = 0; static int flushingbufs; /* @@ -1844,7 +1846,7 @@ restart: vfs_vmio_release(bp); } if (bp->b_vp) - brelvp(bp); + waiters = brelvp(bp); } /* @@ -1913,7 +1915,7 @@ restart: * Notify any waiters for the buffer lock about * identity change by freeing the buffer. */ - if (qindex == QUEUE_CLEAN && BUF_LOCKWAITERS(bp) > 0) { + if (qindex == QUEUE_CLEAN && waiters > 0) { bp->b_flags |= B_INVAL; bfreekva(bp); brelse(bp); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5bdd380..171d73b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1525,11 +1525,12 @@ bgetvp(struct vnode *vp, struct buf *bp) /* * Disassociate a buffer from a vnode. */ -void +int brelvp(struct buf *bp) { struct bufobj *bo; struct vnode *vp; + int waiters; CTR3(KTR_BUF, "brelvp(%p) vp %p flags %X", bp, bp->b_vp, bp->b_flags); KASSERT(bp->b_vp != NULL, ("brelvp: NULL")); @@ -1554,7 +1555,10 @@ brelvp(struct buf *bp) bp->b_flags &= ~B_NEEDSGIANT; bp->b_vp = NULL; bp->b_bufobj = NULL; + waiters = bp->b_waiters; vdropl(vp); + + return (waiters); } /* diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h index 6a2d603..1524d40 100644 --- a/sys/netncp/ncp_conn.h +++ b/sys/netncp/ncp_conn.h @@ -132,6 +132,7 @@ struct ncp_conn_stat { #ifdef _KERNEL #ifndef LK_SHARED +#include <sys/lock.h> #include <sys/lockmgr.h> #endif diff --git a/sys/netsmb/smb_conn.h b/sys/netsmb/smb_conn.h index a83af8b..f9d8272 100644 --- a/sys/netsmb/smb_conn.h +++ b/sys/netsmb/smb_conn.h @@ -164,6 +164,7 @@ struct smb_share_info { #ifdef _KERNEL +#include <sys/lock.h> #include <sys/lockmgr.h> #include <netsmb/smb_subr.h> diff --git a/sys/nfs4client/nfs4_idmap.c b/sys/nfs4client/nfs4_idmap.c index 065bef2..000ad17 100644 --- a/sys/nfs4client/nfs4_idmap.c +++ b/sys/nfs4client/nfs4_idmap.c @@ -32,6 +32,7 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> +#include <sys/lock.h> #include <sys/lockmgr.h> #include <sys/fnv_hash.h> #include <sys/proc.h> diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 4682ae6..5cb5656 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -139,6 +139,7 @@ struct buf { void *b_fsprivate2; void *b_fsprivate3; int b_pin_count; + int b_waiters; /* (V) waiters counter */ }; #define b_object b_bufobj->bo_object @@ -266,15 +267,41 @@ extern const char *buf_wmesg; /* Default buffer lock message */ * * Get a lock sleeping non-interruptably until it becomes available. */ -#define BUF_LOCK(bp, locktype, interlock) \ - (lockmgr(&(bp)->b_lock, (locktype), (interlock))) +static __inline int +BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock); +static __inline int +BUF_LOCK(struct buf *bp, int locktype, struct mtx *interlock) +{ + int res; + + if (locktype & LK_INTERLOCK) + bp->b_waiters++; + res = lockmgr(&bp->b_lock, locktype, interlock); + if (locktype & LK_INTERLOCK) + bp->b_waiters--; + return (res); +} /* * Get a lock sleeping with specified interruptably and timeout. */ -#define BUF_TIMELOCK(bp, locktype, interlock, wmesg, catch, timo) \ - (lockmgr_args(&(bp)->b_lock, (locktype) | LK_TIMELOCK, \ - (interlock), (wmesg), (PRIBIO + 4) | (catch), (timo))) +static __inline int +BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock, + const char *wmesg, int catch, int timo); +static __inline int +BUF_TIMELOCK(struct buf *bp, int locktype, struct mtx *interlock, + const char *wmesg, int catch, int timo) +{ + int res; + + if (locktype & LK_INTERLOCK) + bp->b_waiters++; + res = lockmgr_args(&bp->b_lock, locktype | LK_TIMELOCK, interlock, + wmesg, (PRIBIO + 4) | catch, timo); + if (locktype & LK_INTERLOCK) + bp->b_waiters--; + return (res); +} /* * Release a lock. Only the acquiring process may free the lock unless @@ -351,16 +378,6 @@ BUF_KERNPROC(struct buf *bp) } #endif -/* - * Find out the number of waiters on a lock. - */ -static __inline int BUF_LOCKWAITERS(struct buf *); -static __inline int -BUF_LOCKWAITERS(struct buf *bp) -{ - return (lockwaiters(&bp->b_lock)); -} - #endif /* _KERNEL */ struct buf_queue_head { @@ -516,7 +533,7 @@ void vfs_unbusy_pages(struct buf *); int vmapbuf(struct buf *); void vunmapbuf(struct buf *); void relpbuf(struct buf *, int *); -void brelvp(struct buf *); +int brelvp(struct buf *); void bgetvp(struct vnode *, struct buf *); void pbgetbo(struct bufobj *bo, struct buf *bp); void pbgetvp(struct vnode *, struct buf *); diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h index 6650702..9ad572a 100644 --- a/sys/sys/bufobj.h +++ b/sys/sys/bufobj.h @@ -55,6 +55,7 @@ struct bufobj; struct buf_ops; +struct thread; extern struct buf_ops buf_ops_bio; diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h index 2307127..1ef52cb 100644 --- a/sys/sys/lockmgr.h +++ b/sys/sys/lockmgr.h @@ -41,7 +41,7 @@ #include <sys/stack.h> /* XXX */ #endif #include <sys/queue.h> -#include <sys/lock.h> +#include <sys/_lock.h> struct mtx; @@ -111,7 +111,7 @@ struct lock { * These may be set in lock_init to set their mode permanently, * or passed in as arguments to the lock manager. */ -#define LK_EXTFLG_MASK 0x00000ff0 /* mask of external flags */ +#define LK_EXTFLG_MASK 0x0000fff0 /* mask of external flags */ #define LK_NOWAIT 0x00000010 /* do not sleep to await lock */ #define LK_SLEEPFAIL 0x00000020 /* sleep, then return failure */ #define LK_CANRECURSE 0x00000040 /* allow recursive exclusive lock */ @@ -119,37 +119,45 @@ struct lock { #define LK_TIMELOCK 0x00000100 /* use lk_timo, else no timeout */ #define LK_NOWITNESS 0x00000200 /* disable WITNESS */ #define LK_NODUP 0x00000400 /* enable duplication logging */ +#define LK_NOPROFILE 0x00000800 /* disable lock profiling */ +#define LK_QUIET 0x00001000 /* disable lock operations tracking */ +#define LK_FUNC_MASK (LK_NODUP | LK_NOPROFILE | LK_NOWITNESS | LK_QUIET) /* * Nonpersistent external flags. */ -#define LK_RETRY 0x00001000 /* vn_lock: retry until locked */ -#define LK_INTERLOCK 0x00002000 /* +#define LK_RETRY 0x00010000 /* vn_lock: retry until locked */ +#define LK_INTERLOCK 0x00020000 /* * unlock passed mutex after getting * lk_interlock */ + +/* + * Default values for lockmgr_args(). + */ +#define LK_WMESG_DEFAULT (NULL) +#define LK_PRIO_DEFAULT (-1) +#define LK_TIMO_DEFAULT (0) + /* * Internal lock flags. * * These flags are used internally to the lock manager. */ -#define LK_WANT_UPGRADE 0x00010000 /* waiting for share-to-excl upgrade */ -#define LK_WANT_EXCL 0x00020000 /* exclusive lock sought */ -#define LK_HAVE_EXCL 0x00040000 /* exclusive lock obtained */ -#define LK_WAITDRAIN 0x00080000 /* process waiting for lock to drain */ -#define LK_DRAINING 0x00100000 /* lock is being drained */ -#define LK_DESTROYED 0x00200000 /* lock is destroyed */ +#define LK_WANT_UPGRADE 0x00100000 /* waiting for share-to-excl upgrade */ +#define LK_WANT_EXCL 0x00200000 /* exclusive lock sought */ +#define LK_HAVE_EXCL 0x00400000 /* exclusive lock obtained */ +#define LK_WAITDRAIN 0x00800000 /* process waiting for lock to drain */ +#define LK_DRAINING 0x01000000 /* lock is being drained */ +#define LK_DESTROYED 0x02000000 /* lock is destroyed */ /* * Internal state flags corresponding to lk_sharecount, and lk_waitcount */ -#define LK_SHARE_NONZERO 0x01000000 -#define LK_WAIT_NONZERO 0x02000000 +#define LK_SHARE_NONZERO 0x10000000 +#define LK_WAIT_NONZERO 0x20000000 -/* - * Default values for lockmgr_args(). - */ -#define LK_WMESG_DEFAULT (NULL) -#define LK_PRIO_DEFAULT (-1) -#define LK_TIMO_DEFAULT (0) +#ifndef LOCK_FILE +#error "LOCK_FILE not defined, include <sys/lock.h> before <sys/lockmgr.h>" +#endif /* * Assertion flags. @@ -203,7 +211,6 @@ void _lockmgr_assert(struct lock *, int what, const char *, int); void _lockmgr_disown(struct lock *, const char *, int); void lockmgr_printinfo(struct lock *); int lockstatus(struct lock *); -int lockwaiters(struct lock *); #define lockmgr(lock, flags, mtx) \ _lockmgr_args((lock), (flags), (mtx), LK_WMESG_DEFAULT, \ diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 4061720..d7eea4c 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -36,8 +36,8 @@ #include <sys/ucred.h> #include <sys/queue.h> #ifdef _KERNEL +#include <sys/lock.h> #include <sys/lockmgr.h> -#include <sys/_lock.h> #include <sys/_mutex.h> #endif diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 5c96a1c..a1ec516 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -33,17 +33,10 @@ #ifndef _SYS_VNODE_H_ #define _SYS_VNODE_H_ -/* - * XXX - compatability until lockmgr() goes away or all the #includes are - * updated. - */ -#include <sys/lockmgr.h> - #include <sys/bufobj.h> #include <sys/queue.h> -#include <sys/_lock.h> #include <sys/lock.h> -#include <sys/_mutex.h> +#include <sys/lockmgr.h> #include <sys/mutex.h> #include <sys/selinfo.h> #include <sys/uio.h> |
