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/ufs/ufs/ufs_dirhash.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ufs/ufs_dirhash.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.10.8.1 retrieving revision 1.13.2.4 diff -u -p -r1.10.8.1 -r1.13.2.4 --- src/sys/ufs/ufs/ufs_dirhash.c 2006/04/19 03:54:14 1.10.8.1 +++ src/sys/ufs/ufs/ufs_dirhash.c 2007/07/15 13:28:20 1.13.2.4 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_dirhash.c,v 1.10.8.1 2006/04/19 03:54:14 elad Exp $ */ +/* $NetBSD: ufs_dirhash.c,v 1.13.2.4 2007/07/15 13:28:20 ad Exp $ */ /* * Copyright (c) 2001, 2002 Ian Dowse. All rights reserved. @@ -44,7 +44,6 @@ #include #include -#include #include #include #include @@ -57,7 +56,7 @@ #define OFSFMT(ip) ((ip)->i_ump->um_maxsymlinklen <= 0) #define BLKFREE2IDX(n) ((n) > DH_NFSTATS ? DH_NFSTATS : (n)) -static MALLOC_DEFINE(M_DIRHASH, "UFS dirhash", "UFS directory hash tables"); +static MALLOC_JUSTDEFINE(M_DIRHASH, "UFS dirhash", "UFS directory hash tables"); static int ufs_dirhashminblks = 5; static int ufs_dirhashmaxmem = 2 * 1024 * 1024; @@ -74,19 +73,29 @@ static doff_t ufsdirhash_getprev(struct int dirblksiz); static int ufsdirhash_recycle(int wanted); -static POOL_INIT(ufsdirhash_pool, DH_NBLKOFF * sizeof(daddr_t), 0, 0, 0, - "ufsdirhash", &pool_allocator_nointr); - -#define DIRHASHLIST_LOCK() do { } while (0) -#define DIRHASHLIST_UNLOCK() do { } while (0) -#define DIRHASH_LOCK(dh) do { } while (0) -#define DIRHASH_UNLOCK(dh) do { } while (0) +#define DIRHASHLIST_LOCK() mutex_enter(&ufsdirhash_lock) +#define DIRHASHLIST_UNLOCK() mutex_exit(&ufsdirhash_lock) +#define DIRHASH_LOCK(dh) mutex_enter(&(dh)->dh_lock) +#define DIRHASH_UNLOCK(dh) mutex_exit(&(dh)->dh_lock) #define DIRHASH_BLKALLOC_WAITOK() pool_get(&ufsdirhash_pool, PR_WAITOK) #define DIRHASH_BLKFREE(ptr) pool_put(&ufsdirhash_pool, ptr) /* Dirhash list; recently-used entries are near the tail. */ static TAILQ_HEAD(, dirhash) ufsdirhash_list; +/* Protects: ufsdirhash_list, `dh_list' field, ufs_dirhashmem. */ +static kmutex_t ufsdirhash_lock; + +/* + * Locking order: + * ufsdirhash_lock + * dh_lock + * + * The dh_lock mutex should be acquired either via the inode lock, or via + * ufsdirhash_lock. Only the owner of the inode may free the associated + * dirhash, but anything can steal its memory and set dh_hash to NULL. + */ + /* * Attempt to build up a hash table for the directory contents in * inode 'ip'. Returns 0 on success, or -1 of the operation failed. @@ -163,6 +172,7 @@ ufsdirhash_build(struct inode *ip) DIRHASHLIST_UNLOCK(); return (-1); } + mutex_init(&dh->dh_lock, MUTEX_DEFAULT, IPL_NONE); dh->dh_hash = (doff_t **)malloc(narrays * sizeof(dh->dh_hash[0]), M_DIRHASH, M_NOWAIT | M_ZERO); dh->dh_blkfree = (u_int8_t *)malloc(nblocks * sizeof(dh->dh_blkfree[0]), @@ -196,12 +206,12 @@ ufsdirhash_build(struct inode *ip) while (pos < ip->i_size) { if ((curcpu()->ci_schedstate.spc_flags & SPCF_SHOULDYIELD) != 0) { - preempt(1); + preempt(); } /* If necessary, get the next directory block. */ if ((pos & bmask) == 0) { if (bp != NULL) - brelse(bp); + brelse(bp, 0); if (ufs_blkatoff(vp, (off_t)pos, NULL, &bp) != 0) goto fail; } @@ -211,7 +221,7 @@ ufsdirhash_build(struct inode *ip) if (ep->d_reclen == 0 || ep->d_reclen > dirblksiz - (pos & (dirblksiz - 1))) { /* Corrupted directory. */ - brelse(bp); + brelse(bp, 0); goto fail; } if (ep->d_ino != 0) { @@ -228,7 +238,7 @@ ufsdirhash_build(struct inode *ip) } if (bp != NULL) - brelse(bp); + brelse(bp, 0); DIRHASHLIST_LOCK(); TAILQ_INSERT_TAIL(&ufsdirhash_list, dh, dh_list); dh->dh_onlist = 1; @@ -244,6 +254,7 @@ fail: } if (dh->dh_blkfree != NULL) FREE(dh->dh_blkfree, M_DIRHASH); + mutex_destroy(&dh->dh_lock); FREE(dh, M_DIRHASH); ip->i_dirhash = NULL; DIRHASHLIST_LOCK(); @@ -282,6 +293,7 @@ ufsdirhash_free(struct inode *ip) dh->dh_narrays * DH_NBLKOFF * sizeof(**dh->dh_hash) + dh->dh_nblk * sizeof(*dh->dh_blkfree); } + mutex_destroy(&dh->dh_lock); FREE(dh, M_DIRHASH); ip->i_dirhash = NULL; @@ -318,11 +330,11 @@ ufsdirhash_lookup(struct inode *ip, cons return (EJUSTRETURN); /* * Move this dirhash towards the end of the list if it has a - * score higher than the next entry, and acquire the dh_mtx. + * score higher than the next entry, and acquire the dh_lock. * Optimise the case where it's already the last by performing * an unlocked read of the TAILQ_NEXT pointer. * - * In both cases, end up holding just dh_mtx. + * In both cases, end up holding just dh_lock. */ if (TAILQ_NEXT(dh, dh_list) != NULL) { DIRHASHLIST_LOCK(); @@ -395,16 +407,16 @@ restart: panic("ufsdirhash_lookup: bad offset in hash array"); if ((offset & ~bmask) != blkoff) { if (bp != NULL) - brelse(bp); + brelse(bp, 0); blkoff = offset & ~bmask; if (ufs_blkatoff(vp, (off_t)blkoff, NULL, &bp) != 0) return (EJUSTRETURN); } - dp = (struct direct *)(bp->b_data + (offset & bmask)); + dp = (struct direct *)((char *)bp->b_data + (offset & bmask)); if (dp->d_reclen == 0 || dp->d_reclen > dirblksiz - (offset & (dirblksiz - 1))) { /* Corrupted directory. */ - brelse(bp); + brelse(bp, 0); return (EJUSTRETURN); } if (dp->d_namlen == namelen && @@ -415,7 +427,7 @@ restart: prevoff = ufsdirhash_getprev(dp, offset, dirblksiz); if (prevoff == -1) { - brelse(bp); + brelse(bp, 0); return (EJUSTRETURN); } } else @@ -437,7 +449,7 @@ restart: if (dh->dh_hash == NULL) { DIRHASH_UNLOCK(dh); if (bp != NULL) - brelse(bp); + brelse(bp, 0); ufsdirhash_free(ip); return (EJUSTRETURN); } @@ -452,7 +464,7 @@ restart: } DIRHASH_UNLOCK(dh); if (bp != NULL) - brelse(bp); + brelse(bp, 0); return (ENOENT); } @@ -512,7 +524,7 @@ ufsdirhash_findfree(struct inode *ip, in /* Find the first entry with free space. */ for (i = 0; i < dirblksiz; ) { if (dp->d_reclen == 0) { - brelse(bp); + brelse(bp, 0); return (-1); } if (dp->d_ino == 0 || dp->d_reclen > DIRSIZ(0, dp, needswap)) @@ -521,7 +533,7 @@ ufsdirhash_findfree(struct inode *ip, in dp = (struct direct *)((char *)dp + dp->d_reclen); } if (i > dirblksiz) { - brelse(bp); + brelse(bp, 0); return (-1); } slotstart = pos + i; @@ -533,19 +545,19 @@ ufsdirhash_findfree(struct inode *ip, in if (dp->d_ino != 0) freebytes -= DIRSIZ(0, dp, needswap); if (dp->d_reclen == 0) { - brelse(bp); + brelse(bp, 0); return (-1); } i += dp->d_reclen; dp = (struct direct *)((char *)dp + dp->d_reclen); } if (i > dirblksiz) { - brelse(bp); + brelse(bp, 0); return (-1); } if (freebytes < slotneeded) panic("ufsdirhash_findfree: free mismatch"); - brelse(bp); + brelse(bp, 0); *slotsize = pos + i - slotstart; return (slotstart); } @@ -875,7 +887,7 @@ ufsdirhash_hash(struct dirhash *dh, cons * by the value specified by `diff'. * * The caller must ensure we have exclusive access to `dh'; normally - * that means that dh_mtx should be held, but this is also called + * that means that dh_lock should be held, but this is also called * from ufsdirhash_build() where exclusive access can be assumed. */ static void @@ -919,6 +931,10 @@ ufsdirhash_findslot(struct dirhash *dh, { int slot; + KASSERT(mutex_owned(&dh->dh_lock)); + + KASSERT(mutex_owned(&dh->dh_lock)); + /* Find the entry. */ KASSERT(dh->dh_hused < dh->dh_hlen); slot = ufsdirhash_hash(dh, name, namelen); @@ -941,6 +957,10 @@ ufsdirhash_delslot(struct dirhash *dh, i { int i; + KASSERT(mutex_owned(&dh->dh_lock)); + + KASSERT(mutex_owned(&dh->dh_lock)); + /* Mark the entry as deleted. */ DH_ENTRY(dh, slot) = DIRHASH_DEL; @@ -1051,10 +1071,9 @@ ufsdirhash_recycle(int wanted) void ufsdirhash_init() { -#ifdef _LKM pool_init(&ufsdirhash_pool, DH_NBLKOFF * sizeof(daddr_t), 0, 0, 0, - "ufsdirhash", &pool_allocator_nointr); -#endif + "ufsdirhash", &pool_allocator_nointr, IPL_NONE); + mutex_init(&ufsdirhash_lock, MUTEX_DEFAULT, IPL_NONE); TAILQ_INIT(&ufsdirhash_list); } @@ -1062,9 +1081,8 @@ void ufsdirhash_done(void) { KASSERT(TAILQ_EMPTY(&ufsdirhash_list)); -#ifdef _LKM pool_destroy(&ufsdirhash_pool); -#endif + mutex_destroy(&ufsdirhash_lock); } SYSCTL_SETUP(sysctl_vfs_ufs_setup, "sysctl vfs.ufs.dirhash subtree setup")