]> git.proxmox.com Git - mirror_zfs.git/blobdiff - module/zfs/dmu_traverse.c
Fix hung z_zvol tasks during 'zfs receive'
[mirror_zfs.git] / module / zfs / dmu_traverse.c
index 980c1aa2f8222f0acb959e2bb134ef2e5f587c79..f63903ef649dc82960c263b164484d0b170c9d28 100644 (file)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
 #include <sys/dsl_pool.h>
 #include <sys/dnode.h>
 #include <sys/spa.h>
+#include <sys/spa_impl.h>
 #include <sys/zio.h>
 #include <sys/dmu_impl.h>
 #include <sys/sa.h>
 #include <sys/sa_impl.h>
 #include <sys/callb.h>
+#include <sys/zfeature.h>
 
-int zfs_pd_blks_max = 100;
+int32_t zfs_pd_bytes_max = 50 * 1024 * 1024;   /* 50MB */
+int32_t send_holes_without_birth_time = 1;
 
 typedef struct prefetch_data {
        kmutex_t pd_mtx;
        kcondvar_t pd_cv;
-       int pd_blks_max;
-       int pd_blks_fetched;
+       int32_t pd_bytes_fetched;
        int pd_flags;
        boolean_t pd_cancel;
        boolean_t pd_exited;
+       zbookmark_phys_t pd_resume;
 } prefetch_data_t;
 
 typedef struct traverse_data {
@@ -54,23 +57,28 @@ typedef struct traverse_data {
        uint64_t td_objset;
        blkptr_t *td_rootbp;
        uint64_t td_min_txg;
-       zbookmark_t *td_resume;
+       zbookmark_phys_t *td_resume;
        int td_flags;
        prefetch_data_t *td_pfd;
+       boolean_t td_paused;
+       uint64_t td_hole_birth_enabled_txg;
        blkptr_cb_t *td_func;
        void *td_arg;
+       boolean_t td_realloc_possible;
 } traverse_data_t;
 
 static int traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *buf, uint64_t objset, uint64_t object);
+    uint64_t objset, uint64_t object);
+static void prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *,
+    uint64_t objset, uint64_t object);
 
 static int
 traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
 {
        traverse_data_t *td = arg;
-       zbookmark_t zb;
+       zbookmark_phys_t zb;
 
-       if (bp->blk_birth == 0)
+       if (BP_IS_HOLE(bp))
                return (0);
 
        if (claim_txg == 0 && bp->blk_birth >= spa_first_txg(td->td_spa))
@@ -79,7 +87,7 @@ traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
        SET_BOOKMARK(&zb, td->td_objset, ZB_ZIL_OBJECT, ZB_ZIL_LEVEL,
            bp->blk_cksum.zc_word[ZIL_ZC_SEQ]);
 
-       (void) td->td_func(td->td_spa, zilog, bp, NULL, &zb, NULL, td->td_arg);
+       (void) td->td_func(td->td_spa, zilog, bp, &zb, NULL, td->td_arg);
 
        return (0);
 }
@@ -92,9 +100,9 @@ traverse_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
        if (lrc->lrc_txtype == TX_WRITE) {
                lr_write_t *lr = (lr_write_t *)lrc;
                blkptr_t *bp = &lr->lr_blkptr;
-               zbookmark_t zb;
+               zbookmark_phys_t zb;
 
-               if (bp->blk_birth == 0)
+               if (BP_IS_HOLE(bp))
                        return (0);
 
                if (claim_txg == 0 || bp->blk_birth < claim_txg)
@@ -103,7 +111,7 @@ traverse_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
                SET_BOOKMARK(&zb, td->td_objset, lr->lr_foid,
                    ZB_ZIL_LEVEL, lr->lr_offset / BP_GET_LSIZE(bp));
 
-               (void) td->td_func(td->td_spa, zilog, bp, NULL, &zb, NULL,
+               (void) td->td_func(td->td_spa, zilog, bp, &zb, NULL,
                    td->td_arg);
        }
        return (0);
@@ -146,21 +154,20 @@ typedef enum resume_skip {
  */
 static resume_skip_t
 resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
        if (td->td_resume != NULL && !ZB_IS_ZERO(td->td_resume)) {
                /*
                 * If we already visited this bp & everything below,
                 * don't bother doing it again.
                 */
-               if (zbookmark_is_before(dnp, zb, td->td_resume))
+               if (zbookmark_subtree_completed(dnp, zb, td->td_resume))
                        return (RESUME_SKIP_ALL);
 
                /*
                 * If we found the block we're trying to resume from, zero
                 * the bookmark out to indicate that we have resumed.
                 */
-               ASSERT3U(zb->zb_object, <=, td->td_resume->zb_object);
                if (bcmp(zb, td->td_resume, sizeof (*zb)) == 0) {
                        bzero(td->td_resume, sizeof (*zb));
                        if (td->td_flags & TRAVERSE_POST)
@@ -171,23 +178,46 @@ resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
 }
 
 static void
-traverse_pause(traverse_data_t *td, const zbookmark_t *zb)
+traverse_prefetch_metadata(traverse_data_t *td,
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
-       ASSERT(td->td_resume != NULL);
-       ASSERT3U(zb->zb_level, ==, 0);
-       bcopy(zb, td->td_resume, sizeof (*td->td_resume));
+       arc_flags_t flags = ARC_FLAG_NOWAIT | ARC_FLAG_PREFETCH;
+
+       if (!(td->td_flags & TRAVERSE_PREFETCH_METADATA))
+               return;
+       /*
+        * If we are in the process of resuming, don't prefetch, because
+        * some children will not be needed (and in fact may have already
+        * been freed).
+        */
+       if (td->td_resume != NULL && !ZB_IS_ZERO(td->td_resume))
+               return;
+       if (BP_IS_HOLE(bp) || bp->blk_birth <= td->td_min_txg)
+               return;
+       if (BP_GET_LEVEL(bp) == 0 && BP_GET_TYPE(bp) != DMU_OT_DNODE)
+               return;
+
+       (void) arc_read(NULL, td->td_spa, bp, NULL, NULL,
+           ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
+}
+
+static boolean_t
+prefetch_needed(prefetch_data_t *pfd, const blkptr_t *bp)
+{
+       ASSERT(pfd->pd_flags & TRAVERSE_PREFETCH_DATA);
+       if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp) ||
+           BP_GET_TYPE(bp) == DMU_OT_INTENT_LOG)
+               return (B_FALSE);
+       return (B_TRUE);
 }
 
 static int
 traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *pbuf, blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
-       zbookmark_t czb;
-       int err = 0, lasterr = 0;
+       int err = 0;
        arc_buf_t *buf = NULL;
        prefetch_data_t *pd = td->td_pfd;
-       boolean_t hard = td->td_flags & TRAVERSE_HARD;
-       boolean_t pause = B_FALSE;
 
        switch (resume_skip_check(td, dnp, zb)) {
        case RESUME_SKIP_ALL:
@@ -200,202 +230,297 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
                ASSERT(0);
        }
 
-       if (BP_IS_HOLE(bp)) {
-               err = td->td_func(td->td_spa, NULL, NULL, pbuf, zb, dnp,
-                   td->td_arg);
-               return (err);
-       }
-
-       if (bp->blk_birth <= td->td_min_txg)
+       if (bp->blk_birth == 0) {
+               /*
+                * Since this block has a birth time of 0 it must be one of
+                * two things: a hole created before the
+                * SPA_FEATURE_HOLE_BIRTH feature was enabled, or a hole
+                * which has always been a hole in an object.
+                *
+                * If a file is written sparsely, then the unwritten parts of
+                * the file were "always holes" -- that is, they have been
+                * holes since this object was allocated.  However, we (and
+                * our callers) can not necessarily tell when an object was
+                * allocated.  Therefore, if it's possible that this object
+                * was freed and then its object number reused, we need to
+                * visit all the holes with birth==0.
+                *
+                * If it isn't possible that the object number was reused,
+                * then if SPA_FEATURE_HOLE_BIRTH was enabled before we wrote
+                * all the blocks we will visit as part of this traversal,
+                * then this hole must have always existed, so we can skip
+                * it.  We visit blocks born after (exclusive) td_min_txg.
+                *
+                * Note that the meta-dnode cannot be reallocated.
+                */
+               if (!send_holes_without_birth_time &&
+                   (!td->td_realloc_possible ||
+                   zb->zb_object == DMU_META_DNODE_OBJECT) &&
+                   td->td_hole_birth_enabled_txg <= td->td_min_txg)
+                       return (0);
+       } else if (bp->blk_birth <= td->td_min_txg) {
                return (0);
+       }
 
-       if (pd && !pd->pd_exited &&
-           ((pd->pd_flags & TRAVERSE_PREFETCH_DATA) ||
-           BP_GET_TYPE(bp) == DMU_OT_DNODE || BP_GET_LEVEL(bp) > 0)) {
+       if (pd != NULL && !pd->pd_exited && prefetch_needed(pd, bp)) {
+               uint64_t size = BP_GET_LSIZE(bp);
                mutex_enter(&pd->pd_mtx);
-               ASSERT(pd->pd_blks_fetched >= 0);
-               while (pd->pd_blks_fetched == 0 && !pd->pd_exited)
-                       cv_wait(&pd->pd_cv, &pd->pd_mtx);
-               pd->pd_blks_fetched--;
+               ASSERT(pd->pd_bytes_fetched >= 0);
+               while (pd->pd_bytes_fetched < size && !pd->pd_exited)
+                       cv_wait_sig(&pd->pd_cv, &pd->pd_mtx);
+               pd->pd_bytes_fetched -= size;
                cv_broadcast(&pd->pd_cv);
                mutex_exit(&pd->pd_mtx);
        }
 
+       if (BP_IS_HOLE(bp)) {
+               err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg);
+               if (err != 0)
+                       goto post;
+               return (0);
+       }
+
        if (td->td_flags & TRAVERSE_PRE) {
-               err = td->td_func(td->td_spa, NULL, bp, pbuf, zb, dnp,
+               err = td->td_func(td->td_spa, NULL, bp, zb, dnp,
                    td->td_arg);
                if (err == TRAVERSE_VISIT_NO_CHILDREN)
                        return (0);
-               if (err == ERESTART)
-                       pause = B_TRUE; /* handle pausing at a common point */
                if (err != 0)
                        goto post;
        }
 
        if (BP_GET_LEVEL(bp) > 0) {
-               uint32_t flags = ARC_WAIT;
-               int i;
-               blkptr_t *cbp;
-               int epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT;
+               uint32_t flags = ARC_FLAG_WAIT;
+               int32_t i;
+               int32_t epb = BP_GET_LSIZE(bp) >> SPA_BLKPTRSHIFT;
+               zbookmark_phys_t *czb;
 
-               err = dsl_read(NULL, td->td_spa, bp, pbuf,
-                   arc_getbuf_func, &buf,
+               err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
-               if (err)
-                       return (err);
+               if (err != 0)
+                       goto post;
+
+               czb = kmem_alloc(sizeof (zbookmark_phys_t), KM_SLEEP);
+
+               for (i = 0; i < epb; i++) {
+                       SET_BOOKMARK(czb, zb->zb_objset, zb->zb_object,
+                           zb->zb_level - 1,
+                           zb->zb_blkid * epb + i);
+                       traverse_prefetch_metadata(td,
+                           &((blkptr_t *)buf->b_data)[i], czb);
+               }
 
                /* recursively visitbp() blocks below this */
-               cbp = buf->b_data;
-               for (i = 0; i < epb; i++, cbp++) {
-                       SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
+               for (i = 0; i < epb; i++) {
+                       SET_BOOKMARK(czb, zb->zb_objset, zb->zb_object,
                            zb->zb_level - 1,
                            zb->zb_blkid * epb + i);
-                       err = traverse_visitbp(td, dnp, buf, cbp, &czb);
-                       if (err) {
-                               if (!hard)
-                                       break;
-                               lasterr = err;
-                       }
+                       err = traverse_visitbp(td, dnp,
+                           &((blkptr_t *)buf->b_data)[i], czb);
+                       if (err != 0)
+                               break;
                }
+
+               kmem_free(czb, sizeof (zbookmark_phys_t));
+
        } else if (BP_GET_TYPE(bp) == DMU_OT_DNODE) {
-               uint32_t flags = ARC_WAIT;
-               int i;
-               int epb = BP_GET_LSIZE(bp) >> DNODE_SHIFT;
+               uint32_t flags = ARC_FLAG_WAIT;
+               int32_t i;
+               int32_t epb = BP_GET_LSIZE(bp) >> DNODE_SHIFT;
+               dnode_phys_t *child_dnp;
 
-               err = dsl_read(NULL, td->td_spa, bp, pbuf,
-                   arc_getbuf_func, &buf,
+               err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
-               if (err)
-                       return (err);
+               if (err != 0)
+                       goto post;
+               child_dnp = buf->b_data;
+
+               for (i = 0; i < epb; i += child_dnp[i].dn_extra_slots + 1) {
+                       prefetch_dnode_metadata(td, &child_dnp[i],
+                           zb->zb_objset, zb->zb_blkid * epb + i);
+               }
 
                /* recursively visitbp() blocks below this */
-               dnp = buf->b_data;
-               for (i = 0; i < epb; i++, dnp++) {
-                       err = traverse_dnode(td, dnp, buf, zb->zb_objset,
-                           zb->zb_blkid * epb + i);
-                       if (err) {
-                               if (!hard)
-                                       break;
-                               lasterr = err;
-                       }
+               for (i = 0; i < epb; i += child_dnp[i].dn_extra_slots + 1) {
+                       err = traverse_dnode(td, &child_dnp[i],
+                           zb->zb_objset, zb->zb_blkid * epb + i);
+                       if (err != 0)
+                               break;
                }
        } else if (BP_GET_TYPE(bp) == DMU_OT_OBJSET) {
-               uint32_t flags = ARC_WAIT;
+               arc_flags_t flags = ARC_FLAG_WAIT;
                objset_phys_t *osp;
-               dnode_phys_t *dnp;
 
-               err = dsl_read_nolock(NULL, td->td_spa, bp,
-                   arc_getbuf_func, &buf,
+               err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
                    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
-               if (err)
-                       return (err);
+               if (err != 0)
+                       goto post;
 
                osp = buf->b_data;
-               dnp = &osp->os_meta_dnode;
-               err = traverse_dnode(td, dnp, buf, zb->zb_objset,
+               prefetch_dnode_metadata(td, &osp->os_meta_dnode, zb->zb_objset,
                    DMU_META_DNODE_OBJECT);
-               if (err && hard) {
-                       lasterr = err;
-                       err = 0;
+               /*
+                * See the block comment above for the goal of this variable.
+                * If the maxblkid of the meta-dnode is 0, then we know that
+                * we've never had more than DNODES_PER_BLOCK objects in the
+                * dataset, which means we can't have reused any object ids.
+                */
+               if (osp->os_meta_dnode.dn_maxblkid == 0)
+                       td->td_realloc_possible = B_FALSE;
+
+               if (arc_buf_size(buf) >= sizeof (objset_phys_t)) {
+                       prefetch_dnode_metadata(td, &osp->os_groupused_dnode,
+                           zb->zb_objset, DMU_GROUPUSED_OBJECT);
+                       prefetch_dnode_metadata(td, &osp->os_userused_dnode,
+                           zb->zb_objset, DMU_USERUSED_OBJECT);
                }
+
+               err = traverse_dnode(td, &osp->os_meta_dnode, zb->zb_objset,
+                   DMU_META_DNODE_OBJECT);
                if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
-                       dnp = &osp->os_userused_dnode;
-                       err = traverse_dnode(td, dnp, buf, zb->zb_objset,
-                           DMU_USERUSED_OBJECT);
-               }
-               if (err && hard) {
-                       lasterr = err;
-                       err = 0;
+                       err = traverse_dnode(td, &osp->os_groupused_dnode,
+                           zb->zb_objset, DMU_GROUPUSED_OBJECT);
                }
                if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
-                       dnp = &osp->os_groupused_dnode;
-                       err = traverse_dnode(td, dnp, buf, zb->zb_objset,
-                           DMU_GROUPUSED_OBJECT);
+                       err = traverse_dnode(td, &osp->os_userused_dnode,
+                           zb->zb_objset, DMU_USERUSED_OBJECT);
                }
        }
 
        if (buf)
-               (void) arc_buf_remove_ref(buf, &buf);
+               arc_buf_destroy(buf, &buf);
 
 post:
-       if (err == 0 && lasterr == 0 && (td->td_flags & TRAVERSE_POST)) {
-               err = td->td_func(td->td_spa, NULL, bp, pbuf, zb, dnp,
-                   td->td_arg);
-               if (err == ERESTART)
-                       pause = B_TRUE;
+       if (err == 0 && (td->td_flags & TRAVERSE_POST))
+               err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg);
+
+       if ((td->td_flags & TRAVERSE_HARD) && (err == EIO || err == ECKSUM)) {
+               /*
+                * Ignore this disk error as requested by the HARD flag,
+                * and continue traversal.
+                */
+               err = 0;
+       }
+
+       /*
+        * If we are stopping here, set td_resume.
+        */
+       if (td->td_resume != NULL && err != 0 && !td->td_paused) {
+               td->td_resume->zb_objset = zb->zb_objset;
+               td->td_resume->zb_object = zb->zb_object;
+               td->td_resume->zb_level = 0;
+               /*
+                * If we have stopped on an indirect block (e.g. due to
+                * i/o error), we have not visited anything below it.
+                * Set the bookmark to the first level-0 block that we need
+                * to visit.  This way, the resuming code does not need to
+                * deal with resuming from indirect blocks.
+                *
+                * Note, if zb_level <= 0, dnp may be NULL, so we don't want
+                * to dereference it.
+                */
+               td->td_resume->zb_blkid = zb->zb_blkid;
+               if (zb->zb_level > 0) {
+                       td->td_resume->zb_blkid <<= zb->zb_level *
+                           (dnp->dn_indblkshift - SPA_BLKPTRSHIFT);
+               }
+               td->td_paused = B_TRUE;
        }
 
-       if (pause && td->td_resume != NULL) {
-               ASSERT3U(err, ==, ERESTART);
-               ASSERT(!hard);
-               traverse_pause(td, zb);
+       return (err);
+}
+
+static void
+prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *dnp,
+    uint64_t objset, uint64_t object)
+{
+       int j;
+       zbookmark_phys_t czb;
+
+       for (j = 0; j < dnp->dn_nblkptr; j++) {
+               SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
+               traverse_prefetch_metadata(td, &dnp->dn_blkptr[j], &czb);
        }
 
-       return (err != 0 ? err : lasterr);
+       if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
+               SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID);
+               traverse_prefetch_metadata(td, DN_SPILL_BLKPTR(dnp), &czb);
+       }
 }
 
 static int
 traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
-    arc_buf_t *buf, uint64_t objset, uint64_t object)
+    uint64_t objset, uint64_t object)
 {
-       int j, err = 0, lasterr = 0;
-       zbookmark_t czb;
-       boolean_t hard = (td->td_flags & TRAVERSE_HARD);
+       int j, err = 0;
+       zbookmark_phys_t czb;
+
+       if (object != DMU_META_DNODE_OBJECT && td->td_resume != NULL &&
+           object < td->td_resume->zb_object)
+               return (0);
+
+       if (td->td_flags & TRAVERSE_PRE) {
+               SET_BOOKMARK(&czb, objset, object, ZB_DNODE_LEVEL,
+                   ZB_DNODE_BLKID);
+               err = td->td_func(td->td_spa, NULL, NULL, &czb, dnp,
+                   td->td_arg);
+               if (err == TRAVERSE_VISIT_NO_CHILDREN)
+                       return (0);
+               if (err != 0)
+                       return (err);
+       }
 
        for (j = 0; j < dnp->dn_nblkptr; j++) {
                SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
-               err = traverse_visitbp(td, dnp, buf,
-                   (blkptr_t *)&dnp->dn_blkptr[j], &czb);
-               if (err) {
-                       if (!hard)
-                               break;
-                       lasterr = err;
-               }
+               err = traverse_visitbp(td, dnp, &dnp->dn_blkptr[j], &czb);
+               if (err != 0)
+                       break;
        }
 
-       if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
-               SET_BOOKMARK(&czb, objset,
-                   object, 0, DMU_SPILL_BLKID);
-               err = traverse_visitbp(td, dnp, buf,
-                   (blkptr_t *)&dnp->dn_spill, &czb);
-               if (err) {
-                       if (!hard)
-                               return (err);
-                       lasterr = err;
-               }
+       if (err == 0 && (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR)) {
+               SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID);
+               err = traverse_visitbp(td, dnp, DN_SPILL_BLKPTR(dnp), &czb);
        }
-       return (err != 0 ? err : lasterr);
+
+       if (err == 0 && (td->td_flags & TRAVERSE_POST)) {
+               SET_BOOKMARK(&czb, objset, object, ZB_DNODE_LEVEL,
+                   ZB_DNODE_BLKID);
+               err = td->td_func(td->td_spa, NULL, NULL, &czb, dnp,
+                   td->td_arg);
+               if (err == TRAVERSE_VISIT_NO_CHILDREN)
+                       return (0);
+               if (err != 0)
+                       return (err);
+       }
+       return (err);
 }
 
 /* ARGSUSED */
 static int
 traverse_prefetcher(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    arc_buf_t *pbuf, const zbookmark_t *zb, const dnode_phys_t *dnp,
-    void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
        prefetch_data_t *pfd = arg;
-       uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
+       arc_flags_t aflags = ARC_FLAG_NOWAIT | ARC_FLAG_PREFETCH;
 
-       ASSERT(pfd->pd_blks_fetched >= 0);
+       ASSERT(pfd->pd_bytes_fetched >= 0);
+       if (bp == NULL)
+               return (0);
        if (pfd->pd_cancel)
-               return (EINTR);
+               return (SET_ERROR(EINTR));
 
-       if (bp == NULL || !((pfd->pd_flags & TRAVERSE_PREFETCH_DATA) ||
-           BP_GET_TYPE(bp) == DMU_OT_DNODE || BP_GET_LEVEL(bp) > 0) ||
-           BP_GET_TYPE(bp) == DMU_OT_INTENT_LOG)
+       if (!prefetch_needed(pfd, bp))
                return (0);
 
        mutex_enter(&pfd->pd_mtx);
-       while (!pfd->pd_cancel && pfd->pd_blks_fetched >= pfd->pd_blks_max)
-               cv_wait(&pfd->pd_cv, &pfd->pd_mtx);
-       pfd->pd_blks_fetched++;
+       while (!pfd->pd_cancel && pfd->pd_bytes_fetched >= zfs_pd_bytes_max)
+               cv_wait_sig(&pfd->pd_cv, &pfd->pd_mtx);
+       pfd->pd_bytes_fetched += BP_GET_LSIZE(bp);
        cv_broadcast(&pfd->pd_cv);
        mutex_exit(&pfd->pd_mtx);
 
-       (void) dsl_read(NULL, spa, bp, pbuf, NULL, NULL,
-           ZIO_PRIORITY_ASYNC_READ,
-           ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE,
-           &aflags, zb);
+       (void) arc_read(NULL, spa, bp, NULL, NULL, ZIO_PRIORITY_ASYNC_READ,
+           ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE, &aflags, zb);
 
        return (0);
 }
@@ -405,20 +530,23 @@ traverse_prefetch_thread(void *arg)
 {
        traverse_data_t *td_main = arg;
        traverse_data_t td = *td_main;
-       zbookmark_t czb;
+       zbookmark_phys_t czb;
+       fstrans_cookie_t cookie = spl_fstrans_mark();
 
        td.td_func = traverse_prefetcher;
        td.td_arg = td_main->td_pfd;
        td.td_pfd = NULL;
+       td.td_resume = &td_main->td_pfd->pd_resume;
 
        SET_BOOKMARK(&czb, td.td_objset,
            ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
-       (void) traverse_visitbp(&td, NULL, NULL, td.td_rootbp, &czb);
+       (void) traverse_visitbp(&td, NULL, td.td_rootbp, &czb);
 
        mutex_enter(&td_main->td_pfd->pd_mtx);
        td_main->td_pfd->pd_exited = B_TRUE;
        cv_broadcast(&td_main->td_pfd->pd_cv);
        mutex_exit(&td_main->td_pfd->pd_mtx);
+       spl_fstrans_unmark(cookie);
 }
 
 /*
@@ -427,20 +555,20 @@ traverse_prefetch_thread(void *arg)
  */
 static int
 traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg)
 {
        traverse_data_t *td;
        prefetch_data_t *pd;
-       zbookmark_t *czb;
+       zbookmark_phys_t *czb;
        int err;
 
        ASSERT(ds == NULL || objset == ds->ds_object);
        ASSERT(!(flags & TRAVERSE_PRE) || !(flags & TRAVERSE_POST));
 
-       td = kmem_alloc(sizeof(traverse_data_t), KM_PUSHPAGE);
-       pd = kmem_zalloc(sizeof(prefetch_data_t), KM_PUSHPAGE);
-       czb = kmem_alloc(sizeof(zbookmark_t), KM_PUSHPAGE);
+       td = kmem_alloc(sizeof (traverse_data_t), KM_SLEEP);
+       pd = kmem_zalloc(sizeof (prefetch_data_t), KM_SLEEP);
+       czb = kmem_alloc(sizeof (zbookmark_phys_t), KM_SLEEP);
 
        td->td_spa = spa;
        td->td_objset = objset;
@@ -451,45 +579,70 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
        td->td_arg = arg;
        td->td_pfd = pd;
        td->td_flags = flags;
+       td->td_paused = B_FALSE;
+       td->td_realloc_possible = (txg_start == 0 ? B_FALSE : B_TRUE);
+
+       if (spa_feature_is_active(spa, SPA_FEATURE_HOLE_BIRTH)) {
+               VERIFY(spa_feature_enabled_txg(spa,
+                   SPA_FEATURE_HOLE_BIRTH, &td->td_hole_birth_enabled_txg));
+       } else {
+               td->td_hole_birth_enabled_txg = UINT64_MAX;
+       }
 
-       pd->pd_blks_max = zfs_pd_blks_max;
        pd->pd_flags = flags;
+       if (resume != NULL)
+               pd->pd_resume = *resume;
        mutex_init(&pd->pd_mtx, NULL, MUTEX_DEFAULT, NULL);
        cv_init(&pd->pd_cv, NULL, CV_DEFAULT, NULL);
 
-       /* See comment on ZIL traversal in dsl_scan_visitds. */
-       if (ds != NULL && !dsl_dataset_is_snapshot(ds)) {
-               objset_t *os;
-
-               err = dmu_objset_from_ds(ds, &os);
-               if (err)
-                       return (err);
+       SET_BOOKMARK(czb, td->td_objset,
+           ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
 
-               traverse_zil(td, &os->os_zil_header);
+       /* See comment on ZIL traversal in dsl_scan_visitds. */
+       if (ds != NULL && !ds->ds_is_snapshot && !BP_IS_HOLE(rootbp)) {
+               enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
+               uint32_t flags = ARC_FLAG_WAIT;
+               objset_phys_t *osp;
+               arc_buf_t *buf;
+
+               err = arc_read(NULL, td->td_spa, rootbp, arc_getbuf_func,
+                   &buf, ZIO_PRIORITY_ASYNC_READ, zio_flags, &flags, czb);
+               if (err != 0) {
+                       /*
+                        * If both TRAVERSE_HARD and TRAVERSE_PRE are set,
+                        * continue to visitbp so that td_func can be called
+                        * in pre stage, and err will reset to zero.
+                        */
+                       if (!(td->td_flags & TRAVERSE_HARD) ||
+                           !(td->td_flags & TRAVERSE_PRE))
+                               return (err);
+               } else {
+                       osp = buf->b_data;
+                       traverse_zil(td, &osp->os_zil_header);
+                       arc_buf_destroy(buf, &buf);
+               }
        }
 
-       if (!(flags & TRAVERSE_PREFETCH) ||
-           0 == taskq_dispatch(system_taskq, traverse_prefetch_thread,
-           td, TQ_NOQUEUE))
+       if (!(flags & TRAVERSE_PREFETCH_DATA) ||
+           taskq_dispatch(spa->spa_prefetch_taskq, traverse_prefetch_thread,
+           td, TQ_NOQUEUE) == TASKQID_INVALID)
                pd->pd_exited = B_TRUE;
 
-       SET_BOOKMARK(czb, td->td_objset,
-           ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
-       err = traverse_visitbp(td, NULL, NULL, rootbp, czb);
+       err = traverse_visitbp(td, NULL, rootbp, czb);
 
        mutex_enter(&pd->pd_mtx);
        pd->pd_cancel = B_TRUE;
        cv_broadcast(&pd->pd_cv);
        while (!pd->pd_exited)
-               cv_wait(&pd->pd_cv, &pd->pd_mtx);
+               cv_wait_sig(&pd->pd_cv, &pd->pd_mtx);
        mutex_exit(&pd->pd_mtx);
 
        mutex_destroy(&pd->pd_mtx);
        cv_destroy(&pd->pd_cv);
 
-       kmem_free(czb, sizeof(zbookmark_t));
-       kmem_free(pd, sizeof(struct prefetch_data));
-       kmem_free(td, sizeof(struct traverse_data));
+       kmem_free(czb, sizeof (zbookmark_phys_t));
+       kmem_free(pd, sizeof (struct prefetch_data));
+       kmem_free(td, sizeof (struct traverse_data));
 
        return (err);
 }
@@ -499,16 +652,24 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
  * in syncing context).
  */
 int
-traverse_dataset(dsl_dataset_t *ds, uint64_t txg_start, int flags,
-    blkptr_cb_t func, void *arg)
+traverse_dataset_resume(dsl_dataset_t *ds, uint64_t txg_start,
+    zbookmark_phys_t *resume,
+    int flags, blkptr_cb_t func, void *arg)
 {
        return (traverse_impl(ds->ds_dir->dd_pool->dp_spa, ds, ds->ds_object,
-           &ds->ds_phys->ds_bp, txg_start, NULL, flags, func, arg));
+           &dsl_dataset_phys(ds)->ds_bp, txg_start, resume, flags, func, arg));
+}
+
+int
+traverse_dataset(dsl_dataset_t *ds, uint64_t txg_start,
+    int flags, blkptr_cb_t func, void *arg)
+{
+       return (traverse_dataset_resume(ds, txg_start, NULL, flags, func, arg));
 }
 
 int
 traverse_dataset_destroyed(spa_t *spa, blkptr_t *blkptr,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg)
 {
        return (traverse_impl(spa, NULL, ZB_DESTROYED_OBJSET,
@@ -522,7 +683,7 @@ int
 traverse_pool(spa_t *spa, uint64_t txg_start, int flags,
     blkptr_cb_t func, void *arg)
 {
-       int err, lasterr = 0;
+       int err;
        uint64_t obj;
        dsl_pool_t *dp = spa_get_dsl(spa);
        objset_t *mos = dp->dp_meta_objset;
@@ -531,55 +692,58 @@ traverse_pool(spa_t *spa, uint64_t txg_start, int flags,
        /* visit the MOS */
        err = traverse_impl(spa, NULL, 0, spa_get_rootblkptr(spa),
            txg_start, NULL, flags, func, arg);
-       if (err)
+       if (err != 0)
                return (err);
 
        /* visit each dataset */
-       for (obj = 1; err == 0 || (err != ESRCH && hard);
-           err = dmu_object_next(mos, &obj, FALSE, txg_start)) {
+       for (obj = 1; err == 0;
+           err = dmu_object_next(mos, &obj, B_FALSE, txg_start)) {
                dmu_object_info_t doi;
 
                err = dmu_object_info(mos, obj, &doi);
-               if (err) {
-                       if (!hard)
-                               return (err);
-                       lasterr = err;
-                       continue;
+               if (err != 0) {
+                       if (hard)
+                               continue;
+                       break;
                }
 
-               if (doi.doi_type == DMU_OT_DSL_DATASET) {
+               if (doi.doi_bonus_type == DMU_OT_DSL_DATASET) {
                        dsl_dataset_t *ds;
                        uint64_t txg = txg_start;
 
-                       rw_enter(&dp->dp_config_rwlock, RW_READER);
+                       dsl_pool_config_enter(dp, FTAG);
                        err = dsl_dataset_hold_obj(dp, obj, FTAG, &ds);
-                       rw_exit(&dp->dp_config_rwlock);
-                       if (err) {
-                               if (!hard)
-                                       return (err);
-                               lasterr = err;
-                               continue;
+                       dsl_pool_config_exit(dp, FTAG);
+                       if (err != 0) {
+                               if (hard)
+                                       continue;
+                               break;
                        }
-                       if (ds->ds_phys->ds_prev_snap_txg > txg)
-                               txg = ds->ds_phys->ds_prev_snap_txg;
+                       if (dsl_dataset_phys(ds)->ds_prev_snap_txg > txg)
+                               txg = dsl_dataset_phys(ds)->ds_prev_snap_txg;
                        err = traverse_dataset(ds, txg, flags, func, arg);
                        dsl_dataset_rele(ds, FTAG);
-                       if (err) {
-                               if (!hard)
-                                       return (err);
-                               lasterr = err;
-                       }
+                       if (err != 0)
+                               break;
                }
        }
        if (err == ESRCH)
                err = 0;
-       return (err != 0 ? err : lasterr);
+       return (err);
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
 EXPORT_SYMBOL(traverse_dataset);
 EXPORT_SYMBOL(traverse_pool);
 
-module_param(zfs_pd_blks_max, int, 0644);
-MODULE_PARM_DESC(zfs_pd_blks_max, "Max number of blocks to prefetch");
+module_param(zfs_pd_bytes_max, int, 0644);
+MODULE_PARM_DESC(zfs_pd_bytes_max, "Max number of bytes to prefetch");
+
+module_param_named(ignore_hole_birth, send_holes_without_birth_time, int, 0644);
+MODULE_PARM_DESC(ignore_hole_birth, "Alias for send_holes_without_birth_time");
+
+module_param_named(send_holes_without_birth_time,
+       send_holes_without_birth_time, int, 0644);
+MODULE_PARM_DESC(send_holes_without_birth_time,
+       "Ignore hole_birth txg for zfs send");
 #endif