Print this page
4374 dn_free_ranges should use range_tree_t
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/range_tree.c
          +++ new/usr/src/uts/common/fs/zfs/range_tree.c
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  /*
  26      - * Copyright (c) 2013 by Delphix. All rights reserved.
       26 + * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  27   27   */
  28   28  
  29   29  #include <sys/zfs_context.h>
  30   30  #include <sys/spa.h>
  31   31  #include <sys/dmu.h>
  32   32  #include <sys/dnode.h>
  33   33  #include <sys/zio.h>
  34   34  #include <sys/range_tree.h>
  35   35  
  36   36  static kmem_cache_t *range_seg_cache;
↓ open down ↓ 16 lines elided ↑ open up ↑
  53   53  void
  54   54  range_tree_stat_verify(range_tree_t *rt)
  55   55  {
  56   56          range_seg_t *rs;
  57   57          uint64_t hist[RANGE_TREE_HISTOGRAM_SIZE] = { 0 };
  58   58          int i;
  59   59  
  60   60          for (rs = avl_first(&rt->rt_root); rs != NULL;
  61   61              rs = AVL_NEXT(&rt->rt_root, rs)) {
  62   62                  uint64_t size = rs->rs_end - rs->rs_start;
  63      -                int idx = highbit(size) - 1;
       63 +                int idx = highbit64(size) - 1;
  64   64  
  65   65                  hist[idx]++;
  66   66                  ASSERT3U(hist[idx], !=, 0);
  67   67          }
  68   68  
  69   69          for (i = 0; i < RANGE_TREE_HISTOGRAM_SIZE; i++) {
  70   70                  if (hist[i] != rt->rt_histogram[i]) {
  71   71                          zfs_dbgmsg("i=%d, hist=%p, hist=%llu, rt_hist=%llu",
  72   72                              i, hist, hist[i], rt->rt_histogram[i]);
  73   73                  }
  74   74                  VERIFY3U(hist[i], ==, rt->rt_histogram[i]);
  75   75          }
  76   76  }
  77   77  
  78   78  static void
  79   79  range_tree_stat_incr(range_tree_t *rt, range_seg_t *rs)
  80   80  {
  81   81          uint64_t size = rs->rs_end - rs->rs_start;
  82      -        int idx = highbit(size) - 1;
       82 +        int idx = highbit64(size) - 1;
  83   83  
  84   84          ASSERT3U(idx, <,
  85   85              sizeof (rt->rt_histogram) / sizeof (*rt->rt_histogram));
  86   86  
  87   87          ASSERT(MUTEX_HELD(rt->rt_lock));
  88   88          rt->rt_histogram[idx]++;
  89   89          ASSERT3U(rt->rt_histogram[idx], !=, 0);
  90   90  }
  91   91  
  92   92  static void
  93   93  range_tree_stat_decr(range_tree_t *rt, range_seg_t *rs)
  94   94  {
  95   95          uint64_t size = rs->rs_end - rs->rs_start;
  96      -        int idx = highbit(size) - 1;
       96 +        int idx = highbit64(size) - 1;
  97   97  
  98   98          ASSERT3U(idx, <,
  99   99              sizeof (rt->rt_histogram) / sizeof (*rt->rt_histogram));
 100  100  
 101  101          ASSERT(MUTEX_HELD(rt->rt_lock));
 102  102          ASSERT3U(rt->rt_histogram[idx], !=, 0);
 103  103          rt->rt_histogram[idx]--;
 104  104  }
 105  105  
 106  106  /*
↓ open down ↓ 185 lines elided ↑ open up ↑
 292  292                  range_tree_stat_incr(rt, rs);
 293  293  
 294  294                  if (rt->rt_ops != NULL)
 295  295                          rt->rt_ops->rtop_add(rt, rs, rt->rt_arg);
 296  296          }
 297  297  
 298  298          rt->rt_space -= size;
 299  299  }
 300  300  
 301  301  static range_seg_t *
 302      -range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size,
 303      -    avl_index_t *wherep)
      302 +range_tree_find_impl(range_tree_t *rt, uint64_t start, uint64_t size)
 304  303  {
 305      -        range_seg_t rsearch, *rs;
      304 +        avl_index_t where;
      305 +        range_seg_t rsearch;
 306  306          uint64_t end = start + size;
 307  307  
 308  308          ASSERT(MUTEX_HELD(rt->rt_lock));
 309  309          VERIFY(size != 0);
 310  310  
 311  311          rsearch.rs_start = start;
 312  312          rsearch.rs_end = end;
 313      -        rs = avl_find(&rt->rt_root, &rsearch, wherep);
      313 +        return (avl_find(&rt->rt_root, &rsearch, &where));
      314 +}
 314  315  
 315      -        if (rs != NULL && rs->rs_start <= start && rs->rs_end >= end)
      316 +static range_seg_t *
      317 +range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size)
      318 +{
      319 +        range_seg_t *rs = range_tree_find_impl(rt, start, size);
      320 +        if (rs != NULL && rs->rs_start <= start && rs->rs_end >= start + size)
 316  321                  return (rs);
 317  322          return (NULL);
 318  323  }
 319  324  
 320  325  void
 321  326  range_tree_verify(range_tree_t *rt, uint64_t off, uint64_t size)
 322  327  {
 323  328          range_seg_t *rs;
 324      -        avl_index_t where;
 325  329  
 326  330          mutex_enter(rt->rt_lock);
 327      -        rs = range_tree_find(rt, off, size, &where);
      331 +        rs = range_tree_find(rt, off, size);
 328  332          if (rs != NULL)
 329  333                  panic("freeing free block; rs=%p", (void *)rs);
 330  334          mutex_exit(rt->rt_lock);
 331  335  }
 332  336  
 333  337  boolean_t
 334  338  range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size)
 335  339  {
 336      -        avl_index_t where;
      340 +        return (range_tree_find(rt, start, size) != NULL);
      341 +}
 337  342  
 338      -        return (range_tree_find(rt, start, size, &where) != NULL);
      343 +/*
      344 + * Ensure that this range is not in the tree, regardless of whether
      345 + * it is currently in the tree.
      346 + */
      347 +void
      348 +range_tree_clear(range_tree_t *rt, uint64_t start, uint64_t size)
      349 +{
      350 +        range_seg_t *rs;
      351 +
      352 +        while ((rs = range_tree_find_impl(rt, start, size)) != NULL) {
      353 +                uint64_t free_start = MAX(rs->rs_start, start);
      354 +                uint64_t free_end = MIN(rs->rs_end, start + size);
      355 +                range_tree_remove(rt, free_start, free_end - free_start);
      356 +        }
 339  357  }
 340  358  
 341  359  void
 342  360  range_tree_swap(range_tree_t **rtsrc, range_tree_t **rtdst)
 343  361  {
 344  362          range_tree_t *rt;
 345  363  
 346  364          ASSERT(MUTEX_HELD((*rtsrc)->rt_lock));
 347  365          ASSERT0(range_tree_space(*rtdst));
 348  366          ASSERT0(avl_numnodes(&(*rtdst)->rt_root));
↓ open down ↓ 43 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX