]> git.proxmox.com Git - mirror_zfs.git/blobdiff - module/zfs/dmu.c
Undo c89 workarounds to match with upstream
[mirror_zfs.git] / module / zfs / dmu.c
index 4203ddb16c2246f8311f077913247a27676f1de0..4bf9b1a5ba735569289c04d3d0d3ea35e91a63ea 100644 (file)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2016, Nexenta Systems, Inc. All rights reserved.
@@ -49,6 +49,7 @@
 #include <sys/zfeature.h>
 #include <sys/abd.h>
 #include <sys/trace_dmu.h>
+#include <sys/zfs_rlock.h>
 #ifdef _KERNEL
 #include <sys/vmsystm.h>
 #include <sys/zfs_znode.h>
@@ -73,60 +74,60 @@ unsigned long zfs_per_txg_dirty_frees_percent = 30;
 int zfs_dmu_offset_next_sync = 0;
 
 const dmu_object_type_info_t dmu_ot[DMU_OT_NUMTYPES] = {
-       {       DMU_BSWAP_UINT8,        TRUE,   "unallocated"           },
-       {       DMU_BSWAP_ZAP,          TRUE,   "object directory"      },
-       {       DMU_BSWAP_UINT64,       TRUE,   "object array"          },
-       {       DMU_BSWAP_UINT8,        TRUE,   "packed nvlist"         },
-       {       DMU_BSWAP_UINT64,       TRUE,   "packed nvlist size"    },
-       {       DMU_BSWAP_UINT64,       TRUE,   "bpobj"                 },
-       {       DMU_BSWAP_UINT64,       TRUE,   "bpobj header"          },
-       {       DMU_BSWAP_UINT64,       TRUE,   "SPA space map header"  },
-       {       DMU_BSWAP_UINT64,       TRUE,   "SPA space map"         },
-       {       DMU_BSWAP_UINT64,       TRUE,   "ZIL intent log"        },
-       {       DMU_BSWAP_DNODE,        TRUE,   "DMU dnode"             },
-       {       DMU_BSWAP_OBJSET,       TRUE,   "DMU objset"            },
-       {       DMU_BSWAP_UINT64,       TRUE,   "DSL directory"         },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL directory child map"},
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL dataset snap map"  },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL props"             },
-       {       DMU_BSWAP_UINT64,       TRUE,   "DSL dataset"           },
-       {       DMU_BSWAP_ZNODE,        TRUE,   "ZFS znode"             },
-       {       DMU_BSWAP_OLDACL,       TRUE,   "ZFS V0 ACL"            },
-       {       DMU_BSWAP_UINT8,        FALSE,  "ZFS plain file"        },
-       {       DMU_BSWAP_ZAP,          TRUE,   "ZFS directory"         },
-       {       DMU_BSWAP_ZAP,          TRUE,   "ZFS master node"       },
-       {       DMU_BSWAP_ZAP,          TRUE,   "ZFS delete queue"      },
-       {       DMU_BSWAP_UINT8,        FALSE,  "zvol object"           },
-       {       DMU_BSWAP_ZAP,          TRUE,   "zvol prop"             },
-       {       DMU_BSWAP_UINT8,        FALSE,  "other uint8[]"         },
-       {       DMU_BSWAP_UINT64,       FALSE,  "other uint64[]"        },
-       {       DMU_BSWAP_ZAP,          TRUE,   "other ZAP"             },
-       {       DMU_BSWAP_ZAP,          TRUE,   "persistent error log"  },
-       {       DMU_BSWAP_UINT8,        TRUE,   "SPA history"           },
-       {       DMU_BSWAP_UINT64,       TRUE,   "SPA history offsets"   },
-       {       DMU_BSWAP_ZAP,          TRUE,   "Pool properties"       },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL permissions"       },
-       {       DMU_BSWAP_ACL,          TRUE,   "ZFS ACL"               },
-       {       DMU_BSWAP_UINT8,        TRUE,   "ZFS SYSACL"            },
-       {       DMU_BSWAP_UINT8,        TRUE,   "FUID table"            },
-       {       DMU_BSWAP_UINT64,       TRUE,   "FUID table size"       },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL dataset next clones"},
-       {       DMU_BSWAP_ZAP,          TRUE,   "scan work queue"       },
-       {       DMU_BSWAP_ZAP,          TRUE,   "ZFS user/group used"   },
-       {       DMU_BSWAP_ZAP,          TRUE,   "ZFS user/group quota"  },
-       {       DMU_BSWAP_ZAP,          TRUE,   "snapshot refcount tags"},
-       {       DMU_BSWAP_ZAP,          TRUE,   "DDT ZAP algorithm"     },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DDT statistics"        },
-       {       DMU_BSWAP_UINT8,        TRUE,   "System attributes"     },
-       {       DMU_BSWAP_ZAP,          TRUE,   "SA master node"        },
-       {       DMU_BSWAP_ZAP,          TRUE,   "SA attr registration"  },
-       {       DMU_BSWAP_ZAP,          TRUE,   "SA attr layouts"       },
-       {       DMU_BSWAP_ZAP,          TRUE,   "scan translations"     },
-       {       DMU_BSWAP_UINT8,        FALSE,  "deduplicated block"    },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL deadlist map"      },
-       {       DMU_BSWAP_UINT64,       TRUE,   "DSL deadlist map hdr"  },
-       {       DMU_BSWAP_ZAP,          TRUE,   "DSL dir clones"        },
-       {       DMU_BSWAP_UINT64,       TRUE,   "bpobj subobj"          }
+       { DMU_BSWAP_UINT8,      TRUE,   FALSE,  "unallocated"           },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "object directory"      },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "object array"          },
+       { DMU_BSWAP_UINT8,      TRUE,   FALSE,  "packed nvlist"         },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "packed nvlist size"    },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "bpobj"                 },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "bpobj header"          },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "SPA space map header"  },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "SPA space map"         },
+       { DMU_BSWAP_UINT64,     TRUE,   TRUE,   "ZIL intent log"        },
+       { DMU_BSWAP_DNODE,      TRUE,   TRUE,   "DMU dnode"             },
+       { DMU_BSWAP_OBJSET,     TRUE,   FALSE,  "DMU objset"            },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "DSL directory"         },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL directory child map"},
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL dataset snap map"  },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL props"             },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "DSL dataset"           },
+       { DMU_BSWAP_ZNODE,      TRUE,   FALSE,  "ZFS znode"             },
+       { DMU_BSWAP_OLDACL,     TRUE,   TRUE,   "ZFS V0 ACL"            },
+       { DMU_BSWAP_UINT8,      FALSE,  TRUE,   "ZFS plain file"        },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "ZFS directory"         },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "ZFS master node"       },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "ZFS delete queue"      },
+       { DMU_BSWAP_UINT8,      FALSE,  TRUE,   "zvol object"           },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "zvol prop"             },
+       { DMU_BSWAP_UINT8,      FALSE,  TRUE,   "other uint8[]"         },
+       { DMU_BSWAP_UINT64,     FALSE,  TRUE,   "other uint64[]"        },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "other ZAP"             },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "persistent error log"  },
+       { DMU_BSWAP_UINT8,      TRUE,   FALSE,  "SPA history"           },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "SPA history offsets"   },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "Pool properties"       },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL permissions"       },
+       { DMU_BSWAP_ACL,        TRUE,   TRUE,   "ZFS ACL"               },
+       { DMU_BSWAP_UINT8,      TRUE,   TRUE,   "ZFS SYSACL"            },
+       { DMU_BSWAP_UINT8,      TRUE,   TRUE,   "FUID table"            },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "FUID table size"       },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL dataset next clones"},
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "scan work queue"       },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "ZFS user/group used"   },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "ZFS user/group quota"  },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "snapshot refcount tags"},
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DDT ZAP algorithm"     },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DDT statistics"        },
+       { DMU_BSWAP_UINT8,      TRUE,   TRUE,   "System attributes"     },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "SA master node"        },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "SA attr registration"  },
+       { DMU_BSWAP_ZAP,        TRUE,   TRUE,   "SA attr layouts"       },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "scan translations"     },
+       { DMU_BSWAP_UINT8,      FALSE,  TRUE,   "deduplicated block"    },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL deadlist map"      },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "DSL deadlist map hdr"  },
+       { DMU_BSWAP_ZAP,        TRUE,   FALSE,  "DSL dir clones"        },
+       { DMU_BSWAP_UINT64,     TRUE,   FALSE,  "bpobj subobj"          }
 };
 
 const dmu_object_byteswap_info_t dmu_ot_byteswap[DMU_BSWAP_NUMFUNCS] = {
@@ -198,6 +199,8 @@ dmu_buf_hold_by_dnode(dnode_t *dn, uint64_t offset,
 
        if (flags & DMU_READ_NO_PREFETCH)
                db_flags |= DB_RF_NOPREFETCH;
+       if (flags & DMU_READ_NO_DECRYPT)
+               db_flags |= DB_RF_NO_DECRYPT;
 
        err = dmu_buf_hold_noread_by_dnode(dn, offset, tag, dbp);
        if (err == 0) {
@@ -221,6 +224,8 @@ dmu_buf_hold(objset_t *os, uint64_t object, uint64_t offset,
 
        if (flags & DMU_READ_NO_PREFETCH)
                db_flags |= DB_RF_NOPREFETCH;
+       if (flags & DMU_READ_NO_DECRYPT)
+               db_flags |= DB_RF_NO_DECRYPT;
 
        err = dmu_buf_hold_noread(os, object, offset, tag, dbp);
        if (err == 0) {
@@ -321,11 +326,18 @@ dmu_rm_spill(objset_t *os, uint64_t object, dmu_tx_t *tx)
  * returns ENOENT, EIO, or 0.
  */
 int
-dmu_bonus_hold(objset_t *os, uint64_t object, void *tag, dmu_buf_t **dbp)
+dmu_bonus_hold_impl(objset_t *os, uint64_t object, void *tag, uint32_t flags,
+    dmu_buf_t **dbp)
 {
        dnode_t *dn;
        dmu_buf_impl_t *db;
        int error;
+       uint32_t db_flags = DB_RF_MUST_SUCCEED;
+
+       if (flags & DMU_READ_NO_PREFETCH)
+               db_flags |= DB_RF_NOPREFETCH;
+       if (flags & DMU_READ_NO_DECRYPT)
+               db_flags |= DB_RF_NO_DECRYPT;
 
        error = dnode_hold(os, object, FTAG, &dn);
        if (error)
@@ -355,12 +367,24 @@ dmu_bonus_hold(objset_t *os, uint64_t object, void *tag, dmu_buf_t **dbp)
 
        dnode_rele(dn, FTAG);
 
-       VERIFY(0 == dbuf_read(db, NULL, DB_RF_MUST_SUCCEED | DB_RF_NOPREFETCH));
+       error = dbuf_read(db, NULL, db_flags);
+       if (error) {
+               dnode_evict_bonus(dn);
+               dbuf_rele(db, tag);
+               *dbp = NULL;
+               return (error);
+       }
 
        *dbp = &db->db;
        return (0);
 }
 
+int
+dmu_bonus_hold(objset_t *os, uint64_t obj, void *tag, dmu_buf_t **dbp)
+{
+       return (dmu_bonus_hold_impl(os, obj, tag, DMU_READ_NO_PREFETCH, dbp));
+}
+
 /*
  * returns ENOENT, EIO, or 0.
  *
@@ -601,8 +625,8 @@ dmu_buf_rele_array(dmu_buf_t **dbp_fake, int numbufs, void *tag)
  * indirect blocks prefeteched will be those that point to the blocks containing
  * the data starting at offset, and continuing to offset + len.
  *
- * Note that if the indirect blocks above the blocks being prefetched are not in
- * cache, they will be asychronously read in.
+ * Note that if the indirect blocks above the blocks being prefetched are not
+ * in cache, they will be asychronously read in.
  */
 void
 dmu_prefetch(objset_t *os, uint64_t object, int64_t level, uint64_t offset,
@@ -651,10 +675,8 @@ dmu_prefetch(objset_t *os, uint64_t object, int64_t level, uint64_t offset,
        }
 
        if (nblks != 0) {
-               int i;
-
                blkid = dbuf_whichblock(dn, level, offset);
-               for (i = 0; i < nblks; i++)
+               for (int i = 0; i < nblks; i++)
                        dbuf_prefetch(dn, level, blkid + i, pri, 0);
        }
 
@@ -680,7 +702,6 @@ get_next_chunk(dnode_t *dn, uint64_t *start, uint64_t minimum)
        /* bytes of data covered by a level-1 indirect block */
        uint64_t iblkrange =
            dn->dn_datablksz * EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT);
-       uint64_t blks;
 
        ASSERT3U(minimum, <=, *start);
 
@@ -690,7 +711,7 @@ get_next_chunk(dnode_t *dn, uint64_t *start, uint64_t minimum)
        }
        ASSERT(ISP2(iblkrange));
 
-       for (blks = 0; *start > minimum && blks < maxblks; blks++) {
+       for (uint64_t blks = 0; *start > minimum && blks < maxblks; blks++) {
                int err;
 
                /*
@@ -737,13 +758,12 @@ dmu_objset_zfs_unmounting(objset_t *os)
 
 static int
 dmu_free_long_range_impl(objset_t *os, dnode_t *dn, uint64_t offset,
-    uint64_t length)
+    uint64_t length, boolean_t raw)
 {
        uint64_t object_size;
        int err;
        uint64_t dirty_frees_threshold;
        dsl_pool_t *dp = dmu_objset_pool(os);
-       int t;
 
        if (dn == NULL)
                return (SET_ERROR(EINVAL));
@@ -781,7 +801,7 @@ dmu_free_long_range_impl(objset_t *os, dnode_t *dn, uint64_t offset,
                chunk_len = chunk_end - chunk_begin;
 
                mutex_enter(&dp->dp_lock);
-               for (t = 0; t < TXG_SIZE; t++) {
+               for (int t = 0; t < TXG_SIZE; t++) {
                        long_free_dirty_all_txgs +=
                            dp->dp_long_free_dirty_pertxg[t];
                }
@@ -820,6 +840,17 @@ dmu_free_long_range_impl(objset_t *os, dnode_t *dn, uint64_t offset,
                    uint64_t, long_free_dirty_all_txgs, uint64_t, chunk_len,
                    uint64_t, dmu_tx_get_txg(tx));
                dnode_free_range(dn, chunk_begin, chunk_len, tx);
+
+               /* if this is a raw free, mark the dirty record as such */
+               if (raw) {
+                       dbuf_dirty_record_t *dr = dn->dn_dbuf->db_last_dirty;
+
+                       while (dr != NULL && dr->dr_txg > tx->tx_txg)
+                               dr = dr->dr_next;
+                       if (dr != NULL && dr->dr_txg == tx->tx_txg)
+                               dr->dt.dl.dr_raw = B_TRUE;
+               }
+
                dmu_tx_commit(tx);
 
                length -= chunk_len;
@@ -837,7 +868,7 @@ dmu_free_long_range(objset_t *os, uint64_t object,
        err = dnode_hold(os, object, FTAG, &dn);
        if (err != 0)
                return (err);
-       err = dmu_free_long_range_impl(os, dn, offset, length);
+       err = dmu_free_long_range_impl(os, dn, offset, length, B_FALSE);
 
        /*
         * It is important to zero out the maxblkid when freeing the entire
@@ -852,8 +883,37 @@ dmu_free_long_range(objset_t *os, uint64_t object,
        return (err);
 }
 
+/*
+ * This function is equivalent to dmu_free_long_range(), but also
+ * marks the new dirty record as a raw write.
+ */
 int
-dmu_free_long_object(objset_t *os, uint64_t object)
+dmu_free_long_range_raw(objset_t *os, uint64_t object,
+    uint64_t offset, uint64_t length)
+{
+       dnode_t *dn;
+       int err;
+
+       err = dnode_hold(os, object, FTAG, &dn);
+       if (err != 0)
+               return (err);
+       err = dmu_free_long_range_impl(os, dn, offset, length, B_TRUE);
+
+       /*
+        * It is important to zero out the maxblkid when freeing the entire
+        * file, so that (a) subsequent calls to dmu_free_long_range_impl()
+        * will take the fast path, and (b) dnode_reallocate() can verify
+        * that the entire file has been freed.
+        */
+       if (err == 0 && offset == 0 && length == DMU_OBJECT_END)
+               dn->dn_maxblkid = 0;
+
+       dnode_rele(dn, FTAG);
+       return (err);
+}
+
+static int
+dmu_free_long_object_impl(objset_t *os, uint64_t object, boolean_t raw)
 {
        dmu_tx_t *tx;
        int err;
@@ -868,7 +928,11 @@ dmu_free_long_object(objset_t *os, uint64_t object)
        dmu_tx_mark_netfree(tx);
        err = dmu_tx_assign(tx, TXG_WAIT);
        if (err == 0) {
-               err = dmu_object_free(os, object, tx);
+               if (raw)
+                       err = dmu_object_dirty_raw(os, object, tx);
+               if (err == 0)
+                       err = dmu_object_free(os, object, tx);
+
                dmu_tx_commit(tx);
        } else {
                dmu_tx_abort(tx);
@@ -877,6 +941,19 @@ dmu_free_long_object(objset_t *os, uint64_t object)
        return (err);
 }
 
+int
+dmu_free_long_object(objset_t *os, uint64_t object)
+{
+       return (dmu_free_long_object_impl(os, object, B_FALSE));
+}
+
+int
+dmu_free_long_object_raw(objset_t *os, uint64_t object)
+{
+       return (dmu_free_long_object_impl(os, object, B_TRUE));
+}
+
+
 int
 dmu_free_range(objset_t *os, uint64_t object, uint64_t offset,
     uint64_t size, dmu_tx_t *tx)
@@ -886,7 +963,7 @@ dmu_free_range(objset_t *os, uint64_t object, uint64_t offset,
        if (err)
                return (err);
        ASSERT(offset < UINT64_MAX);
-       ASSERT(size == -1ULL || size <= UINT64_MAX - offset);
+       ASSERT(size == DMU_OBJECT_END || size <= UINT64_MAX - offset);
        dnode_free_range(dn, offset, size, tx);
        dnode_rele(dn, FTAG);
        return (0);
@@ -1225,7 +1302,7 @@ xuio_stat_wbuf_nocopy(void)
 }
 
 #ifdef _KERNEL
-static int
+int
 dmu_read_uio_dnode(dnode_t *dn, uio_t *uio, uint64_t size)
 {
        dmu_buf_t **dbp;
@@ -1334,7 +1411,7 @@ dmu_read_uio(objset_t *os, uint64_t object, uio_t *uio, uint64_t size)
        return (err);
 }
 
-static int
+int
 dmu_write_uio_dnode(dnode_t *dn, uio_t *uio, uint64_t size, dmu_tx_t *tx)
 {
        dmu_buf_t **dbp;
@@ -1462,28 +1539,95 @@ dmu_return_arcbuf(arc_buf_t *buf)
        arc_buf_destroy(buf, FTAG);
 }
 
+void
+dmu_convert_to_raw(dmu_buf_t *handle, boolean_t byteorder, const uint8_t *salt,
+    const uint8_t *iv, const uint8_t *mac, dmu_tx_t *tx)
+{
+       dmu_object_type_t type;
+       dmu_buf_impl_t *db = (dmu_buf_impl_t *)handle;
+       uint64_t dsobj = dmu_objset_id(db->db_objset);
+
+       ASSERT3P(db->db_buf, !=, NULL);
+       ASSERT3U(dsobj, !=, 0);
+
+       dmu_buf_will_change_crypt_params(handle, tx);
+
+       DB_DNODE_ENTER(db);
+       type = DB_DNODE(db)->dn_type;
+       DB_DNODE_EXIT(db);
+
+       /*
+        * This technically violates the assumption the dmu code makes
+        * that dnode blocks are only released in syncing context.
+        */
+       (void) arc_release(db->db_buf, db);
+       arc_convert_to_raw(db->db_buf, dsobj, byteorder, type, salt, iv, mac);
+}
+
+void
+dmu_copy_from_buf(objset_t *os, uint64_t object, uint64_t offset,
+    dmu_buf_t *handle, dmu_tx_t *tx)
+{
+       dmu_buf_t *dst_handle;
+       dmu_buf_impl_t *dstdb;
+       dmu_buf_impl_t *srcdb = (dmu_buf_impl_t *)handle;
+       arc_buf_t *abuf;
+       uint64_t datalen;
+       boolean_t byteorder;
+       uint8_t salt[ZIO_DATA_SALT_LEN];
+       uint8_t iv[ZIO_DATA_IV_LEN];
+       uint8_t mac[ZIO_DATA_MAC_LEN];
+
+       ASSERT3P(srcdb->db_buf, !=, NULL);
+
+       /* hold the db that we want to write to */
+       VERIFY0(dmu_buf_hold(os, object, offset, FTAG, &dst_handle,
+           DMU_READ_NO_DECRYPT));
+       dstdb = (dmu_buf_impl_t *)dst_handle;
+       datalen = arc_buf_size(srcdb->db_buf);
+
+       /* allocated an arc buffer that matches the type of srcdb->db_buf */
+       if (arc_is_encrypted(srcdb->db_buf)) {
+               arc_get_raw_params(srcdb->db_buf, &byteorder, salt, iv, mac);
+               abuf = arc_loan_raw_buf(os->os_spa, dmu_objset_id(os),
+                   byteorder, salt, iv, mac, DB_DNODE(dstdb)->dn_type,
+                   datalen, arc_buf_lsize(srcdb->db_buf),
+                   arc_get_compression(srcdb->db_buf));
+       } else {
+               /* we won't get a compressed db back from dmu_buf_hold() */
+               ASSERT3U(arc_get_compression(srcdb->db_buf),
+                   ==, ZIO_COMPRESS_OFF);
+               abuf = arc_loan_buf(os->os_spa,
+                   DMU_OT_IS_METADATA(DB_DNODE(dstdb)->dn_type), datalen);
+       }
+
+       ASSERT3U(datalen, ==, arc_buf_size(abuf));
+
+       /* copy the data to the new buffer and assign it to the dstdb */
+       bcopy(srcdb->db_buf->b_data, abuf->b_data, datalen);
+       dbuf_assign_arcbuf(dstdb, abuf, tx);
+       dmu_buf_rele(dst_handle, FTAG);
+}
+
 /*
  * When possible directly assign passed loaned arc buffer to a dbuf.
  * If this is not possible copy the contents of passed arc buf via
  * dmu_write().
  */
 void
-dmu_assign_arcbuf(dmu_buf_t *handle, uint64_t offset, arc_buf_t *buf,
+dmu_assign_arcbuf_by_dnode(dnode_t *dn, uint64_t offset, arc_buf_t *buf,
     dmu_tx_t *tx)
 {
-       dmu_buf_impl_t *dbuf = (dmu_buf_impl_t *)handle;
-       dnode_t *dn;
        dmu_buf_impl_t *db;
+       objset_t *os = dn->dn_objset;
+       uint64_t object = dn->dn_object;
        uint32_t blksz = (uint32_t)arc_buf_lsize(buf);
        uint64_t blkid;
 
-       DB_DNODE_ENTER(dbuf);
-       dn = DB_DNODE(dbuf);
        rw_enter(&dn->dn_struct_rwlock, RW_READER);
        blkid = dbuf_whichblock(dn, 0, offset);
        VERIFY((db = dbuf_hold(dn, blkid, FTAG)) != NULL);
        rw_exit(&dn->dn_struct_rwlock);
-       DB_DNODE_EXIT(dbuf);
 
        /*
         * We can only assign if the offset is aligned, the arc buf is the
@@ -1493,19 +1637,10 @@ dmu_assign_arcbuf(dmu_buf_t *handle, uint64_t offset, arc_buf_t *buf,
                dbuf_assign_arcbuf(db, buf, tx);
                dbuf_rele(db, FTAG);
        } else {
-               objset_t *os;
-               uint64_t object;
-
                /* compressed bufs must always be assignable to their dbuf */
                ASSERT3U(arc_get_compression(buf), ==, ZIO_COMPRESS_OFF);
                ASSERT(!(buf->b_flags & ARC_BUF_FLAG_COMPRESSED));
 
-               DB_DNODE_ENTER(dbuf);
-               dn = DB_DNODE(dbuf);
-               os = dn->dn_objset;
-               object = dn->dn_object;
-               DB_DNODE_EXIT(dbuf);
-
                dbuf_rele(db, FTAG);
                dmu_write(os, object, offset, blksz, buf->b_data, tx);
                dmu_return_arcbuf(buf);
@@ -1513,6 +1648,17 @@ dmu_assign_arcbuf(dmu_buf_t *handle, uint64_t offset, arc_buf_t *buf,
        }
 }
 
+void
+dmu_assign_arcbuf_by_dbuf(dmu_buf_t *handle, uint64_t offset, arc_buf_t *buf,
+    dmu_tx_t *tx)
+{
+       dmu_buf_impl_t *dbuf = (dmu_buf_impl_t *)handle;
+
+       DB_DNODE_ENTER(dbuf);
+       dmu_assign_arcbuf_by_dnode(DB_DNODE(dbuf), offset, buf, tx);
+       DB_DNODE_EXIT(dbuf);
+}
+
 typedef struct {
        dbuf_dirty_record_t     *dsa_dr;
        dmu_sync_cb_t           *dsa_done;
@@ -1537,7 +1683,7 @@ dmu_sync_ready(zio_t *zio, arc_buf_t *buf, void *varg)
                        BP_SET_LSIZE(bp, db->db_size);
                } else if (!BP_IS_EMBEDDED(bp)) {
                        ASSERT(BP_GET_LEVEL(bp) == 0);
-                       bp->blk_fill = 1;
+                       BP_SET_FILL(bp, 1);
                }
        }
 }
@@ -1561,13 +1707,14 @@ dmu_sync_done(zio_t *zio, arc_buf_t *buf, void *varg)
        if (zio->io_error == 0) {
                dr->dt.dl.dr_nopwrite = !!(zio->io_flags & ZIO_FLAG_NOPWRITE);
                if (dr->dt.dl.dr_nopwrite) {
-                       ASSERTV(blkptr_t *bp = zio->io_bp);
-                       ASSERTV(blkptr_t *bp_orig = &zio->io_bp_orig);
-                       ASSERTV(uint8_t chksum = BP_GET_CHECKSUM(bp_orig));
+                       blkptr_t *bp = zio->io_bp;
+                       blkptr_t *bp_orig = &zio->io_bp_orig;
+                       uint8_t chksum = BP_GET_CHECKSUM(bp_orig);
 
                        ASSERT(BP_EQUAL(bp, bp_orig));
+                       VERIFY(BP_EQUAL(bp, db->db_blkptr));
                        ASSERT(zio->io_prop.zp_compress != ZIO_COMPRESS_OFF);
-                       ASSERT(zio_checksum_table[chksum].ci_flags &
+                       VERIFY(zio_checksum_table[chksum].ci_flags &
                            ZCHECKSUM_FLAG_NOPWRITE);
                }
                dr->dt.dl.dr_overridden_by = *zio->io_bp;
@@ -1606,19 +1753,11 @@ dmu_sync_late_arrival_done(zio_t *zio)
        ASSERTV(blkptr_t *bp_orig = &zio->io_bp_orig);
 
        if (zio->io_error == 0 && !BP_IS_HOLE(bp)) {
-               /*
-                * If we didn't allocate a new block (i.e. ZIO_FLAG_NOPWRITE)
-                * then there is nothing to do here. Otherwise, free the
-                * newly allocated block in this txg.
-                */
-               if (zio->io_flags & ZIO_FLAG_NOPWRITE) {
-                       ASSERT(BP_EQUAL(bp, bp_orig));
-               } else {
-                       ASSERT(BP_IS_HOLE(bp_orig) || !BP_EQUAL(bp, bp_orig));
-                       ASSERT(zio->io_bp->blk_birth == zio->io_txg);
-                       ASSERT(zio->io_txg > spa_syncing_txg(zio->io_spa));
-                       zio_free(zio->io_spa, zio->io_txg, zio->io_bp);
-               }
+               ASSERT(!(zio->io_flags & ZIO_FLAG_NOPWRITE));
+               ASSERT(BP_IS_HOLE(bp_orig) || !BP_EQUAL(bp, bp_orig));
+               ASSERT(zio->io_bp->blk_birth == zio->io_txg);
+               ASSERT(zio->io_txg > spa_syncing_txg(zio->io_spa));
+               zio_free(zio->io_spa, zio->io_txg, zio->io_bp);
        }
 
        dmu_tx_commit(dsa->dsa_tx);
@@ -1650,6 +1789,29 @@ dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
        dsa->dsa_zgd = zgd;
        dsa->dsa_tx = tx;
 
+       /*
+        * Since we are currently syncing this txg, it's nontrivial to
+        * determine what BP to nopwrite against, so we disable nopwrite.
+        *
+        * When syncing, the db_blkptr is initially the BP of the previous
+        * txg.  We can not nopwrite against it because it will be changed
+        * (this is similar to the non-late-arrival case where the dbuf is
+        * dirty in a future txg).
+        *
+        * Then dbuf_write_ready() sets bp_blkptr to the location we will write.
+        * We can not nopwrite against it because although the BP will not
+        * (typically) be changed, the data has not yet been persisted to this
+        * location.
+        *
+        * Finally, when dbuf_write_done() is called, it is theoretically
+        * possible to always nopwrite, because the data that was written in
+        * this txg is the same data that we are trying to write.  However we
+        * would need to check that this dbuf is not dirty in any future
+        * txg's (as we do in the normal dmu_sync() path). For simplicity, we
+        * don't nopwrite in this case.
+        */
+       zp->zp_nopwrite = B_FALSE;
+
        zio_nowait(zio_write(pio, os->os_spa, dmu_tx_get_txg(tx), zgd->zgd_bp,
            abd_get_from_buf(zgd->zgd_db->db_data, zgd->zgd_db->db_size),
            zgd->zgd_db->db_size, zgd->zgd_db->db_size, zp,
@@ -1687,7 +1849,6 @@ dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
 int
 dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
 {
-       blkptr_t *bp = zgd->zgd_bp;
        dmu_buf_impl_t *db = (dmu_buf_impl_t *)zgd->zgd_db;
        objset_t *os = db->db_objset;
        dsl_dataset_t *ds = os->os_dsl_dataset;
@@ -1700,13 +1861,17 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
        ASSERT(pio != NULL);
        ASSERT(txg != 0);
 
+       /* dbuf is within the locked range */
+       ASSERT3U(db->db.db_offset, >=, zgd->zgd_rl->r_off);
+       ASSERT3U(db->db.db_offset + db->db.db_size, <=,
+           zgd->zgd_rl->r_off + zgd->zgd_rl->r_len);
+
        SET_BOOKMARK(&zb, ds->ds_object,
            db->db.db_object, db->db_level, db->db_blkid);
 
        DB_DNODE_ENTER(db);
        dn = DB_DNODE(db);
-       dmu_write_policy(os, dn, db->db_level, WP_DMU_SYNC,
-           ZIO_COMPRESS_INHERIT, &zp);
+       dmu_write_policy(os, dn, db->db_level, WP_DMU_SYNC, &zp);
        DB_DNODE_EXIT(db);
 
        /*
@@ -1755,6 +1920,21 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
 
        ASSERT(dr->dr_next == NULL || dr->dr_next->dr_txg < txg);
 
+       if (db->db_blkptr != NULL) {
+               /*
+                * We need to fill in zgd_bp with the current blkptr so that
+                * the nopwrite code can check if we're writing the same
+                * data that's already on disk.  We can only nopwrite if we
+                * are sure that after making the copy, db_blkptr will not
+                * change until our i/o completes.  We ensure this by
+                * holding the db_mtx, and only allowing nopwrite if the
+                * block is not already dirty (see below).  This is verified
+                * by dmu_sync_done(), which VERIFYs that the db_blkptr has
+                * not changed.
+                */
+               *zgd->zgd_bp = *db->db_blkptr;
+       }
+
        /*
         * Assume the on-disk data is X, the current syncing data (in
         * txg - 1) is Y, and the current in-memory data is Z (currently
@@ -1806,13 +1986,27 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
        dsa->dsa_tx = NULL;
 
        zio_nowait(arc_write(pio, os->os_spa, txg,
-           bp, dr->dt.dl.dr_data, DBUF_IS_L2CACHEABLE(db),
+           zgd->zgd_bp, dr->dt.dl.dr_data, DBUF_IS_L2CACHEABLE(db),
            &zp, dmu_sync_ready, NULL, NULL, dmu_sync_done, dsa,
            ZIO_PRIORITY_SYNC_WRITE, ZIO_FLAG_CANFAIL, &zb));
 
        return (0);
 }
 
+int
+dmu_object_set_nlevels(objset_t *os, uint64_t object, int nlevels, dmu_tx_t *tx)
+{
+       dnode_t *dn;
+       int err;
+
+       err = dnode_hold(os, object, FTAG, &dn);
+       if (err)
+               return (err);
+       err = dnode_set_nlevels(dn, nlevels, tx);
+       dnode_rele(dn, FTAG);
+       return (err);
+}
+
 int
 dmu_object_set_blocksize(objset_t *os, uint64_t object, uint64_t size, int ibs,
     dmu_tx_t *tx)
@@ -1867,6 +2061,25 @@ dmu_object_set_compress(objset_t *os, uint64_t object, uint8_t compress,
        dnode_rele(dn, FTAG);
 }
 
+/*
+ * Dirty an object and set the dirty record's raw flag. This is used
+ * when writing raw data to an object that will not effect the
+ * encryption parameters, specifically during raw receives.
+ */
+int
+dmu_object_dirty_raw(objset_t *os, uint64_t object, dmu_tx_t *tx)
+{
+       dnode_t *dn;
+       int err;
+
+       err = dnode_hold(os, object, FTAG, &dn);
+       if (err)
+               return (err);
+       dmu_buf_will_change_crypt_params((dmu_buf_t *)dn->dn_dbuf, tx);
+       dnode_rele(dn, FTAG);
+       return (err);
+}
+
 int zfs_mdcomp_disable = 0;
 
 /*
@@ -1876,8 +2089,7 @@ int zfs_mdcomp_disable = 0;
 int zfs_redundant_metadata_most_ditto_level = 2;
 
 void
-dmu_write_policy(objset_t *os, dnode_t *dn, int level, int wp,
-    enum zio_compress override_compress, zio_prop_t *zp)
+dmu_write_policy(objset_t *os, dnode_t *dn, int level, int wp, zio_prop_t *zp)
 {
        dmu_object_type_t type = dn ? dn->dn_type : DMU_OT_OBJSET;
        boolean_t ismd = (level > 0 || DMU_OT_IS_METADATA(type) ||
@@ -1888,11 +2100,9 @@ dmu_write_policy(objset_t *os, dnode_t *dn, int level, int wp,
        boolean_t dedup = B_FALSE;
        boolean_t nopwrite = B_FALSE;
        boolean_t dedup_verify = os->os_dedup_verify;
+       boolean_t encrypt = B_FALSE;
        int copies = os->os_copies;
 
-       IMPLY(override_compress == ZIO_COMPRESS_LZ4,
-           spa_feature_is_active(os->os_spa, SPA_FEATURE_LZ4_COMPRESS));
-
        /*
         * We maintain different write policies for each of the following
         * types of data:
@@ -1978,23 +2188,44 @@ dmu_write_policy(objset_t *os, dnode_t *dn, int level, int wp,
                    compress != ZIO_COMPRESS_OFF && zfs_nopwrite_enabled);
        }
 
-       zp->zp_checksum = checksum;
-
        /*
-        * If we're writing a pre-compressed buffer, the compression type we use
-        * must match the data. If it hasn't been compressed yet, then we should
-        * use the value dictated by the policies above.
+        * All objects in an encrypted objset are protected from modification
+        * via a MAC. Encrypted objects store their IV and salt in the last DVA
+        * in the bp, so we cannot use all copies. Encrypted objects are also
+        * not subject to nopwrite since writing the same data will still
+        * result in a new ciphertext. Only encrypted blocks can be dedup'd
+        * to avoid ambiguity in the dedup code since the DDT does not store
+        * object types.
         */
-       zp->zp_compress = override_compress != ZIO_COMPRESS_INHERIT
-           ? override_compress : compress;
-       ASSERT3U(zp->zp_compress, !=, ZIO_COMPRESS_INHERIT);
+       if (os->os_encrypted && (wp & WP_NOFILL) == 0) {
+               encrypt = B_TRUE;
+
+               if (DMU_OT_IS_ENCRYPTED(type)) {
+                       copies = MIN(copies, SPA_DVAS_PER_BP - 1);
+                       nopwrite = B_FALSE;
+               } else {
+                       dedup = B_FALSE;
+               }
+
+               if (type == DMU_OT_DNODE || type == DMU_OT_OBJSET)
+                       compress = ZIO_COMPRESS_EMPTY;
+       }
 
+       zp->zp_compress = compress;
+       zp->zp_checksum = checksum;
        zp->zp_type = (wp & WP_SPILL) ? dn->dn_bonustype : type;
        zp->zp_level = level;
        zp->zp_copies = MIN(copies, spa_max_replication(os->os_spa));
        zp->zp_dedup = dedup;
        zp->zp_dedup_verify = dedup && dedup_verify;
        zp->zp_nopwrite = nopwrite;
+       zp->zp_encrypt = encrypt;
+       zp->zp_byteorder = ZFS_HOST_BYTEORDER;
+       bzero(zp->zp_salt, ZIO_DATA_SALT_LEN);
+       bzero(zp->zp_iv, ZIO_DATA_IV_LEN);
+       bzero(zp->zp_mac, ZIO_DATA_MAC_LEN);
+
+       ASSERT3U(zp->zp_compress, !=, ZIO_COMPRESS_INHERIT);
 }
 
 /*
@@ -2056,7 +2287,6 @@ void
 __dmu_object_info_from_dnode(dnode_t *dn, dmu_object_info_t *doi)
 {
        dnode_phys_t *dnp = dn->dn_phys;
-       int i;
 
        doi->doi_data_block_size = dn->dn_datablksz;
        doi->doi_metadata_block_size = dn->dn_indblkshift ?
@@ -2072,7 +2302,7 @@ __dmu_object_info_from_dnode(dnode_t *dn, dmu_object_info_t *doi)
        doi->doi_physical_blocks_512 = (DN_USED_BYTES(dnp) + 256) >> 9;
        doi->doi_max_offset = (dn->dn_maxblkid + 1) * dn->dn_datablksz;
        doi->doi_fill_count = 0;
-       for (i = 0; i < dnp->dn_nblkptr; i++)
+       for (int i = 0; i < dnp->dn_nblkptr; i++)
                doi->doi_fill_count += BP_GET_FILL(&dnp->dn_blkptr[i]);
 }
 
@@ -2238,7 +2468,9 @@ EXPORT_SYMBOL(dmu_buf_rele_array);
 EXPORT_SYMBOL(dmu_prefetch);
 EXPORT_SYMBOL(dmu_free_range);
 EXPORT_SYMBOL(dmu_free_long_range);
+EXPORT_SYMBOL(dmu_free_long_range_raw);
 EXPORT_SYMBOL(dmu_free_long_object);
+EXPORT_SYMBOL(dmu_free_long_object_raw);
 EXPORT_SYMBOL(dmu_read);
 EXPORT_SYMBOL(dmu_read_by_dnode);
 EXPORT_SYMBOL(dmu_write);
@@ -2249,6 +2481,7 @@ EXPORT_SYMBOL(dmu_object_info_from_dnode);
 EXPORT_SYMBOL(dmu_object_info_from_db);
 EXPORT_SYMBOL(dmu_object_size_from_db);
 EXPORT_SYMBOL(dmu_object_dnsize_from_db);
+EXPORT_SYMBOL(dmu_object_set_nlevels);
 EXPORT_SYMBOL(dmu_object_set_blocksize);
 EXPORT_SYMBOL(dmu_object_set_checksum);
 EXPORT_SYMBOL(dmu_object_set_compress);
@@ -2256,7 +2489,8 @@ EXPORT_SYMBOL(dmu_write_policy);
 EXPORT_SYMBOL(dmu_sync);
 EXPORT_SYMBOL(dmu_request_arcbuf);
 EXPORT_SYMBOL(dmu_return_arcbuf);
-EXPORT_SYMBOL(dmu_assign_arcbuf);
+EXPORT_SYMBOL(dmu_assign_arcbuf_by_dnode);
+EXPORT_SYMBOL(dmu_assign_arcbuf_by_dbuf);
 EXPORT_SYMBOL(dmu_buf_hold);
 EXPORT_SYMBOL(dmu_ot);