[BACK]Return to ufs_dirhash.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / ufs / ufs

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/ufs/ufs/ufs_dirhash.c between version 1.1.4.1 and 1.4.2.3

version 1.1.4.1, 2005/03/19 08:37:06 version 1.4.2.3, 2007/09/03 14:46:59
Line 27 
Line 27 
  * $FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.3.2.8 2004/12/08 11:54:13 dwmalone Exp $   * $FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.3.2.8 2004/12/08 11:54:13 dwmalone Exp $
  */   */
   
   #include <sys/cdefs.h>
   __KERNEL_RCSID(0, "$NetBSD$");
   
 /*  /*
  * This implements a hash-based lookup scheme for UFS directories.   * This implements a hash-based lookup scheme for UFS directories.
  */   */
   
 #ifdef UFS_DIRHASH  
   
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/systm.h>  #include <sys/systm.h>
 #include <sys/kernel.h>  #include <sys/kernel.h>
Line 46 
Line 47 
 #include <sys/pool.h>  #include <sys/pool.h>
 #include <sys/sysctl.h>  #include <sys/sysctl.h>
   
 #include <ufs/ufs/quota.h>  
 #include <ufs/ufs/inode.h>  #include <ufs/ufs/inode.h>
 #include <ufs/ufs/dir.h>  #include <ufs/ufs/dir.h>
 #include <ufs/ufs/dirhash.h>  #include <ufs/ufs/dirhash.h>
Line 59 
Line 59 
 #define OFSFMT(ip)              ((ip)->i_ump->um_maxsymlinklen <= 0)  #define OFSFMT(ip)              ((ip)->i_ump->um_maxsymlinklen <= 0)
 #define BLKFREE2IDX(n)          ((n) > DH_NFSTATS ? DH_NFSTATS : (n))  #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_dirhashminblks = 5;
 static int ufs_dirhashmaxmem = 2 * 1024 * 1024;  static int ufs_dirhashmaxmem = 2 * 1024 * 1024;
Line 76  static doff_t ufsdirhash_getprev(struct 
Line 76  static doff_t ufsdirhash_getprev(struct 
            int dirblksiz);             int dirblksiz);
 static int ufsdirhash_recycle(int wanted);  static int ufsdirhash_recycle(int wanted);
   
 POOL_INIT(ufsdirhash_pool, DH_NBLKOFF * sizeof(daddr_t), 0, 0, 0, "ufsdirhash",  static struct pool ufsdirhash_pool;
     &pool_allocator_nointr);  
   
 #define DIRHASHLIST_LOCK()              do { } while (0)  #define DIRHASHLIST_LOCK()              mutex_enter(&ufsdirhash_lock)
 #define DIRHASHLIST_UNLOCK()            do { } while (0)  #define DIRHASHLIST_UNLOCK()            mutex_exit(&ufsdirhash_lock)
 #define DIRHASH_LOCK(dh)                do { } while (0)  #define DIRHASH_LOCK(dh)                mutex_enter(&(dh)->dh_lock)
 #define DIRHASH_UNLOCK(dh)              do { } while (0)  #define DIRHASH_UNLOCK(dh)              mutex_exit(&(dh)->dh_lock)
 #define DIRHASH_BLKALLOC_WAITOK()       pool_get(&ufsdirhash_pool, PR_WAITOK)  #define DIRHASH_BLKALLOC_WAITOK()       pool_get(&ufsdirhash_pool, PR_WAITOK)
 #define DIRHASH_BLKFREE(ptr)            pool_put(&ufsdirhash_pool, ptr)  #define DIRHASH_BLKFREE(ptr)            pool_put(&ufsdirhash_pool, ptr)
   
 /* Dirhash list; recently-used entries are near the tail. */  /* Dirhash list; recently-used entries are near the tail. */
 static TAILQ_HEAD(, dirhash) ufsdirhash_list;  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   * Attempt to build up a hash table for the directory contents in
  * inode 'ip'. Returns 0 on success, or -1 of the operation failed.   * inode 'ip'. Returns 0 on success, or -1 of the operation failed.
Line 165  ufsdirhash_build(struct inode *ip)
Line 177  ufsdirhash_build(struct inode *ip)
                 DIRHASHLIST_UNLOCK();                  DIRHASHLIST_UNLOCK();
                 return (-1);                  return (-1);
         }          }
         MALLOC(dh->dh_hash, doff_t **, narrays * sizeof(dh->dh_hash[0]),          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);              M_DIRHASH, M_NOWAIT | M_ZERO);
         MALLOC(dh->dh_blkfree, u_int8_t *, nblocks * sizeof(dh->dh_blkfree[0]),          dh->dh_blkfree = (u_int8_t *)malloc(nblocks * sizeof(dh->dh_blkfree[0]),
             M_DIRHASH, M_NOWAIT);              M_DIRHASH, M_NOWAIT);
         if (dh->dh_hash == NULL || dh->dh_blkfree == NULL)          if (dh->dh_hash == NULL || dh->dh_blkfree == NULL)
                 goto fail;                  goto fail;
Line 196  ufsdirhash_build(struct inode *ip)
Line 209  ufsdirhash_build(struct inode *ip)
         bmask = VFSTOUFS(vp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;          bmask = VFSTOUFS(vp->v_mount)->um_mountp->mnt_stat.f_iosize - 1;
         pos = 0;          pos = 0;
         while (pos < ip->i_size) {          while (pos < ip->i_size) {
                   if ((curcpu()->ci_schedstate.spc_flags & SPCF_SHOULDYIELD)
                       != 0) {
                           preempt();
                   }
                 /* If necessary, get the next directory block. */                  /* If necessary, get the next directory block. */
                 if ((pos & bmask) == 0) {                  if ((pos & bmask) == 0) {
                         if (bp != NULL)                          if (bp != NULL)
                                 brelse(bp);                                  brelse(bp);
                         if (VOP_BLKATOFF(vp, (off_t)pos, NULL, &bp) != 0)                          if (ufs_blkatoff(vp, (off_t)pos, NULL, &bp) != 0)
                                 goto fail;                                  goto fail;
                 }                  }
   
Line 242  fail:
Line 259  fail:
         }          }
         if (dh->dh_blkfree != NULL)          if (dh->dh_blkfree != NULL)
                 FREE(dh->dh_blkfree, M_DIRHASH);                  FREE(dh->dh_blkfree, M_DIRHASH);
           mutex_destroy(&dh->dh_lock);
         FREE(dh, M_DIRHASH);          FREE(dh, M_DIRHASH);
         ip->i_dirhash = NULL;          ip->i_dirhash = NULL;
         DIRHASHLIST_LOCK();          DIRHASHLIST_LOCK();
Line 280  ufsdirhash_free(struct inode *ip)
Line 298  ufsdirhash_free(struct inode *ip)
                     dh->dh_narrays * DH_NBLKOFF * sizeof(**dh->dh_hash) +                      dh->dh_narrays * DH_NBLKOFF * sizeof(**dh->dh_hash) +
                     dh->dh_nblk * sizeof(*dh->dh_blkfree);                      dh->dh_nblk * sizeof(*dh->dh_blkfree);
         }          }
           mutex_destroy(&dh->dh_lock);
         FREE(dh, M_DIRHASH);          FREE(dh, M_DIRHASH);
         ip->i_dirhash = NULL;          ip->i_dirhash = NULL;
   
Line 316  ufsdirhash_lookup(struct inode *ip, cons
Line 335  ufsdirhash_lookup(struct inode *ip, cons
                 return (EJUSTRETURN);                  return (EJUSTRETURN);
         /*          /*
          * Move this dirhash towards the end of the list if it has a           * 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           * Optimise the case where it's already the last by performing
          * an unlocked read of the TAILQ_NEXT pointer.           * 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) {          if (TAILQ_NEXT(dh, dh_list) != NULL) {
                 DIRHASHLIST_LOCK();                  DIRHASHLIST_LOCK();
Line 395  restart:
Line 414  restart:
                         if (bp != NULL)                          if (bp != NULL)
                                 brelse(bp);                                  brelse(bp);
                         blkoff = offset & ~bmask;                          blkoff = offset & ~bmask;
                         if (VOP_BLKATOFF(vp, (off_t)blkoff, NULL, &bp) != 0)                          if (ufs_blkatoff(vp, (off_t)blkoff, NULL, &bp) != 0)
                                 return (EJUSTRETURN);                                  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 >                  if (dp->d_reclen == 0 || dp->d_reclen >
                     dirblksiz - (offset & (dirblksiz - 1))) {                      dirblksiz - (offset & (dirblksiz - 1))) {
                         /* Corrupted directory. */                          /* Corrupted directory. */
Line 504  ufsdirhash_findfree(struct inode *ip, in
Line 523  ufsdirhash_findfree(struct inode *ip, in
             dh->dh_blkfree[dirblock] >= howmany(slotneeded, DIRALIGN));              dh->dh_blkfree[dirblock] >= howmany(slotneeded, DIRALIGN));
         DIRHASH_UNLOCK(dh);          DIRHASH_UNLOCK(dh);
         pos = dirblock * dirblksiz;          pos = dirblock * dirblksiz;
         error = VOP_BLKATOFF(ip->i_vnode, (off_t)pos, (void *)&dp, &bp);          error = ufs_blkatoff(ip->i_vnode, (off_t)pos, (void *)&dp, &bp);
         if (error)          if (error)
                 return (-1);                  return (-1);
         /* Find the first entry with free space. */          /* Find the first entry with free space. */
Line 780  ufsdirhash_dirtrunc(struct inode *ip, do
Line 799  ufsdirhash_dirtrunc(struct inode *ip, do
  * a directory block matches its actual contents. Panics if a mismatch   * a directory block matches its actual contents. Panics if a mismatch
  * is detected.   * is detected.
  *   *
  * On entry, `buf' should point to the start of an in-core   * On entry, `sbuf' should point to the start of an in-core
  * DIRBLKSIZ-sized directory block, and `offset' should contain the   * DIRBLKSIZ-sized directory block, and `offset' should contain the
  * offset from the start of the directory of that block.   * offset from the start of the directory of that block.
  */   */
 void  void
 ufsdirhash_checkblock(struct inode *ip, char *buf, doff_t offset)  ufsdirhash_checkblock(struct inode *ip, char *sbuf, doff_t offset)
 {  {
         struct dirhash *dh;          struct dirhash *dh;
         struct direct *dp;          struct direct *dp;
Line 810  ufsdirhash_checkblock(struct inode *ip, 
Line 829  ufsdirhash_checkblock(struct inode *ip, 
   
         nfree = 0;          nfree = 0;
         for (i = 0; i < dirblksiz; i += dp->d_reclen) {          for (i = 0; i < dirblksiz; i += dp->d_reclen) {
                 dp = (struct direct *)(buf + i);                  dp = (struct direct *)(sbuf + i);
                 if (dp->d_reclen == 0 || i + dp->d_reclen > dirblksiz)                  if (dp->d_reclen == 0 || i + dp->d_reclen > dirblksiz)
                         panic("ufsdirhash_checkblock: bad dir");                          panic("ufsdirhash_checkblock: bad dir");
   
Line 873  ufsdirhash_hash(struct dirhash *dh, cons
Line 892  ufsdirhash_hash(struct dirhash *dh, cons
  * by the value specified by `diff'.   * by the value specified by `diff'.
  *   *
  * The caller must ensure we have exclusive access to `dh'; normally   * 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.   * from ufsdirhash_build() where exclusive access can be assumed.
  */   */
 static void  static void
Line 917  ufsdirhash_findslot(struct dirhash *dh, 
Line 936  ufsdirhash_findslot(struct dirhash *dh, 
 {  {
         int slot;          int slot;
   
           KASSERT(mutex_owned(&dh->dh_lock));
   
         /* Find the entry. */          /* Find the entry. */
         KASSERT(dh->dh_hused < dh->dh_hlen);          KASSERT(dh->dh_hused < dh->dh_hlen);
         slot = ufsdirhash_hash(dh, name, namelen);          slot = ufsdirhash_hash(dh, name, namelen);
Line 939  ufsdirhash_delslot(struct dirhash *dh, i
Line 960  ufsdirhash_delslot(struct dirhash *dh, i
 {  {
         int i;          int i;
   
           KASSERT(mutex_owned(&dh->dh_lock));
   
         /* Mark the entry as deleted. */          /* Mark the entry as deleted. */
         DH_ENTRY(dh, slot) = DIRHASH_DEL;          DH_ENTRY(dh, slot) = DIRHASH_DEL;
   
Line 1049  ufsdirhash_recycle(int wanted)
Line 1072  ufsdirhash_recycle(int wanted)
 void  void
 ufsdirhash_init()  ufsdirhash_init()
 {  {
 #ifdef _LKM  
           mutex_init(&ufsdirhash_lock, MUTEX_DEFAULT, IPL_NONE);
           malloc_type_attach(M_DIRHASH);
         pool_init(&ufsdirhash_pool, DH_NBLKOFF * sizeof(daddr_t), 0, 0, 0,          pool_init(&ufsdirhash_pool, DH_NBLKOFF * sizeof(daddr_t), 0, 0, 0,
             "ufsdirhash", &pool_allocator_nointr);              "ufsdirhash", &pool_allocator_nointr, IPL_NONE);
 #endif  
         TAILQ_INIT(&ufsdirhash_list);          TAILQ_INIT(&ufsdirhash_list);
 }  }
   
 void  void
 ufsdirhash_done()  ufsdirhash_done(void)
 {  {
   
         KASSERT(TAILQ_EMPTY(&ufsdirhash_list));          KASSERT(TAILQ_EMPTY(&ufsdirhash_list));
 #ifdef _LKM  
         pool_destroy(&ufsdirhash_pool);          pool_destroy(&ufsdirhash_pool);
 #endif          malloc_type_detach(M_DIRHASH);
           mutex_destroy(&ufsdirhash_lock);
 }  }
   
 SYSCTL_SETUP(sysctl_vfs_ufs_setup, "sysctl vfs.ufs.dirhash subtree setup")  SYSCTL_SETUP(sysctl_vfs_ufs_setup, "sysctl vfs.ufs.dirhash subtree setup")
 {  {
         struct sysctlnode *rnode, *cnode;          const struct sysctlnode *rnode, *cnode;
   
         sysctl_createv(clog, 0, NULL, &rnode,          sysctl_createv(clog, 0, NULL, &rnode,
                        CTLFLAG_PERMANENT,                         CTLFLAG_PERMANENT,
Line 1117  SYSCTL_SETUP(sysctl_vfs_ufs_setup, "sysc
Line 1142  SYSCTL_SETUP(sysctl_vfs_ufs_setup, "sysc
                        NULL, 0, &ufs_dirhashcheck, 0,                         NULL, 0, &ufs_dirhashcheck, 0,
                        CTL_CREATE, CTL_EOL);                         CTL_CREATE, CTL_EOL);
 }  }
   
 #endif /* UFS_DIRHASH */  
Legend:
Removed from v.1.1.4.1  
changed lines
  Added in v.1.4.2.3
CVSweb <webmaster@jp.NetBSD.org>