]> git.proxmox.com Git - mirror_zfs.git/blobdiff - module/zfs/arc.c
Encryption patch follow-up
[mirror_zfs.git] / module / zfs / arc.c
index 351e50e404a329146053b8c65477d3d44deaf772..1329e8e83c5b19a75cca40cee4cb0d3c47cc87b4 100644 (file)
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
- * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
  * Copyright (c) 2014 by Saso Kiselkov. All rights reserved.
  * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  */
  * ARC is disabled, then the L2ARC's block must be transformed to look
  * like the physical block in the main data pool before comparing the
  * checksum and determining its validity.
+ *
+ * The L1ARC has a slightly different system for storing encrypted data.
+ * Raw (encrypted + possibly compressed) data has a few subtle differences from
+ * data that is just compressed. The biggest difference is that it is not
+ * possible to decrypt encrypted data (or visa versa) if the keys aren't loaded.
+ * The other difference is that encryption cannot be treated as a suggestion.
+ * If a caller would prefer compressed data, but they actually wind up with
+ * uncompressed data the worst thing that could happen is there might be a
+ * performance hit. If the caller requests encrypted data, however, we must be
+ * sure they actually get it or else secret information could be leaked. Raw
+ * data is stored in hdr->b_crypt_hdr.b_rabd. An encrypted header, therefore,
+ * may have both an encrypted version and a decrypted version of its data at
+ * once. When a caller needs a raw arc_buf_t, it is allocated and the data is
+ * copied out of this header. To avoid complications with b_pabd, raw buffers
+ * cannot be shared.
  */
 
 #include <sys/spa.h>
 #include <sys/zio_checksum.h>
 #include <sys/multilist.h>
 #include <sys/abd.h>
+#include <sys/zil.h>
+#include <sys/fm/fs/zfs.h>
 #ifdef _KERNEL
 #include <sys/vmsystm.h>
 #include <vm/anon.h>
@@ -307,13 +324,6 @@ static kcondvar_t  arc_reclaim_waiters_cv;
  */
 int zfs_arc_evict_batch_limit = 10;
 
-/*
- * The number of sublists used for each of the arc state lists. If this
- * is not set to a suitable value by the user, it will be configured to
- * the number of CPUs on the system in arc_init().
- */
-int zfs_arc_num_sublists_per_state = 0;
-
 /* number of seconds before growing cache again */
 static int             arc_grow_retry = 5;
 
@@ -326,6 +336,11 @@ static int         arc_p_min_shift = 4;
 /* log2(fraction of arc to reclaim) */
 static int             arc_shrink_shift = 7;
 
+/* percent of pagecache to reclaim arc to */
+#ifdef _KERNEL
+static uint_t          zfs_arc_pc_percent = 0;
+#endif
+
 /*
  * log2(fraction of ARC which must be free to allow growing).
  * I.e. If there is less than arc_c >> arc_no_grow_shift free memory,
@@ -628,12 +643,15 @@ typedef struct arc_stats {
        kstat_named_t arcstat_l2_abort_lowmem;
        kstat_named_t arcstat_l2_cksum_bad;
        kstat_named_t arcstat_l2_io_error;
-       kstat_named_t arcstat_l2_size;
-       kstat_named_t arcstat_l2_asize;
+       kstat_named_t arcstat_l2_lsize;
+       kstat_named_t arcstat_l2_psize;
        kstat_named_t arcstat_l2_hdr_size;
        kstat_named_t arcstat_memory_throttle_count;
        kstat_named_t arcstat_memory_direct_count;
        kstat_named_t arcstat_memory_indirect_count;
+       kstat_named_t arcstat_memory_all_bytes;
+       kstat_named_t arcstat_memory_free_bytes;
+       kstat_named_t arcstat_memory_available_bytes;
        kstat_named_t arcstat_no_grow;
        kstat_named_t arcstat_tempreserve;
        kstat_named_t arcstat_loaned_bytes;
@@ -647,6 +665,7 @@ typedef struct arc_stats {
        kstat_named_t arcstat_demand_hit_predictive_prefetch;
        kstat_named_t arcstat_need_free;
        kstat_named_t arcstat_sys_free;
+       kstat_named_t arcstat_raw_size;
 } arc_stats_t;
 
 static arc_stats_t arc_stats = {
@@ -729,6 +748,9 @@ static arc_stats_t arc_stats = {
        { "memory_throttle_count",      KSTAT_DATA_UINT64 },
        { "memory_direct_count",        KSTAT_DATA_UINT64 },
        { "memory_indirect_count",      KSTAT_DATA_UINT64 },
+       { "memory_all_bytes",           KSTAT_DATA_UINT64 },
+       { "memory_free_bytes",          KSTAT_DATA_UINT64 },
+       { "memory_available_bytes",     KSTAT_DATA_INT64 },
        { "arc_no_grow",                KSTAT_DATA_UINT64 },
        { "arc_tempreserve",            KSTAT_DATA_UINT64 },
        { "arc_loaned_bytes",           KSTAT_DATA_UINT64 },
@@ -741,7 +763,8 @@ static arc_stats_t arc_stats = {
        { "sync_wait_for_async",        KSTAT_DATA_UINT64 },
        { "demand_hit_predictive_prefetch", KSTAT_DATA_UINT64 },
        { "arc_need_free",              KSTAT_DATA_UINT64 },
-       { "arc_sys_free",               KSTAT_DATA_UINT64 }
+       { "arc_sys_free",               KSTAT_DATA_UINT64 },
+       { "arc_raw_size",               KSTAT_DATA_UINT64 }
 };
 
 #define        ARCSTAT(stat)   (arc_stats.stat.value.ui64)
@@ -817,6 +840,8 @@ static arc_state_t  *arc_l2c_only;
 #define        arc_need_free   ARCSTAT(arcstat_need_free) /* bytes to be freed */
 #define        arc_sys_free    ARCSTAT(arcstat_sys_free) /* target system free bytes */
 
+/* size of all b_rabd's in entire arc */
+#define        arc_raw_size    ARCSTAT(arcstat_raw_size)
 /* compressed size of entire arc */
 #define        arc_compressed_size     ARCSTAT(arcstat_compressed_size)
 /* uncompressed size of entire arc */
@@ -846,6 +871,8 @@ static taskq_t *arc_prune_taskq;
 #define        HDR_L2_WRITING(hdr)     ((hdr)->b_flags & ARC_FLAG_L2_WRITING)
 #define        HDR_L2_EVICTED(hdr)     ((hdr)->b_flags & ARC_FLAG_L2_EVICTED)
 #define        HDR_L2_WRITE_HEAD(hdr)  ((hdr)->b_flags & ARC_FLAG_L2_WRITE_HEAD)
+#define        HDR_PROTECTED(hdr)      ((hdr)->b_flags & ARC_FLAG_PROTECTED)
+#define        HDR_NOAUTH(hdr)         ((hdr)->b_flags & ARC_FLAG_NOAUTH)
 #define        HDR_SHARED_DATA(hdr)    ((hdr)->b_flags & ARC_FLAG_SHARED_DATA)
 
 #define        HDR_ISTYPE_METADATA(hdr)        \
@@ -854,6 +881,13 @@ static taskq_t *arc_prune_taskq;
 
 #define        HDR_HAS_L1HDR(hdr)      ((hdr)->b_flags & ARC_FLAG_HAS_L1HDR)
 #define        HDR_HAS_L2HDR(hdr)      ((hdr)->b_flags & ARC_FLAG_HAS_L2HDR)
+#define        HDR_HAS_RABD(hdr)       \
+       (HDR_HAS_L1HDR(hdr) && HDR_PROTECTED(hdr) &&    \
+       (hdr)->b_crypt_hdr.b_rabd != NULL)
+#define        HDR_ENCRYPTED(hdr)      \
+       (HDR_PROTECTED(hdr) && DMU_OT_IS_ENCRYPTED((hdr)->b_crypt_hdr.b_ot))
+#define        HDR_AUTHENTICATED(hdr)  \
+       (HDR_PROTECTED(hdr) && !DMU_OT_IS_ENCRYPTED((hdr)->b_crypt_hdr.b_ot))
 
 /* For storing compression mode in b_flags */
 #define        HDR_COMPRESS_OFFSET     (highbit64(ARC_FLAG_COMPRESS_0) - 1)
@@ -866,12 +900,14 @@ static taskq_t *arc_prune_taskq;
 #define        ARC_BUF_LAST(buf)       ((buf)->b_next == NULL)
 #define        ARC_BUF_SHARED(buf)     ((buf)->b_flags & ARC_BUF_FLAG_SHARED)
 #define        ARC_BUF_COMPRESSED(buf) ((buf)->b_flags & ARC_BUF_FLAG_COMPRESSED)
+#define        ARC_BUF_ENCRYPTED(buf)  ((buf)->b_flags & ARC_BUF_FLAG_ENCRYPTED)
 
 /*
  * Other sizes
  */
 
-#define        HDR_FULL_SIZE ((int64_t)sizeof (arc_buf_hdr_t))
+#define        HDR_FULL_CRYPT_SIZE ((int64_t)sizeof (arc_buf_hdr_t))
+#define        HDR_FULL_SIZE ((int64_t)offsetof(arc_buf_hdr_t, b_crypt_hdr))
 #define        HDR_L2ONLY_SIZE ((int64_t)offsetof(arc_buf_hdr_t, b_l1hdr))
 
 /*
@@ -958,6 +994,7 @@ typedef struct l2arc_read_callback {
        blkptr_t                l2rcb_bp;               /* original blkptr */
        zbookmark_phys_t        l2rcb_zb;               /* original bookmark */
        int                     l2rcb_flags;            /* original flags */
+       abd_t                   *l2rcb_abd;             /* temporary buffer */
 } l2arc_read_callback_t;
 
 typedef struct l2arc_data_free {
@@ -968,6 +1005,14 @@ typedef struct l2arc_data_free {
        list_node_t     l2df_list_node;
 } l2arc_data_free_t;
 
+typedef enum arc_fill_flags {
+       ARC_FILL_LOCKED         = 1 << 0, /* hdr lock is held */
+       ARC_FILL_COMPRESSED     = 1 << 1, /* fill with compressed data */
+       ARC_FILL_ENCRYPTED      = 1 << 2, /* fill with encrypted data */
+       ARC_FILL_NOAUTH         = 1 << 3, /* don't attempt to authenticate */
+       ARC_FILL_IN_PLACE       = 1 << 4  /* fill in place (special case) */
+} arc_fill_flags_t;
+
 static kmutex_t l2arc_feed_thr_lock;
 static kcondvar_t l2arc_feed_thr_cv;
 static uint8_t l2arc_thread_exit;
@@ -978,8 +1023,8 @@ static void arc_get_data_impl(arc_buf_hdr_t *, uint64_t, void *);
 static void arc_free_data_abd(arc_buf_hdr_t *, abd_t *, uint64_t, void *);
 static void arc_free_data_buf(arc_buf_hdr_t *, void *, uint64_t, void *);
 static void arc_free_data_impl(arc_buf_hdr_t *hdr, uint64_t size, void *tag);
-static void arc_hdr_free_pabd(arc_buf_hdr_t *);
-static void arc_hdr_alloc_pabd(arc_buf_hdr_t *);
+static void arc_hdr_free_abd(arc_buf_hdr_t *, boolean_t);
+static void arc_hdr_alloc_abd(arc_buf_hdr_t *, boolean_t);
 static void arc_access(arc_buf_hdr_t *, kmutex_t *);
 static boolean_t arc_is_overflowing(void);
 static void arc_buf_watch(arc_buf_t *);
@@ -1131,7 +1176,9 @@ buf_hash_remove(arc_buf_hdr_t *hdr)
 /*
  * Global data structures and functions for the buf kmem cache.
  */
+
 static kmem_cache_t *hdr_full_cache;
+static kmem_cache_t *hdr_full_crypt_cache;
 static kmem_cache_t *hdr_l2only_cache;
 static kmem_cache_t *buf_cache;
 
@@ -1154,6 +1201,7 @@ buf_fini(void)
        for (i = 0; i < BUF_LOCKS; i++)
                mutex_destroy(&buf_hash_table.ht_locks[i].ht_lock);
        kmem_cache_destroy(hdr_full_cache);
+       kmem_cache_destroy(hdr_full_crypt_cache);
        kmem_cache_destroy(hdr_l2only_cache);
        kmem_cache_destroy(buf_cache);
 }
@@ -1180,6 +1228,19 @@ hdr_full_cons(void *vbuf, void *unused, int kmflag)
        return (0);
 }
 
+/* ARGSUSED */
+static int
+hdr_full_crypt_cons(void *vbuf, void *unused, int kmflag)
+{
+       arc_buf_hdr_t *hdr = vbuf;
+
+       hdr_full_cons(vbuf, unused, kmflag);
+       bzero(&hdr->b_crypt_hdr, sizeof (hdr->b_crypt_hdr));
+       arc_space_consume(sizeof (hdr->b_crypt_hdr), ARC_SPACE_HDRS);
+
+       return (0);
+}
+
 /* ARGSUSED */
 static int
 hdr_l2only_cons(void *vbuf, void *unused, int kmflag)
@@ -1223,6 +1284,16 @@ hdr_full_dest(void *vbuf, void *unused)
        arc_space_return(HDR_FULL_SIZE, ARC_SPACE_HDRS);
 }
 
+/* ARGSUSED */
+static void
+hdr_full_crypt_dest(void *vbuf, void *unused)
+{
+       arc_buf_hdr_t *hdr = vbuf;
+
+       hdr_full_dest(vbuf, unused);
+       arc_space_return(sizeof (hdr->b_crypt_hdr), ARC_SPACE_HDRS);
+}
+
 /* ARGSUSED */
 static void
 hdr_l2only_dest(void *vbuf, void *unused)
@@ -1295,6 +1366,9 @@ retry:
 
        hdr_full_cache = kmem_cache_create("arc_buf_hdr_t_full", HDR_FULL_SIZE,
            0, hdr_full_cons, hdr_full_dest, hdr_recl, NULL, NULL, 0);
+       hdr_full_crypt_cache = kmem_cache_create("arc_buf_hdr_t_full_crypt",
+           HDR_FULL_CRYPT_SIZE, 0, hdr_full_crypt_cons, hdr_full_crypt_dest,
+           hdr_recl, NULL, NULL, 0);
        hdr_l2only_cache = kmem_cache_create("arc_buf_hdr_t_l2only",
            HDR_L2ONLY_SIZE, 0, hdr_l2only_cons, hdr_l2only_dest, hdr_recl,
            NULL, NULL, 0);
@@ -1331,6 +1405,46 @@ arc_buf_lsize(arc_buf_t *buf)
        return (HDR_GET_LSIZE(buf->b_hdr));
 }
 
+/*
+ * This function will return B_TRUE if the buffer is encrypted in memory.
+ * This buffer can be decrypted by calling arc_untransform().
+ */
+boolean_t
+arc_is_encrypted(arc_buf_t *buf)
+{
+       return (ARC_BUF_ENCRYPTED(buf) != 0);
+}
+
+/*
+ * Returns B_TRUE if the buffer represents data that has not had its MAC
+ * verified yet.
+ */
+boolean_t
+arc_is_unauthenticated(arc_buf_t *buf)
+{
+       return (HDR_NOAUTH(buf->b_hdr) != 0);
+}
+
+void
+arc_get_raw_params(arc_buf_t *buf, boolean_t *byteorder, uint8_t *salt,
+    uint8_t *iv, uint8_t *mac)
+{
+       arc_buf_hdr_t *hdr = buf->b_hdr;
+
+       ASSERT(HDR_PROTECTED(hdr));
+
+       bcopy(hdr->b_crypt_hdr.b_salt, salt, ZIO_DATA_SALT_LEN);
+       bcopy(hdr->b_crypt_hdr.b_iv, iv, ZIO_DATA_IV_LEN);
+       bcopy(hdr->b_crypt_hdr.b_mac, mac, ZIO_DATA_MAC_LEN);
+       *byteorder = (hdr->b_l1hdr.b_byteswap == DMU_BSWAP_NUMFUNCS) ?
+           ZFS_HOST_BYTEORDER : !ZFS_HOST_BYTEORDER;
+}
+
+/*
+ * Indicates how this buffer is compressed in memory. If it is not compressed
+ * the value will be ZIO_COMPRESS_OFF. It can be made normally readable with
+ * arc_untransform() as long as it is also unencrypted.
+ */
 enum zio_compress
 arc_get_compression(arc_buf_t *buf)
 {
@@ -1338,6 +1452,18 @@ arc_get_compression(arc_buf_t *buf)
            HDR_GET_COMPRESS(buf->b_hdr) : ZIO_COMPRESS_OFF);
 }
 
+/*
+ * Return the compression algorithm used to store this data in the ARC. If ARC
+ * compression is enabled or this is an encrypted block, this will be the same
+ * as what's used to store it on-disk. Otherwise, this will be ZIO_COMPRESS_OFF.
+ */
+static inline enum zio_compress
+arc_hdr_get_compress(arc_buf_hdr_t *hdr)
+{
+       return (HDR_COMPRESSION_ENABLED(hdr) ?
+           HDR_GET_COMPRESS(hdr) : ZIO_COMPRESS_OFF);
+}
+
 static inline boolean_t
 arc_buf_is_shared(arc_buf_t *buf)
 {
@@ -1357,10 +1483,15 @@ arc_buf_is_shared(arc_buf_t *buf)
        return (shared);
 }
 
+/*
+ * Free the checksum associated with this header. If there is no checksum, this
+ * is a no-op.
+ */
 static inline void
 arc_cksum_free(arc_buf_hdr_t *hdr)
 {
        ASSERT(HDR_HAS_L1HDR(hdr));
+
        mutex_enter(&hdr->b_l1hdr.b_freeze_lock);
        if (hdr->b_l1hdr.b_freeze_cksum != NULL) {
                kmem_free(hdr->b_l1hdr.b_freeze_cksum, sizeof (zio_cksum_t));
@@ -1369,6 +1500,22 @@ arc_cksum_free(arc_buf_hdr_t *hdr)
        mutex_exit(&hdr->b_l1hdr.b_freeze_lock);
 }
 
+/*
+ * Return true iff at least one of the bufs on hdr is not compressed.
+ * Encrypted buffers count as compressed.
+ */
+static boolean_t
+arc_hdr_has_uncompressed_buf(arc_buf_hdr_t *hdr)
+{
+       for (arc_buf_t *b = hdr->b_l1hdr.b_buf; b != NULL; b = b->b_next) {
+               if (!ARC_BUF_COMPRESSED(b)) {
+                       return (B_TRUE);
+               }
+       }
+       return (B_FALSE);
+}
+
+
 /*
  * If we've turned on the ZFS_DEBUG_MODIFY flag, verify that the buf's data
  * matches the checksum that is stored in the hdr. If there is no checksum,
@@ -1384,6 +1531,8 @@ arc_cksum_verify(arc_buf_t *buf)
                return;
 
        if (ARC_BUF_COMPRESSED(buf)) {
+               ASSERT(hdr->b_l1hdr.b_freeze_cksum == NULL ||
+                   arc_hdr_has_uncompressed_buf(hdr));
                return;
        }
 
@@ -1401,57 +1550,17 @@ arc_cksum_verify(arc_buf_t *buf)
        mutex_exit(&hdr->b_l1hdr.b_freeze_lock);
 }
 
+/*
+ * This function makes the assumption that data stored in the L2ARC
+ * will be transformed exactly as it is in the main pool. Because of
+ * this we can verify the checksum against the reading process's bp.
+ */
 static boolean_t
 arc_cksum_is_equal(arc_buf_hdr_t *hdr, zio_t *zio)
 {
-       enum zio_compress compress = BP_GET_COMPRESS(zio->io_bp);
-       boolean_t valid_cksum;
-
        ASSERT(!BP_IS_EMBEDDED(zio->io_bp));
        VERIFY3U(BP_GET_PSIZE(zio->io_bp), ==, HDR_GET_PSIZE(hdr));
 
-       /*
-        * We rely on the blkptr's checksum to determine if the block
-        * is valid or not. When compressed arc is enabled, the l2arc
-        * writes the block to the l2arc just as it appears in the pool.
-        * This allows us to use the blkptr's checksum to validate the
-        * data that we just read off of the l2arc without having to store
-        * a separate checksum in the arc_buf_hdr_t. However, if compressed
-        * arc is disabled, then the data written to the l2arc is always
-        * uncompressed and won't match the block as it exists in the main
-        * pool. When this is the case, we must first compress it if it is
-        * compressed on the main pool before we can validate the checksum.
-        */
-       if (!HDR_COMPRESSION_ENABLED(hdr) && compress != ZIO_COMPRESS_OFF) {
-               uint64_t lsize;
-               uint64_t csize;
-               void *cbuf;
-               ASSERT3U(HDR_GET_COMPRESS(hdr), ==, ZIO_COMPRESS_OFF);
-
-               cbuf = zio_buf_alloc(HDR_GET_PSIZE(hdr));
-               lsize = HDR_GET_LSIZE(hdr);
-               csize = zio_compress_data(compress, zio->io_abd, cbuf, lsize);
-
-               ASSERT3U(csize, <=, HDR_GET_PSIZE(hdr));
-               if (csize < HDR_GET_PSIZE(hdr)) {
-                       /*
-                        * Compressed blocks are always a multiple of the
-                        * smallest ashift in the pool. Ideally, we would
-                        * like to round up the csize to the next
-                        * spa_min_ashift but that value may have changed
-                        * since the block was last written. Instead,
-                        * we rely on the fact that the hdr's psize
-                        * was set to the psize of the block when it was
-                        * last written. We set the csize to that value
-                        * and zero out any part that should not contain
-                        * data.
-                        */
-                       bzero((char *)cbuf + csize, HDR_GET_PSIZE(hdr) - csize);
-                       csize = HDR_GET_PSIZE(hdr);
-               }
-               zio_push_transform(zio, cbuf, csize, HDR_GET_PSIZE(hdr), NULL);
-       }
-
        /*
         * Block pointers always store the checksum for the logical data.
         * If the block pointer has the gang bit set, then the checksum
@@ -1465,11 +1574,9 @@ arc_cksum_is_equal(arc_buf_hdr_t *hdr, zio_t *zio)
         * generated using the correct checksum algorithm and accounts for the
         * logical I/O size and not just a gang fragment.
         */
-       valid_cksum = (zio_checksum_error_impl(zio->io_spa, zio->io_bp,
+       return (zio_checksum_error_impl(zio->io_spa, zio->io_bp,
            BP_GET_CHECKSUM(zio->io_bp), zio->io_abd, zio->io_size,
            zio->io_offset, NULL) == 0);
-       zio_pop_transforms(zio);
-       return (valid_cksum);
 }
 
 /*
@@ -1490,6 +1597,7 @@ arc_cksum_compute(arc_buf_t *buf)
 
        mutex_enter(&buf->b_hdr->b_l1hdr.b_freeze_lock);
        if (hdr->b_l1hdr.b_freeze_cksum != NULL) {
+               ASSERT(arc_hdr_has_uncompressed_buf(hdr));
                mutex_exit(&hdr->b_l1hdr.b_freeze_lock);
                return;
        } else if (ARC_BUF_COMPRESSED(buf)) {
@@ -1497,6 +1605,7 @@ arc_cksum_compute(arc_buf_t *buf)
                return;
        }
 
+       ASSERT(!ARC_BUF_ENCRYPTED(buf));
        ASSERT(!ARC_BUF_COMPRESSED(buf));
        hdr->b_l1hdr.b_freeze_cksum = kmem_alloc(sizeof (zio_cksum_t),
            KM_SLEEP);
@@ -1520,7 +1629,7 @@ arc_buf_unwatch(arc_buf_t *buf)
 {
 #ifndef _KERNEL
        if (arc_watch) {
-               ASSERT0(mprotect(buf->b_data, HDR_GET_LSIZE(buf->b_hdr),
+               ASSERT0(mprotect(buf->b_data, arc_buf_size(buf),
                    PROT_READ | PROT_WRITE));
        }
 #endif
@@ -1587,6 +1696,8 @@ arc_buf_thaw(arc_buf_t *buf)
         * allocate b_thawed.
         */
        if (ARC_BUF_COMPRESSED(buf)) {
+               ASSERT(hdr->b_l1hdr.b_freeze_cksum == NULL ||
+                   arc_hdr_has_uncompressed_buf(hdr));
                return;
        }
 
@@ -1605,6 +1716,8 @@ arc_buf_freeze(arc_buf_t *buf)
                return;
 
        if (ARC_BUF_COMPRESSED(buf)) {
+               ASSERT(hdr->b_l1hdr.b_freeze_cksum == NULL ||
+                   arc_hdr_has_uncompressed_buf(hdr));
                return;
        }
 
@@ -1659,15 +1772,14 @@ arc_hdr_set_compress(arc_buf_hdr_t *hdr, enum zio_compress cmp)
         */
        if (!zfs_compressed_arc_enabled || HDR_GET_PSIZE(hdr) == 0) {
                arc_hdr_clear_flags(hdr, ARC_FLAG_COMPRESSED_ARC);
-               HDR_SET_COMPRESS(hdr, ZIO_COMPRESS_OFF);
                ASSERT(!HDR_COMPRESSION_ENABLED(hdr));
-               ASSERT3U(HDR_GET_COMPRESS(hdr), ==, ZIO_COMPRESS_OFF);
        } else {
                arc_hdr_set_flags(hdr, ARC_FLAG_COMPRESSED_ARC);
-               HDR_SET_COMPRESS(hdr, cmp);
-               ASSERT3U(HDR_GET_COMPRESS(hdr), ==, cmp);
                ASSERT(HDR_COMPRESSION_ENABLED(hdr));
        }
+
+       HDR_SET_COMPRESS(hdr, cmp);
+       ASSERT3U(HDR_GET_COMPRESS(hdr), ==, cmp);
 }
 
 /*
@@ -1678,14 +1790,13 @@ static boolean_t
 arc_buf_try_copy_decompressed_data(arc_buf_t *buf)
 {
        arc_buf_hdr_t *hdr = buf->b_hdr;
-       arc_buf_t *from;
        boolean_t copied = B_FALSE;
 
        ASSERT(HDR_HAS_L1HDR(hdr));
        ASSERT3P(buf->b_data, !=, NULL);
        ASSERT(!ARC_BUF_COMPRESSED(buf));
 
-       for (from = hdr->b_l1hdr.b_buf; from != NULL;
+       for (arc_buf_t *from = hdr->b_l1hdr.b_buf; from != NULL;
            from = from->b_next) {
                /* can't use our own data buffer */
                if (from == buf) {
@@ -1708,6 +1819,254 @@ arc_buf_try_copy_decompressed_data(arc_buf_t *buf)
        return (copied);
 }
 
+/*
+ * Return the size of the block, b_pabd, that is stored in the arc_buf_hdr_t.
+ */
+static uint64_t
+arc_hdr_size(arc_buf_hdr_t *hdr)
+{
+       uint64_t size;
+
+       if (arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF &&
+           HDR_GET_PSIZE(hdr) > 0) {
+               size = HDR_GET_PSIZE(hdr);
+       } else {
+               ASSERT3U(HDR_GET_LSIZE(hdr), !=, 0);
+               size = HDR_GET_LSIZE(hdr);
+       }
+       return (size);
+}
+
+static int
+arc_hdr_authenticate(arc_buf_hdr_t *hdr, spa_t *spa, uint64_t dsobj)
+{
+       int ret;
+       uint64_t csize;
+       uint64_t lsize = HDR_GET_LSIZE(hdr);
+       uint64_t psize = HDR_GET_PSIZE(hdr);
+       void *tmpbuf = NULL;
+       abd_t *abd = hdr->b_l1hdr.b_pabd;
+
+       ASSERT(HDR_LOCK(hdr) == NULL || MUTEX_HELD(HDR_LOCK(hdr)));
+       ASSERT(HDR_AUTHENTICATED(hdr));
+       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+
+       /*
+        * The MAC is calculated on the compressed data that is stored on disk.
+        * However, if compressed arc is disabled we will only have the
+        * decompressed data available to us now. Compress it into a temporary
+        * abd so we can verify the MAC. The performance overhead of this will
+        * be relatively low, since most objects in an encrypted objset will
+        * be encrypted (instead of authenticated) anyway.
+        */
+       if (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF &&
+           !HDR_COMPRESSION_ENABLED(hdr)) {
+               tmpbuf = zio_buf_alloc(lsize);
+               abd = abd_get_from_buf(tmpbuf, lsize);
+               abd_take_ownership_of_buf(abd, B_TRUE);
+
+               csize = zio_compress_data(HDR_GET_COMPRESS(hdr),
+                   hdr->b_l1hdr.b_pabd, tmpbuf, lsize);
+               ASSERT3U(csize, <=, psize);
+               abd_zero_off(abd, csize, psize - csize);
+       }
+
+       /*
+        * Authentication is best effort. We authenticate whenever the key is
+        * available. If we succeed we clear ARC_FLAG_NOAUTH.
+        */
+       if (hdr->b_crypt_hdr.b_ot == DMU_OT_OBJSET) {
+               ASSERT3U(HDR_GET_COMPRESS(hdr), ==, ZIO_COMPRESS_OFF);
+               ASSERT3U(lsize, ==, psize);
+               ret = spa_do_crypt_objset_mac_abd(B_FALSE, spa, dsobj, abd,
+                   psize, hdr->b_l1hdr.b_byteswap != DMU_BSWAP_NUMFUNCS);
+       } else {
+               ret = spa_do_crypt_mac_abd(B_FALSE, spa, dsobj, abd, psize,
+                   hdr->b_crypt_hdr.b_mac);
+       }
+
+       if (ret == 0)
+               arc_hdr_clear_flags(hdr, ARC_FLAG_NOAUTH);
+       else if (ret != ENOENT)
+               goto error;
+
+       if (tmpbuf != NULL)
+               abd_free(abd);
+
+       return (0);
+
+error:
+       if (tmpbuf != NULL)
+               abd_free(abd);
+
+       return (ret);
+}
+
+/*
+ * This function will take a header that only has raw encrypted data in
+ * b_crypt_hdr.b_rabd and decrypt it into a new buffer which is stored in
+ * b_l1hdr.b_pabd. If designated in the header flags, this function will
+ * also decompress the data.
+ */
+static int
+arc_hdr_decrypt(arc_buf_hdr_t *hdr, spa_t *spa, uint64_t dsobj)
+{
+       int ret;
+       dsl_crypto_key_t *dck = NULL;
+       abd_t *cabd = NULL;
+       void *tmp = NULL;
+       boolean_t no_crypt = B_FALSE;
+       boolean_t bswap = (hdr->b_l1hdr.b_byteswap != DMU_BSWAP_NUMFUNCS);
+
+       ASSERT(HDR_LOCK(hdr) == NULL || MUTEX_HELD(HDR_LOCK(hdr)));
+       ASSERT(HDR_ENCRYPTED(hdr));
+
+       arc_hdr_alloc_abd(hdr, B_FALSE);
+
+       /*
+        * We must be careful to use the passed-in dsobj value here and
+        * not the value in b_dsobj. b_dsobj is meant to be a best guess for
+        * the L2ARC, which has the luxury of being able to fail without real
+        * consequences (the data simply won't make it to the L2ARC). In
+        * reality, the dsobj stored in the header may belong to a dataset
+        * that has been unmounted or otherwise disowned, meaning the key
+        * won't be accessible via that dsobj anymore.
+        */
+       ret = spa_keystore_lookup_key(spa, dsobj, FTAG, &dck);
+       if (ret != 0) {
+               ret = SET_ERROR(EACCES);
+               goto error;
+       }
+
+       ret = zio_do_crypt_abd(B_FALSE, &dck->dck_key,
+           hdr->b_crypt_hdr.b_salt, hdr->b_crypt_hdr.b_ot,
+           hdr->b_crypt_hdr.b_iv, hdr->b_crypt_hdr.b_mac,
+           HDR_GET_PSIZE(hdr), bswap, hdr->b_l1hdr.b_pabd,
+           hdr->b_crypt_hdr.b_rabd, &no_crypt);
+       if (ret != 0)
+               goto error;
+
+       if (no_crypt) {
+               abd_copy(hdr->b_l1hdr.b_pabd, hdr->b_crypt_hdr.b_rabd,
+                   HDR_GET_PSIZE(hdr));
+       }
+
+       /*
+        * If this header has disabled arc compression but the b_pabd is
+        * compressed after decrypting it, we need to decompress the newly
+        * decrypted data.
+        */
+       if (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF &&
+           !HDR_COMPRESSION_ENABLED(hdr)) {
+               /*
+                * We want to make sure that we are correctly honoring the
+                * zfs_abd_scatter_enabled setting, so we allocate an abd here
+                * and then loan a buffer from it, rather than allocating a
+                * linear buffer and wrapping it in an abd later.
+                */
+               cabd = arc_get_data_abd(hdr, arc_hdr_size(hdr), hdr);
+               tmp = abd_borrow_buf(cabd, arc_hdr_size(hdr));
+
+               ret = zio_decompress_data(HDR_GET_COMPRESS(hdr),
+                   hdr->b_l1hdr.b_pabd, tmp, HDR_GET_PSIZE(hdr),
+                   HDR_GET_LSIZE(hdr));
+               if (ret != 0) {
+                       abd_return_buf(cabd, tmp, arc_hdr_size(hdr));
+                       goto error;
+               }
+
+               abd_return_buf_copy(cabd, tmp, arc_hdr_size(hdr));
+               arc_free_data_abd(hdr, hdr->b_l1hdr.b_pabd,
+                   arc_hdr_size(hdr), hdr);
+               hdr->b_l1hdr.b_pabd = cabd;
+       }
+
+       spa_keystore_dsl_key_rele(spa, dck, FTAG);
+
+       return (0);
+
+error:
+       arc_hdr_free_abd(hdr, B_FALSE);
+       if (dck != NULL)
+               spa_keystore_dsl_key_rele(spa, dck, FTAG);
+       if (cabd != NULL)
+               arc_free_data_buf(hdr, cabd, arc_hdr_size(hdr), hdr);
+
+       return (ret);
+}
+
+/*
+ * This function is called during arc_buf_fill() to prepare the header's
+ * abd plaintext pointer for use. This involves authenticated protected
+ * data and decrypting encrypted data into the plaintext abd.
+ */
+static int
+arc_fill_hdr_crypt(arc_buf_hdr_t *hdr, kmutex_t *hash_lock, spa_t *spa,
+    uint64_t dsobj, boolean_t noauth)
+{
+       int ret;
+
+       ASSERT(HDR_PROTECTED(hdr));
+
+       if (hash_lock != NULL)
+               mutex_enter(hash_lock);
+
+       if (HDR_NOAUTH(hdr) && !noauth) {
+               /*
+                * The caller requested authenticated data but our data has
+                * not been authenticated yet. Verify the MAC now if we can.
+                */
+               ret = arc_hdr_authenticate(hdr, spa, dsobj);
+               if (ret != 0)
+                       goto error;
+       } else if (HDR_HAS_RABD(hdr) && hdr->b_l1hdr.b_pabd == NULL) {
+               /*
+                * If we only have the encrypted version of the data, but the
+                * unencrypted version was requested we take this opportunity
+                * to store the decrypted version in the header for future use.
+                */
+               ret = arc_hdr_decrypt(hdr, spa, dsobj);
+               if (ret != 0)
+                       goto error;
+       }
+
+       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+
+       if (hash_lock != NULL)
+               mutex_exit(hash_lock);
+
+       return (0);
+
+error:
+       if (hash_lock != NULL)
+               mutex_exit(hash_lock);
+
+       return (ret);
+}
+
+/*
+ * This function is used by the dbuf code to decrypt bonus buffers in place.
+ * The dbuf code itself doesn't have any locking for decrypting a shared dnode
+ * block, so we use the hash lock here to protect against concurrent calls to
+ * arc_buf_fill().
+ */
+static void
+arc_buf_untransform_in_place(arc_buf_t *buf, kmutex_t *hash_lock)
+{
+       arc_buf_hdr_t *hdr = buf->b_hdr;
+
+       ASSERT(HDR_ENCRYPTED(hdr));
+       ASSERT3U(hdr->b_crypt_hdr.b_ot, ==, DMU_OT_DNODE);
+       ASSERT(HDR_LOCK(hdr) == NULL || MUTEX_HELD(HDR_LOCK(hdr)));
+       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+
+       zio_crypt_copy_dnode_bonus(hdr->b_l1hdr.b_pabd, buf->b_data,
+           arc_buf_size(buf));
+       buf->b_flags &= ~ARC_BUF_FLAG_ENCRYPTED;
+       buf->b_flags &= ~ARC_BUF_FLAG_COMPRESSED;
+       hdr->b_crypt_hdr.b_ebufcnt -= 1;
+}
+
 /*
  * Given a buf that has a data buffer attached to it, this function will
  * efficiently fill the buf with data of the specified compression setting from
@@ -1722,15 +2081,79 @@ arc_buf_try_copy_decompressed_data(arc_buf_t *buf)
  * the correct-sized data buffer.
  */
 static int
-arc_buf_fill(arc_buf_t *buf, boolean_t compressed)
+arc_buf_fill(arc_buf_t *buf, spa_t *spa, uint64_t dsobj, arc_fill_flags_t flags)
 {
+       int error = 0;
        arc_buf_hdr_t *hdr = buf->b_hdr;
-       boolean_t hdr_compressed = (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF);
+       boolean_t hdr_compressed =
+           (arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF);
+       boolean_t compressed = (flags & ARC_FILL_COMPRESSED) != 0;
+       boolean_t encrypted = (flags & ARC_FILL_ENCRYPTED) != 0;
        dmu_object_byteswap_t bswap = hdr->b_l1hdr.b_byteswap;
+       kmutex_t *hash_lock = (flags & ARC_FILL_LOCKED) ? NULL : HDR_LOCK(hdr);
 
        ASSERT3P(buf->b_data, !=, NULL);
-       IMPLY(compressed, hdr_compressed);
+       IMPLY(compressed, hdr_compressed || ARC_BUF_ENCRYPTED(buf));
        IMPLY(compressed, ARC_BUF_COMPRESSED(buf));
+       IMPLY(encrypted, HDR_ENCRYPTED(hdr));
+       IMPLY(encrypted, ARC_BUF_ENCRYPTED(buf));
+       IMPLY(encrypted, ARC_BUF_COMPRESSED(buf));
+       IMPLY(encrypted, !ARC_BUF_SHARED(buf));
+
+       /*
+        * If the caller wanted encrypted data we just need to copy it from
+        * b_rabd and potentially byteswap it. We won't be able to do any
+        * further transforms on it.
+        */
+       if (encrypted) {
+               ASSERT(HDR_HAS_RABD(hdr));
+               abd_copy_to_buf(buf->b_data, hdr->b_crypt_hdr.b_rabd,
+                   HDR_GET_PSIZE(hdr));
+               goto byteswap;
+       }
+
+       /*
+        * Adjust encrypted and authenticated headers to accomodate the
+        * request if needed.
+        */
+       if (HDR_PROTECTED(hdr)) {
+               error = arc_fill_hdr_crypt(hdr, hash_lock, spa,
+                   dsobj, !!(flags & ARC_FILL_NOAUTH));
+               if (error != 0)
+                       return (error);
+       }
+
+       /*
+        * There is a special case here for dnode blocks which are
+        * decrypting their bonus buffers. These blocks may request to
+        * be decrypted in-place. This is necessary because there may
+        * be many dnodes pointing into this buffer and there is
+        * currently no method to synchronize replacing the backing
+        * b_data buffer and updating all of the pointers. Here we use
+        * the hash lock to ensure there are no races. If the need
+        * arises for other types to be decrypted in-place, they must
+        * add handling here as well.
+        */
+       if ((flags & ARC_FILL_IN_PLACE) != 0) {
+               ASSERT(!hdr_compressed);
+               ASSERT(!compressed);
+               ASSERT(!encrypted);
+
+               if (HDR_ENCRYPTED(hdr) && ARC_BUF_ENCRYPTED(buf)) {
+                       ASSERT3U(hdr->b_crypt_hdr.b_ot, ==, DMU_OT_DNODE);
+
+                       if (hash_lock != NULL)
+                               mutex_enter(hash_lock);
+                       arc_buf_untransform_in_place(buf, hash_lock);
+                       if (hash_lock != NULL)
+                               mutex_exit(hash_lock);
+
+                       /* Compute the hdr's checksum if necessary */
+                       arc_cksum_compute(buf);
+               }
+
+               return (0);
+       }
 
        if (hdr_compressed == compressed) {
                if (!arc_buf_is_shared(buf)) {
@@ -1785,7 +2208,7 @@ arc_buf_fill(arc_buf_t *buf, boolean_t compressed)
                        ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, !=, NULL);
                        return (0);
                } else {
-                       int error = zio_decompress_data(HDR_GET_COMPRESS(hdr),
+                       error = zio_decompress_data(HDR_GET_COMPRESS(hdr),
                            hdr->b_l1hdr.b_pabd, buf->b_data,
                            HDR_GET_PSIZE(hdr), HDR_GET_LSIZE(hdr));
 
@@ -1796,13 +2219,14 @@ arc_buf_fill(arc_buf_t *buf, boolean_t compressed)
                        if (error != 0) {
                                zfs_dbgmsg(
                                    "hdr %p, compress %d, psize %d, lsize %d",
-                                   hdr, HDR_GET_COMPRESS(hdr),
+                                   hdr, arc_hdr_get_compress(hdr),
                                    HDR_GET_PSIZE(hdr), HDR_GET_LSIZE(hdr));
                                return (SET_ERROR(EIO));
                        }
                }
        }
 
+byteswap:
        /* Byteswap the buf's data if necessary */
        if (bswap != DMU_BSWAP_NUMFUNCS) {
                ASSERT(!HDR_SHARED_DATA(hdr));
@@ -1816,28 +2240,21 @@ arc_buf_fill(arc_buf_t *buf, boolean_t compressed)
        return (0);
 }
 
-int
-arc_decompress(arc_buf_t *buf)
-{
-       return (arc_buf_fill(buf, B_FALSE));
-}
-
 /*
- * Return the size of the block, b_pabd, that is stored in the arc_buf_hdr_t.
+ * If this function is being called to decrypt an encrypted buffer or verify an
+ * authenticated one, the key must be loaded and a mapping must be made
+ * available in the keystore via spa_keystore_create_mapping() or one of its
+ * callers.
  */
-static uint64_t
-arc_hdr_size(arc_buf_hdr_t *hdr)
+int
+arc_untransform(arc_buf_t *buf, spa_t *spa, uint64_t dsobj, boolean_t in_place)
 {
-       uint64_t size;
+       arc_fill_flags_t flags = 0;
 
-       if (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF &&
-           HDR_GET_PSIZE(hdr) > 0) {
-               size = HDR_GET_PSIZE(hdr);
-       } else {
-               ASSERT3U(HDR_GET_LSIZE(hdr), !=, 0);
-               size = HDR_GET_LSIZE(hdr);
-       }
-       return (size);
+       if (in_place)
+               flags |= ARC_FILL_IN_PLACE;
+
+       return (arc_buf_fill(buf, spa, dsobj, flags));
 }
 
 /*
@@ -1857,6 +2274,7 @@ arc_evictable_space_increment(arc_buf_hdr_t *hdr, arc_state_t *state)
                ASSERT0(hdr->b_l1hdr.b_bufcnt);
                ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
                ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+               ASSERT(!HDR_HAS_RABD(hdr));
                (void) refcount_add_many(&state->arcs_esize[type],
                    HDR_GET_LSIZE(hdr), hdr);
                return;
@@ -1867,6 +2285,11 @@ arc_evictable_space_increment(arc_buf_hdr_t *hdr, arc_state_t *state)
                (void) refcount_add_many(&state->arcs_esize[type],
                    arc_hdr_size(hdr), hdr);
        }
+       if (HDR_HAS_RABD(hdr)) {
+               (void) refcount_add_many(&state->arcs_esize[type],
+                   HDR_GET_PSIZE(hdr), hdr);
+       }
+
        for (buf = hdr->b_l1hdr.b_buf; buf != NULL; buf = buf->b_next) {
                if (arc_buf_is_shared(buf))
                        continue;
@@ -1892,6 +2315,7 @@ arc_evictable_space_decrement(arc_buf_hdr_t *hdr, arc_state_t *state)
                ASSERT0(hdr->b_l1hdr.b_bufcnt);
                ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
                ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+               ASSERT(!HDR_HAS_RABD(hdr));
                (void) refcount_remove_many(&state->arcs_esize[type],
                    HDR_GET_LSIZE(hdr), hdr);
                return;
@@ -1902,6 +2326,11 @@ arc_evictable_space_decrement(arc_buf_hdr_t *hdr, arc_state_t *state)
                (void) refcount_remove_many(&state->arcs_esize[type],
                    arc_hdr_size(hdr), hdr);
        }
+       if (HDR_HAS_RABD(hdr)) {
+               (void) refcount_remove_many(&state->arcs_esize[type],
+                   HDR_GET_PSIZE(hdr), hdr);
+       }
+
        for (buf = hdr->b_l1hdr.b_buf; buf != NULL; buf = buf->b_next) {
                if (arc_buf_is_shared(buf))
                        continue;
@@ -1934,7 +2363,7 @@ add_reference(arc_buf_hdr_t *hdr, void *tag)
            (state != arc_anon)) {
                /* We don't use the L2-only state list. */
                if (state != arc_l2c_only) {
-                       multilist_remove(&state->arcs_list[arc_buf_type(hdr)],
+                       multilist_remove(state->arcs_list[arc_buf_type(hdr)],
                            hdr);
                        arc_evictable_space_decrement(hdr, state);
                }
@@ -1964,7 +2393,7 @@ remove_reference(arc_buf_hdr_t *hdr, kmutex_t *hash_lock, void *tag)
         */
        if (((cnt = refcount_remove(&hdr->b_l1hdr.b_refcnt, tag)) == 0) &&
            (state != arc_anon)) {
-               multilist_insert(&state->arcs_list[arc_buf_type(hdr)], hdr);
+               multilist_insert(state->arcs_list[arc_buf_type(hdr)], hdr);
                ASSERT3U(hdr->b_l1hdr.b_bufcnt, >, 0);
                arc_evictable_space_increment(hdr, state);
        }
@@ -2045,7 +2474,8 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
                old_state = hdr->b_l1hdr.b_state;
                refcnt = refcount_count(&hdr->b_l1hdr.b_refcnt);
                bufcnt = hdr->b_l1hdr.b_bufcnt;
-               update_old = (bufcnt > 0 || hdr->b_l1hdr.b_pabd != NULL);
+               update_old = (bufcnt > 0 || hdr->b_l1hdr.b_pabd != NULL ||
+                   HDR_HAS_RABD(hdr));
        } else {
                old_state = arc_l2c_only;
                refcnt = 0;
@@ -2066,7 +2496,7 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
        if (refcnt == 0) {
                if (old_state != arc_anon && old_state != arc_l2c_only) {
                        ASSERT(HDR_HAS_L1HDR(hdr));
-                       multilist_remove(&old_state->arcs_list[buftype], hdr);
+                       multilist_remove(old_state->arcs_list[buftype], hdr);
 
                        if (GHOST_STATE(old_state)) {
                                ASSERT0(bufcnt);
@@ -2083,7 +2513,7 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
                         * beforehand.
                         */
                        ASSERT(HDR_HAS_L1HDR(hdr));
-                       multilist_insert(&new_state->arcs_list[buftype], hdr);
+                       multilist_insert(new_state->arcs_list[buftype], hdr);
 
                        if (GHOST_STATE(new_state)) {
                                ASSERT0(bufcnt);
@@ -2115,6 +2545,7 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
                        (void) refcount_add_many(&new_state->arcs_size,
                            HDR_GET_LSIZE(hdr), hdr);
                        ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+                       ASSERT(!HDR_HAS_RABD(hdr));
                } else {
                        arc_buf_t *buf;
                        uint32_t buffers = 0;
@@ -2147,8 +2578,11 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
                        if (hdr->b_l1hdr.b_pabd != NULL) {
                                (void) refcount_add_many(&new_state->arcs_size,
                                    arc_hdr_size(hdr), hdr);
-                       } else {
-                               ASSERT(GHOST_STATE(old_state));
+                       }
+
+                       if (HDR_HAS_RABD(hdr)) {
+                               (void) refcount_add_many(&new_state->arcs_size,
+                                   HDR_GET_PSIZE(hdr), hdr);
                        }
                }
        }
@@ -2158,6 +2592,7 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
                if (GHOST_STATE(old_state)) {
                        ASSERT0(bufcnt);
                        ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+                       ASSERT(!HDR_HAS_RABD(hdr));
 
                        /*
                         * When moving a header off of a ghost state,
@@ -2198,9 +2633,20 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
                                    buf);
                        }
                        ASSERT3U(bufcnt, ==, buffers);
-                       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
-                       (void) refcount_remove_many(
-                           &old_state->arcs_size, arc_hdr_size(hdr), hdr);
+                       ASSERT(hdr->b_l1hdr.b_pabd != NULL ||
+                           HDR_HAS_RABD(hdr));
+
+                       if (hdr->b_l1hdr.b_pabd != NULL) {
+                               (void) refcount_remove_many(
+                                   &old_state->arcs_size, arc_hdr_size(hdr),
+                                   hdr);
+                       }
+
+                       if (HDR_HAS_RABD(hdr)) {
+                               (void) refcount_remove_many(
+                                   &old_state->arcs_size, HDR_GET_PSIZE(hdr),
+                                   hdr);
+                       }
                }
        }
 
@@ -2211,8 +2657,8 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *hdr,
         * L2 headers should never be on the L2 state list since they don't
         * have L1 headers allocated.
         */
-       ASSERT(multilist_is_empty(&arc_l2c_only->arcs_list[ARC_BUFC_DATA]) &&
-           multilist_is_empty(&arc_l2c_only->arcs_list[ARC_BUFC_METADATA]));
+       ASSERT(multilist_is_empty(arc_l2c_only->arcs_list[ARC_BUFC_DATA]) &&
+           multilist_is_empty(arc_l2c_only->arcs_list[ARC_BUFC_METADATA]));
 }
 
 void
@@ -2301,15 +2747,15 @@ arc_space_return(uint64_t space, arc_space_type_t type)
 static boolean_t
 arc_can_share(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 {
-       boolean_t hdr_compressed, buf_compressed;
        /*
         * The criteria for sharing a hdr's data are:
-        * 1. the hdr's compression matches the buf's compression
-        * 2. the hdr doesn't need to be byteswapped
-        * 3. the hdr isn't already being shared
-        * 4. the buf is either compressed or it is the last buf in the hdr list
+        * 1. the buffer is not encrypted
+        * 2. the hdr's compression matches the buf's compression
+        * 3. the hdr doesn't need to be byteswapped
+        * 4. the hdr isn't already being shared
+        * 5. the buf is either compressed or it is the last buf in the hdr list
         *
-        * Criterion #4 maintains the invariant that shared uncompressed
+        * Criterion #5 maintains the invariant that shared uncompressed
         * bufs must be the final buf in the hdr's b_buf list. Reading this, you
         * might ask, "if a compressed buf is allocated first, won't that be the
         * last thing in the list?", but in that case it's impossible to create
@@ -2324,9 +2770,11 @@ arc_can_share(arc_buf_hdr_t *hdr, arc_buf_t *buf)
         * sharing if the new buf isn't the first to be added.
         */
        ASSERT3P(buf->b_hdr, ==, hdr);
-       hdr_compressed = HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF;
-       buf_compressed = ARC_BUF_COMPRESSED(buf) != 0;
-       return (buf_compressed == hdr_compressed &&
+       boolean_t hdr_compressed =
+           arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF;
+       boolean_t buf_compressed = ARC_BUF_COMPRESSED(buf) != 0;
+       return (!ARC_BUF_ENCRYPTED(buf) &&
+           buf_compressed == hdr_compressed &&
            hdr->b_l1hdr.b_byteswap == DMU_BSWAP_NUMFUNCS &&
            !HDR_SHARED_DATA(hdr) &&
            (ARC_BUF_LAST(buf) || ARC_BUF_COMPRESSED(buf)));
@@ -2338,11 +2786,12 @@ arc_can_share(arc_buf_hdr_t *hdr, arc_buf_t *buf)
  * copy was made successfully, or an error code otherwise.
  */
 static int
-arc_buf_alloc_impl(arc_buf_hdr_t *hdr, void *tag, boolean_t compressed,
+arc_buf_alloc_impl(arc_buf_hdr_t *hdr, spa_t *spa, uint64_t dsobj, void *tag,
+    boolean_t encrypted, boolean_t compressed, boolean_t noauth,
     boolean_t fill, arc_buf_t **ret)
 {
        arc_buf_t *buf;
-       boolean_t can_share;
+       arc_fill_flags_t flags = ARC_FILL_LOCKED;
 
        ASSERT(HDR_HAS_L1HDR(hdr));
        ASSERT3U(HDR_GET_LSIZE(hdr), >, 0);
@@ -2350,6 +2799,7 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, void *tag, boolean_t compressed,
            hdr->b_type == ARC_BUFC_METADATA);
        ASSERT3P(ret, !=, NULL);
        ASSERT3P(*ret, ==, NULL);
+       IMPLY(encrypted, compressed);
 
        hdr->b_l1hdr.b_mru_hits = 0;
        hdr->b_l1hdr.b_mru_ghost_hits = 0;
@@ -2373,18 +2823,23 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, void *tag, boolean_t compressed,
 
        /*
         * Only honor requests for compressed bufs if the hdr is actually
-        * compressed.
+        * compressed. This must be overriden if the buffer is encrypted since
+        * encrypted buffers cannot be decompressed.
         */
-       if (compressed && HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF)
+       if (encrypted) {
+               buf->b_flags |= ARC_BUF_FLAG_COMPRESSED;
+               buf->b_flags |= ARC_BUF_FLAG_ENCRYPTED;
+               flags |= ARC_FILL_COMPRESSED | ARC_FILL_ENCRYPTED;
+       } else if (compressed &&
+           arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF) {
                buf->b_flags |= ARC_BUF_FLAG_COMPRESSED;
+               flags |= ARC_FILL_COMPRESSED;
+       }
 
-       /*
-        * Although the ARC should handle it correctly, levels above the ARC
-        * should prevent us from having multiple compressed bufs off the same
-        * hdr. To ensure we notice it if this behavior changes, we assert this
-        * here the best we can.
-        */
-       IMPLY(ARC_BUF_COMPRESSED(buf), !HDR_SHARED_DATA(hdr));
+       if (noauth) {
+               ASSERT0(encrypted);
+               flags |= ARC_FILL_NOAUTH;
+       }
 
        /*
         * If the hdr's data can be shared then we share the data buffer and
@@ -2399,8 +2854,8 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, void *tag, boolean_t compressed,
         * Second, the hdr's ABD must be linear so that the buf's user doesn't
         * need to be ABD-aware.
         */
-       can_share = arc_can_share(hdr, buf) && !HDR_L2_WRITING(hdr) &&
-           abd_is_linear(hdr->b_l1hdr.b_pabd);
+       boolean_t can_share = arc_can_share(hdr, buf) && !HDR_L2_WRITING(hdr) &&
+           hdr->b_l1hdr.b_pabd != NULL && abd_is_linear(hdr->b_l1hdr.b_pabd);
 
        /* Set up b_data and sharing */
        if (can_share) {
@@ -2416,13 +2871,15 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, void *tag, boolean_t compressed,
 
        hdr->b_l1hdr.b_buf = buf;
        hdr->b_l1hdr.b_bufcnt += 1;
+       if (encrypted)
+               hdr->b_crypt_hdr.b_ebufcnt += 1;
 
        /*
         * If the user wants the data from the hdr, we need to either copy or
         * decompress the data.
         */
        if (fill) {
-               return (arc_buf_fill(buf, ARC_BUF_COMPRESSED(buf) != 0));
+               return (arc_buf_fill(buf, spa, dsobj, flags));
        }
 
        return (0);
@@ -2430,6 +2887,15 @@ arc_buf_alloc_impl(arc_buf_hdr_t *hdr, void *tag, boolean_t compressed,
 
 static char *arc_onloan_tag = "onloan";
 
+static inline void
+arc_loaned_bytes_update(int64_t delta)
+{
+       atomic_add_64(&arc_loaned_bytes, delta);
+
+       /* assert that it did not wrap around */
+       ASSERT3S(atomic_add_64_nv(&arc_loaned_bytes, 0), >=, 0);
+}
+
 /*
  * Loan out an anonymous arc buffer. Loaned buffers are not counted as in
  * flight data by arc_tempreserve_space() until they are "returned". Loaned
@@ -2442,7 +2908,8 @@ arc_loan_buf(spa_t *spa, boolean_t is_metadata, int size)
        arc_buf_t *buf = arc_alloc_buf(spa, arc_onloan_tag,
            is_metadata ? ARC_BUFC_METADATA : ARC_BUFC_DATA, size);
 
-       atomic_add_64(&arc_loaned_bytes, size);
+       arc_loaned_bytes_update(size);
+
        return (buf);
 }
 
@@ -2453,6 +2920,20 @@ arc_loan_compressed_buf(spa_t *spa, uint64_t psize, uint64_t lsize,
        arc_buf_t *buf = arc_alloc_compressed_buf(spa, arc_onloan_tag,
            psize, lsize, compression_type);
 
+       arc_loaned_bytes_update(psize);
+
+       return (buf);
+}
+
+arc_buf_t *
+arc_loan_raw_buf(spa_t *spa, uint64_t dsobj, boolean_t byteorder,
+    const uint8_t *salt, const uint8_t *iv, const uint8_t *mac,
+    dmu_object_type_t ot, uint64_t psize, uint64_t lsize,
+    enum zio_compress compression_type)
+{
+       arc_buf_t *buf = arc_alloc_raw_buf(spa, arc_onloan_tag, dsobj,
+           byteorder, salt, iv, mac, ot, psize, lsize, compression_type);
+
        atomic_add_64(&arc_loaned_bytes, psize);
        return (buf);
 }
@@ -2471,7 +2952,7 @@ arc_return_buf(arc_buf_t *buf, void *tag)
        (void) refcount_add(&hdr->b_l1hdr.b_refcnt, tag);
        (void) refcount_remove(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
 
-       atomic_add_64(&arc_loaned_bytes, -arc_buf_size(buf));
+       arc_loaned_bytes_update(-arc_buf_size(buf));
 }
 
 /* Detach an arc_buf from a dbuf (tag) */
@@ -2485,7 +2966,7 @@ arc_loan_inuse_buf(arc_buf_t *buf, void *tag)
        (void) refcount_add(&hdr->b_l1hdr.b_refcnt, arc_onloan_tag);
        (void) refcount_remove(&hdr->b_l1hdr.b_refcnt, tag);
 
-       atomic_add_64(&arc_loaned_bytes, -arc_buf_size(buf));
+       arc_loaned_bytes_update(arc_buf_size(buf));
 }
 
 static void
@@ -2502,11 +2983,11 @@ l2arc_free_abd_on_write(abd_t *abd, size_t size, arc_buf_contents_t type)
 }
 
 static void
-arc_hdr_free_on_write(arc_buf_hdr_t *hdr)
+arc_hdr_free_on_write(arc_buf_hdr_t *hdr, boolean_t free_rdata)
 {
        arc_state_t *state = hdr->b_l1hdr.b_state;
        arc_buf_contents_t type = arc_buf_type(hdr);
-       uint64_t size = arc_hdr_size(hdr);
+       uint64_t size = (free_rdata) ? HDR_GET_PSIZE(hdr) : arc_hdr_size(hdr);
 
        /* protected by hash lock, if in the hash table */
        if (multilist_link_active(&hdr->b_l1hdr.b_arc_node)) {
@@ -2517,8 +2998,18 @@ arc_hdr_free_on_write(arc_buf_hdr_t *hdr)
                    size, hdr);
        }
        (void) refcount_remove_many(&state->arcs_size, size, hdr);
+       if (type == ARC_BUFC_METADATA) {
+               arc_space_return(size, ARC_SPACE_META);
+       } else {
+               ASSERT(type == ARC_BUFC_DATA);
+               arc_space_return(size, ARC_SPACE_DATA);
+       }
 
-       l2arc_free_abd_on_write(hdr->b_l1hdr.b_pabd, size, type);
+       if (free_rdata) {
+               l2arc_free_abd_on_write(hdr->b_crypt_hdr.b_rabd, size, type);
+       } else {
+               l2arc_free_abd_on_write(hdr->b_l1hdr.b_pabd, size, type);
+       }
 }
 
 /*
@@ -2531,6 +3022,7 @@ arc_share_buf(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 {
        ASSERT(arc_can_share(hdr, buf));
        ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+       ASSERT(!ARC_BUF_ENCRYPTED(buf));
        ASSERT(MUTEX_HELD(HDR_LOCK(hdr)) || HDR_EMPTY(hdr));
 
        /*
@@ -2590,12 +3082,12 @@ arc_unshare_buf(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 static arc_buf_t *
 arc_buf_remove(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 {
-       arc_buf_t **bufp = &hdr->b_l1hdr.b_buf;
-       arc_buf_t *lastbuf = NULL;
-
        ASSERT(HDR_HAS_L1HDR(hdr));
        ASSERT(MUTEX_HELD(HDR_LOCK(hdr)) || HDR_EMPTY(hdr));
 
+       arc_buf_t **bufp = &hdr->b_l1hdr.b_buf;
+       arc_buf_t *lastbuf = NULL;
+
        /*
         * Remove the buf from the hdr list and locate the last
         * remaining buffer on the list.
@@ -2630,7 +3122,6 @@ arc_buf_remove(arc_buf_hdr_t *hdr, arc_buf_t *buf)
 static void
 arc_buf_destroy_impl(arc_buf_t *buf)
 {
-       arc_buf_t *lastbuf;
        arc_buf_hdr_t *hdr = buf->b_hdr;
 
        /*
@@ -2659,9 +3150,21 @@ arc_buf_destroy_impl(arc_buf_t *buf)
 
                ASSERT(hdr->b_l1hdr.b_bufcnt > 0);
                hdr->b_l1hdr.b_bufcnt -= 1;
+
+               if (ARC_BUF_ENCRYPTED(buf))
+                       hdr->b_crypt_hdr.b_ebufcnt -= 1;
+
+               /*
+                * if we have no more encrypted buffers and we've already
+                * gotten a copy of the decrypted data we can free b_rabd to
+                * save some space.
+                */
+               if (hdr->b_crypt_hdr.b_ebufcnt == 0 && HDR_HAS_RABD(hdr) &&
+                   hdr->b_l1hdr.b_pabd != NULL)
+                       arc_hdr_free_abd(hdr, B_TRUE);
        }
 
-       lastbuf = arc_buf_remove(hdr, buf);
+       arc_buf_t *lastbuf = arc_buf_remove(hdr, buf);
 
        if (ARC_BUF_SHARED(buf) && !ARC_BUF_COMPRESSED(buf)) {
                /*
@@ -2673,16 +3176,17 @@ arc_buf_destroy_impl(arc_buf_t *buf)
                 * There is an equivalent case for compressed bufs, but since
                 * they aren't guaranteed to be the last buf in the list and
                 * that is an exceedingly rare case, we just allow that space be
-                * wasted temporarily.
+                * wasted temporarily. We must also be careful not to share
+                * encrypted buffers, since they cannot be shared.
                 */
-               if (lastbuf != NULL) {
+               if (lastbuf != NULL && !ARC_BUF_ENCRYPTED(lastbuf)) {
                        /* Only one buf can be shared at once */
                        VERIFY(!arc_buf_is_shared(lastbuf));
                        /* hdr is uncompressed so can't have compressed buf */
                        VERIFY(!ARC_BUF_COMPRESSED(lastbuf));
 
                        ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
-                       arc_hdr_free_pabd(hdr);
+                       arc_hdr_free_abd(hdr, B_FALSE);
 
                        /*
                         * We must setup a new shared block between the
@@ -2703,11 +3207,16 @@ arc_buf_destroy_impl(arc_buf_t *buf)
                 */
                ASSERT3P(lastbuf, !=, NULL);
                ASSERT(arc_buf_is_shared(lastbuf) ||
-                   HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF);
+                   arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF);
        }
 
-       if (hdr->b_l1hdr.b_bufcnt == 0)
+       /*
+        * Free the checksum if we're removing the last uncompressed buf from
+        * this hdr.
+        */
+       if (!arc_hdr_has_uncompressed_buf(hdr)) {
                arc_cksum_free(hdr);
+       }
 
        /* clean up the buf */
        buf->b_hdr = NULL;
@@ -2715,26 +3224,43 @@ arc_buf_destroy_impl(arc_buf_t *buf)
 }
 
 static void
-arc_hdr_alloc_pabd(arc_buf_hdr_t *hdr)
+arc_hdr_alloc_abd(arc_buf_hdr_t *hdr, boolean_t alloc_rdata)
 {
+       uint64_t size;
+
        ASSERT3U(HDR_GET_LSIZE(hdr), >, 0);
        ASSERT(HDR_HAS_L1HDR(hdr));
-       ASSERT(!HDR_SHARED_DATA(hdr));
+       ASSERT(!HDR_SHARED_DATA(hdr) || alloc_rdata);
+       IMPLY(alloc_rdata, HDR_PROTECTED(hdr));
 
-       ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
-       hdr->b_l1hdr.b_pabd = arc_get_data_abd(hdr, arc_hdr_size(hdr), hdr);
-       hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
-       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+       if (hdr->b_l1hdr.b_pabd == NULL && !HDR_HAS_RABD(hdr))
+               hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
 
-       ARCSTAT_INCR(arcstat_compressed_size, arc_hdr_size(hdr));
+       if (alloc_rdata) {
+               size = HDR_GET_PSIZE(hdr);
+               ASSERT3P(hdr->b_crypt_hdr.b_rabd, ==, NULL);
+               hdr->b_crypt_hdr.b_rabd = arc_get_data_abd(hdr, size, hdr);
+               ASSERT3P(hdr->b_crypt_hdr.b_rabd, !=, NULL);
+               ARCSTAT_INCR(arcstat_raw_size, size);
+       } else {
+               size = arc_hdr_size(hdr);
+               ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+               hdr->b_l1hdr.b_pabd = arc_get_data_abd(hdr, size, hdr);
+               ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+       }
+
+       ARCSTAT_INCR(arcstat_compressed_size, size);
        ARCSTAT_INCR(arcstat_uncompressed_size, HDR_GET_LSIZE(hdr));
 }
 
 static void
-arc_hdr_free_pabd(arc_buf_hdr_t *hdr)
+arc_hdr_free_abd(arc_buf_hdr_t *hdr, boolean_t free_rdata)
 {
+       uint64_t size = (free_rdata) ? HDR_GET_PSIZE(hdr) : arc_hdr_size(hdr);
+
        ASSERT(HDR_HAS_L1HDR(hdr));
-       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+       ASSERT(hdr->b_l1hdr.b_pabd != NULL || HDR_HAS_RABD(hdr));
+       IMPLY(free_rdata, HDR_HAS_RABD(hdr));
 
        /*
         * If the hdr is currently being written to the l2arc then
@@ -2743,28 +3269,42 @@ arc_hdr_free_pabd(arc_buf_hdr_t *hdr)
         * writing it to the l2arc device.
         */
        if (HDR_L2_WRITING(hdr)) {
-               arc_hdr_free_on_write(hdr);
+               arc_hdr_free_on_write(hdr, free_rdata);
                ARCSTAT_BUMP(arcstat_l2_free_on_write);
+       } else if (free_rdata) {
+               arc_free_data_abd(hdr, hdr->b_crypt_hdr.b_rabd, size, hdr);
        } else {
-               arc_free_data_abd(hdr, hdr->b_l1hdr.b_pabd,
-                   arc_hdr_size(hdr), hdr);
+               arc_free_data_abd(hdr, hdr->b_l1hdr.b_pabd, size, hdr);
        }
-       hdr->b_l1hdr.b_pabd = NULL;
-       hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
 
-       ARCSTAT_INCR(arcstat_compressed_size, -arc_hdr_size(hdr));
+       if (free_rdata) {
+               hdr->b_crypt_hdr.b_rabd = NULL;
+               ARCSTAT_INCR(arcstat_raw_size, -size);
+       } else {
+               hdr->b_l1hdr.b_pabd = NULL;
+       }
+
+       if (hdr->b_l1hdr.b_pabd == NULL && !HDR_HAS_RABD(hdr))
+               hdr->b_l1hdr.b_byteswap = DMU_BSWAP_NUMFUNCS;
+
+       ARCSTAT_INCR(arcstat_compressed_size, -size);
        ARCSTAT_INCR(arcstat_uncompressed_size, -HDR_GET_LSIZE(hdr));
 }
 
 static arc_buf_hdr_t *
 arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
-    enum zio_compress compression_type, arc_buf_contents_t type)
+    boolean_t protected, enum zio_compress compression_type,
+    arc_buf_contents_t type, boolean_t alloc_rdata)
 {
        arc_buf_hdr_t *hdr;
 
        VERIFY(type == ARC_BUFC_DATA || type == ARC_BUFC_METADATA);
+       if (protected) {
+               hdr = kmem_cache_alloc(hdr_full_crypt_cache, KM_PUSHPAGE);
+       } else {
+               hdr = kmem_cache_alloc(hdr_full_cache, KM_PUSHPAGE);
+       }
 
-       hdr = kmem_cache_alloc(hdr_full_cache, KM_PUSHPAGE);
        ASSERT(HDR_EMPTY(hdr));
        ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
        HDR_SET_PSIZE(hdr, psize);
@@ -2774,6 +3314,8 @@ arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
        hdr->b_flags = 0;
        arc_hdr_set_flags(hdr, arc_bufc_to_flags(type) | ARC_FLAG_HAS_L1HDR);
        arc_hdr_set_compress(hdr, compression_type);
+       if (protected)
+               arc_hdr_set_flags(hdr, ARC_FLAG_PROTECTED);
 
        hdr->b_l1hdr.b_state = arc_anon;
        hdr->b_l1hdr.b_arc_access = 0;
@@ -2785,7 +3327,7 @@ arc_hdr_alloc(uint64_t spa, int32_t psize, int32_t lsize,
         * the compressed or uncompressed data depending on the block
         * it references and compressed arc enablement.
         */
-       arc_hdr_alloc_pabd(hdr);
+       arc_hdr_alloc_abd(hdr, alloc_rdata);
        ASSERT(refcount_is_zero(&hdr->b_l1hdr.b_refcnt));
 
        return (hdr);
@@ -2808,6 +3350,16 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
        ASSERT((old == hdr_full_cache && new == hdr_l2only_cache) ||
            (old == hdr_l2only_cache && new == hdr_full_cache));
 
+       /*
+        * if the caller wanted a new full header and the header is to be
+        * encrypted we will actually allocate the header from the full crypt
+        * cache instead. The same applies to freeing from the old cache.
+        */
+       if (HDR_PROTECTED(hdr) && new == hdr_full_cache)
+               new = hdr_full_crypt_cache;
+       if (HDR_PROTECTED(hdr) && old == hdr_full_cache)
+               old = hdr_full_crypt_cache;
+
        nhdr = kmem_cache_alloc(new, KM_PUSHPAGE);
 
        ASSERT(MUTEX_HELD(HDR_LOCK(hdr)));
@@ -2815,7 +3367,7 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 
        bcopy(hdr, nhdr, HDR_L2ONLY_SIZE);
 
-       if (new == hdr_full_cache) {
+       if (new == hdr_full_cache || new == hdr_full_crypt_cache) {
                arc_hdr_set_flags(nhdr, ARC_FLAG_HAS_L1HDR);
                /*
                 * arc_access and arc_change_state need to be aware that a
@@ -2826,6 +3378,7 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 
                /* Verify previous threads set to NULL before freeing */
                ASSERT3P(nhdr->b_l1hdr.b_pabd, ==, NULL);
+               ASSERT(!HDR_HAS_RABD(hdr));
        } else {
                ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
                ASSERT0(hdr->b_l1hdr.b_bufcnt);
@@ -2848,6 +3401,7 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
                 */
                VERIFY(!HDR_L2_WRITING(hdr));
                VERIFY3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+               ASSERT(!HDR_HAS_RABD(hdr));
 
                arc_hdr_clear_flags(nhdr, ARC_FLAG_HAS_L1HDR);
        }
@@ -2889,6 +3443,111 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
        return (nhdr);
 }
 
+/*
+ * This function allows an L1 header to be reallocated as a crypt
+ * header and vice versa. If we are going to a crypt header, the
+ * new fields will be zeroed out.
+ */
+static arc_buf_hdr_t *
+arc_hdr_realloc_crypt(arc_buf_hdr_t *hdr, boolean_t need_crypt)
+{
+       arc_buf_hdr_t *nhdr;
+       arc_buf_t *buf;
+       kmem_cache_t *ncache, *ocache;
+
+       ASSERT(HDR_HAS_L1HDR(hdr));
+       ASSERT3U(!!HDR_PROTECTED(hdr), !=, need_crypt);
+       ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
+       ASSERT(!multilist_link_active(&hdr->b_l1hdr.b_arc_node));
+
+       if (need_crypt) {
+               ncache = hdr_full_crypt_cache;
+               ocache = hdr_full_cache;
+       } else {
+               ncache = hdr_full_cache;
+               ocache = hdr_full_crypt_cache;
+       }
+
+       nhdr = kmem_cache_alloc(ncache, KM_PUSHPAGE);
+       bcopy(hdr, nhdr, HDR_L2ONLY_SIZE);
+       nhdr->b_l1hdr.b_freeze_cksum = hdr->b_l1hdr.b_freeze_cksum;
+       nhdr->b_l1hdr.b_bufcnt = hdr->b_l1hdr.b_bufcnt;
+       nhdr->b_l1hdr.b_byteswap = hdr->b_l1hdr.b_byteswap;
+       nhdr->b_l1hdr.b_state = hdr->b_l1hdr.b_state;
+       nhdr->b_l1hdr.b_arc_access = hdr->b_l1hdr.b_arc_access;
+       nhdr->b_l1hdr.b_mru_hits = hdr->b_l1hdr.b_mru_hits;
+       nhdr->b_l1hdr.b_mru_ghost_hits = hdr->b_l1hdr.b_mru_ghost_hits;
+       nhdr->b_l1hdr.b_mfu_hits = hdr->b_l1hdr.b_mfu_hits;
+       nhdr->b_l1hdr.b_mfu_ghost_hits = hdr->b_l1hdr.b_mfu_ghost_hits;
+       nhdr->b_l1hdr.b_l2_hits = hdr->b_l1hdr.b_l2_hits;
+       nhdr->b_l1hdr.b_acb = hdr->b_l1hdr.b_acb;
+       nhdr->b_l1hdr.b_pabd = hdr->b_l1hdr.b_pabd;
+       nhdr->b_l1hdr.b_buf = hdr->b_l1hdr.b_buf;
+
+       /*
+        * This refcount_add() exists only to ensure that the individual
+        * arc buffers always point to a header that is referenced, avoiding
+        * a small race condition that could trigger ASSERTs.
+        */
+       (void) refcount_add(&nhdr->b_l1hdr.b_refcnt, FTAG);
+
+       for (buf = nhdr->b_l1hdr.b_buf; buf != NULL; buf = buf->b_next) {
+               mutex_enter(&buf->b_evict_lock);
+               buf->b_hdr = nhdr;
+               mutex_exit(&buf->b_evict_lock);
+       }
+
+       refcount_transfer(&nhdr->b_l1hdr.b_refcnt, &hdr->b_l1hdr.b_refcnt);
+       (void) refcount_remove(&nhdr->b_l1hdr.b_refcnt, FTAG);
+
+       if (need_crypt) {
+               arc_hdr_set_flags(nhdr, ARC_FLAG_PROTECTED);
+       } else {
+               arc_hdr_clear_flags(nhdr, ARC_FLAG_PROTECTED);
+       }
+
+       buf_discard_identity(hdr);
+       kmem_cache_free(ocache, hdr);
+
+       return (nhdr);
+}
+
+/*
+ * This function is used by the send / receive code to convert a newly
+ * allocated arc_buf_t to one that is suitable for a raw encrypted write. It
+ * is also used to allow the root objset block to be uupdated without altering
+ * its embedded MACs. Both block types will always be uncompressed so we do not
+ * have to worry about compression type or psize.
+ */
+void
+arc_convert_to_raw(arc_buf_t *buf, uint64_t dsobj, boolean_t byteorder,
+    dmu_object_type_t ot, const uint8_t *salt, const uint8_t *iv,
+    const uint8_t *mac)
+{
+       arc_buf_hdr_t *hdr = buf->b_hdr;
+
+       ASSERT(ot == DMU_OT_DNODE || ot == DMU_OT_OBJSET);
+       ASSERT(HDR_HAS_L1HDR(hdr));
+       ASSERT3P(hdr->b_l1hdr.b_state, ==, arc_anon);
+
+       buf->b_flags |= (ARC_BUF_FLAG_COMPRESSED | ARC_BUF_FLAG_ENCRYPTED);
+       if (!HDR_PROTECTED(hdr))
+               hdr = arc_hdr_realloc_crypt(hdr, B_TRUE);
+       hdr->b_crypt_hdr.b_dsobj = dsobj;
+       hdr->b_crypt_hdr.b_ot = ot;
+       hdr->b_l1hdr.b_byteswap = (byteorder == ZFS_HOST_BYTEORDER) ?
+           DMU_BSWAP_NUMFUNCS : DMU_OT_BYTESWAP(ot);
+       if (!arc_hdr_has_uncompressed_buf(hdr))
+               arc_cksum_free(hdr);
+
+       if (salt != NULL)
+               bcopy(salt, hdr->b_crypt_hdr.b_salt, ZIO_DATA_SALT_LEN);
+       if (iv != NULL)
+               bcopy(iv, hdr->b_crypt_hdr.b_iv, ZIO_DATA_IV_LEN);
+       if (mac != NULL)
+               bcopy(mac, hdr->b_crypt_hdr.b_mac, ZIO_DATA_MAC_LEN);
+}
+
 /*
  * Allocate a new arc_buf_hdr_t and arc_buf_t and return the buf to the caller.
  * The buf is returned thawed since we expect the consumer to modify it.
@@ -2896,13 +3555,13 @@ arc_hdr_realloc(arc_buf_hdr_t *hdr, kmem_cache_t *old, kmem_cache_t *new)
 arc_buf_t *
 arc_alloc_buf(spa_t *spa, void *tag, arc_buf_contents_t type, int32_t size)
 {
-       arc_buf_t *buf;
        arc_buf_hdr_t *hdr = arc_hdr_alloc(spa_load_guid(spa), size, size,
-           ZIO_COMPRESS_OFF, type);
+           B_FALSE, ZIO_COMPRESS_OFF, type, B_FALSE);
        ASSERT(!MUTEX_HELD(HDR_LOCK(hdr)));
 
-       buf = NULL;
-       VERIFY0(arc_buf_alloc_impl(hdr, tag, B_FALSE, B_FALSE, &buf));
+       arc_buf_t *buf = NULL;
+       VERIFY0(arc_buf_alloc_impl(hdr, spa, 0, tag, B_FALSE, B_FALSE,
+           B_FALSE, B_FALSE, &buf));
        arc_buf_thaw(buf);
 
        return (buf);
@@ -2916,55 +3575,96 @@ arc_buf_t *
 arc_alloc_compressed_buf(spa_t *spa, void *tag, uint64_t psize, uint64_t lsize,
     enum zio_compress compression_type)
 {
-       arc_buf_hdr_t *hdr;
-       arc_buf_t *buf;
        ASSERT3U(lsize, >, 0);
        ASSERT3U(lsize, >=, psize);
-       ASSERT(compression_type > ZIO_COMPRESS_OFF);
-       ASSERT(compression_type < ZIO_COMPRESS_FUNCTIONS);
+       ASSERT3U(compression_type, >, ZIO_COMPRESS_OFF);
+       ASSERT3U(compression_type, <, ZIO_COMPRESS_FUNCTIONS);
 
-       hdr = arc_hdr_alloc(spa_load_guid(spa), psize, lsize,
-           compression_type, ARC_BUFC_DATA);
+       arc_buf_hdr_t *hdr = arc_hdr_alloc(spa_load_guid(spa), psize, lsize,
+           B_FALSE, compression_type, ARC_BUFC_DATA, B_FALSE);
        ASSERT(!MUTEX_HELD(HDR_LOCK(hdr)));
 
-       buf = NULL;
-       VERIFY0(arc_buf_alloc_impl(hdr, tag, B_TRUE, B_FALSE, &buf));
+       arc_buf_t *buf = NULL;
+       VERIFY0(arc_buf_alloc_impl(hdr, spa, 0, tag, B_FALSE,
+           B_TRUE, B_FALSE, B_FALSE, &buf));
        arc_buf_thaw(buf);
        ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
 
        if (!arc_buf_is_shared(buf)) {
                /*
                 * To ensure that the hdr has the correct data in it if we call
-                * arc_decompress() on this buf before it's been written to
+                * arc_untransform() on this buf before it's been written to
                 * disk, it's easiest if we just set up sharing between the
                 * buf and the hdr.
                 */
                ASSERT(!abd_is_linear(hdr->b_l1hdr.b_pabd));
-               arc_hdr_free_pabd(hdr);
+               arc_hdr_free_abd(hdr, B_FALSE);
                arc_share_buf(hdr, buf);
        }
 
        return (buf);
 }
 
+arc_buf_t *
+arc_alloc_raw_buf(spa_t *spa, void *tag, uint64_t dsobj, boolean_t byteorder,
+    const uint8_t *salt, const uint8_t *iv, const uint8_t *mac,
+    dmu_object_type_t ot, uint64_t psize, uint64_t lsize,
+    enum zio_compress compression_type)
+{
+       arc_buf_hdr_t *hdr;
+       arc_buf_t *buf;
+       arc_buf_contents_t type = DMU_OT_IS_METADATA(ot) ?
+           ARC_BUFC_METADATA : ARC_BUFC_DATA;
+
+       ASSERT3U(lsize, >, 0);
+       ASSERT3U(lsize, >=, psize);
+       ASSERT3U(compression_type, >=, ZIO_COMPRESS_OFF);
+       ASSERT3U(compression_type, <, ZIO_COMPRESS_FUNCTIONS);
+
+       hdr = arc_hdr_alloc(spa_load_guid(spa), psize, lsize, B_TRUE,
+           compression_type, type, B_TRUE);
+       ASSERT(!MUTEX_HELD(HDR_LOCK(hdr)));
+
+       hdr->b_crypt_hdr.b_dsobj = dsobj;
+       hdr->b_crypt_hdr.b_ot = ot;
+       hdr->b_l1hdr.b_byteswap = (byteorder == ZFS_HOST_BYTEORDER) ?
+           DMU_BSWAP_NUMFUNCS : DMU_OT_BYTESWAP(ot);
+       bcopy(salt, hdr->b_crypt_hdr.b_salt, ZIO_DATA_SALT_LEN);
+       bcopy(iv, hdr->b_crypt_hdr.b_iv, ZIO_DATA_IV_LEN);
+       bcopy(mac, hdr->b_crypt_hdr.b_mac, ZIO_DATA_MAC_LEN);
+
+       /*
+        * This buffer will be considered encrypted even if the ot is not an
+        * encrypted type. It will become authenticated instead in
+        * arc_write_ready().
+        */
+       buf = NULL;
+       VERIFY0(arc_buf_alloc_impl(hdr, spa, dsobj, tag, B_TRUE, B_TRUE,
+           B_FALSE, B_FALSE, &buf));
+       arc_buf_thaw(buf);
+       ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
+
+       return (buf);
+}
+
 static void
 arc_hdr_l2hdr_destroy(arc_buf_hdr_t *hdr)
 {
        l2arc_buf_hdr_t *l2hdr = &hdr->b_l2hdr;
        l2arc_dev_t *dev = l2hdr->b_dev;
-       uint64_t asize = arc_hdr_size(hdr);
+       uint64_t psize = arc_hdr_size(hdr);
 
        ASSERT(MUTEX_HELD(&dev->l2ad_mtx));
        ASSERT(HDR_HAS_L2HDR(hdr));
 
        list_remove(&dev->l2ad_buflist, hdr);
 
-       ARCSTAT_INCR(arcstat_l2_asize, -asize);
-       ARCSTAT_INCR(arcstat_l2_size, -HDR_GET_LSIZE(hdr));
+       ARCSTAT_INCR(arcstat_l2_psize, -psize);
+       ARCSTAT_INCR(arcstat_l2_lsize, -HDR_GET_LSIZE(hdr));
 
-       vdev_space_update(dev->l2ad_vdev, -asize, 0, 0);
+       vdev_space_update(dev->l2ad_vdev, -psize, 0, 0);
 
-       (void) refcount_remove_many(&dev->l2ad_alloc, asize, hdr);
+       (void) refcount_remove_many(&dev->l2ad_alloc, psize, hdr);
        arc_hdr_clear_flags(hdr, ARC_FLAG_HAS_L2HDR);
 }
 
@@ -3012,15 +3712,25 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
                while (hdr->b_l1hdr.b_buf != NULL)
                        arc_buf_destroy_impl(hdr->b_l1hdr.b_buf);
 
-               if (hdr->b_l1hdr.b_pabd != NULL)
-                       arc_hdr_free_pabd(hdr);
+               if (hdr->b_l1hdr.b_pabd != NULL) {
+                       arc_hdr_free_abd(hdr, B_FALSE);
+               }
+
+               if (HDR_HAS_RABD(hdr)) {
+                       arc_hdr_free_abd(hdr, B_TRUE);
+               }
        }
 
        ASSERT3P(hdr->b_hash_next, ==, NULL);
        if (HDR_HAS_L1HDR(hdr)) {
                ASSERT(!multilist_link_active(&hdr->b_l1hdr.b_arc_node));
                ASSERT3P(hdr->b_l1hdr.b_acb, ==, NULL);
-               kmem_cache_free(hdr_full_cache, hdr);
+
+               if (!HDR_PROTECTED(hdr)) {
+                       kmem_cache_free(hdr_full_cache, hdr);
+               } else {
+                       kmem_cache_free(hdr_full_crypt_cache, hdr);
+               }
        } else {
                kmem_cache_free(hdr_l2only_cache, hdr);
        }
@@ -3097,6 +3807,7 @@ arc_evict_hdr(arc_buf_hdr_t *hdr, kmutex_t *hash_lock)
 
                if (HDR_HAS_L2HDR(hdr)) {
                        ASSERT(hdr->b_l1hdr.b_pabd == NULL);
+                       ASSERT(!HDR_HAS_RABD(hdr));
                        /*
                         * This buffer is cached on the 2nd Level ARC;
                         * don't destroy the header.
@@ -3163,7 +3874,11 @@ arc_evict_hdr(arc_buf_hdr_t *hdr, kmutex_t *hash_lock)
                 * This ensures that the accounting is updated correctly
                 * in arc_free_data_impl().
                 */
-               arc_hdr_free_pabd(hdr);
+               if (hdr->b_l1hdr.b_pabd != NULL)
+                       arc_hdr_free_abd(hdr, B_FALSE);
+
+               if (HDR_HAS_RABD(hdr))
+                       arc_hdr_free_abd(hdr, B_TRUE);
 
                arc_change_state(evicted_state, hdr, hash_lock);
                ASSERT(HDR_IN_HASH_TABLE(hdr));
@@ -3303,7 +4018,7 @@ arc_evict_state(arc_state_t *state, uint64_t spa, int64_t bytes,
     arc_buf_contents_t type)
 {
        uint64_t total_evicted = 0;
-       multilist_t *ml = &state->arcs_list[type];
+       multilist_t *ml = state->arcs_list[type];
        int num_sublists;
        arc_buf_hdr_t **markers;
        int i;
@@ -3682,8 +4397,8 @@ arc_adjust_meta(void)
 static arc_buf_contents_t
 arc_adjust_type(arc_state_t *state)
 {
-       multilist_t *data_ml = &state->arcs_list[ARC_BUFC_DATA];
-       multilist_t *meta_ml = &state->arcs_list[ARC_BUFC_METADATA];
+       multilist_t *data_ml = state->arcs_list[ARC_BUFC_DATA];
+       multilist_t *meta_ml = state->arcs_list[ARC_BUFC_METADATA];
        int data_idx = multilist_get_random_index(data_ml);
        int meta_idx = multilist_get_random_index(meta_ml);
        multilist_sublist_t *data_mls;
@@ -3949,11 +4664,45 @@ static uint64_t
 arc_all_memory(void)
 {
 #ifdef _KERNEL
-       return (MIN(ptob(physmem),
-           vmem_size(heap_arena, VMEM_FREE | VMEM_ALLOC)));
+#ifdef CONFIG_HIGHMEM
+       return (ptob(totalram_pages - totalhigh_pages));
+#else
+       return (ptob(totalram_pages));
+#endif /* CONFIG_HIGHMEM */
 #else
        return (ptob(physmem) / 2);
-#endif
+#endif /* _KERNEL */
+}
+
+/*
+ * Return the amount of memory that is considered free.  In user space
+ * which is primarily used for testing we pretend that free memory ranges
+ * from 0-20% of all memory.
+ */
+static uint64_t
+arc_free_memory(void)
+{
+#ifdef _KERNEL
+#ifdef CONFIG_HIGHMEM
+       struct sysinfo si;
+       si_meminfo(&si);
+       return (ptob(si.freeram - si.freehigh));
+#else
+#ifdef ZFS_GLOBAL_NODE_PAGE_STATE
+       return (ptob(nr_free_pages() +
+           global_node_page_state(NR_INACTIVE_FILE) +
+           global_node_page_state(NR_INACTIVE_ANON) +
+           global_node_page_state(NR_SLAB_RECLAIMABLE)));
+#else
+       return (ptob(nr_free_pages() +
+           global_page_state(NR_INACTIVE_FILE) +
+           global_page_state(NR_INACTIVE_ANON) +
+           global_page_state(NR_SLAB_RECLAIMABLE)));
+#endif /* ZFS_GLOBAL_NODE_PAGE_STATE */
+#endif /* CONFIG_HIGHMEM */
+#else
+       return (spa_get_random(arc_all_memory() * 20 / 100));
+#endif /* _KERNEL */
 }
 
 typedef enum free_memory_reason_t {
@@ -3992,17 +4741,15 @@ arc_available_memory(void)
        int64_t lowest = INT64_MAX;
        free_memory_reason_t r = FMR_UNKNOWN;
 #ifdef _KERNEL
-       uint64_t available_memory = ptob(freemem);
        int64_t n;
 #ifdef __linux__
+#ifdef freemem
+#undef freemem
+#endif
        pgcnt_t needfree = btop(arc_need_free);
        pgcnt_t lotsfree = btop(arc_sys_free);
        pgcnt_t desfree = 0;
-#endif
-
-#if defined(__i386)
-       available_memory =
-           MIN(available_memory, vmem_size(heap_arena, VMEM_FREE));
+       pgcnt_t freemem = btop(arc_free_memory());
 #endif
 
        if (needfree > 0) {
@@ -4020,7 +4767,7 @@ arc_available_memory(void)
         * number of needed free pages.  We add extra pages here to make sure
         * the scanner doesn't start up while we're freeing memory.
         */
-       n = PAGESIZE * (btop(available_memory) - lotsfree - needfree - desfree);
+       n = PAGESIZE * (freemem - lotsfree - needfree - desfree);
        if (n < lowest) {
                lowest = n;
                r = FMR_LOTSFREE;
@@ -4041,7 +4788,6 @@ arc_available_memory(void)
                r = FMR_SWAPFS_MINFREE;
        }
 
-
        /*
         * Check that we have enough availrmem that memory locking (e.g., via
         * mlock(3C) or memcntl(2)) can still succeed.  (pages_pp_maximum
@@ -4057,9 +4803,9 @@ arc_available_memory(void)
        }
 #endif
 
-#if defined(__i386)
+#if defined(_ILP32)
        /*
-        * If we're on an i386 platform, it's possible that we'll exhaust the
+        * If we're on a 32-bit platform, it's possible that we'll exhaust the
         * kernel heap space before we ever run out of available physical
         * memory.  Most checks of the size of the heap_area compare against
         * tune.t_minarmem, which is the minimum available real memory that we
@@ -4128,6 +4874,7 @@ arc_kmem_reap_now(void)
        extern kmem_cache_t     *zio_data_buf_cache[];
        extern kmem_cache_t     *range_seg_cache;
 
+#ifdef _KERNEL
        if ((arc_meta_used >= arc_meta_limit) && zfs_arc_meta_prune) {
                /*
                 * We are exceeding our meta-data cache limit.
@@ -4135,9 +4882,16 @@ arc_kmem_reap_now(void)
                 */
                arc_prune_async(zfs_arc_meta_prune);
        }
+#if defined(_ILP32)
+       /*
+        * Reclaim unused memory from all kmem caches.
+        */
+       kmem_reap();
+#endif
+#endif
 
        for (i = 0; i < SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT; i++) {
-#ifdef _ILP32
+#if defined(_ILP32)
                /* reach upper limit of cache size on 32-bit */
                if (zio_buf_cache[i] == NULL)
                        break;
@@ -4182,7 +4936,7 @@ arc_kmem_reap_now(void)
  * using mutex_tryenter() from arc_reclaim_thread().
  */
 static void
-arc_reclaim_thread(void)
+arc_reclaim_thread(void *unused)
 {
        fstrans_cookie_t        cookie = spl_fstrans_mark();
        hrtime_t                growtime = 0;
@@ -4193,9 +4947,8 @@ arc_reclaim_thread(void)
        mutex_enter(&arc_reclaim_lock);
        while (!arc_reclaim_thread_exit) {
                int64_t to_free;
-               int64_t free_memory = arc_available_memory();
                uint64_t evicted = 0;
-
+               uint64_t need_free = arc_need_free;
                arc_tuning_update();
 
                /*
@@ -4215,6 +4968,14 @@ arc_reclaim_thread(void)
 #endif
                mutex_exit(&arc_reclaim_lock);
 
+               /*
+                * We call arc_adjust() before (possibly) calling
+                * arc_kmem_reap_now(), so that we can wake up
+                * arc_get_data_buf() sooner.
+                */
+               evicted = arc_adjust();
+
+               int64_t free_memory = arc_available_memory();
                if (free_memory < 0) {
 
                        arc_no_grow = B_TRUE;
@@ -4237,7 +4998,7 @@ arc_reclaim_thread(void)
                        to_free = (arc_c >> arc_shrink_shift) - free_memory;
                        if (to_free > 0) {
 #ifdef _KERNEL
-                               to_free = MAX(to_free, arc_need_free);
+                               to_free = MAX(to_free, need_free);
 #endif
                                arc_shrink(to_free);
                        }
@@ -4247,8 +5008,6 @@ arc_reclaim_thread(void)
                        arc_no_grow = B_FALSE;
                }
 
-               evicted = arc_adjust();
-
                mutex_enter(&arc_reclaim_lock);
 
                /*
@@ -4264,11 +5023,12 @@ arc_reclaim_thread(void)
                        /*
                         * We're either no longer overflowing, or we
                         * can't evict anything more, so we should wake
-                        * up any threads before we go to sleep and clear
-                        * arc_need_free since nothing more can be done.
+                        * up any threads before we go to sleep and remove
+                        * the bytes we were working on from arc_need_free
+                        * since nothing more will be done here.
                         */
                        cv_broadcast(&arc_reclaim_waiters_cv);
-                       arc_need_free = 0;
+                       ARCSTAT_INCR(arcstat_need_free, -need_free);
 
                        /*
                         * Block until signaled, or after one second (we
@@ -4343,17 +5103,25 @@ arc_evictable_memory(void)
            refcount_count(&arc_mru->arcs_esize[ARC_BUFC_METADATA]) +
            refcount_count(&arc_mfu->arcs_esize[ARC_BUFC_DATA]) +
            refcount_count(&arc_mfu->arcs_esize[ARC_BUFC_METADATA]);
-       uint64_t ghost_clean =
-           refcount_count(&arc_mru_ghost->arcs_esize[ARC_BUFC_DATA]) +
-           refcount_count(&arc_mru_ghost->arcs_esize[ARC_BUFC_METADATA]) +
-           refcount_count(&arc_mfu_ghost->arcs_esize[ARC_BUFC_DATA]) +
-           refcount_count(&arc_mfu_ghost->arcs_esize[ARC_BUFC_METADATA]);
        uint64_t arc_dirty = MAX((int64_t)arc_size - (int64_t)arc_clean, 0);
 
-       if (arc_dirty >= arc_c_min)
-               return (ghost_clean + arc_clean);
+       /*
+        * Scale reported evictable memory in proportion to page cache, cap
+        * at specified min/max.
+        */
+#ifdef ZFS_GLOBAL_NODE_PAGE_STATE
+       uint64_t min = (ptob(global_node_page_state(NR_FILE_PAGES)) / 100) *
+           zfs_arc_pc_percent;
+#else
+       uint64_t min = (ptob(global_page_state(NR_FILE_PAGES)) / 100) *
+           zfs_arc_pc_percent;
+#endif
+       min = MAX(arc_c_min, MIN(arc_c_max, min));
+
+       if (arc_dirty >= min)
+               return (arc_clean);
 
-       return (ghost_clean + MAX((int64_t)arc_size - (int64_t)arc_c_min, 0));
+       return (MAX((int64_t)arc_size - (int64_t)min, 0));
 }
 
 /*
@@ -4387,33 +5155,33 @@ __arc_shrinker_func(struct shrinker *shrink, struct shrink_control *sc)
                return (SHRINK_STOP);
 
        /* Reclaim in progress */
-       if (mutex_tryenter(&arc_reclaim_lock) == 0)
-               return (SHRINK_STOP);
+       if (mutex_tryenter(&arc_reclaim_lock) == 0) {
+               ARCSTAT_INCR(arcstat_need_free, ptob(sc->nr_to_scan));
+               return (0);
+       }
 
        mutex_exit(&arc_reclaim_lock);
 
        /*
         * Evict the requested number of pages by shrinking arc_c the
-        * requested amount.  If there is nothing left to evict just
-        * reap whatever we can from the various arc slabs.
+        * requested amount.
         */
        if (pages > 0) {
                arc_shrink(ptob(sc->nr_to_scan));
-               arc_kmem_reap_now();
+               if (current_is_kswapd())
+                       arc_kmem_reap_now();
 #ifdef HAVE_SPLIT_SHRINKER_CALLBACK
-               pages = MAX(pages - btop(arc_evictable_memory()), 0);
+               pages = MAX((int64_t)pages -
+                   (int64_t)btop(arc_evictable_memory()), 0);
 #else
                pages = btop(arc_evictable_memory());
 #endif
-       } else {
-               arc_kmem_reap_now();
+               /*
+                * We've shrunk what we can, wake up threads.
+                */
+               cv_broadcast(&arc_reclaim_waiters_cv);
+       } else
                pages = SHRINK_STOP;
-       }
-
-       /*
-        * We've reaped what we can, wake up threads.
-        */
-       cv_broadcast(&arc_reclaim_waiters_cv);
 
        /*
         * When direct reclaim is observed it usually indicates a rapid
@@ -4426,7 +5194,7 @@ __arc_shrinker_func(struct shrinker *shrink, struct shrink_control *sc)
                ARCSTAT_BUMP(arcstat_memory_indirect_count);
        } else {
                arc_no_grow = B_TRUE;
-               arc_need_free = ptob(sc->nr_to_scan);
+               arc_kmem_reap_now();
                ARCSTAT_BUMP(arcstat_memory_direct_count);
        }
 
@@ -4835,22 +5603,22 @@ arc_access(arc_buf_hdr_t *hdr, kmutex_t *hash_lock)
        }
 }
 
-/* a generic arc_done_func_t which you can use */
+/* a generic arc_read_done_func_t which you can use */
 /* ARGSUSED */
 void
-arc_bcopy_func(zio_t *zio, arc_buf_t *buf, void *arg)
+arc_bcopy_func(zio_t *zio, int error, arc_buf_t *buf, void *arg)
 {
-       if (zio == NULL || zio->io_error == 0)
+       if (error == 0)
                bcopy(buf->b_data, arg, arc_buf_size(buf));
        arc_buf_destroy(buf, arg);
 }
 
-/* a generic arc_done_func_t */
+/* a generic arc_read_done_func_t */
 void
-arc_getbuf_func(zio_t *zio, arc_buf_t *buf, void *arg)
+arc_getbuf_func(zio_t *zio, int error, arc_buf_t *buf, void *arg)
 {
        arc_buf_t **bufp = arg;
-       if (zio && zio->io_error) {
+       if (error != 0) {
                arc_buf_destroy(buf, arg);
                *bufp = NULL;
        } else {
@@ -4864,27 +5632,29 @@ arc_hdr_verify(arc_buf_hdr_t *hdr, blkptr_t *bp)
 {
        if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp)) {
                ASSERT3U(HDR_GET_PSIZE(hdr), ==, 0);
-               ASSERT3U(HDR_GET_COMPRESS(hdr), ==, ZIO_COMPRESS_OFF);
+               ASSERT3U(arc_hdr_get_compress(hdr), ==, ZIO_COMPRESS_OFF);
        } else {
                if (HDR_COMPRESSION_ENABLED(hdr)) {
-                       ASSERT3U(HDR_GET_COMPRESS(hdr), ==,
+                       ASSERT3U(arc_hdr_get_compress(hdr), ==,
                            BP_GET_COMPRESS(bp));
                }
                ASSERT3U(HDR_GET_LSIZE(hdr), ==, BP_GET_LSIZE(bp));
                ASSERT3U(HDR_GET_PSIZE(hdr), ==, BP_GET_PSIZE(bp));
+               ASSERT3U(!!HDR_PROTECTED(hdr), ==, BP_IS_PROTECTED(bp));
        }
 }
 
 static void
 arc_read_done(zio_t *zio)
 {
+       blkptr_t        *bp = zio->io_bp;
        arc_buf_hdr_t   *hdr = zio->io_private;
        kmutex_t        *hash_lock = NULL;
        arc_callback_t  *callback_list;
        arc_callback_t  *acb;
        boolean_t       freeable = B_FALSE;
        boolean_t       no_zio_error = (zio->io_error == 0);
-       int callback_cnt = 0;
+
        /*
         * The hdr was inserted into hash-table and removed from lists
         * prior to starting I/O.  We should find this header, since
@@ -4910,6 +5680,26 @@ arc_read_done(zio_t *zio)
                ASSERT3P(hash_lock, !=, NULL);
        }
 
+       if (BP_IS_PROTECTED(bp)) {
+               hdr->b_crypt_hdr.b_ot = BP_GET_TYPE(bp);
+               hdr->b_crypt_hdr.b_dsobj = zio->io_bookmark.zb_objset;
+               zio_crypt_decode_params_bp(bp, hdr->b_crypt_hdr.b_salt,
+                   hdr->b_crypt_hdr.b_iv);
+
+               if (BP_GET_TYPE(bp) == DMU_OT_INTENT_LOG) {
+                       void *tmpbuf;
+
+                       tmpbuf = abd_borrow_buf_copy(zio->io_abd,
+                           sizeof (zil_chain_t));
+                       zio_crypt_decode_mac_zil(tmpbuf,
+                           hdr->b_crypt_hdr.b_mac);
+                       abd_return_buf(zio->io_abd, tmpbuf,
+                           sizeof (zil_chain_t));
+               } else {
+                       zio_crypt_decode_mac_bp(bp, hdr->b_crypt_hdr.b_mac);
+               }
+       }
+
        if (no_zio_error) {
                /* byteswap if necessary */
                if (BP_SHOULD_BYTESWAP(zio->io_bp)) {
@@ -4947,17 +5737,41 @@ arc_read_done(zio_t *zio)
         * passed in. The implementation of arc_buf_alloc_impl() ensures that we
         * aren't needlessly decompressing the data multiple times.
         */
+       int callback_cnt = 0;
        for (acb = callback_list; acb != NULL; acb = acb->acb_next) {
-               int error;
                if (!acb->acb_done)
                        continue;
 
                /* This is a demand read since prefetches don't use callbacks */
-
                callback_cnt++;
 
-               error = arc_buf_alloc_impl(hdr, acb->acb_private,
-                   acb->acb_compressed, no_zio_error, &acb->acb_buf);
+               int error = arc_buf_alloc_impl(hdr, zio->io_spa,
+                   zio->io_bookmark.zb_objset, acb->acb_private,
+                   acb->acb_encrypted, acb->acb_compressed, acb->acb_noauth,
+                   no_zio_error, &acb->acb_buf);
+
+               /*
+                * assert non-speculative zios didn't fail because an
+                * encryption key wasn't loaded
+                */
+               ASSERT((zio->io_flags & ZIO_FLAG_SPECULATIVE) ||
+                   error == 0 || error != ENOENT);
+
+               /*
+                * If we failed to decrypt, report an error now (as the zio
+                * layer would have done if it had done the transforms).
+                */
+               if (error == ECKSUM) {
+                       ASSERT(BP_IS_PROTECTED(bp));
+                       error = SET_ERROR(EIO);
+                       spa_log_error(zio->io_spa, &zio->io_bookmark);
+                       if ((zio->io_flags & ZIO_FLAG_SPECULATIVE) == 0) {
+                               zfs_ereport_post(FM_EREPORT_ZFS_AUTHENTICATION,
+                                   zio->io_spa, NULL, &zio->io_bookmark, zio,
+                                   0, 0);
+                       }
+               }
+
                if (no_zio_error) {
                        zio->io_error = error;
                }
@@ -4965,9 +5779,8 @@ arc_read_done(zio_t *zio)
        hdr->b_l1hdr.b_acb = NULL;
        arc_hdr_clear_flags(hdr, ARC_FLAG_IO_IN_PROGRESS);
        if (callback_cnt == 0) {
-               ASSERT(HDR_PREFETCH(hdr));
-               ASSERT0(hdr->b_l1hdr.b_bufcnt);
-               ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+               ASSERT(HDR_PREFETCH(hdr) || HDR_HAS_RABD(hdr));
+               ASSERT(hdr->b_l1hdr.b_pabd != NULL || HDR_HAS_RABD(hdr));
        }
 
        ASSERT(refcount_is_zero(&hdr->b_l1hdr.b_refcnt) ||
@@ -5006,8 +5819,10 @@ arc_read_done(zio_t *zio)
 
        /* execute each callback and free its structure */
        while ((acb = callback_list) != NULL) {
-               if (acb->acb_done)
-                       acb->acb_done(zio, acb->acb_buf, acb->acb_private);
+               if (acb->acb_done) {
+                       acb->acb_done(zio, zio->io_error, acb->acb_buf,
+                           acb->acb_private);
+               }
 
                if (acb->acb_zio_dummy != NULL) {
                        acb->acb_zio_dummy->io_error = zio->io_error;
@@ -5041,15 +5856,19 @@ arc_read_done(zio_t *zio)
  * for readers of this block.
  */
 int
-arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
-    void *private, zio_priority_t priority, int zio_flags,
-    arc_flags_t *arc_flags, const zbookmark_phys_t *zb)
+arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
+    arc_read_done_func_t *done, void *private, zio_priority_t priority,
+    int zio_flags, arc_flags_t *arc_flags, const zbookmark_phys_t *zb)
 {
        arc_buf_hdr_t *hdr = NULL;
        kmutex_t *hash_lock = NULL;
        zio_t *rzio;
        uint64_t guid = spa_load_guid(spa);
-       boolean_t compressed_read = (zio_flags & ZIO_FLAG_RAW) != 0;
+       boolean_t compressed_read = (zio_flags & ZIO_FLAG_RAW_COMPRESS) != 0;
+       boolean_t encrypted_read = BP_IS_ENCRYPTED(bp) &&
+           (zio_flags & ZIO_FLAG_RAW_ENCRYPT) != 0;
+       boolean_t noauth_read = BP_IS_AUTHENTICATED(bp) &&
+           (zio_flags & ZIO_FLAG_RAW_ENCRYPT) != 0;
        int rc = 0;
 
        ASSERT(!BP_IS_EMBEDDED(bp) ||
@@ -5064,7 +5883,15 @@ top:
                hdr = buf_hash_find(guid, bp, &hash_lock);
        }
 
-       if (hdr != NULL && HDR_HAS_L1HDR(hdr) && hdr->b_l1hdr.b_pabd != NULL) {
+       /*
+        * Determine if we have an L1 cache hit or a cache miss. For simplicity
+        * we maintain encrypted data seperately from compressed / uncompressed
+        * data. If the user is requesting raw encrypted data and we don't have
+        * that in the header we will read from disk to guarantee that we can
+        * get it even if the encryption keys aren't loaded.
+        */
+       if (hdr != NULL && HDR_HAS_L1HDR(hdr) && (HDR_HAS_RABD(hdr) ||
+           (hdr->b_l1hdr.b_pabd != NULL && !encrypted_read))) {
                arc_buf_t *buf = NULL;
                *arc_flags |= ARC_FLAG_CACHED;
 
@@ -5115,6 +5942,7 @@ top:
                                    KM_SLEEP);
                                acb->acb_done = done;
                                acb->acb_private = private;
+                               acb->acb_compressed = compressed_read;
                                if (pio != NULL)
                                        acb->acb_zio_dummy = zio_null(pio,
                                            spa, NULL, NULL, NULL, zio_flags);
@@ -5150,8 +5978,12 @@ top:
                        ASSERT(!BP_IS_EMBEDDED(bp) || !BP_IS_HOLE(bp));
 
                        /* Get a buf with the desired data in it. */
-                       VERIFY0(arc_buf_alloc_impl(hdr, private,
-                           compressed_read, B_TRUE, &buf));
+                       rc = arc_buf_alloc_impl(hdr, spa, zb->zb_objset,
+                           private, encrypted_read, compressed_read,
+                           noauth_read, B_TRUE, &buf);
+
+                       ASSERT((zio_flags & ZIO_FLAG_SPECULATIVE) ||
+                           rc == 0 || rc != ENOENT);
                } else if (*arc_flags & ARC_FLAG_PREFETCH &&
                    refcount_count(&hdr->b_l1hdr.b_refcnt) == 0) {
                        arc_hdr_set_flags(hdr, ARC_FLAG_PREFETCH);
@@ -5167,7 +5999,7 @@ top:
                    data, metadata, hits);
 
                if (done)
-                       done(NULL, buf, private);
+                       done(NULL, rc, buf, private);
        } else {
                uint64_t lsize = BP_GET_LSIZE(bp);
                uint64_t psize = BP_GET_PSIZE(bp);
@@ -5176,6 +6008,7 @@ top:
                uint64_t addr = 0;
                boolean_t devw = B_FALSE;
                uint64_t size;
+               void *hdr_abd;
 
                /*
                 * Gracefully handle a damaged logical block size as a
@@ -5191,7 +6024,8 @@ top:
                        arc_buf_hdr_t *exists = NULL;
                        arc_buf_contents_t type = BP_GET_BUFC_TYPE(bp);
                        hdr = arc_hdr_alloc(spa_load_guid(spa), psize, lsize,
-                           BP_GET_COMPRESS(bp), type);
+                           BP_IS_PROTECTED(bp), BP_GET_COMPRESS(bp), type,
+                           encrypted_read);
 
                        if (!BP_IS_EMBEDDED(bp)) {
                                hdr->b_dva = *BP_IDENTITY(bp);
@@ -5207,26 +6041,42 @@ top:
                        }
                } else {
                        /*
-                        * This block is in the ghost cache. If it was L2-only
-                        * (and thus didn't have an L1 hdr), we realloc the
-                        * header to add an L1 hdr.
+                        * This block is in the ghost cache or encrypted data
+                        * was requested and we didn't have it. If it was
+                        * L2-only (and thus didn't have an L1 hdr),
+                        * we realloc the header to add an L1 hdr.
                         */
                        if (!HDR_HAS_L1HDR(hdr)) {
                                hdr = arc_hdr_realloc(hdr, hdr_l2only_cache,
                                    hdr_full_cache);
                        }
 
-                       ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
-                       ASSERT(GHOST_STATE(hdr->b_l1hdr.b_state));
-                       ASSERT(!HDR_IO_IN_PROGRESS(hdr));
-                       ASSERT(refcount_is_zero(&hdr->b_l1hdr.b_refcnt));
-                       ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
-                       ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
+                       if (GHOST_STATE(hdr->b_l1hdr.b_state)) {
+                               ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+                               ASSERT(!HDR_HAS_RABD(hdr));
+                               ASSERT(!HDR_IO_IN_PROGRESS(hdr));
+                               ASSERT0(refcount_count(&hdr->b_l1hdr.b_refcnt));
+                               ASSERT3P(hdr->b_l1hdr.b_buf, ==, NULL);
+                               ASSERT3P(hdr->b_l1hdr.b_freeze_cksum, ==, NULL);
+                       } else if (HDR_IO_IN_PROGRESS(hdr)) {
+                               /*
+                                * If this header already had an IO in progress
+                                * and we are performing another IO to fetch
+                                * encrypted data we must wait until the first
+                                * IO completes so as not to confuse
+                                * arc_read_done(). This should be very rare
+                                * and so the performance impact shouldn't
+                                * matter.
+                                */
+                               cv_wait(&hdr->b_l1hdr.b_cv, hash_lock);
+                               mutex_exit(hash_lock);
+                               goto top;
+                       }
 
                        /*
                         * This is a delicate dance that we play here.
-                        * This hdr is in the ghost list so we access it
-                        * to move it out of the ghost list before we
+                        * This hdr might be in the ghost list so we access
+                        * it to move it out of the ghost list before we
                         * initiate the read. If it's a prefetch then
                         * it won't have a callback so we'll remove the
                         * reference that arc_buf_alloc_impl() created. We
@@ -5234,25 +6084,41 @@ top:
                         * avoid hitting an assert in remove_reference().
                         */
                        arc_access(hdr, hash_lock);
-                       arc_hdr_alloc_pabd(hdr);
+                       arc_hdr_alloc_abd(hdr, encrypted_read);
                }
-               ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
-               size = arc_hdr_size(hdr);
 
-               /*
-                * If compression is enabled on the hdr, then will do
-                * RAW I/O and will store the compressed data in the hdr's
-                * data block. Otherwise, the hdr's data block will contain
-                * the uncompressed data.
-                */
-               if (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF) {
+               if (encrypted_read) {
+                       ASSERT(HDR_HAS_RABD(hdr));
+                       size = HDR_GET_PSIZE(hdr);
+                       hdr_abd = hdr->b_crypt_hdr.b_rabd;
                        zio_flags |= ZIO_FLAG_RAW;
+               } else {
+                       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+                       size = arc_hdr_size(hdr);
+                       hdr_abd = hdr->b_l1hdr.b_pabd;
+
+                       if (arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF) {
+                               zio_flags |= ZIO_FLAG_RAW_COMPRESS;
+                       }
+
+                       /*
+                        * For authenticated bp's, we do not ask the ZIO layer
+                        * to authenticate them since this will cause the entire
+                        * IO to fail if the key isn't loaded. Instead, we
+                        * defer authentication until arc_buf_fill(), which will
+                        * verify the data when the key is available.
+                        */
+                       if (BP_IS_AUTHENTICATED(bp))
+                               zio_flags |= ZIO_FLAG_RAW_ENCRYPT;
                }
 
-               if (*arc_flags & ARC_FLAG_PREFETCH)
+               if (*arc_flags & ARC_FLAG_PREFETCH &&
+                   refcount_is_zero(&hdr->b_l1hdr.b_refcnt))
                        arc_hdr_set_flags(hdr, ARC_FLAG_PREFETCH);
                if (*arc_flags & ARC_FLAG_L2CACHE)
                        arc_hdr_set_flags(hdr, ARC_FLAG_L2CACHE);
+               if (BP_IS_AUTHENTICATED(bp))
+                       arc_hdr_set_flags(hdr, ARC_FLAG_NOAUTH);
                if (BP_GET_LEVEL(bp) > 0)
                        arc_hdr_set_flags(hdr, ARC_FLAG_INDIRECT);
                if (*arc_flags & ARC_FLAG_PREDICTIVE_PREFETCH)
@@ -5263,6 +6129,8 @@ top:
                acb->acb_done = done;
                acb->acb_private = private;
                acb->acb_compressed = compressed_read;
+               acb->acb_encrypted = encrypted_read;
+               acb->acb_noauth = noauth_read;
 
                ASSERT3P(hdr->b_l1hdr.b_acb, ==, NULL);
                hdr->b_l1hdr.b_acb = acb;
@@ -5315,6 +6183,8 @@ top:
                            !HDR_L2_WRITING(hdr) && !HDR_L2_EVICTED(hdr) &&
                            !(l2arc_noprefetch && HDR_PREFETCH(hdr))) {
                                l2arc_read_callback_t *cb;
+                               abd_t *abd;
+                               uint64_t asize;
 
                                DTRACE_PROBE1(l2arc__hit, arc_buf_hdr_t *, hdr);
                                ARCSTAT_BUMP(arcstat_l2_hits);
@@ -5327,8 +6197,17 @@ top:
                                cb->l2rcb_zb = *zb;
                                cb->l2rcb_flags = zio_flags;
 
+                               asize = vdev_psize_to_asize(vd, size);
+                               if (asize != size) {
+                                       abd = abd_alloc_for_io(asize,
+                                           HDR_ISTYPE_METADATA(hdr));
+                                       cb->l2rcb_abd = abd;
+                               } else {
+                                       abd = hdr_abd;
+                               }
+
                                ASSERT(addr >= VDEV_LABEL_START_SIZE &&
-                                   addr + lsize < vd->vdev_psize -
+                                   addr + asize <= vd->vdev_psize -
                                    VDEV_LABEL_END_SIZE);
 
                                /*
@@ -5337,10 +6216,10 @@ top:
                                 * Issue a null zio if the underlying buffer
                                 * was squashed to zero size by compression.
                                 */
-                               ASSERT3U(HDR_GET_COMPRESS(hdr), !=,
+                               ASSERT3U(arc_hdr_get_compress(hdr), !=,
                                    ZIO_COMPRESS_EMPTY);
                                rzio = zio_read_phys(pio, vd, addr,
-                                   size, hdr->b_l1hdr.b_pabd,
+                                   asize, abd,
                                    ZIO_CHECKSUM_OFF,
                                    l2arc_read_done, cb, priority,
                                    zio_flags | ZIO_FLAG_DONT_CACHE |
@@ -5350,7 +6229,8 @@ top:
 
                                DTRACE_PROBE2(l2arc__read, vdev_t *, vd,
                                    zio_t *, rzio);
-                               ARCSTAT_INCR(arcstat_l2_read_bytes, size);
+                               ARCSTAT_INCR(arcstat_l2_read_bytes,
+                                   HDR_GET_PSIZE(hdr));
 
                                if (*arc_flags & ARC_FLAG_NOWAIT) {
                                        zio_nowait(rzio);
@@ -5380,7 +6260,7 @@ top:
                        }
                }
 
-               rzio = zio_read(pio, spa, bp, hdr->b_l1hdr.b_pabd, size,
+               rzio = zio_read(pio, spa, bp, hdr_abd, size,
                    arc_read_done, hdr, priority, zio_flags, zb);
 
                if (*arc_flags & ARC_FLAG_WAIT) {
@@ -5574,9 +6454,9 @@ arc_release(arc_buf_t *buf, void *tag)
                uint64_t spa = hdr->b_spa;
                uint64_t psize = HDR_GET_PSIZE(hdr);
                uint64_t lsize = HDR_GET_LSIZE(hdr);
-               enum zio_compress compress = HDR_GET_COMPRESS(hdr);
+               boolean_t protected = HDR_PROTECTED(hdr);
+               enum zio_compress compress = arc_hdr_get_compress(hdr);
                arc_buf_contents_t type = arc_buf_type(hdr);
-               arc_buf_t *lastbuf = NULL;
                VERIFY3U(hdr->b_type, ==, type);
 
                ASSERT(hdr->b_l1hdr.b_buf != buf || buf->b_next != NULL);
@@ -5592,7 +6472,7 @@ arc_release(arc_buf_t *buf, void *tag)
                 * a new anonymous hdr. Also find the last buffer
                 * in the hdr's buffer list.
                 */
-               lastbuf = arc_buf_remove(hdr, buf);
+               arc_buf_t *lastbuf = arc_buf_remove(hdr, buf);
                ASSERT3P(lastbuf, !=, NULL);
 
                /*
@@ -5605,9 +6485,7 @@ arc_release(arc_buf_t *buf, void *tag)
 
                        /*
                         * First, sever the block sharing relationship between
-                        * buf and the arc_buf_hdr_t. Then, setup a new
-                        * block sharing relationship with the last buffer
-                        * on the arc_buf_t list.
+                        * buf and the arc_buf_hdr_t.
                         */
                        arc_unshare_buf(hdr, buf);
 
@@ -5620,7 +6498,7 @@ arc_release(arc_buf_t *buf, void *tag)
                        if (arc_can_share(hdr, lastbuf)) {
                                arc_share_buf(hdr, lastbuf);
                        } else {
-                               arc_hdr_alloc_pabd(hdr);
+                               arc_hdr_alloc_abd(hdr, B_FALSE);
                                abd_copy_from_buf(hdr->b_l1hdr.b_pabd,
                                    buf->b_data, psize);
                        }
@@ -5635,10 +6513,11 @@ arc_release(arc_buf_t *buf, void *tag)
                         * if we have a compressed, shared buffer.
                         */
                        ASSERT(arc_buf_is_shared(lastbuf) ||
-                           HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF);
+                           arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF);
                        ASSERT(!ARC_BUF_SHARED(buf));
                }
-               ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
+
+               ASSERT(hdr->b_l1hdr.b_pabd != NULL || HDR_HAS_RABD(hdr));
                ASSERT3P(state, !=, arc_l2c_only);
 
                (void) refcount_remove_many(&state->arcs_size,
@@ -5651,16 +6530,24 @@ arc_release(arc_buf_t *buf, void *tag)
                }
 
                hdr->b_l1hdr.b_bufcnt -= 1;
+               if (ARC_BUF_ENCRYPTED(buf))
+                       hdr->b_crypt_hdr.b_ebufcnt -= 1;
+
                arc_cksum_verify(buf);
                arc_buf_unwatch(buf);
 
+               /* if this is the last uncompressed buf free the checksum */
+               if (!arc_hdr_has_uncompressed_buf(hdr))
+                       arc_cksum_free(hdr);
+
                mutex_exit(hash_lock);
 
                /*
                 * Allocate a new hdr. The new hdr will contain a b_pabd
                 * buffer which will be freed in arc_write().
                 */
-               nhdr = arc_hdr_alloc(spa, psize, lsize, compress, type);
+               nhdr = arc_hdr_alloc(spa, psize, lsize, protected,
+                   compress, type, HDR_HAS_RABD(hdr));
                ASSERT3P(nhdr->b_l1hdr.b_buf, ==, NULL);
                ASSERT0(nhdr->b_l1hdr.b_bufcnt);
                ASSERT0(refcount_count(&nhdr->b_l1hdr.b_refcnt));
@@ -5669,6 +6556,8 @@ arc_release(arc_buf_t *buf, void *tag)
 
                nhdr->b_l1hdr.b_buf = buf;
                nhdr->b_l1hdr.b_bufcnt = 1;
+               if (ARC_BUF_ENCRYPTED(buf))
+                       nhdr->b_crypt_hdr.b_ebufcnt = 1;
                nhdr->b_l1hdr.b_mru_hits = 0;
                nhdr->b_l1hdr.b_mru_ghost_hits = 0;
                nhdr->b_l1hdr.b_mfu_hits = 0;
@@ -5693,8 +6582,8 @@ arc_release(arc_buf_t *buf, void *tag)
                hdr->b_l1hdr.b_l2_hits = 0;
                arc_change_state(arc_anon, hdr, hash_lock);
                hdr->b_l1hdr.b_arc_access = 0;
-               mutex_exit(hash_lock);
 
+               mutex_exit(hash_lock);
                buf_discard_identity(hdr);
                arc_buf_thaw(buf);
        }
@@ -5731,7 +6620,8 @@ arc_write_ready(zio_t *zio)
        arc_write_callback_t *callback = zio->io_private;
        arc_buf_t *buf = callback->awcb_buf;
        arc_buf_hdr_t *hdr = buf->b_hdr;
-       uint64_t psize = BP_IS_HOLE(zio->io_bp) ? 0 : BP_GET_PSIZE(zio->io_bp);
+       blkptr_t *bp = zio->io_bp;
+       uint64_t psize = BP_IS_HOLE(bp) ? 0 : BP_GET_PSIZE(bp);
        enum zio_compress compress;
        fstrans_cookie_t cookie = spl_fstrans_mark();
 
@@ -5751,11 +6641,15 @@ arc_write_ready(zio_t *zio)
                        if (arc_buf_is_shared(buf)) {
                                arc_unshare_buf(hdr, buf);
                        } else {
-                               arc_hdr_free_pabd(hdr);
+                               arc_hdr_free_abd(hdr, B_FALSE);
                        }
                }
+
+               if (HDR_HAS_RABD(hdr))
+                       arc_hdr_free_abd(hdr, B_TRUE);
        }
        ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
+       ASSERT(!HDR_HAS_RABD(hdr));
        ASSERT(!HDR_SHARED_DATA(hdr));
        ASSERT(!arc_buf_is_shared(buf));
 
@@ -5764,21 +6658,54 @@ arc_write_ready(zio_t *zio)
        if (HDR_IO_IN_PROGRESS(hdr))
                ASSERT(zio->io_flags & ZIO_FLAG_REEXECUTED);
 
-       arc_cksum_compute(buf);
        arc_hdr_set_flags(hdr, ARC_FLAG_IO_IN_PROGRESS);
 
-       if (BP_IS_HOLE(zio->io_bp) || BP_IS_EMBEDDED(zio->io_bp)) {
+       if (BP_IS_PROTECTED(bp) != !!HDR_PROTECTED(hdr))
+               hdr = arc_hdr_realloc_crypt(hdr, BP_IS_PROTECTED(bp));
+
+       if (BP_IS_PROTECTED(bp)) {
+               /* ZIL blocks are written through zio_rewrite */
+               ASSERT3U(BP_GET_TYPE(bp), !=, DMU_OT_INTENT_LOG);
+               ASSERT(HDR_PROTECTED(hdr));
+
+               hdr->b_crypt_hdr.b_ot = BP_GET_TYPE(bp);
+               hdr->b_crypt_hdr.b_dsobj = zio->io_bookmark.zb_objset;
+               zio_crypt_decode_params_bp(bp, hdr->b_crypt_hdr.b_salt,
+                   hdr->b_crypt_hdr.b_iv);
+               zio_crypt_decode_mac_bp(bp, hdr->b_crypt_hdr.b_mac);
+       }
+
+       /*
+        * If this block was written for raw encryption but the zio layer
+        * ended up only authenticating it, adjust the buffer flags now.
+        */
+       if (BP_IS_AUTHENTICATED(bp) && ARC_BUF_ENCRYPTED(buf)) {
+               arc_hdr_set_flags(hdr, ARC_FLAG_NOAUTH);
+               buf->b_flags &= ~ARC_BUF_FLAG_ENCRYPTED;
+               if (BP_GET_COMPRESS(bp) == ZIO_COMPRESS_OFF)
+                       buf->b_flags &= ~ARC_BUF_FLAG_COMPRESSED;
+       }
+
+       /* this must be done after the buffer flags are adjusted */
+       arc_cksum_compute(buf);
+
+       if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp)) {
                compress = ZIO_COMPRESS_OFF;
        } else {
-               ASSERT3U(HDR_GET_LSIZE(hdr), ==, BP_GET_LSIZE(zio->io_bp));
-               compress = BP_GET_COMPRESS(zio->io_bp);
+               ASSERT3U(HDR_GET_LSIZE(hdr), ==, BP_GET_LSIZE(bp));
+               compress = BP_GET_COMPRESS(bp);
        }
        HDR_SET_PSIZE(hdr, psize);
        arc_hdr_set_compress(hdr, compress);
 
+       if (zio->io_error != 0 || psize == 0)
+               goto out;
+
        /*
-        * Fill the hdr with data. If the hdr is compressed, the data we want
-        * is available from the zio, otherwise we can take it from the buf.
+        * Fill the hdr with data. If the buffer is encrypted we have no choice
+        * but to copy the data into b_radb. If the hdr is compressed, the data
+        * we want is available from the zio, otherwise we can take it from
+        * the buf.
         *
         * We might be able to share the buf's data with the hdr here. However,
         * doing so would cause the ARC to be full of linear ABDs if we write a
@@ -5788,23 +6715,29 @@ arc_write_ready(zio_t *zio)
         * written. Therefore, if they're allowed then we allocate one and copy
         * the data into it; otherwise, we share the data directly if we can.
         */
-       if (zfs_abd_scatter_enabled || !arc_can_share(hdr, buf)) {
-               arc_hdr_alloc_pabd(hdr);
-
+       if (ARC_BUF_ENCRYPTED(buf)) {
+               ASSERT3U(psize, >, 0);
+               ASSERT(ARC_BUF_COMPRESSED(buf));
+               arc_hdr_alloc_abd(hdr, B_TRUE);
+               abd_copy(hdr->b_crypt_hdr.b_rabd, zio->io_abd, psize);
+       } else if (zfs_abd_scatter_enabled || !arc_can_share(hdr, buf)) {
                /*
                 * Ideally, we would always copy the io_abd into b_pabd, but the
                 * user may have disabled compressed ARC, thus we must check the
                 * hdr's compression setting rather than the io_bp's.
                 */
-               if (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF) {
-                       ASSERT3U(BP_GET_COMPRESS(zio->io_bp), !=,
-                           ZIO_COMPRESS_OFF);
+               if (BP_IS_ENCRYPTED(bp)) {
                        ASSERT3U(psize, >, 0);
-
+                       arc_hdr_alloc_abd(hdr, B_TRUE);
+                       abd_copy(hdr->b_crypt_hdr.b_rabd, zio->io_abd, psize);
+               } else if (arc_hdr_get_compress(hdr) != ZIO_COMPRESS_OFF &&
+                   !ARC_BUF_COMPRESSED(buf)) {
+                       ASSERT3U(psize, >, 0);
+                       arc_hdr_alloc_abd(hdr, B_FALSE);
                        abd_copy(hdr->b_l1hdr.b_pabd, zio->io_abd, psize);
                } else {
                        ASSERT3U(zio->io_orig_size, ==, arc_hdr_size(hdr));
-
+                       arc_hdr_alloc_abd(hdr, B_FALSE);
                        abd_copy_from_buf(hdr->b_l1hdr.b_pabd, buf->b_data,
                            arc_buf_size(buf));
                }
@@ -5816,7 +6749,8 @@ arc_write_ready(zio_t *zio)
                arc_share_buf(hdr, buf);
        }
 
-       arc_hdr_verify(hdr, zio->io_bp);
+out:
+       arc_hdr_verify(hdr, bp);
        spl_fstrans_unmark(cookie);
 }
 
@@ -5928,14 +6862,15 @@ arc_write_done(zio_t *zio)
 zio_t *
 arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
     blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc,
-    const zio_prop_t *zp, arc_done_func_t *ready,
-    arc_done_func_t *children_ready, arc_done_func_t *physdone,
-    arc_done_func_t *done, void *private, zio_priority_t priority,
+    const zio_prop_t *zp, arc_write_done_func_t *ready,
+    arc_write_done_func_t *children_ready, arc_write_done_func_t *physdone,
+    arc_write_done_func_t *done, void *private, zio_priority_t priority,
     int zio_flags, const zbookmark_phys_t *zb)
 {
        arc_buf_hdr_t *hdr = buf->b_hdr;
        arc_write_callback_t *callback;
        zio_t *zio;
+       zio_prop_t localprop = *zp;
 
        ASSERT3P(ready, !=, NULL);
        ASSERT3P(done, !=, NULL);
@@ -5945,9 +6880,30 @@ arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
        ASSERT3U(hdr->b_l1hdr.b_bufcnt, >, 0);
        if (l2arc)
                arc_hdr_set_flags(hdr, ARC_FLAG_L2CACHE);
-       if (ARC_BUF_COMPRESSED(buf)) {
-               ASSERT3U(zp->zp_compress, !=, ZIO_COMPRESS_OFF);
+
+       if (ARC_BUF_ENCRYPTED(buf)) {
+               ASSERT(ARC_BUF_COMPRESSED(buf));
+               localprop.zp_encrypt = B_TRUE;
+               localprop.zp_compress = HDR_GET_COMPRESS(hdr);
+               localprop.zp_byteorder =
+                   (hdr->b_l1hdr.b_byteswap == DMU_BSWAP_NUMFUNCS) ?
+                   ZFS_HOST_BYTEORDER : !ZFS_HOST_BYTEORDER;
+               bcopy(hdr->b_crypt_hdr.b_salt, localprop.zp_salt,
+                   ZIO_DATA_SALT_LEN);
+               bcopy(hdr->b_crypt_hdr.b_iv, localprop.zp_iv,
+                   ZIO_DATA_IV_LEN);
+               bcopy(hdr->b_crypt_hdr.b_mac, localprop.zp_mac,
+                   ZIO_DATA_MAC_LEN);
+               if (DMU_OT_IS_ENCRYPTED(localprop.zp_type)) {
+                       localprop.zp_nopwrite = B_FALSE;
+                       localprop.zp_copies =
+                           MIN(localprop.zp_copies, SPA_DVAS_PER_BP - 1);
+               }
                zio_flags |= ZIO_FLAG_RAW;
+       } else if (ARC_BUF_COMPRESSED(buf)) {
+               ASSERT3U(HDR_GET_LSIZE(hdr), !=, arc_buf_size(buf));
+               localprop.zp_compress = HDR_GET_COMPRESS(hdr);
+               zio_flags |= ZIO_FLAG_RAW_COMPRESS;
        }
        callback = kmem_zalloc(sizeof (arc_write_callback_t), KM_SLEEP);
        callback->awcb_ready = ready;
@@ -5971,18 +6927,22 @@ arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
                if (arc_buf_is_shared(buf)) {
                        arc_unshare_buf(hdr, buf);
                } else {
-                       arc_hdr_free_pabd(hdr);
+                       arc_hdr_free_abd(hdr, B_FALSE);
                }
                VERIFY3P(buf->b_data, !=, NULL);
-               arc_hdr_set_compress(hdr, ZIO_COMPRESS_OFF);
        }
+
+       if (HDR_HAS_RABD(hdr))
+               arc_hdr_free_abd(hdr, B_TRUE);
+
+       arc_hdr_set_compress(hdr, ZIO_COMPRESS_OFF);
+
        ASSERT(!arc_buf_is_shared(buf));
        ASSERT3P(hdr->b_l1hdr.b_pabd, ==, NULL);
 
        zio = zio_write(pio, spa, txg, bp,
            abd_get_from_buf(buf->b_data, HDR_GET_LSIZE(hdr)),
-           HDR_GET_LSIZE(hdr), arc_buf_size(buf), zp,
-           arc_write_ready,
+           HDR_GET_LSIZE(hdr), arc_buf_size(buf), &localprop, arc_write_ready,
            (children_ready != NULL) ? arc_write_children_ready : NULL,
            arc_write_physdone, arc_write_done, callback,
            priority, zio_flags, zb);
@@ -5994,14 +6954,11 @@ static int
 arc_memory_throttle(uint64_t reserve, uint64_t txg)
 {
 #ifdef _KERNEL
-       uint64_t available_memory = ptob(freemem);
+       uint64_t available_memory = arc_free_memory();
        static uint64_t page_load = 0;
        static uint64_t last_txg = 0;
-#ifdef __linux__
-       pgcnt_t minfree = btop(arc_sys_free / 4);
-#endif
 
-#if defined(__i386)
+#if defined(_ILP32)
        available_memory =
            MIN(available_memory, vmem_size(heap_arena, VMEM_FREE));
 #endif
@@ -6019,7 +6976,7 @@ arc_memory_throttle(uint64_t reserve, uint64_t txg)
         * continue to let page writes occur as quickly as possible.
         */
        if (current_is_kswapd()) {
-               if (page_load > MAX(ptob(minfree), available_memory) / 4) {
+               if (page_load > MAX(arc_sys_free / 4, available_memory) / 4) {
                        DMU_TX_STAT_BUMP(dmu_tx_memory_reclaim);
                        return (SET_ERROR(ERESTART));
                }
@@ -6069,6 +7026,10 @@ arc_tempreserve_space(uint64_t reserve, uint64_t txg)
         * network delays from blocking transactions that are ready to be
         * assigned to a txg.
         */
+
+       /* assert that it has not wrapped around */
+       ASSERT3S(atomic_add_64_nv(&arc_loaned_bytes, 0), >=, 0);
+
        anon_size = MAX((int64_t)(refcount_count(&arc_anon->arcs_size) -
            arc_loaned_bytes), 0);
 
@@ -6123,7 +7084,7 @@ arc_kstat_update(kstat_t *ksp, int rw)
        arc_stats_t *as = ksp->ks_data;
 
        if (rw == KSTAT_WRITE) {
-               return (EACCES);
+               return (SET_ERROR(EACCES));
        } else {
                arc_kstat_update_state(arc_anon,
                    &as->arcstat_anon_size,
@@ -6145,6 +7106,13 @@ arc_kstat_update(kstat_t *ksp, int rw)
                    &as->arcstat_mfu_ghost_size,
                    &as->arcstat_mfu_ghost_evictable_data,
                    &as->arcstat_mfu_ghost_evictable_metadata);
+
+               as->arcstat_memory_all_bytes.value.ui64 =
+                   arc_all_memory();
+               as->arcstat_memory_free_bytes.value.ui64 =
+                   arc_free_memory();
+               as->arcstat_memory_available_bytes.value.i64 =
+                   arc_available_memory();
        }
 
        return (0);
@@ -6193,7 +7161,8 @@ arc_state_multilist_index_func(multilist_t *ml, void *obj)
 static void
 arc_tuning_update(void)
 {
-       uint64_t percent, allmem = arc_all_memory();
+       uint64_t allmem = arc_all_memory();
+       unsigned long limit;
 
        /* Valid range: 64M - <all physical memory> */
        if ((zfs_arc_max) && (zfs_arc_max != arc_c_max) &&
@@ -6202,11 +7171,10 @@ arc_tuning_update(void)
                arc_c_max = zfs_arc_max;
                arc_c = arc_c_max;
                arc_p = (arc_c >> 1);
-               /* Valid range of arc_meta_limit: arc_meta_min - arc_c_max */
-               percent = MIN(zfs_arc_meta_limit_percent, 100);
-               arc_meta_limit = MAX(arc_meta_min, (percent * arc_c_max) / 100);
-               percent = MIN(zfs_arc_dnode_limit_percent, 100);
-               arc_dnode_limit = (percent * arc_meta_limit) / 100;
+               if (arc_meta_limit > arc_c_max)
+                       arc_meta_limit = arc_c_max;
+               if (arc_dnode_limit > arc_meta_limit)
+                       arc_dnode_limit = arc_meta_limit;
        }
 
        /* Valid range: 32M - <arc_c_max> */
@@ -6222,21 +7190,27 @@ arc_tuning_update(void)
            (zfs_arc_meta_min >= 1ULL << SPA_MAXBLOCKSHIFT) &&
            (zfs_arc_meta_min <= arc_c_max)) {
                arc_meta_min = zfs_arc_meta_min;
-               arc_meta_limit = MAX(arc_meta_limit, arc_meta_min);
-               arc_dnode_limit = arc_meta_limit / 10;
+               if (arc_meta_limit < arc_meta_min)
+                       arc_meta_limit = arc_meta_min;
+               if (arc_dnode_limit < arc_meta_min)
+                       arc_dnode_limit = arc_meta_min;
        }
 
        /* Valid range: <arc_meta_min> - <arc_c_max> */
-       if ((zfs_arc_meta_limit) && (zfs_arc_meta_limit != arc_meta_limit) &&
-           (zfs_arc_meta_limit >= zfs_arc_meta_min) &&
-           (zfs_arc_meta_limit <= arc_c_max))
-               arc_meta_limit = zfs_arc_meta_limit;
-
-       /* Valid range: <arc_meta_min> - <arc_c_max> */
-       if ((zfs_arc_dnode_limit) && (zfs_arc_dnode_limit != arc_dnode_limit) &&
-           (zfs_arc_dnode_limit >= zfs_arc_meta_min) &&
-           (zfs_arc_dnode_limit <= arc_c_max))
-               arc_dnode_limit = zfs_arc_dnode_limit;
+       limit = zfs_arc_meta_limit ? zfs_arc_meta_limit :
+           MIN(zfs_arc_meta_limit_percent, 100) * arc_c_max / 100;
+       if ((limit != arc_meta_limit) &&
+           (limit >= arc_meta_min) &&
+           (limit <= arc_c_max))
+               arc_meta_limit = limit;
+
+       /* Valid range: <arc_meta_min> - <arc_meta_limit> */
+       limit = zfs_arc_dnode_limit ? zfs_arc_dnode_limit :
+           MIN(zfs_arc_dnode_limit_percent, 100) * arc_meta_limit / 100;
+       if ((limit != arc_dnode_limit) &&
+           (limit >= arc_meta_min) &&
+           (limit <= arc_meta_limit))
+               arc_dnode_limit = limit;
 
        /* Valid range: 1 - N */
        if (zfs_arc_grow_retry)
@@ -6277,46 +7251,46 @@ arc_state_init(void)
        arc_mfu_ghost = &ARC_mfu_ghost;
        arc_l2c_only = &ARC_l2c_only;
 
-       multilist_create(&arc_mru->arcs_list[ARC_BUFC_METADATA],
-           sizeof (arc_buf_hdr_t),
+       arc_mru->arcs_list[ARC_BUFC_METADATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mru->arcs_list[ARC_BUFC_DATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mru->arcs_list[ARC_BUFC_DATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mru_ghost->arcs_list[ARC_BUFC_METADATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mru_ghost->arcs_list[ARC_BUFC_METADATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mru_ghost->arcs_list[ARC_BUFC_DATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mru_ghost->arcs_list[ARC_BUFC_DATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mfu->arcs_list[ARC_BUFC_METADATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mfu->arcs_list[ARC_BUFC_METADATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mfu->arcs_list[ARC_BUFC_DATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mfu->arcs_list[ARC_BUFC_DATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mfu_ghost->arcs_list[ARC_BUFC_METADATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mfu_ghost->arcs_list[ARC_BUFC_METADATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_mfu_ghost->arcs_list[ARC_BUFC_DATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_mfu_ghost->arcs_list[ARC_BUFC_DATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_l2c_only->arcs_list[ARC_BUFC_METADATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_l2c_only->arcs_list[ARC_BUFC_METADATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
-       multilist_create(&arc_l2c_only->arcs_list[ARC_BUFC_DATA],
-           sizeof (arc_buf_hdr_t),
+           arc_state_multilist_index_func);
+       arc_l2c_only->arcs_list[ARC_BUFC_DATA] =
+           multilist_create(sizeof (arc_buf_hdr_t),
            offsetof(arc_buf_hdr_t, b_l1hdr.b_arc_node),
-           zfs_arc_num_sublists_per_state, arc_state_multilist_index_func);
+           arc_state_multilist_index_func);
 
        refcount_create(&arc_anon->arcs_esize[ARC_BUFC_METADATA]);
        refcount_create(&arc_anon->arcs_esize[ARC_BUFC_DATA]);
@@ -6369,22 +7343,22 @@ arc_state_fini(void)
        refcount_destroy(&arc_mfu_ghost->arcs_size);
        refcount_destroy(&arc_l2c_only->arcs_size);
 
-       multilist_destroy(&arc_mru->arcs_list[ARC_BUFC_METADATA]);
-       multilist_destroy(&arc_mru_ghost->arcs_list[ARC_BUFC_METADATA]);
-       multilist_destroy(&arc_mfu->arcs_list[ARC_BUFC_METADATA]);
-       multilist_destroy(&arc_mfu_ghost->arcs_list[ARC_BUFC_METADATA]);
-       multilist_destroy(&arc_mru->arcs_list[ARC_BUFC_DATA]);
-       multilist_destroy(&arc_mru_ghost->arcs_list[ARC_BUFC_DATA]);
-       multilist_destroy(&arc_mfu->arcs_list[ARC_BUFC_DATA]);
-       multilist_destroy(&arc_mfu_ghost->arcs_list[ARC_BUFC_DATA]);
-       multilist_destroy(&arc_l2c_only->arcs_list[ARC_BUFC_METADATA]);
-       multilist_destroy(&arc_l2c_only->arcs_list[ARC_BUFC_DATA]);
+       multilist_destroy(arc_mru->arcs_list[ARC_BUFC_METADATA]);
+       multilist_destroy(arc_mru_ghost->arcs_list[ARC_BUFC_METADATA]);
+       multilist_destroy(arc_mfu->arcs_list[ARC_BUFC_METADATA]);
+       multilist_destroy(arc_mfu_ghost->arcs_list[ARC_BUFC_METADATA]);
+       multilist_destroy(arc_mru->arcs_list[ARC_BUFC_DATA]);
+       multilist_destroy(arc_mru_ghost->arcs_list[ARC_BUFC_DATA]);
+       multilist_destroy(arc_mfu->arcs_list[ARC_BUFC_DATA]);
+       multilist_destroy(arc_mfu_ghost->arcs_list[ARC_BUFC_DATA]);
+       multilist_destroy(arc_l2c_only->arcs_list[ARC_BUFC_METADATA]);
+       multilist_destroy(arc_l2c_only->arcs_list[ARC_BUFC_DATA]);
 }
 
 uint64_t
-arc_max_bytes(void)
+arc_target_bytes(void)
 {
-       return (arc_c_max);
+       return (arc_c);
 }
 
 void
@@ -6415,16 +7389,17 @@ arc_init(void)
        /* Set max to 1/2 of all memory */
        arc_c_max = allmem / 2;
 
+#ifdef _KERNEL
+       /* Set min cache to 1/32 of all memory, or 32MB, whichever is more */
+       arc_c_min = MAX(allmem / 32, 2ULL << SPA_MAXBLOCKSHIFT);
+#else
        /*
         * In userland, there's only the memory pressure that we artificially
         * create (see arc_available_memory()).  Don't let arc_c get too
         * small, because it can cause transactions to be larger than
         * arc_c, causing arc_tempreserve_space() to fail.
         */
-#ifndef        _KERNEL
        arc_c_min = MAX(arc_c_max / 2, 2ULL << SPA_MAXBLOCKSHIFT);
-#else
-       arc_c_min = 2ULL << SPA_MAXBLOCKSHIFT;
 #endif
 
        arc_c = arc_c_max;
@@ -6447,9 +7422,6 @@ arc_init(void)
        /* Apply user specified tunings */
        arc_tuning_update();
 
-       if (zfs_arc_num_sublists_per_state < 1)
-               zfs_arc_num_sublists_per_state = MAX(boot_ncpus, 1);
-
        /* if kmem_flags are set, lets try to use less memory */
        if (kmem_debugging())
                arc_c = arc_c / 2;
@@ -6489,11 +7461,11 @@ arc_init(void)
         * If it has been set by a module parameter, take that.
         * Otherwise, use a percentage of physical memory defined by
         * zfs_dirty_data_max_percent (default 10%) with a cap at
-        * zfs_dirty_data_max_max (default 25% of physical memory).
+        * zfs_dirty_data_max_max (default 4G or 25% of physical memory).
         */
        if (zfs_dirty_data_max_max == 0)
-               zfs_dirty_data_max_max = allmem *
-                   zfs_dirty_data_max_max_percent / 100;
+               zfs_dirty_data_max_max = MIN(4ULL * 1024 * 1024 * 1024,
+                   allmem * zfs_dirty_data_max_max_percent / 100);
 
        if (zfs_dirty_data_max == 0) {
                zfs_dirty_data_max = allmem *
@@ -6940,8 +7912,8 @@ top:
                        list_remove(buflist, hdr);
                        arc_hdr_clear_flags(hdr, ARC_FLAG_HAS_L2HDR);
 
-                       ARCSTAT_INCR(arcstat_l2_asize, -arc_hdr_size(hdr));
-                       ARCSTAT_INCR(arcstat_l2_size, -HDR_GET_LSIZE(hdr));
+                       ARCSTAT_INCR(arcstat_l2_psize, -arc_hdr_size(hdr));
+                       ARCSTAT_INCR(arcstat_l2_lsize, -HDR_GET_LSIZE(hdr));
 
                        bytes_dropped += arc_hdr_size(hdr);
                        (void) refcount_remove_many(&dev->l2ad_alloc,
@@ -6970,6 +7942,102 @@ top:
        kmem_free(cb, sizeof (l2arc_write_callback_t));
 }
 
+static int
+l2arc_untransform(zio_t *zio, l2arc_read_callback_t *cb)
+{
+       int ret;
+       spa_t *spa = zio->io_spa;
+       arc_buf_hdr_t *hdr = cb->l2rcb_hdr;
+       blkptr_t *bp = zio->io_bp;
+       dsl_crypto_key_t *dck = NULL;
+       uint8_t salt[ZIO_DATA_SALT_LEN];
+       uint8_t iv[ZIO_DATA_IV_LEN];
+       uint8_t mac[ZIO_DATA_MAC_LEN];
+       boolean_t no_crypt = B_FALSE;
+
+       /*
+        * ZIL data is never be written to the L2ARC, so we don't need
+        * special handling for its unique MAC storage.
+        */
+       ASSERT3U(BP_GET_TYPE(bp), !=, DMU_OT_INTENT_LOG);
+       ASSERT(MUTEX_HELD(HDR_LOCK(hdr)));
+
+       /* If the data was encrypted, decrypt it now */
+       if (HDR_ENCRYPTED(hdr)) {
+               abd_t *eabd = arc_get_data_abd(hdr,
+                   arc_hdr_size(hdr), hdr);
+
+               zio_crypt_decode_params_bp(bp, salt, iv);
+               zio_crypt_decode_mac_bp(bp, mac);
+
+               ret = spa_keystore_lookup_key(spa,
+                   cb->l2rcb_zb.zb_objset, FTAG, &dck);
+               if (ret != 0) {
+                       arc_free_data_abd(hdr, eabd, arc_hdr_size(hdr), hdr);
+                       goto error;
+               }
+
+               ret = zio_do_crypt_abd(B_FALSE, &dck->dck_key,
+                   salt, BP_GET_TYPE(bp), iv, mac, HDR_GET_PSIZE(hdr),
+                   BP_SHOULD_BYTESWAP(bp), eabd, hdr->b_l1hdr.b_pabd,
+                   &no_crypt);
+               if (ret != 0) {
+                       arc_free_data_abd(hdr, eabd, arc_hdr_size(hdr), hdr);
+                       spa_keystore_dsl_key_rele(spa, dck, FTAG);
+                       goto error;
+               }
+
+               spa_keystore_dsl_key_rele(spa, dck, FTAG);
+
+               /*
+                * If we actually performed decryption, replace b_pabd
+                * with the decrypted data. Otherwise we can just throw
+                * our decryption buffer away.
+                */
+               if (!no_crypt) {
+                       arc_free_data_abd(hdr, hdr->b_l1hdr.b_pabd,
+                           arc_hdr_size(hdr), hdr);
+                       hdr->b_l1hdr.b_pabd = eabd;
+                       zio->io_abd = eabd;
+               } else {
+                       arc_free_data_abd(hdr, eabd, arc_hdr_size(hdr), hdr);
+               }
+       }
+
+       /*
+        * If the L2ARC block was compressed, but ARC compression
+        * is disabled we decompress the data into a new buffer and
+        * replace the existing data.
+        */
+       if (HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF &&
+           !HDR_COMPRESSION_ENABLED(hdr)) {
+               abd_t *cabd = arc_get_data_abd(hdr, arc_hdr_size(hdr), hdr);
+               void *tmp = abd_borrow_buf(cabd, arc_hdr_size(hdr));
+
+               ret = zio_decompress_data(HDR_GET_COMPRESS(hdr),
+                   hdr->b_l1hdr.b_pabd, tmp, HDR_GET_PSIZE(hdr),
+                   HDR_GET_LSIZE(hdr));
+               if (ret != 0) {
+                       abd_return_buf_copy(cabd, tmp, arc_hdr_size(hdr));
+                       arc_free_data_abd(hdr, cabd, arc_hdr_size(hdr), hdr);
+                       goto error;
+               }
+
+               abd_return_buf_copy(cabd, tmp, arc_hdr_size(hdr));
+               arc_free_data_abd(hdr, hdr->b_l1hdr.b_pabd,
+                   arc_hdr_size(hdr), hdr);
+               hdr->b_l1hdr.b_pabd = cabd;
+               zio->io_abd = cabd;
+               zio->io_size = HDR_GET_LSIZE(hdr);
+       }
+
+       return (0);
+
+error:
+       return (ret);
+}
+
+
 /*
  * A read to a cache device completed.  Validate buffer contents before
  * handing over to the regular ARC routines.
@@ -6977,10 +8045,11 @@ top:
 static void
 l2arc_read_done(zio_t *zio)
 {
+       int tfm_error = 0;
        l2arc_read_callback_t *cb;
        arc_buf_hdr_t *hdr;
        kmutex_t *hash_lock;
-       boolean_t valid_cksum;
+       boolean_t valid_cksum, using_rdata;
 
        ASSERT3P(zio->io_vd, !=, NULL);
        ASSERT(zio->io_flags & ZIO_FLAG_DONT_PROPAGATE);
@@ -6996,17 +8065,57 @@ l2arc_read_done(zio_t *zio)
        mutex_enter(hash_lock);
        ASSERT3P(hash_lock, ==, HDR_LOCK(hdr));
 
+       /*
+        * If the data was read into a temporary buffer,
+        * move it and free the buffer.
+        */
+       if (cb->l2rcb_abd != NULL) {
+               ASSERT3U(arc_hdr_size(hdr), <, zio->io_size);
+               if (zio->io_error == 0) {
+                       abd_copy(hdr->b_l1hdr.b_pabd, cb->l2rcb_abd,
+                           arc_hdr_size(hdr));
+               }
+
+               /*
+                * The following must be done regardless of whether
+                * there was an error:
+                * - free the temporary buffer
+                * - point zio to the real ARC buffer
+                * - set zio size accordingly
+                * These are required because zio is either re-used for
+                * an I/O of the block in the case of the error
+                * or the zio is passed to arc_read_done() and it
+                * needs real data.
+                */
+               abd_free(cb->l2rcb_abd);
+               zio->io_size = zio->io_orig_size = arc_hdr_size(hdr);
+               zio->io_abd = zio->io_orig_abd = hdr->b_l1hdr.b_pabd;
+       }
+
        ASSERT3P(zio->io_abd, !=, NULL);
 
        /*
         * Check this survived the L2ARC journey.
         */
-       ASSERT3P(zio->io_abd, ==, hdr->b_l1hdr.b_pabd);
+       ASSERT(zio->io_abd == hdr->b_l1hdr.b_pabd ||
+           (HDR_HAS_RABD(hdr) && zio->io_abd == hdr->b_crypt_hdr.b_rabd));
        zio->io_bp_copy = cb->l2rcb_bp; /* XXX fix in L2ARC 2.0 */
        zio->io_bp = &zio->io_bp_copy;  /* XXX fix in L2ARC 2.0 */
 
        valid_cksum = arc_cksum_is_equal(hdr, zio);
-       if (valid_cksum && zio->io_error == 0 && !HDR_L2_EVICTED(hdr)) {
+       using_rdata = (HDR_HAS_RABD(hdr) &&
+           zio->io_abd == hdr->b_crypt_hdr.b_rabd);
+
+       /*
+        * b_rabd will always match the data as it exists on disk if it is
+        * being used. Therefore if we are reading into b_rabd we do not
+        * attempt to untransform the data.
+        */
+       if (valid_cksum && !using_rdata)
+               tfm_error = l2arc_untransform(zio, cb);
+
+       if (valid_cksum && tfm_error == 0 && zio->io_error == 0 &&
+           !HDR_L2_EVICTED(hdr)) {
                mutex_exit(hash_lock);
                zio->io_private = hdr;
                arc_read_done(zio);
@@ -7021,7 +8130,7 @@ l2arc_read_done(zio_t *zio)
                } else {
                        zio->io_error = SET_ERROR(EIO);
                }
-               if (!valid_cksum)
+               if (!valid_cksum || tfm_error != 0)
                        ARCSTAT_BUMP(arcstat_l2_cksum_bad);
 
                /*
@@ -7031,11 +8140,13 @@ l2arc_read_done(zio_t *zio)
                 */
                if (zio->io_waiter == NULL) {
                        zio_t *pio = zio_unique_parent(zio);
+                       void *abd = (using_rdata) ?
+                           hdr->b_crypt_hdr.b_rabd : hdr->b_l1hdr.b_pabd;
 
                        ASSERT(!pio || pio->io_child_type == ZIO_CHILD_LOGICAL);
 
                        zio_nowait(zio_read(pio, zio->io_spa, zio->io_bp,
-                           hdr->b_l1hdr.b_pabd, zio->io_size, arc_read_done,
+                           abd, zio->io_size, arc_read_done,
                            hdr, zio->io_priority, cb->l2rcb_flags,
                            &cb->l2rcb_zb));
                }
@@ -7064,16 +8175,16 @@ l2arc_sublist_lock(int list_num)
 
        switch (list_num) {
        case 0:
-               ml = &arc_mfu->arcs_list[ARC_BUFC_METADATA];
+               ml = arc_mfu->arcs_list[ARC_BUFC_METADATA];
                break;
        case 1:
-               ml = &arc_mru->arcs_list[ARC_BUFC_METADATA];
+               ml = arc_mru->arcs_list[ARC_BUFC_METADATA];
                break;
        case 2:
-               ml = &arc_mfu->arcs_list[ARC_BUFC_DATA];
+               ml = arc_mfu->arcs_list[ARC_BUFC_DATA];
                break;
        case 3:
-               ml = &arc_mru->arcs_list[ARC_BUFC_DATA];
+               ml = arc_mru->arcs_list[ARC_BUFC_DATA];
                break;
        default:
                return (NULL);
@@ -7148,18 +8259,16 @@ top:
                        goto top;
                }
 
-               if (HDR_L2_WRITE_HEAD(hdr)) {
-                       /*
-                        * We hit a write head node.  Leave it for
-                        * l2arc_write_done().
-                        */
-                       list_remove(buflist, hdr);
-                       mutex_exit(hash_lock);
-                       continue;
-               }
+               /*
+                * A header can't be on this list if it doesn't have L2 header.
+                */
+               ASSERT(HDR_HAS_L2HDR(hdr));
+
+               /* Ensure this header has finished being written. */
+               ASSERT(!HDR_L2_WRITING(hdr));
+               ASSERT(!HDR_L2_WRITE_HEAD(hdr));
 
-               if (!all && HDR_HAS_L2HDR(hdr) &&
-                   (hdr->b_l2hdr.b_daddr > taddr ||
+               if (!all && (hdr->b_l2hdr.b_daddr >= taddr ||
                    hdr->b_l2hdr.b_daddr < dev->l2ad_hand)) {
                        /*
                         * We've evicted to the target address,
@@ -7169,13 +8278,12 @@ top:
                        break;
                }
 
-               ASSERT(HDR_HAS_L2HDR(hdr));
                if (!HDR_HAS_L1HDR(hdr)) {
                        ASSERT(!HDR_L2_READING(hdr));
                        /*
                         * This doesn't exist in the ARC.  Destroy.
                         * arc_hdr_destroy() will call list_remove()
-                        * and decrement arcstat_l2_size.
+                        * and decrement arcstat_l2_lsize.
                         */
                        arc_change_state(arc_anon, hdr, hash_lock);
                        arc_hdr_destroy(hdr);
@@ -7192,9 +8300,6 @@ top:
                                arc_hdr_set_flags(hdr, ARC_FLAG_L2_EVICTED);
                        }
 
-                       /* Ensure this header has finished being written */
-                       ASSERT(!HDR_L2_WRITING(hdr));
-
                        arc_hdr_l2hdr_destroy(hdr);
                }
                mutex_exit(hash_lock);
@@ -7202,6 +8307,123 @@ top:
        mutex_exit(&dev->l2ad_mtx);
 }
 
+/*
+ * Handle any abd transforms that might be required for writing to the L2ARC.
+ * If successful, this function will always return an abd with the data
+ * transformed as it is on disk in a new abd of asize bytes.
+ */
+static int
+l2arc_apply_transforms(spa_t *spa, arc_buf_hdr_t *hdr, uint64_t asize,
+    abd_t **abd_out)
+{
+       int ret;
+       void *tmp = NULL;
+       abd_t *cabd = NULL, *eabd = NULL, *to_write = hdr->b_l1hdr.b_pabd;
+       enum zio_compress compress = HDR_GET_COMPRESS(hdr);
+       uint64_t psize = HDR_GET_PSIZE(hdr);
+       uint64_t size = arc_hdr_size(hdr);
+       boolean_t ismd = HDR_ISTYPE_METADATA(hdr);
+       boolean_t bswap = (hdr->b_l1hdr.b_byteswap != DMU_BSWAP_NUMFUNCS);
+       dsl_crypto_key_t *dck = NULL;
+       uint8_t mac[ZIO_DATA_MAC_LEN] = { 0 };
+       boolean_t no_crypt = B_FALSE;
+
+       ASSERT((HDR_GET_COMPRESS(hdr) != ZIO_COMPRESS_OFF &&
+           !HDR_COMPRESSION_ENABLED(hdr)) ||
+           HDR_ENCRYPTED(hdr) || HDR_SHARED_DATA(hdr) || psize != asize);
+       ASSERT3U(psize, <=, asize);
+
+       /*
+        * If this data simply needs its own buffer, we simply allocate it
+        * and copy the data. This may be done to elimiate a depedency on a
+        * shared buffer or to reallocate the buffer to match asize.
+        */
+       if (HDR_HAS_RABD(hdr) && asize != psize) {
+               ASSERT3U(size, ==, psize);
+               to_write = abd_alloc_for_io(asize, ismd);
+               abd_copy(to_write, hdr->b_crypt_hdr.b_rabd, size);
+               if (size != asize)
+                       abd_zero_off(to_write, size, asize - size);
+               goto out;
+       }
+
+       if ((compress == ZIO_COMPRESS_OFF || HDR_COMPRESSION_ENABLED(hdr)) &&
+           !HDR_ENCRYPTED(hdr)) {
+               ASSERT3U(size, ==, psize);
+               to_write = abd_alloc_for_io(asize, ismd);
+               abd_copy(to_write, hdr->b_l1hdr.b_pabd, size);
+               if (size != asize)
+                       abd_zero_off(to_write, size, asize - size);
+               goto out;
+       }
+
+       if (compress != ZIO_COMPRESS_OFF && !HDR_COMPRESSION_ENABLED(hdr)) {
+               cabd = abd_alloc_for_io(asize, ismd);
+               tmp = abd_borrow_buf(cabd, asize);
+
+               psize = zio_compress_data(compress, to_write, tmp, size);
+               ASSERT3U(psize, <=, HDR_GET_PSIZE(hdr));
+               if (psize < asize)
+                       bzero((char *)tmp + psize, asize - psize);
+               psize = HDR_GET_PSIZE(hdr);
+               abd_return_buf_copy(cabd, tmp, asize);
+               to_write = cabd;
+       }
+
+       if (HDR_ENCRYPTED(hdr)) {
+               eabd = abd_alloc_for_io(asize, ismd);
+
+               /*
+                * If the dataset was disowned before the buffer
+                * made it to this point, the key to re-encrypt
+                * it won't be available. In this case we simply
+                * won't write the buffer to the L2ARC.
+                */
+               ret = spa_keystore_lookup_key(spa, hdr->b_crypt_hdr.b_dsobj,
+                   FTAG, &dck);
+               if (ret != 0)
+                       goto error;
+
+               ret = zio_do_crypt_abd(B_TRUE, &dck->dck_key,
+                   hdr->b_crypt_hdr.b_salt, hdr->b_crypt_hdr.b_ot,
+                   hdr->b_crypt_hdr.b_iv, mac, psize, bswap, to_write,
+                   eabd, &no_crypt);
+               if (ret != 0)
+                       goto error;
+
+               if (no_crypt)
+                       abd_copy(eabd, to_write, psize);
+
+               if (psize != asize)
+                       abd_zero_off(eabd, psize, asize - psize);
+
+               /* assert that the MAC we got here matches the one we saved */
+               ASSERT0(bcmp(mac, hdr->b_crypt_hdr.b_mac, ZIO_DATA_MAC_LEN));
+               spa_keystore_dsl_key_rele(spa, dck, FTAG);
+
+               if (to_write == cabd)
+                       abd_free(cabd);
+
+               to_write = eabd;
+       }
+
+out:
+       ASSERT3P(to_write, !=, hdr->b_l1hdr.b_pabd);
+       *abd_out = to_write;
+       return (0);
+
+error:
+       if (dck != NULL)
+               spa_keystore_dsl_key_rele(spa, dck, FTAG);
+       if (cabd != NULL)
+               abd_free(cabd);
+       if (eabd != NULL)
+               abd_free(eabd);
+
+       *abd_out = NULL;
+       return (ret);
+}
+
 /*
  * Find and write ARC buffers to the L2ARC device.
  *
@@ -7217,7 +8439,7 @@ static uint64_t
 l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
 {
        arc_buf_hdr_t *hdr, *hdr_prev, *head;
-       uint64_t write_asize, write_psize, write_sz, headroom;
+       uint64_t write_asize, write_psize, write_lsize, headroom;
        boolean_t full;
        l2arc_write_callback_t *cb;
        zio_t *pio, *wzio;
@@ -7227,7 +8449,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
        ASSERT3P(dev->l2ad_vdev, !=, NULL);
 
        pio = NULL;
-       write_sz = write_asize = write_psize = 0;
+       write_lsize = write_asize = write_psize = 0;
        full = B_FALSE;
        head = kmem_cache_alloc(hdr_l2only_cache, KM_PUSHPAGE);
        arc_hdr_set_flags(head, ARC_FLAG_L2_WRITE_HEAD | ARC_FLAG_HAS_L2HDR);
@@ -7258,8 +8480,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
 
                for (; hdr; hdr = hdr_prev) {
                        kmutex_t *hash_lock;
-                       uint64_t asize, size;
-                       abd_t *to_write;
+                       abd_t *to_write = NULL;
 
                        if (arc_warm == B_FALSE)
                                hdr_prev = multilist_sublist_next(mls, hdr);
@@ -7288,12 +8509,79 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
                                continue;
                        }
 
-                       if ((write_asize + HDR_GET_LSIZE(hdr)) > target_sz) {
+                       /*
+                        * We rely on the L1 portion of the header below, so
+                        * it's invalid for this header to have been evicted out
+                        * of the ghost cache, prior to being written out. The
+                        * ARC_FLAG_L2_WRITING bit ensures this won't happen.
+                        */
+                       ASSERT(HDR_HAS_L1HDR(hdr));
+
+                       ASSERT3U(HDR_GET_PSIZE(hdr), >, 0);
+                       ASSERT3U(arc_hdr_size(hdr), >, 0);
+                       ASSERT(hdr->b_l1hdr.b_pabd != NULL ||
+                           HDR_HAS_RABD(hdr));
+                       uint64_t psize = HDR_GET_PSIZE(hdr);
+                       uint64_t asize = vdev_psize_to_asize(dev->l2ad_vdev,
+                           psize);
+
+                       if ((write_asize + asize) > target_sz) {
                                full = B_TRUE;
                                mutex_exit(hash_lock);
                                break;
                        }
 
+                       /*
+                        * We rely on the L1 portion of the header below, so
+                        * it's invalid for this header to have been evicted out
+                        * of the ghost cache, prior to being written out. The
+                        * ARC_FLAG_L2_WRITING bit ensures this won't happen.
+                        */
+                       arc_hdr_set_flags(hdr, ARC_FLAG_L2_WRITING);
+                       ASSERT(HDR_HAS_L1HDR(hdr));
+
+                       ASSERT3U(HDR_GET_PSIZE(hdr), >, 0);
+                       ASSERT(hdr->b_l1hdr.b_pabd != NULL ||
+                           HDR_HAS_RABD(hdr));
+                       ASSERT3U(arc_hdr_size(hdr), >, 0);
+
+                       /*
+                        * If this header has b_rabd, we can use this since it
+                        * must always match the data exactly as it exists on
+                        * disk. Otherwise, the L2ARC can  normally use the
+                        * hdr's data, but if we're sharing data between the
+                        * hdr and one of its bufs, L2ARC needs its own copy of
+                        * the data so that the ZIO below can't race with the
+                        * buf consumer. To ensure that this copy will be
+                        * available for the lifetime of the ZIO and be cleaned
+                        * up afterwards, we add it to the l2arc_free_on_write
+                        * queue. If we need to apply any transforms to the
+                        * data (compression, encryption) we will also need the
+                        * extra buffer.
+                        */
+                       if (HDR_HAS_RABD(hdr) && psize == asize) {
+                               to_write = hdr->b_crypt_hdr.b_rabd;
+                       } else if ((HDR_COMPRESSION_ENABLED(hdr) ||
+                           HDR_GET_COMPRESS(hdr) == ZIO_COMPRESS_OFF) &&
+                           !HDR_ENCRYPTED(hdr) && !HDR_SHARED_DATA(hdr) &&
+                           psize == asize) {
+                               to_write = hdr->b_l1hdr.b_pabd;
+                       } else {
+                               int ret;
+                               arc_buf_contents_t type = arc_buf_type(hdr);
+
+                               ret = l2arc_apply_transforms(spa, hdr, asize,
+                                   &to_write);
+                               if (ret != 0) {
+                                       arc_hdr_clear_flags(hdr,
+                                           ARC_FLAG_L2_WRITING);
+                                       mutex_exit(hash_lock);
+                                       continue;
+                               }
+
+                               l2arc_free_abd_on_write(to_write, asize, type);
+                       }
+
                        if (pio == NULL) {
                                /*
                                 * Insert a dummy header on the buflist so
@@ -7316,62 +8604,27 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
                        hdr->b_l2hdr.b_hits = 0;
 
                        hdr->b_l2hdr.b_daddr = dev->l2ad_hand;
-                       arc_hdr_set_flags(hdr,
-                           ARC_FLAG_L2_WRITING | ARC_FLAG_HAS_L2HDR);
+                       arc_hdr_set_flags(hdr, ARC_FLAG_HAS_L2HDR);
 
                        mutex_enter(&dev->l2ad_mtx);
                        list_insert_head(&dev->l2ad_buflist, hdr);
                        mutex_exit(&dev->l2ad_mtx);
 
-                       /*
-                        * We rely on the L1 portion of the header below, so
-                        * it's invalid for this header to have been evicted out
-                        * of the ghost cache, prior to being written out. The
-                        * ARC_FLAG_L2_WRITING bit ensures this won't happen.
-                        */
-                       ASSERT(HDR_HAS_L1HDR(hdr));
-
-                       ASSERT3U(HDR_GET_PSIZE(hdr), >, 0);
-                       ASSERT3P(hdr->b_l1hdr.b_pabd, !=, NULL);
-                       ASSERT3U(arc_hdr_size(hdr), >, 0);
-                       size = arc_hdr_size(hdr);
-
-                       (void) refcount_add_many(&dev->l2ad_alloc, size, hdr);
+                       (void) refcount_add_many(&dev->l2ad_alloc,
+                           arc_hdr_size(hdr), hdr);
 
-                       /*
-                        * Normally the L2ARC can use the hdr's data, but if
-                        * we're sharing data between the hdr and one of its
-                        * bufs, L2ARC needs its own copy of the data so that
-                        * the ZIO below can't race with the buf consumer. To
-                        * ensure that this copy will be available for the
-                        * lifetime of the ZIO and be cleaned up afterwards, we
-                        * add it to the l2arc_free_on_write queue.
-                        */
-                       if (!HDR_SHARED_DATA(hdr)) {
-                               to_write = hdr->b_l1hdr.b_pabd;
-                       } else {
-                               to_write = abd_alloc_for_io(size,
-                                   HDR_ISTYPE_METADATA(hdr));
-                               abd_copy(to_write, hdr->b_l1hdr.b_pabd, size);
-                               l2arc_free_abd_on_write(to_write, size,
-                                   arc_buf_type(hdr));
-                       }
                        wzio = zio_write_phys(pio, dev->l2ad_vdev,
-                           hdr->b_l2hdr.b_daddr, size, to_write,
+                           hdr->b_l2hdr.b_daddr, asize, to_write,
                            ZIO_CHECKSUM_OFF, NULL, hdr,
                            ZIO_PRIORITY_ASYNC_WRITE,
                            ZIO_FLAG_CANFAIL, B_FALSE);
 
-                       write_sz += HDR_GET_LSIZE(hdr);
+                       write_lsize += HDR_GET_LSIZE(hdr);
                        DTRACE_PROBE2(l2arc__write, vdev_t *, dev->l2ad_vdev,
                            zio_t *, wzio);
 
-                       write_asize += size;
-                       /*
-                        * Keep the clock hand suitably device-aligned.
-                        */
-                       asize = vdev_psize_to_asize(dev->l2ad_vdev, size);
-                       write_psize += asize;
+                       write_psize += psize;
+                       write_asize += asize;
                        dev->l2ad_hand += asize;
 
                        mutex_exit(hash_lock);
@@ -7387,7 +8640,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
 
        /* No buffers selected for writing? */
        if (pio == NULL) {
-               ASSERT0(write_sz);
+               ASSERT0(write_lsize);
                ASSERT(!HDR_HAS_L1HDR(head));
                kmem_cache_free(hdr_l2only_cache, head);
                return (0);
@@ -7395,10 +8648,10 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
 
        ASSERT3U(write_asize, <=, target_sz);
        ARCSTAT_BUMP(arcstat_l2_writes_sent);
-       ARCSTAT_INCR(arcstat_l2_write_bytes, write_asize);
-       ARCSTAT_INCR(arcstat_l2_size, write_sz);
-       ARCSTAT_INCR(arcstat_l2_asize, write_asize);
-       vdev_space_update(dev->l2ad_vdev, write_asize, 0, 0);
+       ARCSTAT_INCR(arcstat_l2_write_bytes, write_psize);
+       ARCSTAT_INCR(arcstat_l2_lsize, write_lsize);
+       ARCSTAT_INCR(arcstat_l2_psize, write_psize);
+       vdev_space_update(dev->l2ad_vdev, write_psize, 0, 0);
 
        /*
         * Bump device hand to the device start if it is approaching the end.
@@ -7421,7 +8674,7 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz)
  * heart of the L2ARC.
  */
 static void
-l2arc_feed_thread(void)
+l2arc_feed_thread(void *unused)
 {
        callb_cpr_t cpr;
        l2arc_dev_t *dev;
@@ -7728,6 +8981,10 @@ MODULE_PARM_DESC(zfs_arc_p_dampener_disable, "disable arc_p adapt dampener");
 module_param(zfs_arc_shrink_shift, int, 0644);
 MODULE_PARM_DESC(zfs_arc_shrink_shift, "log2(fraction of arc to reclaim)");
 
+module_param(zfs_arc_pc_percent, uint, 0644);
+MODULE_PARM_DESC(zfs_arc_pc_percent,
+       "Percent of pagecache to reclaim arc to");
+
 module_param(zfs_arc_p_min_shift, int, 0644);
 MODULE_PARM_DESC(zfs_arc_p_min_shift, "arc_c shift to calc min/max arc_p");
 
@@ -7735,15 +8992,11 @@ module_param(zfs_arc_average_blocksize, int, 0444);
 MODULE_PARM_DESC(zfs_arc_average_blocksize, "Target average block size");
 
 module_param(zfs_compressed_arc_enabled, int, 0644);
-MODULE_PARM_DESC(zfs_arc_average_blocksize, "Disable compressed arc buffers");
+MODULE_PARM_DESC(zfs_compressed_arc_enabled, "Disable compressed arc buffers");
 
 module_param(zfs_arc_min_prefetch_lifespan, int, 0644);
 MODULE_PARM_DESC(zfs_arc_min_prefetch_lifespan, "Min life of prefetch block");
 
-module_param(zfs_arc_num_sublists_per_state, int, 0644);
-MODULE_PARM_DESC(zfs_arc_num_sublists_per_state,
-       "Number of sublists used in each of the ARC state lists");
-
 module_param(l2arc_write_max, ulong, 0644);
 MODULE_PARM_DESC(l2arc_write_max, "Max write bytes per interval");