]> git.proxmox.com Git - mirror_zfs.git/blobdiff - module/zfs/spa.c
Fix typos
[mirror_zfs.git] / module / zfs / spa.c
index 3b5582624aa2faceb2d42d1a2d9ec2eb81fd06ac..f4a6f3f456b82190a2301d77c8f7d0557a56d83b 100644 (file)
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
- * Copyright (c) 2015, Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2013, 2014, Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2011, 2019 by Delphix. All rights reserved.
+ * Copyright (c) 2018, Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
  * Copyright 2013 Saso Kiselkov. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  * Copyright 2016 Toomas Soome <tsoome@me.com>
  * Copyright (c) 2016 Actifio, Inc. All rights reserved.
+ * Copyright 2018 Joyent, Inc.
  * Copyright (c) 2017 Datto Inc.
  * Copyright 2017 Joyent, Inc.
+ * Copyright (c) 2017, Intel Corporation.
  */
 
 /*
@@ -55,6 +56,8 @@
 #include <sys/vdev_removal.h>
 #include <sys/vdev_indirect_mapping.h>
 #include <sys/vdev_indirect_births.h>
+#include <sys/vdev_initialize.h>
+#include <sys/vdev_trim.h>
 #include <sys/vdev_disk.h>
 #include <sys/metaslab.h>
 #include <sys/metaslab_impl.h>
 #ifdef _KERNEL
 #include <sys/fm/protocol.h>
 #include <sys/fm/util.h>
-#include <sys/bootprops.h>
 #include <sys/callb.h>
-#include <sys/cpupart.h>
-#include <sys/pool.h>
-#include <sys/sysdc.h>
 #include <sys/zone.h>
+#include <sys/vmsystm.h>
 #endif /* _KERNEL */
 
 #include "zfs_prop.h"
@@ -134,7 +134,7 @@ static const char *const zio_taskq_types[ZIO_TASKQ_TYPES] = {
  * number of threads assigned to their taskqs using the ZTI_N(#) or ZTI_ONE
  * macros. Other operations process a large amount of data; the ZTI_BATCH
  * macro causes us to create a taskq oriented for throughput. Some operations
- * are so high frequency and short-lived that the taskq itself can become a a
+ * are so high frequency and short-lived that the taskq itself can become a
  * point of lock contention. The ZTI_P(#, #) macro indicates that we need an
  * additional degree of parallelism specified by the number of threads per-
  * taskq and the number of taskqs; when dispatching an event in this case, the
@@ -152,29 +152,108 @@ const zio_taskq_info_t zio_taskqs[ZIO_TYPES][ZIO_TASKQ_TYPES] = {
        { ZTI_P(12, 8), ZTI_NULL,       ZTI_ONE,        ZTI_NULL }, /* FREE */
        { ZTI_ONE,      ZTI_NULL,       ZTI_ONE,        ZTI_NULL }, /* CLAIM */
        { ZTI_ONE,      ZTI_NULL,       ZTI_ONE,        ZTI_NULL }, /* IOCTL */
+       { ZTI_N(4),     ZTI_NULL,       ZTI_ONE,        ZTI_NULL }, /* TRIM */
 };
 
 static void spa_sync_version(void *arg, dmu_tx_t *tx);
 static void spa_sync_props(void *arg, dmu_tx_t *tx);
 static boolean_t spa_has_active_shared_spare(spa_t *spa);
-static inline int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
-    spa_load_state_t state, spa_import_type_t type, boolean_t trust_config,
-    char **ereport);
+static int spa_load_impl(spa_t *spa, spa_import_type_t type, char **ereport);
 static void spa_vdev_resilver_done(spa_t *spa);
 
 uint_t         zio_taskq_batch_pct = 75;       /* 1 thread per cpu in pset */
-id_t           zio_taskq_psrset_bind = PS_NONE;
 boolean_t      zio_taskq_sysdc = B_TRUE;       /* use SDC scheduling class */
 uint_t         zio_taskq_basedc = 80;          /* base duty cycle */
 
 boolean_t      spa_create_process = B_TRUE;    /* no process ==> no sysdc */
 
+/*
+ * Report any spa_load_verify errors found, but do not fail spa_load.
+ * This is used by zdb to analyze non-idle pools.
+ */
+boolean_t      spa_load_verify_dryrun = B_FALSE;
+
 /*
  * This (illegal) pool name is used when temporarily importing a spa_t in order
  * to get the vdev stats associated with the imported devices.
  */
 #define        TRYIMPORT_NAME  "$import"
 
+/*
+ * For debugging purposes: print out vdev tree during pool import.
+ */
+int            spa_load_print_vdev_tree = B_FALSE;
+
+/*
+ * A non-zero value for zfs_max_missing_tvds means that we allow importing
+ * pools with missing top-level vdevs. This is strictly intended for advanced
+ * pool recovery cases since missing data is almost inevitable. Pools with
+ * missing devices can only be imported read-only for safety reasons, and their
+ * fail-mode will be automatically set to "continue".
+ *
+ * With 1 missing vdev we should be able to import the pool and mount all
+ * datasets. User data that was not modified after the missing device has been
+ * added should be recoverable. This means that snapshots created prior to the
+ * addition of that device should be completely intact.
+ *
+ * With 2 missing vdevs, some datasets may fail to mount since there are
+ * dataset statistics that are stored as regular metadata. Some data might be
+ * recoverable if those vdevs were added recently.
+ *
+ * With 3 or more missing vdevs, the pool is severely damaged and MOS entries
+ * may be missing entirely. Chances of data recovery are very low. Note that
+ * there are also risks of performing an inadvertent rewind as we might be
+ * missing all the vdevs with the latest uberblocks.
+ */
+unsigned long  zfs_max_missing_tvds = 0;
+
+/*
+ * The parameters below are similar to zfs_max_missing_tvds but are only
+ * intended for a preliminary open of the pool with an untrusted config which
+ * might be incomplete or out-dated.
+ *
+ * We are more tolerant for pools opened from a cachefile since we could have
+ * an out-dated cachefile where a device removal was not registered.
+ * We could have set the limit arbitrarily high but in the case where devices
+ * are really missing we would want to return the proper error codes; we chose
+ * SPA_DVAS_PER_BP - 1 so that some copies of the MOS would still be available
+ * and we get a chance to retrieve the trusted config.
+ */
+uint64_t       zfs_max_missing_tvds_cachefile = SPA_DVAS_PER_BP - 1;
+
+/*
+ * In the case where config was assembled by scanning device paths (/dev/dsks
+ * by default) we are less tolerant since all the existing devices should have
+ * been detected and we want spa_load to return the right error codes.
+ */
+uint64_t       zfs_max_missing_tvds_scan = 0;
+
+/*
+ * Debugging aid that pauses spa_sync() towards the end.
+ */
+boolean_t      zfs_pause_spa_sync = B_FALSE;
+
+/*
+ * Variables to indicate the livelist condense zthr func should wait at certain
+ * points for the livelist to be removed - used to test condense/destroy races
+ */
+int zfs_livelist_condense_zthr_pause = 0;
+int zfs_livelist_condense_sync_pause = 0;
+
+/*
+ * Variables to track whether or not condense cancellation has been
+ * triggered in testing.
+ */
+int zfs_livelist_condense_sync_cancel = 0;
+int zfs_livelist_condense_zthr_cancel = 0;
+
+/*
+ * Variable to track whether or not extra ALLOC blkptrs were added to a
+ * livelist entry while it was being condensed (caused by the way we track
+ * remapped blkptrs in dbuf_remap_impl)
+ */
+int zfs_livelist_condense_new_alloc = 0;
+
 /*
  * ==========================================================================
  * SPA properties routines
@@ -219,13 +298,21 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
        ASSERT(MUTEX_HELD(&spa->spa_props_lock));
 
        if (rvd != NULL) {
-               alloc = metaslab_class_get_alloc(spa_normal_class(spa));
-               size = metaslab_class_get_space(spa_normal_class(spa));
+               alloc = metaslab_class_get_alloc(mc);
+               alloc += metaslab_class_get_alloc(spa_special_class(spa));
+               alloc += metaslab_class_get_alloc(spa_dedup_class(spa));
+
+               size = metaslab_class_get_space(mc);
+               size += metaslab_class_get_space(spa_special_class(spa));
+               size += metaslab_class_get_space(spa_dedup_class(spa));
+
                spa_prop_add_list(*nvp, ZPOOL_PROP_NAME, spa_name(spa), 0, src);
                spa_prop_add_list(*nvp, ZPOOL_PROP_SIZE, NULL, size, src);
                spa_prop_add_list(*nvp, ZPOOL_PROP_ALLOCATED, NULL, alloc, src);
                spa_prop_add_list(*nvp, ZPOOL_PROP_FREE, NULL,
                    size - alloc, src);
+               spa_prop_add_list(*nvp, ZPOOL_PROP_CHECKPOINT, NULL,
+                   spa->spa_checkpoint_info.sci_dspace, src);
 
                spa_prop_add_list(*nvp, ZPOOL_PROP_FRAGMENTATION, NULL,
                    metaslab_class_fragmentation(mc), src);
@@ -251,6 +338,8 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
                        spa_prop_add_list(*nvp, ZPOOL_PROP_VERSION, NULL,
                            version, ZPROP_SRC_LOCAL);
                }
+               spa_prop_add_list(*nvp, ZPOOL_PROP_LOAD_GUID,
+                   NULL, spa_load_guid(spa), src);
        }
 
        if (pool != NULL) {
@@ -370,8 +459,9 @@ spa_prop_get(spa_t *spa, nvlist_t **nvp)
 
                                dp = spa_get_dsl(spa);
                                dsl_pool_config_enter(dp, FTAG);
-                               if ((err = dsl_dataset_hold_obj(dp,
-                                   za.za_first_integer, FTAG, &ds))) {
+                               err = dsl_dataset_hold_obj(dp,
+                                   za.za_first_integer, FTAG, &ds);
+                               if (err != 0) {
                                        dsl_pool_config_exit(dp, FTAG);
                                        break;
                                }
@@ -488,6 +578,7 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
                case ZPOOL_PROP_AUTOREPLACE:
                case ZPOOL_PROP_LISTSNAPS:
                case ZPOOL_PROP_AUTOEXPAND:
+               case ZPOOL_PROP_AUTOTRIM:
                        error = nvpair_value_uint64(elem, &intval);
                        if (!error && intval > 1)
                                error = SET_ERROR(EINVAL);
@@ -537,14 +628,14 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
                                }
 
                                error = dmu_objset_hold(strval, FTAG, &os);
-                               if (error)
+                               if (error != 0)
                                        break;
 
                                /*
                                 * Must be ZPL, and its property settings
                                 * must be supported by GRUB (compression
-                                * is not gzip, and large blocks or large
-                                * dnodes are not used).
+                                * is not gzip, and large dnodes are not
+                                * used).
                                 */
 
                                if (dmu_objset_type(os) != DMU_OST_ZFS) {
@@ -625,16 +716,6 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
                                error = SET_ERROR(E2BIG);
                        break;
 
-               case ZPOOL_PROP_DEDUPDITTO:
-                       if (spa_version(spa) < SPA_VERSION_DEDUP)
-                               error = SET_ERROR(ENOTSUP);
-                       else
-                               error = nvpair_value_uint64(elem, &intval);
-                       if (error == 0 &&
-                           intval != 0 && intval < ZIO_DEDUPDITTO_MIN)
-                               error = SET_ERROR(EINVAL);
-                       break;
-
                default:
                        break;
                }
@@ -643,6 +724,9 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
                        break;
        }
 
+       (void) nvlist_remove_all(props,
+           zpool_prop_to_name(ZPOOL_PROP_DEDUPDITTO));
+
        if (!error && reset_bootfs) {
                error = nvlist_remove(props,
                    zpool_prop_to_name(ZPOOL_PROP_BOOTFS), DATA_TYPE_STRING);
@@ -763,6 +847,12 @@ spa_change_guid_check(void *arg, dmu_tx_t *tx)
        vdev_t *rvd = spa->spa_root_vdev;
        uint64_t vdev_state;
 
+       if (spa_feature_is_active(spa, SPA_FEATURE_POOL_CHECKPOINT)) {
+               int error = (spa_has_checkpoint(spa)) ?
+                   ZFS_ERR_CHECKPOINT_EXISTS : ZFS_ERR_DISCARDING_CHECKPOINT;
+               return (SET_ERROR(error));
+       }
+
        spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
        vdev_state = rvd->vdev_state;
        spa_config_exit(spa, SCL_STATE, FTAG);
@@ -875,7 +965,6 @@ spa_taskqs_init(spa_t *spa, zio_type_t t, zio_taskq_type_t q)
        uint_t value = ztip->zti_value;
        uint_t count = ztip->zti_count;
        spa_taskqs_t *tqs = &spa->spa_zio_taskq[t][q];
-       char name[32];
        uint_t flags = 0;
        boolean_t batch = B_FALSE;
 
@@ -912,14 +1001,10 @@ spa_taskqs_init(spa_t *spa, zio_type_t t, zio_taskq_type_t q)
 
        for (uint_t i = 0; i < count; i++) {
                taskq_t *tq;
+               char name[32];
 
-               if (count > 1) {
-                       (void) snprintf(name, sizeof (name), "%s_%s_%u",
-                           zio_type_name[t], zio_taskq_types[q], i);
-               } else {
-                       (void) snprintf(name, sizeof (name), "%s_%s",
-                           zio_type_name[t], zio_taskq_types[q]);
-               }
+               (void) snprintf(name, sizeof (name), "%s_%s",
+                   zio_type_name[t], zio_taskq_types[q]);
 
                if (zio_taskq_sysdc && spa->spa_proc != &p0) {
                        if (batch)
@@ -1035,6 +1120,7 @@ spa_create_zio_taskqs(spa_t *spa)
 static void
 spa_thread(void *arg)
 {
+       psetid_t zio_taskq_psrset_bind = PS_NONE;
        callb_cpr_t cprinfo;
 
        spa_t *spa = arg;
@@ -1114,6 +1200,8 @@ spa_activate(spa_t *spa, int mode)
 
        spa->spa_normal_class = metaslab_class_create(spa, zfs_metaslab_ops);
        spa->spa_log_class = metaslab_class_create(spa, zfs_metaslab_ops);
+       spa->spa_special_class = metaslab_class_create(spa, zfs_metaslab_ops);
+       spa->spa_dedup_class = metaslab_class_create(spa, zfs_metaslab_ops);
 
        /* Try to create a covering process */
        mutex_enter(&spa->spa_proc_lock);
@@ -1150,8 +1238,10 @@ spa_activate(spa_t *spa, int mode)
                spa_create_zio_taskqs(spa);
        }
 
-       for (size_t i = 0; i < TXG_SIZE; i++)
-               spa->spa_txg_zio[i] = zio_root(spa, NULL, NULL, 0);
+       for (size_t i = 0; i < TXG_SIZE; i++) {
+               spa->spa_txg_zio[i] = zio_root(spa, NULL, NULL,
+                   ZIO_FLAG_CANFAIL);
+       }
 
        list_create(&spa->spa_config_dirty_list, sizeof (vdev_t),
            offsetof(vdev_t, vdev_config_dirty_node));
@@ -1261,6 +1351,12 @@ spa_deactivate(spa_t *spa)
        metaslab_class_destroy(spa->spa_log_class);
        spa->spa_log_class = NULL;
 
+       metaslab_class_destroy(spa->spa_special_class);
+       spa->spa_special_class = NULL;
+
+       metaslab_class_destroy(spa->spa_dedup_class);
+       spa->spa_dedup_class = NULL;
+
        /*
         * If this was part of an import or the open otherwise failed, we may
         * still have errors left in the queues.  Empty them just in case.
@@ -1346,21 +1442,121 @@ spa_config_parse(spa_t *spa, vdev_t **vdp, nvlist_t *nv, vdev_t *parent,
        return (0);
 }
 
+static boolean_t
+spa_should_flush_logs_on_unload(spa_t *spa)
+{
+       if (!spa_feature_is_active(spa, SPA_FEATURE_LOG_SPACEMAP))
+               return (B_FALSE);
+
+       if (!spa_writeable(spa))
+               return (B_FALSE);
+
+       if (!spa->spa_sync_on)
+               return (B_FALSE);
+
+       if (spa_state(spa) != POOL_STATE_EXPORTED)
+               return (B_FALSE);
+
+       if (zfs_keep_log_spacemaps_at_export)
+               return (B_FALSE);
+
+       return (B_TRUE);
+}
+
+/*
+ * Opens a transaction that will set the flag that will instruct
+ * spa_sync to attempt to flush all the metaslabs for that txg.
+ */
+static void
+spa_unload_log_sm_flush_all(spa_t *spa)
+{
+       dmu_tx_t *tx = dmu_tx_create_dd(spa_get_dsl(spa)->dp_mos_dir);
+       VERIFY0(dmu_tx_assign(tx, TXG_WAIT));
+
+       ASSERT3U(spa->spa_log_flushall_txg, ==, 0);
+       spa->spa_log_flushall_txg = dmu_tx_get_txg(tx);
+
+       dmu_tx_commit(tx);
+       txg_wait_synced(spa_get_dsl(spa), spa->spa_log_flushall_txg);
+}
+
+static void
+spa_unload_log_sm_metadata(spa_t *spa)
+{
+       void *cookie = NULL;
+       spa_log_sm_t *sls;
+       while ((sls = avl_destroy_nodes(&spa->spa_sm_logs_by_txg,
+           &cookie)) != NULL) {
+               VERIFY0(sls->sls_mscount);
+               kmem_free(sls, sizeof (spa_log_sm_t));
+       }
+
+       for (log_summary_entry_t *e = list_head(&spa->spa_log_summary);
+           e != NULL; e = list_head(&spa->spa_log_summary)) {
+               VERIFY0(e->lse_mscount);
+               list_remove(&spa->spa_log_summary, e);
+               kmem_free(e, sizeof (log_summary_entry_t));
+       }
+
+       spa->spa_unflushed_stats.sus_nblocks = 0;
+       spa->spa_unflushed_stats.sus_memused = 0;
+       spa->spa_unflushed_stats.sus_blocklimit = 0;
+}
+
+static void
+spa_destroy_aux_threads(spa_t *spa)
+{
+       if (spa->spa_condense_zthr != NULL) {
+               zthr_destroy(spa->spa_condense_zthr);
+               spa->spa_condense_zthr = NULL;
+       }
+       if (spa->spa_checkpoint_discard_zthr != NULL) {
+               zthr_destroy(spa->spa_checkpoint_discard_zthr);
+               spa->spa_checkpoint_discard_zthr = NULL;
+       }
+       if (spa->spa_livelist_delete_zthr != NULL) {
+               zthr_destroy(spa->spa_livelist_delete_zthr);
+               spa->spa_livelist_delete_zthr = NULL;
+       }
+       if (spa->spa_livelist_condense_zthr != NULL) {
+               zthr_destroy(spa->spa_livelist_condense_zthr);
+               spa->spa_livelist_condense_zthr = NULL;
+       }
+}
+
 /*
  * Opposite of spa_load().
  */
 static void
 spa_unload(spa_t *spa)
 {
-       int i;
-
        ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       ASSERT(spa_state(spa) != POOL_STATE_UNINITIALIZED);
+
+       spa_import_progress_remove(spa_guid(spa));
+       spa_load_note(spa, "UNLOADING");
+
+       /*
+        * If the log space map feature is enabled and the pool is getting
+        * exported (but not destroyed), we want to spend some time flushing
+        * as many metaslabs as we can in an attempt to destroy log space
+        * maps and save import time.
+        */
+       if (spa_should_flush_logs_on_unload(spa))
+               spa_unload_log_sm_flush_all(spa);
 
        /*
         * Stop async tasks.
         */
        spa_async_suspend(spa);
 
+       if (spa->spa_root_vdev) {
+               vdev_t *root_vdev = spa->spa_root_vdev;
+               vdev_initialize_stop_all(root_vdev, VDEV_INITIALIZE_ACTIVE);
+               vdev_trim_stop_all(root_vdev, VDEV_TRIM_ACTIVE);
+               vdev_autotrim_stop_all(spa);
+       }
+
        /*
         * Stop syncing.
         */
@@ -1370,16 +1566,15 @@ spa_unload(spa_t *spa)
        }
 
        /*
-        * Even though vdev_free() also calls vdev_metaslab_fini, we need
-        * to call it earlier, before we wait for async i/o to complete.
-        * This ensures that there is no async metaslab prefetching, by
-        * calling taskq_wait(mg_taskq).
+        * This ensures that there is no async metaslab prefetching
+        * while we attempt to unload the spa.
         */
        if (spa->spa_root_vdev != NULL) {
-               spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-               for (int c = 0; c < spa->spa_root_vdev->vdev_children; c++)
-                       vdev_metaslab_fini(spa->spa_root_vdev->vdev_child[c]);
-               spa_config_exit(spa, SCL_ALL, FTAG);
+               for (int c = 0; c < spa->spa_root_vdev->vdev_children; c++) {
+                       vdev_t *vc = spa->spa_root_vdev->vdev_child[c];
+                       if (vc->vdev_mg != NULL)
+                               taskq_wait(vc->vdev_mg->mg_taskq);
+               }
        }
 
        if (spa->spa_mmp.mmp_thread)
@@ -1400,17 +1595,13 @@ spa_unload(spa_t *spa)
                spa->spa_vdev_removal = NULL;
        }
 
-       if (spa->spa_condense_zthr != NULL) {
-               ASSERT(!zthr_isrunning(spa->spa_condense_zthr));
-               zthr_destroy(spa->spa_condense_zthr);
-               spa->spa_condense_zthr = NULL;
-       }
+       spa_destroy_aux_threads(spa);
 
        spa_condense_fini(spa);
 
        bpobj_close(&spa->spa_deferred_bpobj);
 
-       spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
+       spa_config_enter(spa, SCL_ALL, spa, RW_WRITER);
 
        /*
         * Close all vdevs.
@@ -1429,13 +1620,14 @@ spa_unload(spa_t *spa)
        }
 
        ddt_unload(spa);
+       spa_unload_log_sm_metadata(spa);
 
        /*
         * Drop and purge level 2 cache
         */
        spa_l2cache_drop(spa);
 
-       for (i = 0; i < spa->spa_spares.sav_count; i++)
+       for (int i = 0; i < spa->spa_spares.sav_count; i++)
                vdev_free(spa->spa_spares.sav_vdevs[i]);
        if (spa->spa_spares.sav_vdevs) {
                kmem_free(spa->spa_spares.sav_vdevs,
@@ -1448,7 +1640,7 @@ spa_unload(spa_t *spa)
        }
        spa->spa_spares.sav_count = 0;
 
-       for (i = 0; i < spa->spa_l2cache.sav_count; i++) {
+       for (int i = 0; i < spa->spa_l2cache.sav_count; i++) {
                vdev_clear_stats(spa->spa_l2cache.sav_vdevs[i]);
                vdev_free(spa->spa_l2cache.sav_vdevs[i]);
        }
@@ -1472,7 +1664,7 @@ spa_unload(spa_t *spa)
                spa->spa_comment = NULL;
        }
 
-       spa_config_exit(spa, SCL_ALL, FTAG);
+       spa_config_exit(spa, SCL_ALL, spa);
 }
 
 /*
@@ -1489,6 +1681,18 @@ spa_load_spares(spa_t *spa)
        int i;
        vdev_t *vd, *tvd;
 
+#ifndef _KERNEL
+       /*
+        * zdb opens both the current state of the pool and the
+        * checkpointed state (if present), with a different spa_t.
+        *
+        * As spare vdevs are shared among open pools, we skip loading
+        * them when we load the checkpointed state of the pool.
+        */
+       if (!spa_writeable(spa))
+               return;
+#endif
+
        ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);
 
        /*
@@ -1608,6 +1812,19 @@ spa_load_l2cache(spa_t *spa)
        vdev_t *vd, **oldvdevs, **newvdevs;
        spa_aux_vdev_t *sav = &spa->spa_l2cache;
 
+#ifndef _KERNEL
+       /*
+        * zdb opens both the current state of the pool and the
+        * checkpointed state (if present), with a different spa_t.
+        *
+        * As L2 caches are part of the ARC which is shared among open
+        * pools, we skip loading them when we load the checkpointed
+        * state of the pool.
+        */
+       if (!spa_writeable(spa))
+               return;
+#endif
+
        ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);
 
        oldvdevs = sav->sav_vdevs;
@@ -1748,6 +1965,27 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value)
        return (error);
 }
 
+/*
+ * Concrete top-level vdevs that are not missing and are not logs. At every
+ * spa_sync we write new uberblocks to at least SPA_SYNC_MIN_VDEVS core tvds.
+ */
+static uint64_t
+spa_healthy_core_tvds(spa_t *spa)
+{
+       vdev_t *rvd = spa->spa_root_vdev;
+       uint64_t tvds = 0;
+
+       for (uint64_t i = 0; i < rvd->vdev_children; i++) {
+               vdev_t *vd = rvd->vdev_child[i];
+               if (vd->vdev_islog)
+                       continue;
+               if (vdev_is_concrete(vd) && !vdev_is_dead(vd))
+                       tvds++;
+       }
+
+       return (tvds);
+}
+
 /*
  * Checks to see if the given vdev could not be opened, in which case we post a
  * sysevent to notify the autoreplace code that the device has been removed.
@@ -1755,7 +1993,7 @@ load_nvlist(spa_t *spa, uint64_t obj, nvlist_t **value)
 static void
 spa_check_removed(vdev_t *vd)
 {
-       for (int c = 0; c < vd->vdev_children; c++)
+       for (uint64_t c = 0; c < vd->vdev_children; c++)
                spa_check_removed(vd->vdev_child[c]);
 
        if (vd->vdev_ops->vdev_op_leaf && vdev_is_dead(vd) &&
@@ -1765,38 +2003,14 @@ spa_check_removed(vdev_t *vd)
        }
 }
 
-static void
-spa_config_valid_zaps(vdev_t *vd, vdev_t *mvd)
-{
-       ASSERT3U(vd->vdev_children, ==, mvd->vdev_children);
-
-       vd->vdev_top_zap = mvd->vdev_top_zap;
-       vd->vdev_leaf_zap = mvd->vdev_leaf_zap;
-
-       for (uint64_t i = 0; i < vd->vdev_children; i++) {
-               spa_config_valid_zaps(vd->vdev_child[i], mvd->vdev_child[i]);
-       }
-}
-
-/*
- * Validate the current config against the MOS config
- */
-static boolean_t
-spa_config_valid(spa_t *spa, nvlist_t *config)
+static int
+spa_check_for_missing_logs(spa_t *spa)
 {
-       vdev_t *mrvd, *rvd = spa->spa_root_vdev;
-       nvlist_t *nv;
-
-       VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nv) == 0);
-
-       spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-       VERIFY(spa_config_parse(spa, &mrvd, nv, NULL, 0, VDEV_ALLOC_LOAD) == 0);
-
-       ASSERT3U(rvd->vdev_children, ==, mrvd->vdev_children);
+       vdev_t *rvd = spa->spa_root_vdev;
 
        /*
         * If we're doing a normal import, then build up any additional
-        * diagnostic information about missing devices in this config.
+        * diagnostic information about missing log devices.
         * We'll pass this up to the user for further processing.
         */
        if (!(spa->spa_import_flags & ZFS_IMPORT_MISSING_LOG)) {
@@ -1807,109 +2021,54 @@ spa_config_valid(spa_t *spa, nvlist_t *config)
                    KM_SLEEP);
                VERIFY(nvlist_alloc(&nv, NV_UNIQUE_NAME, KM_SLEEP) == 0);
 
-               for (int c = 0; c < rvd->vdev_children; c++) {
+               for (uint64_t c = 0; c < rvd->vdev_children; c++) {
                        vdev_t *tvd = rvd->vdev_child[c];
-                       vdev_t *mtvd  = mrvd->vdev_child[c];
 
-                       if (tvd->vdev_ops == &vdev_missing_ops &&
-                           mtvd->vdev_ops != &vdev_missing_ops &&
-                           mtvd->vdev_islog)
-                               child[idx++] = vdev_config_generate(spa, mtvd,
-                                   B_FALSE, 0);
+                       /*
+                        * We consider a device as missing only if it failed
+                        * to open (i.e. offline or faulted is not considered
+                        * as missing).
+                        */
+                       if (tvd->vdev_islog &&
+                           tvd->vdev_state == VDEV_STATE_CANT_OPEN) {
+                               child[idx++] = vdev_config_generate(spa, tvd,
+                                   B_FALSE, VDEV_CONFIG_MISSING);
+                       }
                }
 
-               if (idx) {
-                       VERIFY(nvlist_add_nvlist_array(nv,
-                           ZPOOL_CONFIG_CHILDREN, child, idx) == 0);
-                       VERIFY(nvlist_add_nvlist(spa->spa_load_info,
-                           ZPOOL_CONFIG_MISSING_DEVICES, nv) == 0);
+               if (idx > 0) {
+                       fnvlist_add_nvlist_array(nv,
+                           ZPOOL_CONFIG_CHILDREN, child, idx);
+                       fnvlist_add_nvlist(spa->spa_load_info,
+                           ZPOOL_CONFIG_MISSING_DEVICES, nv);
 
-                       for (int i = 0; i < idx; i++)
+                       for (uint64_t i = 0; i < idx; i++)
                                nvlist_free(child[i]);
                }
                nvlist_free(nv);
                kmem_free(child, rvd->vdev_children * sizeof (char **));
-       }
-
-       /*
-        * Compare the root vdev tree with the information we have
-        * from the MOS config (mrvd). Check each top-level vdev
-        * with the corresponding MOS config top-level (mtvd).
-        */
-       for (int c = 0; c < rvd->vdev_children; c++) {
-               vdev_t *tvd = rvd->vdev_child[c];
-               vdev_t *mtvd  = mrvd->vdev_child[c];
-
-               /*
-                * Resolve any "missing" vdevs in the current configuration.
-                * Also trust the MOS config about any "indirect" vdevs.
-                * If we find that the MOS config has more accurate information
-                * about the top-level vdev then use that vdev instead.
-                */
-               if ((tvd->vdev_ops == &vdev_missing_ops &&
-                   mtvd->vdev_ops != &vdev_missing_ops) ||
-                   (mtvd->vdev_ops == &vdev_indirect_ops &&
-                   tvd->vdev_ops != &vdev_indirect_ops)) {
 
-                       /*
-                        * Device specific actions.
-                        */
-                       if (mtvd->vdev_islog) {
-                               if (!(spa->spa_import_flags &
-                                   ZFS_IMPORT_MISSING_LOG)) {
-                                       continue;
-                               }
+               if (idx > 0) {
+                       spa_load_failed(spa, "some log devices are missing");
+                       vdev_dbgmsg_print_tree(rvd, 2);
+                       return (SET_ERROR(ENXIO));
+               }
+       } else {
+               for (uint64_t c = 0; c < rvd->vdev_children; c++) {
+                       vdev_t *tvd = rvd->vdev_child[c];
 
+                       if (tvd->vdev_islog &&
+                           tvd->vdev_state == VDEV_STATE_CANT_OPEN) {
                                spa_set_log_state(spa, SPA_LOG_CLEAR);
-                       } else if (mtvd->vdev_ops != &vdev_indirect_ops) {
-                               continue;
-                       }
-
-                       /*
-                        * Swap the missing vdev with the data we were
-                        * able to obtain from the MOS config.
-                        */
-                       vdev_remove_child(rvd, tvd);
-                       vdev_remove_child(mrvd, mtvd);
-
-                       vdev_add_child(rvd, mtvd);
-                       vdev_add_child(mrvd, tvd);
-
-                       vdev_reopen(rvd);
-               } else {
-                       if (mtvd->vdev_islog) {
-                               /*
-                                * Load the slog device's state from the MOS
-                                * config since it's possible that the label
-                                * does not contain the most up-to-date
-                                * information.
-                                */
-                               vdev_load_log_state(tvd, mtvd);
-                               vdev_reopen(tvd);
+                               spa_load_note(spa, "some log devices are "
+                                   "missing, ZIL is dropped.");
+                               vdev_dbgmsg_print_tree(rvd, 2);
+                               break;
                        }
-
-                       /*
-                        * Per-vdev ZAP info is stored exclusively in the MOS.
-                        */
-                       spa_config_valid_zaps(tvd, mtvd);
                }
-
-               /*
-                * Never trust this info from userland; always use what's
-                * in the MOS.  This prevents it from getting out of sync
-                * with the rest of the info in the MOS.
-                */
-               tvd->vdev_removing = mtvd->vdev_removing;
-               tvd->vdev_indirect_config = mtvd->vdev_indirect_config;
        }
 
-       vdev_free(mrvd);
-       spa_config_exit(spa, SCL_ALL, FTAG);
-
-       /*
-        * Ensure we were able to validate the config.
-        */
-       return (rvd->vdev_guid_sum == spa->spa_uberblock.ub_guid_sum);
+       return (0);
 }
 
 /*
@@ -2039,16 +2198,16 @@ spa_load_verify_done(zio_t *zio)
        }
 
        mutex_enter(&spa->spa_scrub_lock);
-       spa->spa_load_verify_ios--;
+       spa->spa_load_verify_bytes -= BP_GET_PSIZE(bp);
        cv_broadcast(&spa->spa_scrub_io_cv);
        mutex_exit(&spa->spa_scrub_lock);
 }
 
 /*
- * Maximum number of concurrent scrub i/os to create while verifying
- * a pool while importing it.
+ * Maximum number of inflight bytes is the log2 fraction of the arc size.
+ * By default, we set it to 1/16th of the arc.
  */
-int spa_load_verify_maxinflight = 10000;
+int spa_load_verify_shift = 4;
 int spa_load_verify_metadata = B_TRUE;
 int spa_load_verify_data = B_TRUE;
 
@@ -2057,7 +2216,8 @@ static int
 spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
     const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
-       if (bp == NULL || BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
+       if (zb->zb_level == ZB_DNODE_LEVEL || BP_IS_HOLE(bp) ||
+           BP_IS_EMBEDDED(bp) || BP_IS_REDACTED(bp))
                return (0);
        /*
         * Note: normally this routine will not be called if
@@ -2069,13 +2229,14 @@ spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
        if (!BP_IS_METADATA(bp) && !spa_load_verify_data)
                return (0);
 
+       int maxinflight_bytes = arc_target_bytes() >> spa_load_verify_shift;
        zio_t *rio = arg;
        size_t size = BP_GET_PSIZE(bp);
 
        mutex_enter(&spa->spa_scrub_lock);
-       while (spa->spa_load_verify_ios >= spa_load_verify_maxinflight)
+       while (spa->spa_load_verify_bytes >= maxinflight_bytes)
                cv_wait(&spa->spa_scrub_io_cv, &spa->spa_scrub_lock);
-       spa->spa_load_verify_ios++;
+       spa->spa_load_verify_bytes += size;
        mutex_exit(&spa->spa_scrub_lock);
 
        zio_nowait(zio_read(rio, spa, bp, abd_alloc_for_io(size, B_FALSE), size,
@@ -2100,13 +2261,13 @@ spa_load_verify(spa_t *spa)
 {
        zio_t *rio;
        spa_load_error_t sle = { 0 };
-       zpool_rewind_policy_t policy;
+       zpool_load_policy_t policy;
        boolean_t verify_ok = B_FALSE;
        int error = 0;
 
-       zpool_get_rewind_policy(spa->spa_config, &policy);
+       zpool_get_load_policy(spa->spa_config, &policy);
 
-       if (policy.zrp_request & ZPOOL_NEVER_REWIND)
+       if (policy.zlp_rewind & ZPOOL_NEVER_REWIND)
                return (0);
 
        dsl_pool_config_enter(spa->spa_dsl_pool, FTAG);
@@ -2121,18 +2282,34 @@ spa_load_verify(spa_t *spa)
            ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE);
 
        if (spa_load_verify_metadata) {
+               if (spa->spa_extreme_rewind) {
+                       spa_load_note(spa, "performing a complete scan of the "
+                           "pool since extreme rewind is on. This may take "
+                           "a very long time.\n  (spa_load_verify_data=%u, "
+                           "spa_load_verify_metadata=%u)",
+                           spa_load_verify_data, spa_load_verify_metadata);
+               }
+
                error = traverse_pool(spa, spa->spa_verify_min_txg,
                    TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA |
                    TRAVERSE_NO_DECRYPT, spa_load_verify_cb, rio);
        }
 
        (void) zio_wait(rio);
+       ASSERT0(spa->spa_load_verify_bytes);
 
        spa->spa_load_meta_errors = sle.sle_meta_count;
        spa->spa_load_data_errors = sle.sle_data_count;
 
-       if (!error && sle.sle_meta_count <= policy.zrp_maxmeta &&
-           sle.sle_data_count <= policy.zrp_maxdata) {
+       if (sle.sle_meta_count != 0 || sle.sle_data_count != 0) {
+               spa_load_note(spa, "spa_load_verify found %llu metadata errors "
+                   "and %llu data errors", (u_longlong_t)sle.sle_meta_count,
+                   (u_longlong_t)sle.sle_data_count);
+       }
+
+       if (spa_load_verify_dryrun ||
+           (!error && sle.sle_meta_count <= policy.zlp_maxmeta &&
+           sle.sle_data_count <= policy.zlp_maxdata)) {
                int64_t loss = 0;
 
                verify_ok = B_TRUE;
@@ -2150,6 +2327,9 @@ spa_load_verify(spa_t *spa)
                spa->spa_load_max_txg = spa->spa_uberblock.ub_txg;
        }
 
+       if (spa_load_verify_dryrun)
+               return (0);
+
        if (error) {
                if (error != ENXIO && error != EIO)
                        error = SET_ERROR(EIO);
@@ -2173,10 +2353,17 @@ spa_prop_find(spa_t *spa, zpool_prop_t prop, uint64_t *val)
  * Find a value in the pool directory object.
  */
 static int
-spa_dir_prop(spa_t *spa, const char *name, uint64_t *val)
+spa_dir_prop(spa_t *spa, const char *name, uint64_t *val, boolean_t log_enoent)
 {
-       return (zap_lookup(spa->spa_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
-           name, sizeof (uint64_t), 1, val));
+       int error = zap_lookup(spa->spa_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
+           name, sizeof (uint64_t), 1, val);
+
+       if (error != 0 && (error != ENOENT || log_enoent)) {
+               spa_load_failed(spa, "couldn't get '%s' value in MOS directory "
+                   "[error=%d]", name, error);
+       }
+
+       return (error);
 }
 
 static int
@@ -2186,46 +2373,423 @@ spa_vdev_err(vdev_t *vdev, vdev_aux_t aux, int err)
        return (SET_ERROR(err));
 }
 
-static void
-spa_spawn_aux_threads(spa_t *spa)
+boolean_t
+spa_livelist_delete_check(spa_t *spa)
 {
-       ASSERT(spa_writeable(spa));
+       return (spa->spa_livelists_to_delete != 0);
+}
 
-       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+/* ARGSUSED */
+static boolean_t
+spa_livelist_delete_cb_check(void *arg, zthr_t *z)
+{
+       spa_t *spa = arg;
+       return (spa_livelist_delete_check(spa));
+}
 
-       spa_start_indirect_condensing_thread(spa);
+static int
+delete_blkptr_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
+{
+       spa_t *spa = arg;
+       zio_free(spa, tx->tx_txg, bp);
+       dsl_dir_diduse_space(tx->tx_pool->dp_free_dir, DD_USED_HEAD,
+           -bp_get_dsize_sync(spa, bp),
+           -BP_GET_PSIZE(bp), -BP_GET_UCSIZE(bp), tx);
+       return (0);
+}
+
+static int
+dsl_get_next_livelist_obj(objset_t *os, uint64_t zap_obj, uint64_t *llp)
+{
+       int err;
+       zap_cursor_t zc;
+       zap_attribute_t za;
+       zap_cursor_init(&zc, os, zap_obj);
+       err = zap_cursor_retrieve(&zc, &za);
+       zap_cursor_fini(&zc);
+       if (err == 0)
+               *llp = za.za_first_integer;
+       return (err);
 }
 
 /*
- * Fix up config after a partly-completed split.  This is done with the
- * ZPOOL_CONFIG_SPLIT nvlist.  Both the splitting pool and the split-off
- * pool have that entry in their config, but only the splitting one contains
- * a list of all the guids of the vdevs that are being split off.
- *
- * This function determines what to do with that list: either rejoin
- * all the disks to the pool, or complete the splitting process.  To attempt
- * the rejoin, each disk that is offlined is marked online again, and
- * we do a reopen() call.  If the vdev label for every disk that was
- * marked online indicates it was successfully split off (VDEV_AUX_SPLIT_POOL)
- * then we call vdev_split() on each disk, and complete the split.
- *
- * Otherwise we leave the config alone, with all the vdevs in place in
- * the original pool.
+ * Components of livelist deletion that must be performed in syncing
+ * context: freeing block pointers and updating the pool-wide data
+ * structures to indicate how much work is left to do
  */
+typedef struct sublist_delete_arg {
+       spa_t *spa;
+       dsl_deadlist_t *ll;
+       uint64_t key;
+       bplist_t *to_free;
+} sublist_delete_arg_t;
+
 static void
-spa_try_repair(spa_t *spa, nvlist_t *config)
+sublist_delete_sync(void *arg, dmu_tx_t *tx)
 {
-       uint_t extracted;
-       uint64_t *glist;
-       uint_t i, gcount;
-       nvlist_t *nvl;
-       vdev_t **vd;
-       boolean_t attempt_reopen;
+       sublist_delete_arg_t *sda = arg;
+       spa_t *spa = sda->spa;
+       dsl_deadlist_t *ll = sda->ll;
+       uint64_t key = sda->key;
+       bplist_t *to_free = sda->to_free;
 
-       if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_SPLIT, &nvl) != 0)
-               return;
+       bplist_iterate(to_free, delete_blkptr_cb, spa, tx);
+       dsl_deadlist_remove_entry(ll, key, tx);
+}
 
-       /* check that the config is complete */
+typedef struct livelist_delete_arg {
+       spa_t *spa;
+       uint64_t ll_obj;
+       uint64_t zap_obj;
+} livelist_delete_arg_t;
+
+static void
+livelist_delete_sync(void *arg, dmu_tx_t *tx)
+{
+       livelist_delete_arg_t *lda = arg;
+       spa_t *spa = lda->spa;
+       uint64_t ll_obj = lda->ll_obj;
+       uint64_t zap_obj = lda->zap_obj;
+       objset_t *mos = spa->spa_meta_objset;
+       uint64_t count;
+
+       /* free the livelist and decrement the feature count */
+       VERIFY0(zap_remove_int(mos, zap_obj, ll_obj, tx));
+       dsl_deadlist_free(mos, ll_obj, tx);
+       spa_feature_decr(spa, SPA_FEATURE_LIVELIST, tx);
+       VERIFY0(zap_count(mos, zap_obj, &count));
+       if (count == 0) {
+               /* no more livelists to delete */
+               VERIFY0(zap_remove(mos, DMU_POOL_DIRECTORY_OBJECT,
+                   DMU_POOL_DELETED_CLONES, tx));
+               VERIFY0(zap_destroy(mos, zap_obj, tx));
+               spa->spa_livelists_to_delete = 0;
+       }
+}
+
+/*
+ * Load in the value for the livelist to be removed and open it. Then,
+ * load its first sublist and determine which block pointers should actually
+ * be freed. Then, call a synctask which performs the actual frees and updates
+ * the pool-wide livelist data.
+ */
+/* ARGSUSED */
+void
+spa_livelist_delete_cb(void *arg, zthr_t *z)
+{
+       spa_t *spa = arg;
+       uint64_t ll_obj = 0, count;
+       objset_t *mos = spa->spa_meta_objset;
+       uint64_t zap_obj = spa->spa_livelists_to_delete;
+       /*
+        * Determine the next livelist to delete. This function should only
+        * be called if there is at least one deleted clone.
+        */
+       VERIFY0(dsl_get_next_livelist_obj(mos, zap_obj, &ll_obj));
+       VERIFY0(zap_count(mos, ll_obj, &count));
+       if (count > 0) {
+               dsl_deadlist_t ll = { 0 };
+               dsl_deadlist_entry_t *dle;
+               bplist_t to_free;
+               dsl_deadlist_open(&ll, mos, ll_obj);
+               dle = dsl_deadlist_first(&ll);
+               ASSERT3P(dle, !=, NULL);
+               bplist_create(&to_free);
+               int err = dsl_process_sub_livelist(&dle->dle_bpobj, &to_free,
+                   z, NULL);
+               if (err == 0) {
+                       sublist_delete_arg_t sync_arg = {
+                           .spa = spa,
+                           .ll = &ll,
+                           .key = dle->dle_mintxg,
+                           .to_free = &to_free
+                       };
+                       zfs_dbgmsg("deleting sublist (id %llu) from"
+                           " livelist %llu, %d remaining",
+                           dle->dle_bpobj.bpo_object, ll_obj, count - 1);
+                       VERIFY0(dsl_sync_task(spa_name(spa), NULL,
+                           sublist_delete_sync, &sync_arg, 0,
+                           ZFS_SPACE_CHECK_DESTROY));
+               } else {
+                       ASSERT(err == EINTR);
+               }
+               bplist_clear(&to_free);
+               bplist_destroy(&to_free);
+               dsl_deadlist_close(&ll);
+       } else {
+               livelist_delete_arg_t sync_arg = {
+                   .spa = spa,
+                   .ll_obj = ll_obj,
+                   .zap_obj = zap_obj
+               };
+               zfs_dbgmsg("deletion of livelist %llu completed", ll_obj);
+               VERIFY0(dsl_sync_task(spa_name(spa), NULL, livelist_delete_sync,
+                   &sync_arg, 0, ZFS_SPACE_CHECK_DESTROY));
+       }
+}
+
+void
+spa_start_livelist_destroy_thread(spa_t *spa)
+{
+       ASSERT3P(spa->spa_livelist_delete_zthr, ==, NULL);
+       spa->spa_livelist_delete_zthr = zthr_create(
+           spa_livelist_delete_cb_check, spa_livelist_delete_cb, spa);
+}
+
+typedef struct livelist_new_arg {
+       bplist_t *allocs;
+       bplist_t *frees;
+} livelist_new_arg_t;
+
+static int
+livelist_track_new_cb(void *arg, const blkptr_t *bp, boolean_t bp_freed,
+    dmu_tx_t *tx)
+{
+       ASSERT(tx == NULL);
+       livelist_new_arg_t *lna = arg;
+       if (bp_freed) {
+               bplist_append(lna->frees, bp);
+       } else {
+               bplist_append(lna->allocs, bp);
+               zfs_livelist_condense_new_alloc++;
+       }
+       return (0);
+}
+
+typedef struct livelist_condense_arg {
+       spa_t *spa;
+       bplist_t to_keep;
+       uint64_t first_size;
+       uint64_t next_size;
+} livelist_condense_arg_t;
+
+static void
+spa_livelist_condense_sync(void *arg, dmu_tx_t *tx)
+{
+       livelist_condense_arg_t *lca = arg;
+       spa_t *spa = lca->spa;
+       bplist_t new_frees;
+       dsl_dataset_t *ds = spa->spa_to_condense.ds;
+
+       /* Have we been cancelled? */
+       if (spa->spa_to_condense.cancelled) {
+               zfs_livelist_condense_sync_cancel++;
+               goto out;
+       }
+
+       dsl_deadlist_entry_t *first = spa->spa_to_condense.first;
+       dsl_deadlist_entry_t *next = spa->spa_to_condense.next;
+       dsl_deadlist_t *ll = &ds->ds_dir->dd_livelist;
+
+       /*
+        * It's possible that the livelist was changed while the zthr was
+        * running. Therefore, we need to check for new blkptrs in the two
+        * entries being condensed and continue to track them in the livelist.
+        * Because of the way we handle remapped blkptrs (see dbuf_remap_impl),
+        * it's possible that the newly added blkptrs are FREEs or ALLOCs so
+        * we need to sort them into two different bplists.
+        */
+       uint64_t first_obj = first->dle_bpobj.bpo_object;
+       uint64_t next_obj = next->dle_bpobj.bpo_object;
+       uint64_t cur_first_size = first->dle_bpobj.bpo_phys->bpo_num_blkptrs;
+       uint64_t cur_next_size = next->dle_bpobj.bpo_phys->bpo_num_blkptrs;
+
+       bplist_create(&new_frees);
+       livelist_new_arg_t new_bps = {
+           .allocs = &lca->to_keep,
+           .frees = &new_frees,
+       };
+
+       if (cur_first_size > lca->first_size) {
+               VERIFY0(livelist_bpobj_iterate_from_nofree(&first->dle_bpobj,
+                   livelist_track_new_cb, &new_bps, lca->first_size));
+       }
+       if (cur_next_size > lca->next_size) {
+               VERIFY0(livelist_bpobj_iterate_from_nofree(&next->dle_bpobj,
+                   livelist_track_new_cb, &new_bps, lca->next_size));
+       }
+
+       dsl_deadlist_clear_entry(first, ll, tx);
+       ASSERT(bpobj_is_empty(&first->dle_bpobj));
+       dsl_deadlist_remove_entry(ll, next->dle_mintxg, tx);
+
+       bplist_iterate(&lca->to_keep, dsl_deadlist_insert_alloc_cb, ll, tx);
+       bplist_iterate(&new_frees, dsl_deadlist_insert_free_cb, ll, tx);
+       bplist_destroy(&new_frees);
+
+       char dsname[ZFS_MAX_DATASET_NAME_LEN];
+       dsl_dataset_name(ds, dsname);
+       zfs_dbgmsg("txg %llu condensing livelist of %s (id %llu), bpobj %llu "
+           "(%llu blkptrs) and bpobj %llu (%llu blkptrs) -> bpobj %llu "
+           "(%llu blkptrs)", tx->tx_txg, dsname, ds->ds_object, first_obj,
+           cur_first_size, next_obj, cur_next_size,
+           first->dle_bpobj.bpo_object,
+           first->dle_bpobj.bpo_phys->bpo_num_blkptrs);
+out:
+       dmu_buf_rele(ds->ds_dbuf, spa);
+       spa->spa_to_condense.ds = NULL;
+       bplist_clear(&lca->to_keep);
+       bplist_destroy(&lca->to_keep);
+       kmem_free(lca, sizeof (livelist_condense_arg_t));
+       spa->spa_to_condense.syncing = B_FALSE;
+}
+
+void
+spa_livelist_condense_cb(void *arg, zthr_t *t)
+{
+       while (zfs_livelist_condense_zthr_pause &&
+           !(zthr_has_waiters(t) || zthr_iscancelled(t)))
+               delay(1);
+
+       spa_t *spa = arg;
+       dsl_deadlist_entry_t *first = spa->spa_to_condense.first;
+       dsl_deadlist_entry_t *next = spa->spa_to_condense.next;
+       uint64_t first_size, next_size;
+
+       livelist_condense_arg_t *lca =
+           kmem_alloc(sizeof (livelist_condense_arg_t), KM_SLEEP);
+       bplist_create(&lca->to_keep);
+
+       /*
+        * Process the livelists (matching FREEs and ALLOCs) in open context
+        * so we have minimal work in syncing context to condense.
+        *
+        * We save bpobj sizes (first_size and next_size) to use later in
+        * syncing context to determine if entries were added to these sublists
+        * while in open context. This is possible because the clone is still
+        * active and open for normal writes and we want to make sure the new,
+        * unprocessed blockpointers are inserted into the livelist normally.
+        *
+        * Note that dsl_process_sub_livelist() both stores the size number of
+        * blockpointers and iterates over them while the bpobj's lock held, so
+        * the sizes returned to us are consistent which what was actually
+        * processed.
+        */
+       int err = dsl_process_sub_livelist(&first->dle_bpobj, &lca->to_keep, t,
+           &first_size);
+       if (err == 0)
+               err = dsl_process_sub_livelist(&next->dle_bpobj, &lca->to_keep,
+                   t, &next_size);
+
+       if (err == 0) {
+               while (zfs_livelist_condense_sync_pause &&
+                   !(zthr_has_waiters(t) || zthr_iscancelled(t)))
+                       delay(1);
+
+               dmu_tx_t *tx = dmu_tx_create_dd(spa_get_dsl(spa)->dp_mos_dir);
+               dmu_tx_mark_netfree(tx);
+               dmu_tx_hold_space(tx, 1);
+               err = dmu_tx_assign(tx, TXG_NOWAIT | TXG_NOTHROTTLE);
+               if (err == 0) {
+                       /*
+                        * Prevent the condense zthr restarting before
+                        * the synctask completes.
+                        */
+                       spa->spa_to_condense.syncing = B_TRUE;
+                       lca->spa = spa;
+                       lca->first_size = first_size;
+                       lca->next_size = next_size;
+                       dsl_sync_task_nowait(spa_get_dsl(spa),
+                           spa_livelist_condense_sync, lca, 0,
+                           ZFS_SPACE_CHECK_NONE, tx);
+                       dmu_tx_commit(tx);
+                       return;
+               }
+       }
+       /*
+        * Condensing can not continue: either it was externally stopped or
+        * we were unable to assign to a tx because the pool has run out of
+        * space. In the second case, we'll just end up trying to condense
+        * again in a later txg.
+        */
+       ASSERT(err != 0);
+       bplist_clear(&lca->to_keep);
+       bplist_destroy(&lca->to_keep);
+       kmem_free(lca, sizeof (livelist_condense_arg_t));
+       dmu_buf_rele(spa->spa_to_condense.ds->ds_dbuf, spa);
+       spa->spa_to_condense.ds = NULL;
+       if (err == EINTR)
+               zfs_livelist_condense_zthr_cancel++;
+}
+
+/* ARGSUSED */
+/*
+ * Check that there is something to condense but that a condense is not
+ * already in progress and that condensing has not been cancelled.
+ */
+static boolean_t
+spa_livelist_condense_cb_check(void *arg, zthr_t *z)
+{
+       spa_t *spa = arg;
+       if ((spa->spa_to_condense.ds != NULL) &&
+           (spa->spa_to_condense.syncing == B_FALSE) &&
+           (spa->spa_to_condense.cancelled == B_FALSE)) {
+               return (B_TRUE);
+       }
+       return (B_FALSE);
+}
+
+void
+spa_start_livelist_condensing_thread(spa_t *spa)
+{
+       spa->spa_to_condense.ds = NULL;
+       spa->spa_to_condense.first = NULL;
+       spa->spa_to_condense.next = NULL;
+       spa->spa_to_condense.syncing = B_FALSE;
+       spa->spa_to_condense.cancelled = B_FALSE;
+
+       ASSERT3P(spa->spa_livelist_condense_zthr, ==, NULL);
+       spa->spa_livelist_condense_zthr = zthr_create(
+           spa_livelist_condense_cb_check, spa_livelist_condense_cb, spa);
+}
+
+static void
+spa_spawn_aux_threads(spa_t *spa)
+{
+       ASSERT(spa_writeable(spa));
+
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+
+       spa_start_indirect_condensing_thread(spa);
+       spa_start_livelist_destroy_thread(spa);
+       spa_start_livelist_condensing_thread(spa);
+
+       ASSERT3P(spa->spa_checkpoint_discard_zthr, ==, NULL);
+       spa->spa_checkpoint_discard_zthr =
+           zthr_create(spa_checkpoint_discard_thread_check,
+           spa_checkpoint_discard_thread, spa);
+}
+
+/*
+ * Fix up config after a partly-completed split.  This is done with the
+ * ZPOOL_CONFIG_SPLIT nvlist.  Both the splitting pool and the split-off
+ * pool have that entry in their config, but only the splitting one contains
+ * a list of all the guids of the vdevs that are being split off.
+ *
+ * This function determines what to do with that list: either rejoin
+ * all the disks to the pool, or complete the splitting process.  To attempt
+ * the rejoin, each disk that is offlined is marked online again, and
+ * we do a reopen() call.  If the vdev label for every disk that was
+ * marked online indicates it was successfully split off (VDEV_AUX_SPLIT_POOL)
+ * then we call vdev_split() on each disk, and complete the split.
+ *
+ * Otherwise we leave the config alone, with all the vdevs in place in
+ * the original pool.
+ */
+static void
+spa_try_repair(spa_t *spa, nvlist_t *config)
+{
+       uint_t extracted;
+       uint64_t *glist;
+       uint_t i, gcount;
+       nvlist_t *nvl;
+       vdev_t **vd;
+       boolean_t attempt_reopen;
+
+       if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_SPLIT, &nvl) != 0)
+               return;
+
+       /* check that the config is complete */
        if (nvlist_lookup_uint64_array(nvl, ZPOOL_CONFIG_SPLIT_LIST,
            &glist, &gcount) != 0)
                return;
@@ -2279,60 +2843,24 @@ spa_try_repair(spa_t *spa, nvlist_t *config)
 }
 
 static int
-spa_load(spa_t *spa, spa_load_state_t state, spa_import_type_t type,
-    boolean_t trust_config)
+spa_load(spa_t *spa, spa_load_state_t state, spa_import_type_t type)
 {
-       nvlist_t *config = spa->spa_config;
        char *ereport = FM_EREPORT_ZFS_POOL;
-       char *comment;
        int error;
-       uint64_t pool_guid;
-       nvlist_t *nvl;
-
-       if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_GUID, &pool_guid))
-               return (SET_ERROR(EINVAL));
-
-       ASSERT(spa->spa_comment == NULL);
-       if (nvlist_lookup_string(config, ZPOOL_CONFIG_COMMENT, &comment) == 0)
-               spa->spa_comment = spa_strdup(comment);
-
-       /*
-        * Versioning wasn't explicitly added to the label until later, so if
-        * it's not present treat it as the initial version.
-        */
-       if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
-           &spa->spa_ubsync.ub_version) != 0)
-               spa->spa_ubsync.ub_version = SPA_VERSION_INITIAL;
 
-       (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_TXG,
-           &spa->spa_config_txg);
-
-       if ((state == SPA_LOAD_IMPORT || state == SPA_LOAD_TRYIMPORT) &&
-           spa_guid_exists(pool_guid, 0)) {
-               error = SET_ERROR(EEXIST);
-       } else {
-               spa->spa_config_guid = pool_guid;
-
-               if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_SPLIT,
-                   &nvl) == 0) {
-                       VERIFY(nvlist_dup(nvl, &spa->spa_config_splitting,
-                           KM_SLEEP) == 0);
-               }
-
-               nvlist_free(spa->spa_load_info);
-               spa->spa_load_info = fnvlist_alloc();
+       spa->spa_load_state = state;
+       (void) spa_import_progress_set_state(spa_guid(spa),
+           spa_load_state(spa));
 
-               gethrestime(&spa->spa_loaded_ts);
-               error = spa_load_impl(spa, pool_guid, config, state, type,
-                   trust_config, &ereport);
-       }
+       gethrestime(&spa->spa_loaded_ts);
+       error = spa_load_impl(spa, type, &ereport);
 
        /*
         * Don't count references from objsets that are already closed
         * and are making their way through the eviction process.
         */
        spa_evicting_os_wait(spa);
-       spa->spa_minref = refcount_count(&spa->spa_refcount);
+       spa->spa_minref = zfs_refcount_count(&spa->spa_refcount);
        if (error) {
                if (error != EEXIST) {
                        spa->spa_loaded_ts.tv_sec = 0;
@@ -2345,6 +2873,9 @@ spa_load(spa_t *spa, spa_load_state_t state, spa_import_type_t type,
        spa->spa_load_state = error ? SPA_LOAD_ERROR : SPA_LOAD_NONE;
        spa->spa_ena = 0;
 
+       (void) spa_import_progress_set_state(spa_guid(spa),
+           spa_load_state(spa));
+
        return (error);
 }
 
@@ -2390,6 +2921,7 @@ spa_activity_check_required(spa_t *spa, uberblock_t *ub, nvlist_t *label,
        uint64_t hostid = 0;
        uint64_t tryconfig_txg = 0;
        uint64_t tryconfig_timestamp = 0;
+       uint16_t tryconfig_mmp_seq = 0;
        nvlist_t *nvinfo;
 
        if (nvlist_exists(config, ZPOOL_CONFIG_LOAD_INFO)) {
@@ -2398,6 +2930,8 @@ spa_activity_check_required(spa_t *spa, uberblock_t *ub, nvlist_t *label,
                    &tryconfig_txg);
                (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_TIMESTAMP,
                    &tryconfig_timestamp);
+               (void) nvlist_lookup_uint16(nvinfo, ZPOOL_CONFIG_MMP_SEQ,
+                   &tryconfig_mmp_seq);
        }
 
        (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_STATE, &state);
@@ -2414,14 +2948,17 @@ spa_activity_check_required(spa_t *spa, uberblock_t *ub, nvlist_t *label,
         */
        if (ub->ub_mmp_magic == MMP_MAGIC && ub->ub_mmp_delay == 0)
                return (B_FALSE);
+
        /*
-        * If the tryconfig_* values are nonzero, they are the results of an
-        * earlier tryimport.  If they match the uberblock we just found, then
-        * the pool has not changed and we return false so we do not test a
-        * second time.
+        * If the tryconfig_ values are nonzero, they are the results of an
+        * earlier tryimport.  If they all match the uberblock we just found,
+        * then the pool has not changed and we return false so we do not test
+        * second time.
         */
        if (tryconfig_txg && tryconfig_txg == ub->ub_txg &&
-           tryconfig_timestamp && tryconfig_timestamp == ub->ub_timestamp)
+           tryconfig_timestamp && tryconfig_timestamp == ub->ub_timestamp &&
+           tryconfig_mmp_seq && tryconfig_mmp_seq ==
+           (MMP_SEQ_VALID(ub) ? MMP_SEQ(ub) : 0))
                return (B_FALSE);
 
        /*
@@ -2444,6 +2981,76 @@ spa_activity_check_required(spa_t *spa, uberblock_t *ub, nvlist_t *label,
        return (B_TRUE);
 }
 
+/*
+ * Nanoseconds the activity check must watch for changes on-disk.
+ */
+static uint64_t
+spa_activity_check_duration(spa_t *spa, uberblock_t *ub)
+{
+       uint64_t import_intervals = MAX(zfs_multihost_import_intervals, 1);
+       uint64_t multihost_interval = MSEC2NSEC(
+           MMP_INTERVAL_OK(zfs_multihost_interval));
+       uint64_t import_delay = MAX(NANOSEC, import_intervals *
+           multihost_interval);
+
+       /*
+        * Local tunables determine a minimum duration except for the case
+        * where we know when the remote host will suspend the pool if MMP
+        * writes do not land.
+        *
+        * See Big Theory comment at the top of mmp.c for the reasoning behind
+        * these cases and times.
+        */
+
+       ASSERT(MMP_IMPORT_SAFETY_FACTOR >= 100);
+
+       if (MMP_INTERVAL_VALID(ub) && MMP_FAIL_INT_VALID(ub) &&
+           MMP_FAIL_INT(ub) > 0) {
+
+               /* MMP on remote host will suspend pool after failed writes */
+               import_delay = MMP_FAIL_INT(ub) * MSEC2NSEC(MMP_INTERVAL(ub)) *
+                   MMP_IMPORT_SAFETY_FACTOR / 100;
+
+               zfs_dbgmsg("fail_intvals>0 import_delay=%llu ub_mmp "
+                   "mmp_fails=%llu ub_mmp mmp_interval=%llu "
+                   "import_intervals=%u", import_delay, MMP_FAIL_INT(ub),
+                   MMP_INTERVAL(ub), import_intervals);
+
+       } else if (MMP_INTERVAL_VALID(ub) && MMP_FAIL_INT_VALID(ub) &&
+           MMP_FAIL_INT(ub) == 0) {
+
+               /* MMP on remote host will never suspend pool */
+               import_delay = MAX(import_delay, (MSEC2NSEC(MMP_INTERVAL(ub)) +
+                   ub->ub_mmp_delay) * import_intervals);
+
+               zfs_dbgmsg("fail_intvals=0 import_delay=%llu ub_mmp "
+                   "mmp_interval=%llu ub_mmp_delay=%llu "
+                   "import_intervals=%u", import_delay, MMP_INTERVAL(ub),
+                   ub->ub_mmp_delay, import_intervals);
+
+       } else if (MMP_VALID(ub)) {
+               /*
+                * zfs-0.7 compatibility case
+                */
+
+               import_delay = MAX(import_delay, (multihost_interval +
+                   ub->ub_mmp_delay) * import_intervals);
+
+               zfs_dbgmsg("import_delay=%llu ub_mmp_delay=%llu "
+                   "import_intervals=%u leaves=%u", import_delay,
+                   ub->ub_mmp_delay, import_intervals,
+                   vdev_count_leaves(spa));
+       } else {
+               /* Using local tunings is the only reasonable option */
+               zfs_dbgmsg("pool last imported on non-MMP aware "
+                   "host using import_delay=%llu multihost_interval=%llu "
+                   "import_intervals=%u", import_delay, multihost_interval,
+                   import_intervals);
+       }
+
+       return (import_delay);
+}
+
 /*
  * Perform the import activity check.  If the user canceled the import or
  * we detected activity then fail.
@@ -2451,10 +3058,11 @@ spa_activity_check_required(spa_t *spa, uberblock_t *ub, nvlist_t *label,
 static int
 spa_activity_check(spa_t *spa, uberblock_t *ub, nvlist_t *config)
 {
-       uint64_t import_intervals = MAX(zfs_multihost_import_intervals, 1);
        uint64_t txg = ub->ub_txg;
        uint64_t timestamp = ub->ub_timestamp;
-       uint64_t import_delay = NANOSEC;
+       uint64_t mmp_config = ub->ub_mmp_config;
+       uint16_t mmp_seq = MMP_SEQ_VALID(ub) ? MMP_SEQ(ub) : 0;
+       uint64_t import_delay;
        hrtime_t import_expire;
        nvlist_t *mmp_label = NULL;
        vdev_t *rvd = spa->spa_root_vdev;
@@ -2471,7 +3079,7 @@ spa_activity_check(spa_t *spa, uberblock_t *ub, nvlist_t *config)
         * during the earlier tryimport.  If the txg recorded there is 0 then
         * the pool is known to be active on another host.
         *
-        * Otherwise, the pool might be in use on another node.  Check for
+        * Otherwise, the pool might be in use on another host.  Check for
         * changes in the uberblocks on disk if necessary.
         */
        if (nvlist_exists(config, ZPOOL_CONFIG_LOAD_INFO)) {
@@ -2486,32 +3094,28 @@ spa_activity_check(spa_t *spa, uberblock_t *ub, nvlist_t *config)
                }
        }
 
-       /*
-        * Preferentially use the zfs_multihost_interval from the node which
-        * last imported the pool.  This value is stored in an MMP uberblock as.
-        *
-        * ub_mmp_delay * vdev_count_leaves() == zfs_multihost_interval
-        */
-       if (ub->ub_mmp_magic == MMP_MAGIC && ub->ub_mmp_delay)
-               import_delay = MAX(import_delay, import_intervals *
-                   ub->ub_mmp_delay * MAX(vdev_count_leaves(spa), 1));
-
-       /* Apply a floor using the local default values. */
-       import_delay = MAX(import_delay, import_intervals *
-           MSEC2NSEC(MAX(zfs_multihost_interval, MMP_MIN_INTERVAL)));
-
-       zfs_dbgmsg("import_delay=%llu ub_mmp_delay=%llu import_intervals=%u "
-           "leaves=%u", import_delay, ub->ub_mmp_delay, import_intervals,
-           vdev_count_leaves(spa));
+       import_delay = spa_activity_check_duration(spa, ub);
 
        /* Add a small random factor in case of simultaneous imports (0-25%) */
-       import_expire = gethrtime() + import_delay +
-           (import_delay * spa_get_random(250) / 1000);
+       import_delay += import_delay * spa_get_random(250) / 1000;
+
+       import_expire = gethrtime() + import_delay;
 
        while (gethrtime() < import_expire) {
+               (void) spa_import_progress_set_mmp_check(spa_guid(spa),
+                   NSEC2SEC(import_expire - gethrtime()));
+
                vdev_uberblock_load(rvd, ub, &mmp_label);
 
-               if (txg != ub->ub_txg || timestamp != ub->ub_timestamp) {
+               if (txg != ub->ub_txg || timestamp != ub->ub_timestamp ||
+                   mmp_seq != (MMP_SEQ_VALID(ub) ? MMP_SEQ(ub) : 0)) {
+                       zfs_dbgmsg("multihost activity detected "
+                           "txg %llu ub_txg  %llu "
+                           "timestamp %llu ub_timestamp  %llu "
+                           "mmp_config %#llx ub_mmp_config %#llx",
+                           txg, ub->ub_txg, timestamp, ub->ub_timestamp,
+                           mmp_config, ub->ub_mmp_config);
+
                        error = SET_ERROR(EREMOTEIO);
                        break;
                }
@@ -2579,23 +3183,103 @@ out:
 }
 
 static int
-spa_ld_parse_config(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
-    spa_load_state_t state, spa_import_type_t type)
+spa_verify_host(spa_t *spa, nvlist_t *mos_config)
+{
+       uint64_t hostid;
+       char *hostname;
+       uint64_t myhostid = 0;
+
+       if (!spa_is_root(spa) && nvlist_lookup_uint64(mos_config,
+           ZPOOL_CONFIG_HOSTID, &hostid) == 0) {
+               hostname = fnvlist_lookup_string(mos_config,
+                   ZPOOL_CONFIG_HOSTNAME);
+
+               myhostid = zone_get_hostid(NULL);
+
+               if (hostid != 0 && myhostid != 0 && hostid != myhostid) {
+                       cmn_err(CE_WARN, "pool '%s' could not be "
+                           "loaded as it was last accessed by "
+                           "another system (host: %s hostid: 0x%llx). "
+                           "See: http://illumos.org/msg/ZFS-8000-EY",
+                           spa_name(spa), hostname, (u_longlong_t)hostid);
+                       spa_load_failed(spa, "hostid verification failed: pool "
+                           "last accessed by host: %s (hostid: 0x%llx)",
+                           hostname, (u_longlong_t)hostid);
+                       return (SET_ERROR(EBADF));
+               }
+       }
+
+       return (0);
+}
+
+static int
+spa_ld_parse_config(spa_t *spa, spa_import_type_t type)
 {
        int error = 0;
-       nvlist_t *nvtree = NULL;
+       nvlist_t *nvtree, *nvl, *config = spa->spa_config;
        int parse;
        vdev_t *rvd;
+       uint64_t pool_guid;
+       char *comment;
 
-       ASSERT(MUTEX_HELD(&spa_namespace_lock));
-
-       spa->spa_load_state = state;
+       /*
+        * Versioning wasn't explicitly added to the label until later, so if
+        * it's not present treat it as the initial version.
+        */
+       if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
+           &spa->spa_ubsync.ub_version) != 0)
+               spa->spa_ubsync.ub_version = SPA_VERSION_INITIAL;
 
-       if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvtree))
+       if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_GUID, &pool_guid)) {
+               spa_load_failed(spa, "invalid config provided: '%s' missing",
+                   ZPOOL_CONFIG_POOL_GUID);
                return (SET_ERROR(EINVAL));
+       }
 
-       parse = (type == SPA_IMPORT_EXISTING ?
-           VDEV_ALLOC_LOAD : VDEV_ALLOC_SPLIT);
+       /*
+        * If we are doing an import, ensure that the pool is not already
+        * imported by checking if its pool guid already exists in the
+        * spa namespace.
+        *
+        * The only case that we allow an already imported pool to be
+        * imported again, is when the pool is checkpointed and we want to
+        * look at its checkpointed state from userland tools like zdb.
+        */
+#ifdef _KERNEL
+       if ((spa->spa_load_state == SPA_LOAD_IMPORT ||
+           spa->spa_load_state == SPA_LOAD_TRYIMPORT) &&
+           spa_guid_exists(pool_guid, 0)) {
+#else
+       if ((spa->spa_load_state == SPA_LOAD_IMPORT ||
+           spa->spa_load_state == SPA_LOAD_TRYIMPORT) &&
+           spa_guid_exists(pool_guid, 0) &&
+           !spa_importing_readonly_checkpoint(spa)) {
+#endif
+               spa_load_failed(spa, "a pool with guid %llu is already open",
+                   (u_longlong_t)pool_guid);
+               return (SET_ERROR(EEXIST));
+       }
+
+       spa->spa_config_guid = pool_guid;
+
+       nvlist_free(spa->spa_load_info);
+       spa->spa_load_info = fnvlist_alloc();
+
+       ASSERT(spa->spa_comment == NULL);
+       if (nvlist_lookup_string(config, ZPOOL_CONFIG_COMMENT, &comment) == 0)
+               spa->spa_comment = spa_strdup(comment);
+
+       (void) nvlist_lookup_uint64(config, ZPOOL_CONFIG_POOL_TXG,
+           &spa->spa_config_txg);
+
+       if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_SPLIT, &nvl) == 0)
+               spa->spa_config_splitting = fnvlist_dup(nvl);
+
+       if (nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvtree)) {
+               spa_load_failed(spa, "invalid config provided: '%s' missing",
+                   ZPOOL_CONFIG_VDEV_TREE);
+               return (SET_ERROR(EINVAL));
+       }
 
        /*
         * Create "The Godfather" zio to hold all async IOs
@@ -2614,11 +3298,16 @@ spa_ld_parse_config(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
         * configuration requires knowing the version number.
         */
        spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
+       parse = (type == SPA_IMPORT_EXISTING ?
+           VDEV_ALLOC_LOAD : VDEV_ALLOC_SPLIT);
        error = spa_config_parse(spa, &rvd, nvtree, NULL, 0, parse);
        spa_config_exit(spa, SCL_ALL, FTAG);
 
-       if (error != 0)
+       if (error != 0) {
+               spa_load_failed(spa, "unable to parse config [error=%d]",
+                   error);
                return (error);
+       }
 
        ASSERT(spa->spa_root_vdev == rvd);
        ASSERT3U(spa->spa_min_ashift, >=, SPA_MINBLOCKSHIFT);
@@ -2631,63 +3320,143 @@ spa_ld_parse_config(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
        return (0);
 }
 
+/*
+ * Recursively open all vdevs in the vdev tree. This function is called twice:
+ * first with the untrusted config, then with the trusted config.
+ */
 static int
 spa_ld_open_vdevs(spa_t *spa)
 {
        int error = 0;
 
+       /*
+        * spa_missing_tvds_allowed defines how many top-level vdevs can be
+        * missing/unopenable for the root vdev to be still considered openable.
+        */
+       if (spa->spa_trust_config) {
+               spa->spa_missing_tvds_allowed = zfs_max_missing_tvds;
+       } else if (spa->spa_config_source == SPA_CONFIG_SRC_CACHEFILE) {
+               spa->spa_missing_tvds_allowed = zfs_max_missing_tvds_cachefile;
+       } else if (spa->spa_config_source == SPA_CONFIG_SRC_SCAN) {
+               spa->spa_missing_tvds_allowed = zfs_max_missing_tvds_scan;
+       } else {
+               spa->spa_missing_tvds_allowed = 0;
+       }
+
+       spa->spa_missing_tvds_allowed =
+           MAX(zfs_max_missing_tvds, spa->spa_missing_tvds_allowed);
+
        spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
        error = vdev_open(spa->spa_root_vdev);
        spa_config_exit(spa, SCL_ALL, FTAG);
 
+       if (spa->spa_missing_tvds != 0) {
+               spa_load_note(spa, "vdev tree has %lld missing top-level "
+                   "vdevs.", (u_longlong_t)spa->spa_missing_tvds);
+               if (spa->spa_trust_config && (spa->spa_mode & FWRITE)) {
+                       /*
+                        * Although theoretically we could allow users to open
+                        * incomplete pools in RW mode, we'd need to add a lot
+                        * of extra logic (e.g. adjust pool space to account
+                        * for missing vdevs).
+                        * This limitation also prevents users from accidentally
+                        * opening the pool in RW mode during data recovery and
+                        * damaging it further.
+                        */
+                       spa_load_note(spa, "pools with missing top-level "
+                           "vdevs can only be opened in read-only mode.");
+                       error = SET_ERROR(ENXIO);
+               } else {
+                       spa_load_note(spa, "current settings allow for maximum "
+                           "%lld missing top-level vdevs at this stage.",
+                           (u_longlong_t)spa->spa_missing_tvds_allowed);
+               }
+       }
+       if (error != 0) {
+               spa_load_failed(spa, "unable to open vdev tree [error=%d]",
+                   error);
+       }
+       if (spa->spa_missing_tvds != 0 || error != 0)
+               vdev_dbgmsg_print_tree(spa->spa_root_vdev, 2);
+
        return (error);
 }
 
+/*
+ * We need to validate the vdev labels against the configuration that
+ * we have in hand. This function is called twice: first with an untrusted
+ * config, then with a trusted config. The validation is more strict when the
+ * config is trusted.
+ */
 static int
-spa_ld_validate_vdevs(spa_t *spa, spa_import_type_t type,
-    boolean_t trust_config)
+spa_ld_validate_vdevs(spa_t *spa)
 {
        int error = 0;
        vdev_t *rvd = spa->spa_root_vdev;
 
-       /*
-        * We need to validate the vdev labels against the configuration that
-        * we have in hand, which is dependent on the setting of trust_config.
-        * If trust_config is true then we're validating the vdev labels based
-        * on that config.  Otherwise, we're validating against the cached
-        * config (zpool.cache) that was read when we loaded the zfs module, and
-        * then later we will recursively call spa_load() and validate against
-        * the vdev config.
-        *
-        * If we're assembling a new pool that's been split off from an
-        * existing pool, the labels haven't yet been updated so we skip
-        * validation for now.
-        */
-       if (type != SPA_IMPORT_ASSEMBLE) {
-               spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-               error = vdev_validate(rvd, trust_config);
-               spa_config_exit(spa, SCL_ALL, FTAG);
+       spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
+       error = vdev_validate(rvd);
+       spa_config_exit(spa, SCL_ALL, FTAG);
 
-               if (error != 0)
-                       return (error);
+       if (error != 0) {
+               spa_load_failed(spa, "vdev_validate failed [error=%d]", error);
+               return (error);
+       }
 
-               if (rvd->vdev_state <= VDEV_STATE_CANT_OPEN)
-                       return (SET_ERROR(ENXIO));
+       if (rvd->vdev_state <= VDEV_STATE_CANT_OPEN) {
+               spa_load_failed(spa, "cannot open vdev tree after invalidating "
+                   "some vdevs");
+               vdev_dbgmsg_print_tree(rvd, 2);
+               return (SET_ERROR(ENXIO));
        }
 
        return (0);
 }
 
+static void
+spa_ld_select_uberblock_done(spa_t *spa, uberblock_t *ub)
+{
+       spa->spa_state = POOL_STATE_ACTIVE;
+       spa->spa_ubsync = spa->spa_uberblock;
+       spa->spa_verify_min_txg = spa->spa_extreme_rewind ?
+           TXG_INITIAL - 1 : spa_last_synced_txg(spa) - TXG_DEFER_SIZE - 1;
+       spa->spa_first_txg = spa->spa_last_ubsync_txg ?
+           spa->spa_last_ubsync_txg : spa_last_synced_txg(spa) + 1;
+       spa->spa_claim_max_txg = spa->spa_first_txg;
+       spa->spa_prev_software_version = ub->ub_software_version;
+}
+
 static int
-spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
-    boolean_t trust_config)
+spa_ld_select_uberblock(spa_t *spa, spa_import_type_t type)
 {
        vdev_t *rvd = spa->spa_root_vdev;
        nvlist_t *label;
        uberblock_t *ub = &spa->spa_uberblock;
-       uint64_t children;
        boolean_t activity_check = B_FALSE;
 
+       /*
+        * If we are opening the checkpointed state of the pool by
+        * rewinding to it, at this point we will have written the
+        * checkpointed uberblock to the vdev labels, so searching
+        * the labels will find the right uberblock.  However, if
+        * we are opening the checkpointed state read-only, we have
+        * not modified the labels. Therefore, we must ignore the
+        * labels and continue using the spa_uberblock that was set
+        * by spa_ld_checkpoint_rewind.
+        *
+        * Note that it would be fine to ignore the labels when
+        * rewinding (opening writeable) as well. However, if we
+        * crash just after writing the labels, we will end up
+        * searching the labels. Doing so in the common case means
+        * that this code path gets exercised normally, rather than
+        * just in the edge case.
+        */
+       if (ub->ub_checkpoint_txg != 0 &&
+           spa_importing_readonly_checkpoint(spa)) {
+               spa_ld_select_uberblock_done(spa, ub);
+               return (0);
+       }
+
        /*
         * Find the best uberblock.
         */
@@ -2698,15 +3467,25 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
         */
        if (ub->ub_txg == 0) {
                nvlist_free(label);
+               spa_load_failed(spa, "no valid uberblock found");
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, ENXIO));
        }
 
+       if (spa->spa_load_max_txg != UINT64_MAX) {
+               (void) spa_import_progress_set_max_txg(spa_guid(spa),
+                   (u_longlong_t)spa->spa_load_max_txg);
+       }
+       spa_load_note(spa, "using uberblock with txg=%llu",
+           (u_longlong_t)ub->ub_txg);
+
+
        /*
         * For pools which have the multihost property on determine if the
         * pool is truly inactive and can be safely imported.  Prevent
         * hosts which don't have a hostid set from importing the pool.
         */
-       activity_check = spa_activity_check_required(spa, ub, label, config);
+       activity_check = spa_activity_check_required(spa, ub, label,
+           spa->spa_config);
        if (activity_check) {
                if (ub->ub_mmp_magic == MMP_MAGIC && ub->ub_mmp_delay &&
                    spa_get_hostid() == 0) {
@@ -2716,7 +3495,7 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
                        return (spa_vdev_err(rvd, VDEV_AUX_ACTIVE, EREMOTEIO));
                }
 
-               int error = spa_activity_check(spa, ub, config);
+               int error = spa_activity_check(spa, ub, spa->spa_config);
                if (error) {
                        nvlist_free(label);
                        return (error);
@@ -2726,6 +3505,9 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
                    ZPOOL_CONFIG_MMP_STATE, MMP_STATE_INACTIVE);
                fnvlist_add_uint64(spa->spa_load_info,
                    ZPOOL_CONFIG_MMP_TXG, ub->ub_txg);
+               fnvlist_add_uint16(spa->spa_load_info,
+                   ZPOOL_CONFIG_MMP_SEQ,
+                   (MMP_SEQ_VALID(ub) ? MMP_SEQ(ub) : 0));
        }
 
        /*
@@ -2733,6 +3515,8 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
         */
        if (!SPA_VERSION_IS_SUPPORTED(ub->ub_version)) {
                nvlist_free(label);
+               spa_load_failed(spa, "version %llu is not supported",
+                   (u_longlong_t)ub->ub_version);
                return (spa_vdev_err(rvd, VDEV_AUX_VERSION_NEWER, ENOTSUP));
        }
 
@@ -2743,9 +3527,17 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
                 * If we weren't able to find what's necessary for reading the
                 * MOS in the label, return failure.
                 */
-               if (label == NULL || nvlist_lookup_nvlist(label,
-                   ZPOOL_CONFIG_FEATURES_FOR_READ, &features) != 0) {
+               if (label == NULL) {
+                       spa_load_failed(spa, "label config unavailable");
+                       return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA,
+                           ENXIO));
+               }
+
+               if (nvlist_lookup_nvlist(label, ZPOOL_CONFIG_FEATURES_FOR_READ,
+                   &features) != 0) {
                        nvlist_free(label);
+                       spa_load_failed(spa, "invalid label: '%s' missing",
+                           ZPOOL_CONFIG_FEATURES_FOR_READ);
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA,
                            ENXIO));
                }
@@ -2784,6 +3576,7 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
                        VERIFY(nvlist_add_nvlist(spa->spa_load_info,
                            ZPOOL_CONFIG_UNSUP_FEAT, unsup_feat) == 0);
                        nvlist_free(unsup_feat);
+                       spa_load_failed(spa, "some features are unsupported");
                        return (spa_vdev_err(rvd, VDEV_AUX_UNSUP_FEAT,
                            ENOTSUP));
                }
@@ -2791,21 +3584,9 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
                nvlist_free(unsup_feat);
        }
 
-       /*
-        * If the vdev guid sum doesn't match the uberblock, we have an
-        * incomplete configuration.  We first check to see if the pool
-        * is aware of the complete config (i.e ZPOOL_CONFIG_VDEV_CHILDREN).
-        * If it is, defer the vdev_guid_sum check till later so we
-        * can handle missing vdevs.
-        */
-       if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_VDEV_CHILDREN,
-           &children) != 0 && trust_config && type != SPA_IMPORT_ASSEMBLE &&
-           rvd->vdev_guid_sum != ub->ub_guid_sum)
-               return (spa_vdev_err(rvd, VDEV_AUX_BAD_GUID_SUM, ENXIO));
-
        if (type != SPA_IMPORT_ASSEMBLE && spa->spa_config_splitting) {
                spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
-               spa_try_repair(spa, config);
+               spa_try_repair(spa, spa->spa_config);
                spa_config_exit(spa, SCL_ALL, FTAG);
                nvlist_free(spa->spa_config_splitting);
                spa->spa_config_splitting = NULL;
@@ -2814,14 +3595,7 @@ spa_ld_select_uberblock(spa_t *spa, nvlist_t *config, spa_import_type_t type,
        /*
         * Initialize internal SPA structures.
         */
-       spa->spa_state = POOL_STATE_ACTIVE;
-       spa->spa_ubsync = spa->spa_uberblock;
-       spa->spa_verify_min_txg = spa->spa_extreme_rewind ?
-           TXG_INITIAL - 1 : spa_last_synced_txg(spa) - TXG_DEFER_SIZE - 1;
-       spa->spa_first_txg = spa->spa_last_ubsync_txg ?
-           spa->spa_last_ubsync_txg : spa_last_synced_txg(spa) + 1;
-       spa->spa_claim_max_txg = spa->spa_first_txg;
-       spa->spa_prev_software_version = ub->ub_software_version;
+       spa_ld_select_uberblock_done(spa, ub);
 
        return (0);
 }
@@ -2832,48 +3606,177 @@ spa_ld_open_rootbp(spa_t *spa)
        int error = 0;
        vdev_t *rvd = spa->spa_root_vdev;
 
-       error = dsl_pool_init(spa, spa->spa_first_txg, &spa->spa_dsl_pool);
-       if (error)
-               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
-       spa->spa_meta_objset = spa->spa_dsl_pool->dp_meta_objset;
+       error = dsl_pool_init(spa, spa->spa_first_txg, &spa->spa_dsl_pool);
+       if (error != 0) {
+               spa_load_failed(spa, "unable to open rootbp in dsl_pool_init "
+                   "[error=%d]", error);
+               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       }
+       spa->spa_meta_objset = spa->spa_dsl_pool->dp_meta_objset;
+
+       return (0);
+}
+
+static int
+spa_ld_trusted_config(spa_t *spa, spa_import_type_t type,
+    boolean_t reloading)
+{
+       vdev_t *mrvd, *rvd = spa->spa_root_vdev;
+       nvlist_t *nv, *mos_config, *policy;
+       int error = 0, copy_error;
+       uint64_t healthy_tvds, healthy_tvds_mos;
+       uint64_t mos_config_txg;
+
+       if (spa_dir_prop(spa, DMU_POOL_CONFIG, &spa->spa_config_object, B_TRUE)
+           != 0)
+               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+
+       /*
+        * If we're assembling a pool from a split, the config provided is
+        * already trusted so there is nothing to do.
+        */
+       if (type == SPA_IMPORT_ASSEMBLE)
+               return (0);
+
+       healthy_tvds = spa_healthy_core_tvds(spa);
+
+       if (load_nvlist(spa, spa->spa_config_object, &mos_config)
+           != 0) {
+               spa_load_failed(spa, "unable to retrieve MOS config");
+               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       }
+
+       /*
+        * If we are doing an open, pool owner wasn't verified yet, thus do
+        * the verification here.
+        */
+       if (spa->spa_load_state == SPA_LOAD_OPEN) {
+               error = spa_verify_host(spa, mos_config);
+               if (error != 0) {
+                       nvlist_free(mos_config);
+                       return (error);
+               }
+       }
+
+       nv = fnvlist_lookup_nvlist(mos_config, ZPOOL_CONFIG_VDEV_TREE);
+
+       spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
+
+       /*
+        * Build a new vdev tree from the trusted config
+        */
+       VERIFY(spa_config_parse(spa, &mrvd, nv, NULL, 0, VDEV_ALLOC_LOAD) == 0);
+
+       /*
+        * Vdev paths in the MOS may be obsolete. If the untrusted config was
+        * obtained by scanning /dev/dsk, then it will have the right vdev
+        * paths. We update the trusted MOS config with this information.
+        * We first try to copy the paths with vdev_copy_path_strict, which
+        * succeeds only when both configs have exactly the same vdev tree.
+        * If that fails, we fall back to a more flexible method that has a
+        * best effort policy.
+        */
+       copy_error = vdev_copy_path_strict(rvd, mrvd);
+       if (copy_error != 0 || spa_load_print_vdev_tree) {
+               spa_load_note(spa, "provided vdev tree:");
+               vdev_dbgmsg_print_tree(rvd, 2);
+               spa_load_note(spa, "MOS vdev tree:");
+               vdev_dbgmsg_print_tree(mrvd, 2);
+       }
+       if (copy_error != 0) {
+               spa_load_note(spa, "vdev_copy_path_strict failed, falling "
+                   "back to vdev_copy_path_relaxed");
+               vdev_copy_path_relaxed(rvd, mrvd);
+       }
 
-       return (0);
-}
+       vdev_close(rvd);
+       vdev_free(rvd);
+       spa->spa_root_vdev = mrvd;
+       rvd = mrvd;
+       spa_config_exit(spa, SCL_ALL, FTAG);
 
-static int
-spa_ld_validate_config(spa_t *spa, spa_import_type_t type)
-{
-       vdev_t *rvd = spa->spa_root_vdev;
+       /*
+        * We will use spa_config if we decide to reload the spa or if spa_load
+        * fails and we rewind. We must thus regenerate the config using the
+        * MOS information with the updated paths. ZPOOL_LOAD_POLICY is used to
+        * pass settings on how to load the pool and is not stored in the MOS.
+        * We copy it over to our new, trusted config.
+        */
+       mos_config_txg = fnvlist_lookup_uint64(mos_config,
+           ZPOOL_CONFIG_POOL_TXG);
+       nvlist_free(mos_config);
+       mos_config = spa_config_generate(spa, NULL, mos_config_txg, B_FALSE);
+       if (nvlist_lookup_nvlist(spa->spa_config, ZPOOL_LOAD_POLICY,
+           &policy) == 0)
+               fnvlist_add_nvlist(mos_config, ZPOOL_LOAD_POLICY, policy);
+       spa_config_set(spa, mos_config);
+       spa->spa_config_source = SPA_CONFIG_SRC_MOS;
 
-       if (spa_dir_prop(spa, DMU_POOL_CONFIG, &spa->spa_config_object) != 0)
-               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       /*
+        * Now that we got the config from the MOS, we should be more strict
+        * in checking blkptrs and can make assumptions about the consistency
+        * of the vdev tree. spa_trust_config must be set to true before opening
+        * vdevs in order for them to be writeable.
+        */
+       spa->spa_trust_config = B_TRUE;
 
        /*
-        * Validate the config, using the MOS config to fill in any
-        * information which might be missing.  If we fail to validate
-        * the config then declare the pool unfit for use. If we're
-        * assembling a pool from a split, the log is not transferred
-        * over.
+        * Open and validate the new vdev tree
         */
-       if (type != SPA_IMPORT_ASSEMBLE) {
-               nvlist_t *mos_config;
-               if (load_nvlist(spa, spa->spa_config_object, &mos_config) != 0)
-                       return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       error = spa_ld_open_vdevs(spa);
+       if (error != 0)
+               return (error);
 
-               if (!spa_config_valid(spa, mos_config)) {
-                       nvlist_free(mos_config);
-                       return (spa_vdev_err(rvd, VDEV_AUX_BAD_GUID_SUM,
-                           ENXIO));
-               }
-               nvlist_free(mos_config);
+       error = spa_ld_validate_vdevs(spa);
+       if (error != 0)
+               return (error);
 
+       if (copy_error != 0 || spa_load_print_vdev_tree) {
+               spa_load_note(spa, "final vdev tree:");
+               vdev_dbgmsg_print_tree(rvd, 2);
+       }
+
+       if (spa->spa_load_state != SPA_LOAD_TRYIMPORT &&
+           !spa->spa_extreme_rewind && zfs_max_missing_tvds == 0) {
                /*
-                * Now that we've validated the config, check the state of the
-                * root vdev.  If it can't be opened, it indicates one or
-                * more toplevel vdevs are faulted.
+                * Sanity check to make sure that we are indeed loading the
+                * latest uberblock. If we missed SPA_SYNC_MIN_VDEVS tvds
+                * in the config provided and they happened to be the only ones
+                * to have the latest uberblock, we could involuntarily perform
+                * an extreme rewind.
                 */
-               if (rvd->vdev_state <= VDEV_STATE_CANT_OPEN)
-                       return (SET_ERROR(ENXIO));
+               healthy_tvds_mos = spa_healthy_core_tvds(spa);
+               if (healthy_tvds_mos - healthy_tvds >=
+                   SPA_SYNC_MIN_VDEVS) {
+                       spa_load_note(spa, "config provided misses too many "
+                           "top-level vdevs compared to MOS (%lld vs %lld). ",
+                           (u_longlong_t)healthy_tvds,
+                           (u_longlong_t)healthy_tvds_mos);
+                       spa_load_note(spa, "vdev tree:");
+                       vdev_dbgmsg_print_tree(rvd, 2);
+                       if (reloading) {
+                               spa_load_failed(spa, "config was already "
+                                   "provided from MOS. Aborting.");
+                               return (spa_vdev_err(rvd,
+                                   VDEV_AUX_CORRUPT_DATA, EIO));
+                       }
+                       spa_load_note(spa, "spa must be reloaded using MOS "
+                           "config");
+                       return (SET_ERROR(EAGAIN));
+               }
+       }
+
+       error = spa_check_for_missing_logs(spa);
+       if (error != 0)
+               return (spa_vdev_err(rvd, VDEV_AUX_BAD_GUID_SUM, ENXIO));
+
+       if (rvd->vdev_guid_sum != spa->spa_uberblock.ub_guid_sum) {
+               spa_load_failed(spa, "uberblock guid sum doesn't match MOS "
+                   "guid sum (%llu != %llu)",
+                   (u_longlong_t)spa->spa_uberblock.ub_guid_sum,
+                   (u_longlong_t)rvd->vdev_guid_sum);
+               return (spa_vdev_err(rvd, VDEV_AUX_BAD_GUID_SUM,
+                   ENXIO));
        }
 
        return (0);
@@ -2889,14 +3792,20 @@ spa_ld_open_indirect_vdev_metadata(spa_t *spa)
         * Everything that we read before spa_remove_init() must be stored
         * on concreted vdevs.  Therefore we do this as early as possible.
         */
-       if (spa_remove_init(spa) != 0)
+       error = spa_remove_init(spa);
+       if (error != 0) {
+               spa_load_failed(spa, "spa_remove_init failed [error=%d]",
+                   error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       }
 
        /*
         * Retrieve information needed to condense indirect vdev mappings.
         */
        error = spa_condense_init(spa);
        if (error != 0) {
+               spa_load_failed(spa, "spa_condense_init failed [error=%d]",
+                   error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, error));
        }
 
@@ -2904,8 +3813,7 @@ spa_ld_open_indirect_vdev_metadata(spa_t *spa)
 }
 
 static int
-spa_ld_check_features(spa_t *spa, spa_load_state_t state,
-    boolean_t *missing_feat_writep)
+spa_ld_check_features(spa_t *spa, boolean_t *missing_feat_writep)
 {
        int error = 0;
        vdev_t *rvd = spa->spa_root_vdev;
@@ -2915,17 +3823,17 @@ spa_ld_check_features(spa_t *spa, spa_load_state_t state,
                nvlist_t *unsup_feat, *enabled_feat;
 
                if (spa_dir_prop(spa, DMU_POOL_FEATURES_FOR_READ,
-                   &spa->spa_feat_for_read_obj) != 0) {
+                   &spa->spa_feat_for_read_obj, B_TRUE) != 0) {
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
                }
 
                if (spa_dir_prop(spa, DMU_POOL_FEATURES_FOR_WRITE,
-                   &spa->spa_feat_for_write_obj) != 0) {
+                   &spa->spa_feat_for_write_obj, B_TRUE) != 0) {
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
                }
 
                if (spa_dir_prop(spa, DMU_POOL_FEATURE_DESCRIPTIONS,
-                   &spa->spa_feat_desc_obj) != 0) {
+                   &spa->spa_feat_desc_obj, B_TRUE) != 0) {
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
                }
 
@@ -2936,7 +3844,8 @@ spa_ld_check_features(spa_t *spa, spa_load_state_t state,
                    unsup_feat, enabled_feat))
                        missing_feat_read = B_TRUE;
 
-               if (spa_writeable(spa) || state == SPA_LOAD_TRYIMPORT) {
+               if (spa_writeable(spa) ||
+                   spa->spa_load_state == SPA_LOAD_TRYIMPORT) {
                        if (!spa_features_check(spa, B_TRUE,
                            unsup_feat, enabled_feat)) {
                                *missing_feat_writep = B_TRUE;
@@ -2980,6 +3889,7 @@ spa_ld_check_features(spa_t *spa, spa_load_state_t state,
                 */
                if (missing_feat_read || (*missing_feat_writep &&
                    spa_writeable(spa))) {
+                       spa_load_failed(spa, "pool uses unsupported features");
                        return (spa_vdev_err(rvd, VDEV_AUX_UNSUP_FEAT,
                            ENOTSUP));
                }
@@ -2999,6 +3909,9 @@ spa_ld_check_features(spa_t *spa, spa_load_state_t state,
                                spa->spa_feat_refcount_cache[i] =
                                    SPA_FEATURE_DISABLED;
                        } else {
+                               spa_load_failed(spa, "error getting refcount "
+                                   "for feature %s [error=%d]",
+                                   spa_feature_table[i].fi_guid, error);
                                return (spa_vdev_err(rvd,
                                    VDEV_AUX_CORRUPT_DATA, EIO));
                        }
@@ -3007,10 +3920,20 @@ spa_ld_check_features(spa_t *spa, spa_load_state_t state,
 
        if (spa_feature_is_active(spa, SPA_FEATURE_ENABLED_TXG)) {
                if (spa_dir_prop(spa, DMU_POOL_FEATURE_ENABLED_TXG,
-                   &spa->spa_feat_enabled_txg_obj) != 0)
+                   &spa->spa_feat_enabled_txg_obj, B_TRUE) != 0)
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
        }
 
+       /*
+        * Encryption was added before bookmark_v2, even though bookmark_v2
+        * is now a dependency. If this pool has encryption enabled without
+        * bookmark_v2, trigger an errata message.
+        */
+       if (spa_feature_is_enabled(spa, SPA_FEATURE_ENCRYPTION) &&
+           !spa_feature_is_enabled(spa, SPA_FEATURE_BOOKMARK_V2)) {
+               spa->spa_errata = ZPOOL_ERRATA_ZOL_8308_ENCRYPTION;
+       }
+
        return (0);
 }
 
@@ -3023,47 +3946,10 @@ spa_ld_load_special_directories(spa_t *spa)
        spa->spa_is_initializing = B_TRUE;
        error = dsl_pool_open(spa->spa_dsl_pool);
        spa->spa_is_initializing = B_FALSE;
-       if (error != 0)
-               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
-
-       return (0);
-}
-
-static int
-spa_ld_prepare_for_reload(spa_t *spa, int orig_mode)
-{
-       vdev_t *rvd = spa->spa_root_vdev;
-
-       uint64_t hostid;
-       nvlist_t *policy = NULL;
-       nvlist_t *mos_config;
-
-       if (load_nvlist(spa, spa->spa_config_object, &mos_config) != 0)
+       if (error != 0) {
+               spa_load_failed(spa, "dsl_pool_open failed [error=%d]", error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
-
-       if (!spa_is_root(spa) && nvlist_lookup_uint64(mos_config,
-           ZPOOL_CONFIG_HOSTID, &hostid) == 0) {
-               char *hostname;
-               unsigned long myhostid = 0;
-
-               VERIFY(nvlist_lookup_string(mos_config,
-                   ZPOOL_CONFIG_HOSTNAME, &hostname) == 0);
-
-               myhostid = spa_get_hostid();
-               if (hostid && myhostid && hostid != myhostid) {
-                       nvlist_free(mos_config);
-                       return (SET_ERROR(EBADF));
-               }
        }
-       if (nvlist_lookup_nvlist(spa->spa_config,
-           ZPOOL_REWIND_POLICY, &policy) == 0)
-               VERIFY(nvlist_add_nvlist(mos_config,
-                   ZPOOL_REWIND_POLICY, policy) == 0);
-
-       spa_config_set(spa, mos_config);
-       spa_unload(spa);
-       spa_deactivate(spa);
-       spa_activate(spa, orig_mode);
 
        return (0);
 }
@@ -3085,26 +3971,31 @@ spa_ld_get_props(spa_t *spa)
                (void) random_get_pseudo_bytes(spa->spa_cksum_salt.zcs_bytes,
                    sizeof (spa->spa_cksum_salt.zcs_bytes));
        } else if (error != 0) {
+               spa_load_failed(spa, "unable to retrieve checksum salt from "
+                   "MOS [error=%d]", error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
        }
 
-       if (spa_dir_prop(spa, DMU_POOL_SYNC_BPOBJ, &obj) != 0)
+       if (spa_dir_prop(spa, DMU_POOL_SYNC_BPOBJ, &obj, B_TRUE) != 0)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
        error = bpobj_open(&spa->spa_deferred_bpobj, spa->spa_meta_objset, obj);
-       if (error != 0)
+       if (error != 0) {
+               spa_load_failed(spa, "error opening deferred-frees bpobj "
+                   "[error=%d]", error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       }
 
        /*
         * Load the bit that tells us to use the new accounting function
         * (raid-z deflation).  If we have an older pool, this will not
         * be present.
         */
-       error = spa_dir_prop(spa, DMU_POOL_DEFLATE, &spa->spa_deflate);
+       error = spa_dir_prop(spa, DMU_POOL_DEFLATE, &spa->spa_deflate, B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
 
        error = spa_dir_prop(spa, DMU_POOL_CREATION_VERSION,
-           &spa->spa_creation_version);
+           &spa->spa_creation_version, B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
 
@@ -3112,12 +4003,22 @@ spa_ld_get_props(spa_t *spa)
         * Load the persistent error log.  If we have an older pool, this will
         * not be present.
         */
-       error = spa_dir_prop(spa, DMU_POOL_ERRLOG_LAST, &spa->spa_errlog_last);
+       error = spa_dir_prop(spa, DMU_POOL_ERRLOG_LAST, &spa->spa_errlog_last,
+           B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
 
        error = spa_dir_prop(spa, DMU_POOL_ERRLOG_SCRUB,
-           &spa->spa_errlog_scrub);
+           &spa->spa_errlog_scrub, B_FALSE);
+       if (error != 0 && error != ENOENT)
+               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+
+       /*
+        * Load the livelist deletion field. If a livelist is queued for
+        * deletion, indicate that in the spa
+        */
+       error = spa_dir_prop(spa, DMU_POOL_DELETED_CLONES,
+           &spa->spa_livelists_to_delete, B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
 
@@ -3125,7 +4026,7 @@ spa_ld_get_props(spa_t *spa)
         * Load the history object.  If we have an older pool, this
         * will not be present.
         */
-       error = spa_dir_prop(spa, DMU_POOL_HISTORY, &spa->spa_history);
+       error = spa_dir_prop(spa, DMU_POOL_HISTORY, &spa->spa_history, B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
 
@@ -3138,11 +4039,13 @@ spa_ld_get_props(spa_t *spa)
 
        /* The sentinel is only available in the MOS config. */
        nvlist_t *mos_config;
-       if (load_nvlist(spa, spa->spa_config_object, &mos_config) != 0)
+       if (load_nvlist(spa, spa->spa_config_object, &mos_config) != 0) {
+               spa_load_failed(spa, "unable to retrieve MOS config");
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       }
 
        error = spa_dir_prop(spa, DMU_POOL_VDEV_ZAP_MAP,
-           &spa->spa_all_vdev_zaps);
+           &spa->spa_all_vdev_zaps, B_FALSE);
 
        if (error == ENOENT) {
                VERIFY(!nvlist_exists(mos_config,
@@ -3168,7 +4071,8 @@ spa_ld_get_props(spa_t *spa)
 
        spa->spa_delegation = zpool_prop_default_numeric(ZPOOL_PROP_DELEGATION);
 
-       error = spa_dir_prop(spa, DMU_POOL_PROPS, &spa->spa_pool_props_object);
+       error = spa_dir_prop(spa, DMU_POOL_PROPS, &spa->spa_pool_props_object,
+           B_FALSE);
        if (error && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
 
@@ -3180,12 +4084,24 @@ spa_ld_get_props(spa_t *spa)
                spa_prop_find(spa, ZPOOL_PROP_DELEGATION, &spa->spa_delegation);
                spa_prop_find(spa, ZPOOL_PROP_FAILUREMODE, &spa->spa_failmode);
                spa_prop_find(spa, ZPOOL_PROP_AUTOEXPAND, &spa->spa_autoexpand);
-               spa_prop_find(spa, ZPOOL_PROP_DEDUPDITTO,
-                   &spa->spa_dedup_ditto);
-
+               spa_prop_find(spa, ZPOOL_PROP_MULTIHOST, &spa->spa_multihost);
+               spa_prop_find(spa, ZPOOL_PROP_AUTOTRIM, &spa->spa_autotrim);
                spa->spa_autoreplace = (autoreplace != 0);
        }
 
+       /*
+        * If we are importing a pool with missing top-level vdevs,
+        * we enforce that the pool doesn't panic or get suspended on
+        * error since the likelihood of missing data is extremely high.
+        */
+       if (spa->spa_missing_tvds > 0 &&
+           spa->spa_failmode != ZIO_FAILURE_MODE_CONTINUE &&
+           spa->spa_load_state != SPA_LOAD_TRYIMPORT) {
+               spa_load_note(spa, "forcing failmode to 'continue' "
+                   "as some top level vdevs are missing");
+               spa->spa_failmode = ZIO_FAILURE_MODE_CONTINUE;
+       }
+
        return (0);
 }
 
@@ -3204,14 +4120,17 @@ spa_ld_open_aux_vdevs(spa_t *spa, spa_import_type_t type)
        /*
         * Load any hot spares for this pool.
         */
-       error = spa_dir_prop(spa, DMU_POOL_SPARES, &spa->spa_spares.sav_object);
+       error = spa_dir_prop(spa, DMU_POOL_SPARES, &spa->spa_spares.sav_object,
+           B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
        if (error == 0 && type != SPA_IMPORT_ASSEMBLE) {
                ASSERT(spa_version(spa) >= SPA_VERSION_SPARES);
                if (load_nvlist(spa, spa->spa_spares.sav_object,
-                   &spa->spa_spares.sav_config) != 0)
+                   &spa->spa_spares.sav_config) != 0) {
+                       spa_load_failed(spa, "error loading spares nvlist");
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+               }
 
                spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
                spa_load_spares(spa);
@@ -3224,14 +4143,16 @@ spa_ld_open_aux_vdevs(spa_t *spa, spa_import_type_t type)
         * Load any level 2 ARC devices for this pool.
         */
        error = spa_dir_prop(spa, DMU_POOL_L2CACHE,
-           &spa->spa_l2cache.sav_object);
+           &spa->spa_l2cache.sav_object, B_FALSE);
        if (error != 0 && error != ENOENT)
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
        if (error == 0 && type != SPA_IMPORT_ASSEMBLE) {
                ASSERT(spa_version(spa) >= SPA_VERSION_L2CACHE);
                if (load_nvlist(spa, spa->spa_l2cache.sav_object,
-                   &spa->spa_l2cache.sav_config) != 0)
+                   &spa->spa_l2cache.sav_config) != 0) {
+                       spa_load_failed(spa, "error loading l2cache nvlist");
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+               }
 
                spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
                spa_load_l2cache(spa);
@@ -3244,7 +4165,7 @@ spa_ld_open_aux_vdevs(spa_t *spa, spa_import_type_t type)
 }
 
 static int
-spa_ld_load_vdev_metadata(spa_t *spa, spa_load_state_t state)
+spa_ld_load_vdev_metadata(spa_t *spa)
 {
        int error = 0;
        vdev_t *rvd = spa->spa_root_vdev;
@@ -3268,14 +4189,14 @@ spa_ld_load_vdev_metadata(spa_t *spa, spa_load_state_t state)
         * unopenable vdevs so that the normal autoreplace handler can take
         * over.
         */
-       if (spa->spa_autoreplace && state != SPA_LOAD_TRYIMPORT) {
+       if (spa->spa_autoreplace && spa->spa_load_state != SPA_LOAD_TRYIMPORT) {
                spa_check_removed(spa->spa_root_vdev);
                /*
                 * For the import case, this is done in spa_import(), because
                 * at this point we're using the spare definitions from
                 * the MOS config, not necessarily from the userland config.
                 */
-               if (state != SPA_LOAD_IMPORT) {
+               if (spa->spa_load_state != SPA_LOAD_IMPORT) {
                        spa_aux_check_removed(&spa->spa_spares);
                        spa_aux_check_removed(&spa->spa_l2cache);
                }
@@ -3286,6 +4207,14 @@ spa_ld_load_vdev_metadata(spa_t *spa, spa_load_state_t state)
         */
        error = vdev_load(rvd);
        if (error != 0) {
+               spa_load_failed(spa, "vdev_load failed [error=%d]", error);
+               return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, error));
+       }
+
+       error = spa_ld_log_spacemaps(spa);
+       if (error != 0) {
+               spa_load_failed(spa, "spa_ld_log_sm_data failed [error=%d]",
+                   error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, error));
        }
 
@@ -3306,8 +4235,10 @@ spa_ld_load_dedup_tables(spa_t *spa)
        vdev_t *rvd = spa->spa_root_vdev;
 
        error = ddt_load(spa);
-       if (error != 0)
+       if (error != 0) {
+               spa_load_failed(spa, "ddt_load failed [error=%d]", error);
                return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
+       }
 
        return (0);
 }
@@ -3317,17 +4248,26 @@ spa_ld_verify_logs(spa_t *spa, spa_import_type_t type, char **ereport)
 {
        vdev_t *rvd = spa->spa_root_vdev;
 
-       if (type != SPA_IMPORT_ASSEMBLE && spa_writeable(spa) &&
-           spa_check_logs(spa)) {
-               *ereport = FM_EREPORT_ZFS_LOG_REPLAY;
-               return (spa_vdev_err(rvd, VDEV_AUX_BAD_LOG, ENXIO));
+       if (type != SPA_IMPORT_ASSEMBLE && spa_writeable(spa)) {
+               boolean_t missing = spa_check_logs(spa);
+               if (missing) {
+                       if (spa->spa_missing_tvds != 0) {
+                               spa_load_note(spa, "spa_check_logs failed "
+                                   "so dropping the logs");
+                       } else {
+                               *ereport = FM_EREPORT_ZFS_LOG_REPLAY;
+                               spa_load_failed(spa, "spa_check_logs failed");
+                               return (spa_vdev_err(rvd, VDEV_AUX_BAD_LOG,
+                                   ENXIO));
+                       }
+               }
        }
 
        return (0);
 }
 
 static int
-spa_ld_verify_pool_data(spa_t *spa, spa_load_state_t state)
+spa_ld_verify_pool_data(spa_t *spa)
 {
        int error = 0;
        vdev_t *rvd = spa->spa_root_vdev;
@@ -3336,9 +4276,11 @@ spa_ld_verify_pool_data(spa_t *spa, spa_load_state_t state)
         * We've successfully opened the pool, verify that we're ready
         * to start pushing transactions.
         */
-       if (state != SPA_LOAD_TRYIMPORT) {
+       if (spa->spa_load_state != SPA_LOAD_TRYIMPORT) {
                error = spa_load_verify(spa);
                if (error != 0) {
+                       spa_load_failed(spa, "spa_load_verify failed "
+                           "[error=%d]", error);
                        return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA,
                            error));
                }
@@ -3373,8 +4315,8 @@ spa_ld_claim_log_blocks(spa_t *spa)
 }
 
 static void
-spa_ld_check_for_config_update(spa_t *spa, spa_load_state_t state,
-    int64_t config_cache_txg)
+spa_ld_check_for_config_update(spa_t *spa, uint64_t config_cache_txg,
+    boolean_t update_config_cache)
 {
        vdev_t *rvd = spa->spa_root_vdev;
        int need_update = B_FALSE;
@@ -3386,9 +4328,9 @@ spa_ld_check_for_config_update(spa_t *spa, spa_load_state_t state,
         * If this is a verbatim import, trust the current
         * in-core spa_config and update the disk labels.
         */
-       if (config_cache_txg != spa->spa_config_txg ||
-           state == SPA_LOAD_IMPORT ||
-           state == SPA_LOAD_RECOVER ||
+       if (update_config_cache || config_cache_txg != spa->spa_config_txg ||
+           spa->spa_load_state == SPA_LOAD_IMPORT ||
+           spa->spa_load_state == SPA_LOAD_RECOVER ||
            (spa->spa_import_flags & ZFS_IMPORT_VERBATIM))
                need_update = B_TRUE;
 
@@ -3397,44 +4339,87 @@ spa_ld_check_for_config_update(spa_t *spa, spa_load_state_t state,
                        need_update = B_TRUE;
 
        /*
-        * Update the config cache asychronously in case we're the
+        * Update the config cache asynchronously in case we're the
         * root pool, in which case the config cache isn't writable yet.
         */
        if (need_update)
                spa_async_request(spa, SPA_ASYNC_CONFIG_UPDATE);
 }
 
-/*
- * Load an existing storage pool, using the config provided. This config
- * describes which vdevs are part of the pool and is later validated against
- * partial configs present in each vdev's label and an entire copy of the
- * config stored in the MOS.
- */
+static void
+spa_ld_prepare_for_reload(spa_t *spa)
+{
+       int mode = spa->spa_mode;
+       int async_suspended = spa->spa_async_suspended;
+
+       spa_unload(spa);
+       spa_deactivate(spa);
+       spa_activate(spa, mode);
+
+       /*
+        * We save the value of spa_async_suspended as it gets reset to 0 by
+        * spa_unload(). We want to restore it back to the original value before
+        * returning as we might be calling spa_async_resume() later.
+        */
+       spa->spa_async_suspended = async_suspended;
+}
+
 static int
-spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
-    spa_load_state_t state, spa_import_type_t type, boolean_t trust_config,
-    char **ereport)
+spa_ld_read_checkpoint_txg(spa_t *spa)
 {
+       uberblock_t checkpoint;
        int error = 0;
-       uint64_t config_cache_txg = spa->spa_config_txg;
-       int orig_mode = spa->spa_mode;
-       boolean_t missing_feat_write = B_FALSE;
+
+       ASSERT0(spa->spa_checkpoint_txg);
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+
+       error = zap_lookup(spa->spa_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
+           DMU_POOL_ZPOOL_CHECKPOINT, sizeof (uint64_t),
+           sizeof (uberblock_t) / sizeof (uint64_t), &checkpoint);
+
+       if (error == ENOENT)
+               return (0);
+
+       if (error != 0)
+               return (error);
+
+       ASSERT3U(checkpoint.ub_txg, !=, 0);
+       ASSERT3U(checkpoint.ub_checkpoint_txg, !=, 0);
+       ASSERT3U(checkpoint.ub_timestamp, !=, 0);
+       spa->spa_checkpoint_txg = checkpoint.ub_txg;
+       spa->spa_checkpoint_info.sci_timestamp = checkpoint.ub_timestamp;
+
+       return (0);
+}
+
+static int
+spa_ld_mos_init(spa_t *spa, spa_import_type_t type)
+{
+       int error = 0;
+
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       ASSERT(spa->spa_config_source != SPA_CONFIG_SRC_NONE);
 
        /*
-        * If this is an untrusted config, first access the pool in read-only
-        * mode. We will then retrieve a trusted copy of the config from the MOS
-        * and use it to reopen the pool in read-write mode.
+        * Never trust the config that is provided unless we are assembling
+        * a pool following a split.
+        * This means don't trust blkptrs and the vdev tree in general. This
+        * also effectively puts the spa in read-only mode since
+        * spa_writeable() checks for spa_trust_config to be true.
+        * We will later load a trusted config from the MOS.
         */
-       if (!trust_config)
-               spa->spa_mode = FREAD;
+       if (type != SPA_IMPORT_ASSEMBLE)
+               spa->spa_trust_config = B_FALSE;
 
        /*
         * Parse the config provided to create a vdev tree.
         */
-       error = spa_ld_parse_config(spa, pool_guid, config, state, type);
+       error = spa_ld_parse_config(spa, type);
        if (error != 0)
                return (error);
 
+       spa_import_progress_add(spa);
+
        /*
         * Now that we have the vdev tree, try to open each vdev. This involves
         * opening the underlying physical device, retrieving its geometry and
@@ -3449,19 +4434,24 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
        /*
         * Read the label of each vdev and make sure that the GUIDs stored
         * there match the GUIDs in the config provided.
+        * If we're assembling a new pool that's been split off from an
+        * existing pool, the labels haven't yet been updated so we skip
+        * validation for now.
         */
-       error = spa_ld_validate_vdevs(spa, type, trust_config);
-       if (error != 0)
-               return (error);
+       if (type != SPA_IMPORT_ASSEMBLE) {
+               error = spa_ld_validate_vdevs(spa);
+               if (error != 0)
+                       return (error);
+       }
 
        /*
-        * Read vdev labels to find the best uberblock (i.e. latest, unless
-        * spa_load_max_txg is set) and store it in spa_uberblock. We get the
-        * list of features required to read blkptrs in the MOS from the vdev
-        * label with the best uberblock and verify that our version of zfs
-        * supports them all.
+        * Read all vdev labels to find the best uberblock (i.e. latest,
+        * unless spa_load_max_txg is set) and store it in spa_uberblock. We
+        * get the list of features required to read blkptrs in the MOS from
+        * the vdev label with the best uberblock and verify that our version
+        * of zfs supports them all.
         */
-       error = spa_ld_select_uberblock(spa, config, type, trust_config);
+       error = spa_ld_select_uberblock(spa, type);
        if (error != 0)
                return (error);
 
@@ -3474,12 +4464,208 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
        if (error != 0)
                return (error);
 
+       return (0);
+}
+
+static int
+spa_ld_checkpoint_rewind(spa_t *spa)
+{
+       uberblock_t checkpoint;
+       int error = 0;
+
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       ASSERT(spa->spa_import_flags & ZFS_IMPORT_CHECKPOINT);
+
+       error = zap_lookup(spa->spa_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
+           DMU_POOL_ZPOOL_CHECKPOINT, sizeof (uint64_t),
+           sizeof (uberblock_t) / sizeof (uint64_t), &checkpoint);
+
+       if (error != 0) {
+               spa_load_failed(spa, "unable to retrieve checkpointed "
+                   "uberblock from the MOS config [error=%d]", error);
+
+               if (error == ENOENT)
+                       error = ZFS_ERR_NO_CHECKPOINT;
+
+               return (error);
+       }
+
+       ASSERT3U(checkpoint.ub_txg, <, spa->spa_uberblock.ub_txg);
+       ASSERT3U(checkpoint.ub_txg, ==, checkpoint.ub_checkpoint_txg);
+
+       /*
+        * We need to update the txg and timestamp of the checkpointed
+        * uberblock to be higher than the latest one. This ensures that
+        * the checkpointed uberblock is selected if we were to close and
+        * reopen the pool right after we've written it in the vdev labels.
+        * (also see block comment in vdev_uberblock_compare)
+        */
+       checkpoint.ub_txg = spa->spa_uberblock.ub_txg + 1;
+       checkpoint.ub_timestamp = gethrestime_sec();
+
+       /*
+        * Set current uberblock to be the checkpointed uberblock.
+        */
+       spa->spa_uberblock = checkpoint;
+
+       /*
+        * If we are doing a normal rewind, then the pool is open for
+        * writing and we sync the "updated" checkpointed uberblock to
+        * disk. Once this is done, we've basically rewound the whole
+        * pool and there is no way back.
+        *
+        * There are cases when we don't want to attempt and sync the
+        * checkpointed uberblock to disk because we are opening a
+        * pool as read-only. Specifically, verifying the checkpointed
+        * state with zdb, and importing the checkpointed state to get
+        * a "preview" of its content.
+        */
+       if (spa_writeable(spa)) {
+               vdev_t *rvd = spa->spa_root_vdev;
+
+               spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
+               vdev_t *svd[SPA_SYNC_MIN_VDEVS] = { NULL };
+               int svdcount = 0;
+               int children = rvd->vdev_children;
+               int c0 = spa_get_random(children);
+
+               for (int c = 0; c < children; c++) {
+                       vdev_t *vd = rvd->vdev_child[(c0 + c) % children];
+
+                       /* Stop when revisiting the first vdev */
+                       if (c > 0 && svd[0] == vd)
+                               break;
+
+                       if (vd->vdev_ms_array == 0 || vd->vdev_islog ||
+                           !vdev_is_concrete(vd))
+                               continue;
+
+                       svd[svdcount++] = vd;
+                       if (svdcount == SPA_SYNC_MIN_VDEVS)
+                               break;
+               }
+               error = vdev_config_sync(svd, svdcount, spa->spa_first_txg);
+               if (error == 0)
+                       spa->spa_last_synced_guid = rvd->vdev_guid;
+               spa_config_exit(spa, SCL_ALL, FTAG);
+
+               if (error != 0) {
+                       spa_load_failed(spa, "failed to write checkpointed "
+                           "uberblock to the vdev labels [error=%d]", error);
+                       return (error);
+               }
+       }
+
+       return (0);
+}
+
+static int
+spa_ld_mos_with_trusted_config(spa_t *spa, spa_import_type_t type,
+    boolean_t *update_config_cache)
+{
+       int error;
+
+       /*
+        * Parse the config for pool, open and validate vdevs,
+        * select an uberblock, and use that uberblock to open
+        * the MOS.
+        */
+       error = spa_ld_mos_init(spa, type);
+       if (error != 0)
+               return (error);
+
+       /*
+        * Retrieve the trusted config stored in the MOS and use it to create
+        * a new, exact version of the vdev tree, then reopen all vdevs.
+        */
+       error = spa_ld_trusted_config(spa, type, B_FALSE);
+       if (error == EAGAIN) {
+               if (update_config_cache != NULL)
+                       *update_config_cache = B_TRUE;
+
+               /*
+                * Redo the loading process with the trusted config if it is
+                * too different from the untrusted config.
+                */
+               spa_ld_prepare_for_reload(spa);
+               spa_load_note(spa, "RELOADING");
+               error = spa_ld_mos_init(spa, type);
+               if (error != 0)
+                       return (error);
+
+               error = spa_ld_trusted_config(spa, type, B_TRUE);
+               if (error != 0)
+                       return (error);
+
+       } else if (error != 0) {
+               return (error);
+       }
+
+       return (0);
+}
+
+/*
+ * Load an existing storage pool, using the config provided. This config
+ * describes which vdevs are part of the pool and is later validated against
+ * partial configs present in each vdev's label and an entire copy of the
+ * config stored in the MOS.
+ */
+static int
+spa_load_impl(spa_t *spa, spa_import_type_t type, char **ereport)
+{
+       int error = 0;
+       boolean_t missing_feat_write = B_FALSE;
+       boolean_t checkpoint_rewind =
+           (spa->spa_import_flags & ZFS_IMPORT_CHECKPOINT);
+       boolean_t update_config_cache = B_FALSE;
+
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       ASSERT(spa->spa_config_source != SPA_CONFIG_SRC_NONE);
+
+       spa_load_note(spa, "LOADING");
+
+       error = spa_ld_mos_with_trusted_config(spa, type, &update_config_cache);
+       if (error != 0)
+               return (error);
+
+       /*
+        * If we are rewinding to the checkpoint then we need to repeat
+        * everything we've done so far in this function but this time
+        * selecting the checkpointed uberblock and using that to open
+        * the MOS.
+        */
+       if (checkpoint_rewind) {
+               /*
+                * If we are rewinding to the checkpoint update config cache
+                * anyway.
+                */
+               update_config_cache = B_TRUE;
+
+               /*
+                * Extract the checkpointed uberblock from the current MOS
+                * and use this as the pool's uberblock from now on. If the
+                * pool is imported as writeable we also write the checkpoint
+                * uberblock to the labels, making the rewind permanent.
+                */
+               error = spa_ld_checkpoint_rewind(spa);
+               if (error != 0)
+                       return (error);
+
+               /*
+                * Redo the loading process again with the
+                * checkpointed uberblock.
+                */
+               spa_ld_prepare_for_reload(spa);
+               spa_load_note(spa, "LOADING checkpointed uberblock");
+               error = spa_ld_mos_with_trusted_config(spa, type, NULL);
+               if (error != 0)
+                       return (error);
+       }
+
        /*
-        * Retrieve the config stored in the MOS and use it to validate the
-        * config provided. Also extract some information from the MOS config
-        * to update our vdev tree.
+        * Retrieve the checkpoint txg if the pool has a checkpoint.
         */
-       error = spa_ld_validate_config(spa, type);
+       error = spa_ld_read_checkpoint_txg(spa);
        if (error != 0)
                return (error);
 
@@ -3499,7 +4685,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
         * Retrieve the full list of active features from the MOS and check if
         * they are all supported.
         */
-       error = spa_ld_check_features(spa, state, &missing_feat_write);
+       error = spa_ld_check_features(spa, &missing_feat_write);
        if (error != 0)
                return (error);
 
@@ -3511,17 +4697,6 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
        if (error != 0)
                return (error);
 
-       /*
-        * If the config provided is not trusted, discard it and use the config
-        * from the MOS to reload the pool.
-        */
-       if (!trust_config) {
-               error = spa_ld_prepare_for_reload(spa, orig_mode);
-               if (error != 0)
-                       return (error);
-               return (spa_load(spa, state, SPA_IMPORT_EXISTING, B_TRUE));
-       }
-
        /*
         * Retrieve pool properties from the MOS.
         */
@@ -3541,7 +4716,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
         * Load the metadata for all vdevs. Also check if unopenable devices
         * should be autoreplaced.
         */
-       error = spa_ld_load_vdev_metadata(spa, state);
+       error = spa_ld_load_vdev_metadata(spa);
        if (error != 0)
                return (error);
 
@@ -3558,7 +4733,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
                return (error);
 
        if (missing_feat_write) {
-               ASSERT(state == SPA_LOAD_TRYIMPORT);
+               ASSERT(spa->spa_load_state == SPA_LOAD_TRYIMPORT);
 
                /*
                 * At this point, we know that we can open the pool in
@@ -3574,7 +4749,7 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
         * state. When performing an extreme rewind, we verify the whole pool,
         * which can take a very long time.
         */
-       error = spa_ld_verify_pool_data(spa, state);
+       error = spa_ld_verify_pool_data(spa);
        if (error != 0)
                return (error);
 
@@ -3590,9 +4765,21 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
         * pool. If we are importing the pool in read-write mode, a few
         * additional steps must be performed to finish the import.
         */
-       if (spa_writeable(spa) && (state == SPA_LOAD_RECOVER ||
+       if (spa_writeable(spa) && (spa->spa_load_state == SPA_LOAD_RECOVER ||
            spa->spa_load_max_txg == UINT64_MAX)) {
-               ASSERT(state != SPA_LOAD_TRYIMPORT);
+               uint64_t config_cache_txg = spa->spa_config_txg;
+
+               ASSERT(spa->spa_load_state != SPA_LOAD_TRYIMPORT);
+
+               /*
+                * In case of a checkpoint rewind, log the original txg
+                * of the checkpointed uberblock.
+                */
+               if (checkpoint_rewind) {
+                       spa_history_log_internal(spa, "checkpoint rewind",
+                           NULL, "rewound state to txg=%llu",
+                           (u_longlong_t)spa->spa_uberblock.ub_checkpoint_txg);
+               }
 
                /*
                 * Traverse the ZIL and claim all blocks.
@@ -3620,7 +4807,8 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
                 * next sync, we would update the config stored in vdev labels
                 * and the cachefile (by default /etc/zfs/zpool.cache).
                 */
-               spa_ld_check_for_config_update(spa, state, config_cache_txg);
+               spa_ld_check_for_config_update(spa, config_cache_txg,
+                   update_config_cache);
 
                /*
                 * Check all DTLs to see if anything needs resilvering.
@@ -3635,8 +4823,17 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
                 */
                spa_history_log_version(spa, "open", NULL);
 
+               spa_restart_removal(spa);
+               spa_spawn_aux_threads(spa);
+
                /*
                 * Delete any inconsistent datasets.
+                *
+                * Note:
+                * Since we may be issuing deletes for clones here,
+                * we make sure to do so after we've spawned all the
+                * auxiliary threads above (from which the livelist
+                * deletion zthr is part of).
                 */
                (void) dmu_objset_find(spa_name(spa),
                    dsl_destroy_inconsistent, NULL, DS_FIND_CHILDREN);
@@ -3646,16 +4843,21 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
                 */
                dsl_pool_clean_tmp_userrefs(spa->spa_dsl_pool);
 
-               spa_restart_removal(spa);
-
-               spa_spawn_aux_threads(spa);
+               spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
+               vdev_initialize_restart(spa->spa_root_vdev);
+               vdev_trim_restart(spa->spa_root_vdev);
+               vdev_autotrim_restart(spa);
+               spa_config_exit(spa, SCL_CONFIG, FTAG);
        }
 
+       spa_import_progress_remove(spa_guid(spa));
+       spa_load_note(spa, "LOADED");
+
        return (0);
 }
 
 static int
-spa_load_retry(spa_t *spa, spa_load_state_t state, int trust_config)
+spa_load_retry(spa_t *spa, spa_load_state_t state)
 {
        int mode = spa->spa_mode;
 
@@ -3667,7 +4869,10 @@ spa_load_retry(spa_t *spa, spa_load_state_t state, int trust_config)
        spa_activate(spa, mode);
        spa_async_suspend(spa);
 
-       return (spa_load(spa, state, SPA_IMPORT_EXISTING, trust_config));
+       spa_load_note(spa, "spa_load_retry: rewind, max txg: %llu",
+           (u_longlong_t)spa->spa_load_max_txg);
+
+       return (spa_load(spa, state, SPA_IMPORT_EXISTING));
 }
 
 /*
@@ -3678,8 +4883,8 @@ spa_load_retry(spa_t *spa, spa_load_state_t state, int trust_config)
  * spa_load().
  */
 static int
-spa_load_best(spa_t *spa, spa_load_state_t state, int trust_config,
-    uint64_t max_request, int rewind_flags)
+spa_load_best(spa_t *spa, spa_load_state_t state, uint64_t max_request,
+    int rewind_flags)
 {
        nvlist_t *loadinfo = NULL;
        nvlist_t *config = NULL;
@@ -3696,10 +4901,19 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int trust_config,
                        spa->spa_extreme_rewind = B_TRUE;
        }
 
-       load_error = rewind_error = spa_load(spa, state, SPA_IMPORT_EXISTING,
-           trust_config);
+       load_error = rewind_error = spa_load(spa, state, SPA_IMPORT_EXISTING);
        if (load_error == 0)
                return (0);
+       if (load_error == ZFS_ERR_NO_CHECKPOINT) {
+               /*
+                * When attempting checkpoint-rewind on a pool with no
+                * checkpoint, we should not attempt to load uberblocks
+                * from previous txgs when spa_load fails.
+                */
+               ASSERT(spa->spa_import_flags & ZFS_IMPORT_CHECKPOINT);
+               spa_import_progress_remove(spa_guid(spa));
+               return (load_error);
+       }
 
        if (spa->spa_root_vdev != NULL)
                config = spa_config_generate(spa, NULL, -1ULL, B_TRUE);
@@ -3709,6 +4923,7 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int trust_config,
 
        if (rewind_flags & ZPOOL_NEVER_REWIND) {
                nvlist_free(config);
+               spa_import_progress_remove(spa_guid(spa));
                return (load_error);
        }
 
@@ -3738,7 +4953,7 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int trust_config,
            spa->spa_uberblock.ub_txg <= spa->spa_load_max_txg) {
                if (spa->spa_load_max_txg < safe_rewind_txg)
                        spa->spa_extreme_rewind = B_TRUE;
-               rewind_error = spa_load_retry(spa, state, trust_config);
+               rewind_error = spa_load_retry(spa, state);
        }
 
        spa->spa_extreme_rewind = B_FALSE;
@@ -3751,6 +4966,7 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int trust_config,
 
        if (state == SPA_LOAD_RECOVER) {
                ASSERT3P(loadinfo, ==, NULL);
+               spa_import_progress_remove(spa_guid(spa));
                return (rewind_error);
        } else {
                /* Store the rewind info as part of the initial load info */
@@ -3761,6 +4977,7 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int trust_config,
                fnvlist_free(spa->spa_load_info);
                spa->spa_load_info = loadinfo;
 
+               spa_import_progress_remove(spa_guid(spa));
                return (load_error);
        }
 }
@@ -3807,22 +5024,24 @@ spa_open_common(const char *pool, spa_t **spapp, void *tag, nvlist_t *nvpolicy,
        }
 
        if (spa->spa_state == POOL_STATE_UNINITIALIZED) {
-               zpool_rewind_policy_t policy;
+               zpool_load_policy_t policy;
 
                firstopen = B_TRUE;
 
-               zpool_get_rewind_policy(nvpolicy ? nvpolicy : spa->spa_config,
+               zpool_get_load_policy(nvpolicy ? nvpolicy : spa->spa_config,
                    &policy);
-               if (policy.zrp_request & ZPOOL_DO_REWIND)
+               if (policy.zlp_rewind & ZPOOL_DO_REWIND)
                        state = SPA_LOAD_RECOVER;
 
                spa_activate(spa, spa_mode_global);
 
                if (state != SPA_LOAD_RECOVER)
                        spa->spa_last_ubsync_txg = spa->spa_load_txg = 0;
+               spa->spa_config_source = SPA_CONFIG_SRC_CACHEFILE;
 
-               error = spa_load_best(spa, state, B_FALSE, policy.zrp_txg,
-                   policy.zrp_request);
+               zfs_dbgmsg("spa_open_common: opening %s", pool);
+               error = spa_load_best(spa, state, policy.zlp_txg,
+                   policy.zlp_rewind);
 
                if (error == EBADF) {
                        /*
@@ -4370,7 +5589,7 @@ spa_create_check_encryption_params(dsl_crypto_params_t *dcp,
            !has_encryption)
                return (SET_ERROR(ENOTSUP));
 
-       return (dmu_objset_create_crypt_check(NULL, dcp));
+       return (dmu_objset_create_crypt_check(NULL, dcp, NULL));
 }
 
 /*
@@ -4389,7 +5608,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
        uint64_t txg = TXG_INITIAL;
        nvlist_t **spares, **l2cache;
        uint_t nspares, nl2cache;
-       uint64_t version, obj, root_dsobj = 0;
+       uint64_t version, obj;
        boolean_t has_features;
        boolean_t has_encryption;
        spa_feature_t feat;
@@ -4397,7 +5616,8 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
        char *poolname;
        nvlist_t *nvl;
 
-       if (nvlist_lookup_string(props, "tname", &poolname) != 0)
+       if (props == NULL ||
+           nvlist_lookup_string(props, "tname", &poolname) != 0)
                poolname = (char *)pool;
 
        /*
@@ -4472,6 +5692,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
        spa->spa_removing_phys.sr_state = DSS_NONE;
        spa->spa_removing_phys.sr_removing_vdev = -1;
        spa->spa_removing_phys.sr_prev_indirect_vdev = -1;
+       spa->spa_indirect_vdevs_loaded = B_TRUE;
 
        /*
         * Create "The Godfather" zio to hold all async IOs
@@ -4501,9 +5722,15 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
            (error = vdev_create(rvd, txg, B_FALSE)) == 0 &&
            (error = spa_validate_aux(spa, nvroot, txg,
            VDEV_ALLOC_ADD)) == 0) {
-               for (int c = 0; c < rvd->vdev_children; c++) {
-                       vdev_metaslab_set_size(rvd->vdev_child[c]);
-                       vdev_expand(rvd->vdev_child[c], txg);
+               /*
+                * instantiate the metaslab groups (this will dirty the vdevs)
+                * we can no longer error exit past this point
+                */
+               for (int c = 0; error == 0 && c < rvd->vdev_children; c++) {
+                       vdev_t *vd = rvd->vdev_child[c];
+
+                       vdev_metaslab_set_size(vd);
+                       vdev_expand(vd, txg);
                }
        }
 
@@ -4628,6 +5855,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
        spa->spa_failmode = zpool_prop_default_numeric(ZPOOL_PROP_FAILUREMODE);
        spa->spa_autoexpand = zpool_prop_default_numeric(ZPOOL_PROP_AUTOEXPAND);
        spa->spa_multihost = zpool_prop_default_numeric(ZPOOL_PROP_MULTIHOST);
+       spa->spa_autotrim = zpool_prop_default_numeric(ZPOOL_PROP_AUTOTRIM);
 
        if (props != NULL) {
                spa_configfile_set(spa, props, B_FALSE);
@@ -4636,27 +5864,11 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
 
        dmu_tx_commit(tx);
 
-       /*
-        * If the root dataset is encrypted we will need to create key mappings
-        * for the zio layer before we start to write any data to disk and hold
-        * them until after the first txg has been synced. Waiting for the first
-        * transaction to complete also ensures that our bean counters are
-        * appropriately updated.
-        */
-       if (dp->dp_root_dir->dd_crypto_obj != 0) {
-               root_dsobj = dsl_dir_phys(dp->dp_root_dir)->dd_head_dataset_obj;
-               VERIFY0(spa_keystore_create_mapping_impl(spa, root_dsobj,
-                   dp->dp_root_dir, FTAG));
-       }
-
        spa->spa_sync_on = B_TRUE;
        txg_sync_start(dp);
        mmp_thread_start(spa);
        txg_wait_synced(dp, txg);
 
-       if (dp->dp_root_dir->dd_crypto_obj != 0)
-               VERIFY0(spa_keystore_remove_mapping(spa, root_dsobj, FTAG));
-
        spa_spawn_aux_threads(spa);
 
        spa_write_cachefile(spa, B_FALSE, B_TRUE);
@@ -4666,7 +5878,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
         * and are making their way through the eviction process.
         */
        spa_evicting_os_wait(spa);
-       spa->spa_minref = refcount_count(&spa->spa_refcount);
+       spa->spa_minref = zfs_refcount_count(&spa->spa_refcount);
        spa->spa_load_state = SPA_LOAD_NONE;
 
        mutex_exit(&spa_namespace_lock);
@@ -4683,7 +5895,7 @@ spa_import(char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
        spa_t *spa;
        char *altroot = NULL;
        spa_load_state_t state = SPA_LOAD_IMPORT;
-       zpool_rewind_policy_t policy;
+       zpool_load_policy_t policy;
        uint64_t mode = spa_mode_global;
        uint64_t readonly = B_FALSE;
        int error;
@@ -4722,7 +5934,7 @@ spa_import(char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
 
                spa_write_cachefile(spa, B_FALSE, B_TRUE);
                spa_event_notify(spa, NULL, NULL, ESC_ZFS_POOL_IMPORT);
-
+               zfs_dbgmsg("spa_import: verbatim import of %s", pool);
                mutex_exit(&spa_namespace_lock);
                return (0);
        }
@@ -4734,20 +5946,20 @@ spa_import(char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
         */
        spa_async_suspend(spa);
 
-       zpool_get_rewind_policy(config, &policy);
-       if (policy.zrp_request & ZPOOL_DO_REWIND)
+       zpool_get_load_policy(config, &policy);
+       if (policy.zlp_rewind & ZPOOL_DO_REWIND)
                state = SPA_LOAD_RECOVER;
 
-       /*
-        * Pass off the heavy lifting to spa_load().  Pass TRUE for trust_config
-        * because the user-supplied config is actually the one to trust when
-        * doing an import.
-        */
-       if (state != SPA_LOAD_RECOVER)
-               spa->spa_last_ubsync_txg = spa->spa_load_txg = 0;
+       spa->spa_config_source = SPA_CONFIG_SRC_TRYIMPORT;
 
-       error = spa_load_best(spa, state, B_TRUE, policy.zrp_txg,
-           policy.zrp_request);
+       if (state != SPA_LOAD_RECOVER) {
+               spa->spa_last_ubsync_txg = spa->spa_load_txg = 0;
+               zfs_dbgmsg("spa_import: importing %s", pool);
+       } else {
+               zfs_dbgmsg("spa_import: importing %s, max_txg=%lld "
+                   "(RECOVERY MODE)", pool, (longlong_t)policy.zlp_txg);
+       }
+       error = spa_load_best(spa, state, policy.zlp_txg, policy.zlp_rewind);
 
        /*
         * Propagate anything learned while loading the pool and pass it
@@ -4861,10 +6073,11 @@ nvlist_t *
 spa_tryimport(nvlist_t *tryconfig)
 {
        nvlist_t *config = NULL;
-       char *poolname;
+       char *poolname, *cachefile;
        spa_t *spa;
        uint64_t state;
        int error;
+       zpool_load_policy_t policy;
 
        if (nvlist_lookup_string(tryconfig, ZPOOL_CONFIG_POOL_NAME, &poolname))
                return (NULL);
@@ -4880,11 +6093,27 @@ spa_tryimport(nvlist_t *tryconfig)
        spa_activate(spa, FREAD);
 
        /*
-        * Pass off the heavy lifting to spa_load().
-        * Pass TRUE for trust_config because the user-supplied config
-        * is actually the one to trust when doing an import.
+        * Rewind pool if a max txg was provided.
         */
-       error = spa_load(spa, SPA_LOAD_TRYIMPORT, SPA_IMPORT_EXISTING, B_TRUE);
+       zpool_get_load_policy(spa->spa_config, &policy);
+       if (policy.zlp_txg != UINT64_MAX) {
+               spa->spa_load_max_txg = policy.zlp_txg;
+               spa->spa_extreme_rewind = B_TRUE;
+               zfs_dbgmsg("spa_tryimport: importing %s, max_txg=%lld",
+                   poolname, (longlong_t)policy.zlp_txg);
+       } else {
+               zfs_dbgmsg("spa_tryimport: importing %s", poolname);
+       }
+
+       if (nvlist_lookup_string(tryconfig, ZPOOL_CONFIG_CACHEFILE, &cachefile)
+           == 0) {
+               zfs_dbgmsg("spa_tryimport: using cachefile '%s'", cachefile);
+               spa->spa_config_source = SPA_CONFIG_SRC_CACHEFILE;
+       } else {
+               spa->spa_config_source = SPA_CONFIG_SRC_SCAN;
+       }
+
+       error = spa_load(spa, SPA_LOAD_TRYIMPORT, SPA_IMPORT_EXISTING);
 
        /*
         * If 'tryconfig' was at least parsable, return the current config.
@@ -4980,6 +6209,13 @@ spa_export_common(char *pool, int new_state, nvlist_t **oldconfig,
                return (SET_ERROR(ENOENT));
        }
 
+       if (spa->spa_is_exporting) {
+               /* the pool is being exported by another thread */
+               mutex_exit(&spa_namespace_lock);
+               return (SET_ERROR(ZFS_ERR_EXPORT_IN_PROGRESS));
+       }
+       spa->spa_is_exporting = B_TRUE;
+
        /*
         * Put a hold on the pool, drop the namespace lock, stop async tasks,
         * reacquire the namespace lock, and see if we can export.
@@ -5015,6 +6251,7 @@ spa_export_common(char *pool, int new_state, nvlist_t **oldconfig,
            (spa->spa_inject_ref != 0 &&
            new_state != POOL_STATE_UNINITIALIZED)) {
                spa_async_resume(spa);
+               spa->spa_is_exporting = B_FALSE;
                mutex_exit(&spa_namespace_lock);
                return (SET_ERROR(EBUSY));
        }
@@ -5029,10 +6266,25 @@ spa_export_common(char *pool, int new_state, nvlist_t **oldconfig,
                if (!force && new_state == POOL_STATE_EXPORTED &&
                    spa_has_active_shared_spare(spa)) {
                        spa_async_resume(spa);
+                       spa->spa_is_exporting = B_FALSE;
                        mutex_exit(&spa_namespace_lock);
                        return (SET_ERROR(EXDEV));
                }
 
+               /*
+                * We're about to export or destroy this pool. Make sure
+                * we stop all initialization and trim activity here before
+                * we set the spa_final_txg. This will ensure that all
+                * dirty data resulting from the initialization is
+                * committed to disk before we unload the pool.
+                */
+               if (spa->spa_root_vdev != NULL) {
+                       vdev_t *rvd = spa->spa_root_vdev;
+                       vdev_initialize_stop_all(rvd, VDEV_INITIALIZE_ACTIVE);
+                       vdev_trim_stop_all(rvd, VDEV_TRIM_ACTIVE);
+                       vdev_autotrim_stop_all(spa);
+               }
+
                /*
                 * We want this to be reflected on every label,
                 * so mark them all dirty.  spa_unload() will do the
@@ -5066,9 +6318,16 @@ export_spa:
                if (!hardforce)
                        spa_write_cachefile(spa, B_TRUE, B_TRUE);
                spa_remove(spa);
+       } else {
+               /*
+                * If spa_remove() is not called for this spa_t and
+                * there is any possibility that it can be reused,
+                * we make sure to reset the exporting flag.
+                */
+               spa->spa_is_exporting = B_FALSE;
        }
-       mutex_exit(&spa_namespace_lock);
 
+       mutex_exit(&spa_namespace_lock);
        return (0);
 }
 
@@ -5116,7 +6375,7 @@ spa_reset(char *pool)
 int
 spa_vdev_add(spa_t *spa, nvlist_t *nvroot)
 {
-       uint64_t txg, id;
+       uint64_t txg;
        int error;
        vdev_t *rvd = spa->spa_root_vdev;
        vdev_t *vd, *tvd;
@@ -5191,19 +6450,9 @@ spa_vdev_add(spa_t *spa, nvlist_t *nvroot)
        }
 
        for (int c = 0; c < vd->vdev_children; c++) {
-
-               /*
-                * Set the vdev id to the first hole, if one exists.
-                */
-               for (id = 0; id < rvd->vdev_children; id++) {
-                       if (rvd->vdev_child[id]->vdev_ishole) {
-                               vdev_free(rvd->vdev_child[id]);
-                               break;
-                       }
-               }
                tvd = vd->vdev_child[c];
                vdev_remove_child(vd, tvd);
-               tvd->vdev_id = id;
+               tvd->vdev_id = rvd->vdev_children;
                vdev_add_child(rvd, tvd);
                vdev_config_dirty(tvd);
        }
@@ -5275,6 +6524,13 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
 
        oldvd = spa_lookup_by_guid(spa, guid, B_FALSE);
 
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       if (spa_feature_is_active(spa, SPA_FEATURE_POOL_CHECKPOINT)) {
+               error = (spa_has_checkpoint(spa)) ?
+                   ZFS_ERR_CHECKPOINT_EXISTS : ZFS_ERR_DISCARDING_CHECKPOINT;
+               return (spa_vdev_exit(spa, NULL, txg, error));
+       }
+
        if (spa->spa_vdev_removal != NULL)
                return (spa_vdev_exit(spa, NULL, txg, EBUSY));
 
@@ -5438,9 +6694,14 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
        /*
         * Schedule the resilver to restart in the future. We do this to
         * ensure that dmu_sync-ed blocks have been stitched into the
-        * respective datasets.
+        * respective datasets. We do not do this if resilvers have been
+        * deferred.
         */
-       dsl_resilver_restart(spa->spa_dsl_pool, dtl_max_txg);
+       if (dsl_scan_resilvering(spa_get_dsl(spa)) &&
+           spa_feature_is_enabled(spa, SPA_FEATURE_RESILVER_DEFER))
+               vdev_set_deferred_resilver(spa, newvd);
+       else
+               dsl_resilver_restart(spa->spa_dsl_pool, dtl_max_txg);
 
        if (spa->spa_bootfs)
                spa_event_notify(spa, newvd, NULL, ESC_ZFS_BOOTFS_VDEV_ATTACH);
@@ -5487,6 +6748,27 @@ spa_vdev_detach(spa_t *spa, uint64_t guid, uint64_t pguid, int replace_done)
 
        vd = spa_lookup_by_guid(spa, guid, B_FALSE);
 
+       /*
+        * Besides being called directly from the userland through the
+        * ioctl interface, spa_vdev_detach() can be potentially called
+        * at the end of spa_vdev_resilver_done().
+        *
+        * In the regular case, when we have a checkpoint this shouldn't
+        * happen as we never empty the DTLs of a vdev during the scrub
+        * [see comment in dsl_scan_done()]. Thus spa_vdev_resilvering_done()
+        * should never get here when we have a checkpoint.
+        *
+        * That said, even in a case when we checkpoint the pool exactly
+        * as spa_vdev_resilver_done() calls this function everything
+        * should be fine as the resilver will return right away.
+        */
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       if (spa_feature_is_active(spa, SPA_FEATURE_POOL_CHECKPOINT)) {
+               error = (spa_has_checkpoint(spa)) ?
+                   ZFS_ERR_CHECKPOINT_EXISTS : ZFS_ERR_DISCARDING_CHECKPOINT;
+               return (spa_vdev_exit(spa, NULL, txg, error));
+       }
+
        if (vd == NULL)
                return (spa_vdev_exit(spa, NULL, txg, ENODEV));
 
@@ -5620,7 +6902,6 @@ spa_vdev_detach(spa_t *spa, uint64_t guid, uint64_t pguid, int replace_done)
                vdev_remove_parent(cvd);
        }
 
-
        /*
         * We don't set tvd until now because the parent we just removed
         * may have been the previous top-level vdev.
@@ -5704,6 +6985,237 @@ spa_vdev_detach(spa_t *spa, uint64_t guid, uint64_t pguid, int replace_done)
        return (error);
 }
 
+static int
+spa_vdev_initialize_impl(spa_t *spa, uint64_t guid, uint64_t cmd_type,
+    list_t *vd_list)
+{
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+
+       spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_READER);
+
+       /* Look up vdev and ensure it's a leaf. */
+       vdev_t *vd = spa_lookup_by_guid(spa, guid, B_FALSE);
+       if (vd == NULL || vd->vdev_detached) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(ENODEV));
+       } else if (!vd->vdev_ops->vdev_op_leaf || !vdev_is_concrete(vd)) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(EINVAL));
+       } else if (!vdev_writeable(vd)) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(EROFS));
+       }
+       mutex_enter(&vd->vdev_initialize_lock);
+       spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+
+       /*
+        * When we activate an initialize action we check to see
+        * if the vdev_initialize_thread is NULL. We do this instead
+        * of using the vdev_initialize_state since there might be
+        * a previous initialization process which has completed but
+        * the thread is not exited.
+        */
+       if (cmd_type == POOL_INITIALIZE_START &&
+           (vd->vdev_initialize_thread != NULL ||
+           vd->vdev_top->vdev_removing)) {
+               mutex_exit(&vd->vdev_initialize_lock);
+               return (SET_ERROR(EBUSY));
+       } else if (cmd_type == POOL_INITIALIZE_CANCEL &&
+           (vd->vdev_initialize_state != VDEV_INITIALIZE_ACTIVE &&
+           vd->vdev_initialize_state != VDEV_INITIALIZE_SUSPENDED)) {
+               mutex_exit(&vd->vdev_initialize_lock);
+               return (SET_ERROR(ESRCH));
+       } else if (cmd_type == POOL_INITIALIZE_SUSPEND &&
+           vd->vdev_initialize_state != VDEV_INITIALIZE_ACTIVE) {
+               mutex_exit(&vd->vdev_initialize_lock);
+               return (SET_ERROR(ESRCH));
+       }
+
+       switch (cmd_type) {
+       case POOL_INITIALIZE_START:
+               vdev_initialize(vd);
+               break;
+       case POOL_INITIALIZE_CANCEL:
+               vdev_initialize_stop(vd, VDEV_INITIALIZE_CANCELED, vd_list);
+               break;
+       case POOL_INITIALIZE_SUSPEND:
+               vdev_initialize_stop(vd, VDEV_INITIALIZE_SUSPENDED, vd_list);
+               break;
+       default:
+               panic("invalid cmd_type %llu", (unsigned long long)cmd_type);
+       }
+       mutex_exit(&vd->vdev_initialize_lock);
+
+       return (0);
+}
+
+int
+spa_vdev_initialize(spa_t *spa, nvlist_t *nv, uint64_t cmd_type,
+    nvlist_t *vdev_errlist)
+{
+       int total_errors = 0;
+       list_t vd_list;
+
+       list_create(&vd_list, sizeof (vdev_t),
+           offsetof(vdev_t, vdev_initialize_node));
+
+       /*
+        * We hold the namespace lock through the whole function
+        * to prevent any changes to the pool while we're starting or
+        * stopping initialization. The config and state locks are held so that
+        * we can properly assess the vdev state before we commit to
+        * the initializing operation.
+        */
+       mutex_enter(&spa_namespace_lock);
+
+       for (nvpair_t *pair = nvlist_next_nvpair(nv, NULL);
+           pair != NULL; pair = nvlist_next_nvpair(nv, pair)) {
+               uint64_t vdev_guid = fnvpair_value_uint64(pair);
+
+               int error = spa_vdev_initialize_impl(spa, vdev_guid, cmd_type,
+                   &vd_list);
+               if (error != 0) {
+                       char guid_as_str[MAXNAMELEN];
+
+                       (void) snprintf(guid_as_str, sizeof (guid_as_str),
+                           "%llu", (unsigned long long)vdev_guid);
+                       fnvlist_add_int64(vdev_errlist, guid_as_str, error);
+                       total_errors++;
+               }
+       }
+
+       /* Wait for all initialize threads to stop. */
+       vdev_initialize_stop_wait(spa, &vd_list);
+
+       /* Sync out the initializing state */
+       txg_wait_synced(spa->spa_dsl_pool, 0);
+       mutex_exit(&spa_namespace_lock);
+
+       list_destroy(&vd_list);
+
+       return (total_errors);
+}
+
+static int
+spa_vdev_trim_impl(spa_t *spa, uint64_t guid, uint64_t cmd_type,
+    uint64_t rate, boolean_t partial, boolean_t secure, list_t *vd_list)
+{
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+
+       spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_READER);
+
+       /* Look up vdev and ensure it's a leaf. */
+       vdev_t *vd = spa_lookup_by_guid(spa, guid, B_FALSE);
+       if (vd == NULL || vd->vdev_detached) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(ENODEV));
+       } else if (!vd->vdev_ops->vdev_op_leaf || !vdev_is_concrete(vd)) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(EINVAL));
+       } else if (!vdev_writeable(vd)) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(EROFS));
+       } else if (!vd->vdev_has_trim) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(EOPNOTSUPP));
+       } else if (secure && !vd->vdev_has_securetrim) {
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               return (SET_ERROR(EOPNOTSUPP));
+       }
+       mutex_enter(&vd->vdev_trim_lock);
+       spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+
+       /*
+        * When we activate a TRIM action we check to see if the
+        * vdev_trim_thread is NULL. We do this instead of using the
+        * vdev_trim_state since there might be a previous TRIM process
+        * which has completed but the thread is not exited.
+        */
+       if (cmd_type == POOL_TRIM_START &&
+           (vd->vdev_trim_thread != NULL || vd->vdev_top->vdev_removing)) {
+               mutex_exit(&vd->vdev_trim_lock);
+               return (SET_ERROR(EBUSY));
+       } else if (cmd_type == POOL_TRIM_CANCEL &&
+           (vd->vdev_trim_state != VDEV_TRIM_ACTIVE &&
+           vd->vdev_trim_state != VDEV_TRIM_SUSPENDED)) {
+               mutex_exit(&vd->vdev_trim_lock);
+               return (SET_ERROR(ESRCH));
+       } else if (cmd_type == POOL_TRIM_SUSPEND &&
+           vd->vdev_trim_state != VDEV_TRIM_ACTIVE) {
+               mutex_exit(&vd->vdev_trim_lock);
+               return (SET_ERROR(ESRCH));
+       }
+
+       switch (cmd_type) {
+       case POOL_TRIM_START:
+               vdev_trim(vd, rate, partial, secure);
+               break;
+       case POOL_TRIM_CANCEL:
+               vdev_trim_stop(vd, VDEV_TRIM_CANCELED, vd_list);
+               break;
+       case POOL_TRIM_SUSPEND:
+               vdev_trim_stop(vd, VDEV_TRIM_SUSPENDED, vd_list);
+               break;
+       default:
+               panic("invalid cmd_type %llu", (unsigned long long)cmd_type);
+       }
+       mutex_exit(&vd->vdev_trim_lock);
+
+       return (0);
+}
+
+/*
+ * Initiates a manual TRIM for the requested vdevs. This kicks off individual
+ * TRIM threads for each child vdev.  These threads pass over all of the free
+ * space in the vdev's metaslabs and issues TRIM commands for that space.
+ */
+int
+spa_vdev_trim(spa_t *spa, nvlist_t *nv, uint64_t cmd_type, uint64_t rate,
+    boolean_t partial, boolean_t secure, nvlist_t *vdev_errlist)
+{
+       int total_errors = 0;
+       list_t vd_list;
+
+       list_create(&vd_list, sizeof (vdev_t),
+           offsetof(vdev_t, vdev_trim_node));
+
+       /*
+        * We hold the namespace lock through the whole function
+        * to prevent any changes to the pool while we're starting or
+        * stopping TRIM. The config and state locks are held so that
+        * we can properly assess the vdev state before we commit to
+        * the TRIM operation.
+        */
+       mutex_enter(&spa_namespace_lock);
+
+       for (nvpair_t *pair = nvlist_next_nvpair(nv, NULL);
+           pair != NULL; pair = nvlist_next_nvpair(nv, pair)) {
+               uint64_t vdev_guid = fnvpair_value_uint64(pair);
+
+               int error = spa_vdev_trim_impl(spa, vdev_guid, cmd_type,
+                   rate, partial, secure, &vd_list);
+               if (error != 0) {
+                       char guid_as_str[MAXNAMELEN];
+
+                       (void) snprintf(guid_as_str, sizeof (guid_as_str),
+                           "%llu", (unsigned long long)vdev_guid);
+                       fnvlist_add_int64(vdev_errlist, guid_as_str, error);
+                       total_errors++;
+               }
+       }
+
+       /* Wait for all TRIM threads to stop. */
+       vdev_trim_stop_wait(spa, &vd_list);
+
+       /* Sync out the TRIM state */
+       txg_wait_synced(spa->spa_dsl_pool, 0);
+       mutex_exit(&spa_namespace_lock);
+
+       list_destroy(&vd_list);
+
+       return (total_errors);
+}
+
 /*
  * Split a set of devices from their mirrors, and create a new pool from them.
  */
@@ -5725,6 +7237,13 @@ spa_vdev_split_mirror(spa_t *spa, char *newname, nvlist_t *config,
 
        txg = spa_vdev_enter(spa);
 
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
+       if (spa_feature_is_active(spa, SPA_FEATURE_POOL_CHECKPOINT)) {
+               error = (spa_has_checkpoint(spa)) ?
+                   ZFS_ERR_CHECKPOINT_EXISTS : ZFS_ERR_DISCARDING_CHECKPOINT;
+               return (spa_vdev_exit(spa, NULL, txg, error));
+       }
+
        /* clear the log and flush everything up to now */
        activate_slog = spa_passivate_log(spa);
        (void) spa_vdev_config_exit(spa, NULL, txg, 0, FTAG);
@@ -5820,7 +7339,8 @@ spa_vdev_split_mirror(spa_t *spa, char *newname, nvlist_t *config,
                        break;
                }
 
-               if (vdev_dtl_required(vml[c])) {
+               if (vdev_dtl_required(vml[c]) ||
+                   vdev_resilver_needed(vml[c], NULL, NULL)) {
                        error = SET_ERROR(EBUSY);
                        break;
                }
@@ -5904,8 +7424,42 @@ spa_vdev_split_mirror(spa_t *spa, char *newname, nvlist_t *config,
        spa_activate(newspa, spa_mode_global);
        spa_async_suspend(newspa);
 
+       /*
+        * Temporarily stop the initializing and TRIM activity.  We set the
+        * state to ACTIVE so that we know to resume initializing or TRIM
+        * once the split has completed.
+        */
+       list_t vd_initialize_list;
+       list_create(&vd_initialize_list, sizeof (vdev_t),
+           offsetof(vdev_t, vdev_initialize_node));
+
+       list_t vd_trim_list;
+       list_create(&vd_trim_list, sizeof (vdev_t),
+           offsetof(vdev_t, vdev_trim_node));
+
+       for (c = 0; c < children; c++) {
+               if (vml[c] != NULL) {
+                       mutex_enter(&vml[c]->vdev_initialize_lock);
+                       vdev_initialize_stop(vml[c],
+                           VDEV_INITIALIZE_ACTIVE, &vd_initialize_list);
+                       mutex_exit(&vml[c]->vdev_initialize_lock);
+
+                       mutex_enter(&vml[c]->vdev_trim_lock);
+                       vdev_trim_stop(vml[c], VDEV_TRIM_ACTIVE, &vd_trim_list);
+                       mutex_exit(&vml[c]->vdev_trim_lock);
+               }
+       }
+
+       vdev_initialize_stop_wait(spa, &vd_initialize_list);
+       vdev_trim_stop_wait(spa, &vd_trim_list);
+
+       list_destroy(&vd_initialize_list);
+       list_destroy(&vd_trim_list);
+
+       newspa->spa_config_source = SPA_CONFIG_SRC_SPLIT;
+
        /* create the new pool from the disks of the original pool */
-       error = spa_load(newspa, SPA_LOAD_IMPORT, SPA_IMPORT_ASSEMBLE, B_TRUE);
+       error = spa_load(newspa, SPA_LOAD_IMPORT, SPA_IMPORT_ASSEMBLE);
        if (error)
                goto out;
 
@@ -5945,6 +7499,18 @@ spa_vdev_split_mirror(spa_t *spa, char *newname, nvlist_t *config,
                dmu_tx_abort(tx);
        for (c = 0; c < children; c++) {
                if (vml[c] != NULL) {
+                       vdev_t *tvd = vml[c]->vdev_top;
+
+                       /*
+                        * Need to be sure the detachable VDEV is not
+                        * on any *other* txg's DTL list to prevent it
+                        * from being accessed after it's freed.
+                        */
+                       for (int t = 0; t < TXG_SIZE; t++) {
+                               (void) txg_list_remove_this(
+                                   &tvd->vdev_dtl_list, vml[c], t);
+                       }
+
                        vdev_split(vml[c]);
                        if (error == 0)
                                spa_history_log_internal(spa, "detach", tx,
@@ -5989,6 +7555,12 @@ out:
                if (vml[c] != NULL)
                        vml[c]->vdev_offline = B_FALSE;
        }
+
+       /* restart initializing or trimming disks as necessary */
+       spa_async_request(spa, SPA_ASYNC_INITIALIZE_RESTART);
+       spa_async_request(spa, SPA_ASYNC_TRIM_RESTART);
+       spa_async_request(spa, SPA_ASYNC_AUTOTRIM_RESTART);
+
        vdev_reopen(spa->spa_root_vdev);
 
        nvlist_free(spa->spa_config_splitting);
@@ -6036,6 +7608,7 @@ spa_vdev_resilver_done_hunt(vdev_t *vd)
 
        /*
         * Check for a completed resilver with the 'unspare' flag set.
+        * Also potentially update faulted state.
         */
        if (vd->vdev_ops == &vdev_spare_ops) {
                vdev_t *first = vd->vdev_child[0];
@@ -6057,6 +7630,8 @@ spa_vdev_resilver_done_hunt(vdev_t *vd)
                    !vdev_dtl_required(oldvd))
                        return (oldvd);
 
+               vdev_propagate_state(vd);
+
                /*
                 * If there are more than two spares attached to a disk,
                 * and those spares are not required, then we want to
@@ -6201,6 +7776,10 @@ spa_scan(spa_t *spa, pool_scan_func_t func)
        if (func >= POOL_SCAN_FUNCS || func == POOL_SCAN_NONE)
                return (SET_ERROR(ENOTSUP));
 
+       if (func == POOL_SCAN_RESILVER &&
+           !spa_feature_is_enabled(spa, SPA_FEATURE_RESILVER_DEFER))
+               return (SET_ERROR(ENOTSUP));
+
        /*
         * If a resilver was requested, but there is no DTL on a
         * writeable leaf device, we have nothing to do.
@@ -6278,6 +7857,7 @@ static void
 spa_async_thread(void *arg)
 {
        spa_t *spa = (spa_t *)arg;
+       dsl_pool_t *dp = spa->spa_dsl_pool;
        int tasks;
 
        ASSERT(spa->spa_sync_on);
@@ -6295,8 +7875,14 @@ spa_async_thread(void *arg)
 
                mutex_enter(&spa_namespace_lock);
                old_space = metaslab_class_get_space(spa_normal_class(spa));
+               old_space += metaslab_class_get_space(spa_special_class(spa));
+               old_space += metaslab_class_get_space(spa_dedup_class(spa));
+
                spa_config_update(spa, SPA_CONFIG_UPDATE_POOL);
+
                new_space = metaslab_class_get_space(spa_normal_class(spa));
+               new_space += metaslab_class_get_space(spa_special_class(spa));
+               new_space += metaslab_class_get_space(spa_dedup_class(spa));
                mutex_exit(&spa_namespace_lock);
 
                /*
@@ -6347,8 +7933,34 @@ spa_async_thread(void *arg)
        /*
         * Kick off a resilver.
         */
-       if (tasks & SPA_ASYNC_RESILVER)
-               dsl_resilver_restart(spa->spa_dsl_pool, 0);
+       if (tasks & SPA_ASYNC_RESILVER &&
+           (!dsl_scan_resilvering(dp) ||
+           !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_RESILVER_DEFER)))
+               dsl_resilver_restart(dp, 0);
+
+       if (tasks & SPA_ASYNC_INITIALIZE_RESTART) {
+               mutex_enter(&spa_namespace_lock);
+               spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
+               vdev_initialize_restart(spa->spa_root_vdev);
+               spa_config_exit(spa, SCL_CONFIG, FTAG);
+               mutex_exit(&spa_namespace_lock);
+       }
+
+       if (tasks & SPA_ASYNC_TRIM_RESTART) {
+               mutex_enter(&spa_namespace_lock);
+               spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
+               vdev_trim_restart(spa->spa_root_vdev);
+               spa_config_exit(spa, SCL_CONFIG, FTAG);
+               mutex_exit(&spa_namespace_lock);
+       }
+
+       if (tasks & SPA_ASYNC_AUTOTRIM_RESTART) {
+               mutex_enter(&spa_namespace_lock);
+               spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
+               vdev_autotrim_restart(spa);
+               spa_config_exit(spa, SCL_CONFIG, FTAG);
+               mutex_exit(&spa_namespace_lock);
+       }
 
        /*
         * Let the world know that we're done.
@@ -6372,8 +7984,20 @@ spa_async_suspend(spa_t *spa)
        spa_vdev_remove_suspend(spa);
 
        zthr_t *condense_thread = spa->spa_condense_zthr;
-       if (condense_thread != NULL && zthr_isrunning(condense_thread))
-               VERIFY0(zthr_cancel(condense_thread));
+       if (condense_thread != NULL)
+               zthr_cancel(condense_thread);
+
+       zthr_t *discard_thread = spa->spa_checkpoint_discard_zthr;
+       if (discard_thread != NULL)
+               zthr_cancel(discard_thread);
+
+       zthr_t *ll_delete_thread = spa->spa_livelist_delete_zthr;
+       if (ll_delete_thread != NULL)
+               zthr_cancel(ll_delete_thread);
+
+       zthr_t *ll_condense_thread = spa->spa_livelist_condense_zthr;
+       if (ll_condense_thread != NULL)
+               zthr_cancel(ll_condense_thread);
 }
 
 void
@@ -6386,8 +8010,20 @@ spa_async_resume(spa_t *spa)
        spa_restart_removal(spa);
 
        zthr_t *condense_thread = spa->spa_condense_zthr;
-       if (condense_thread != NULL && !zthr_isrunning(condense_thread))
+       if (condense_thread != NULL)
                zthr_resume(condense_thread);
+
+       zthr_t *discard_thread = spa->spa_checkpoint_discard_zthr;
+       if (discard_thread != NULL)
+               zthr_resume(discard_thread);
+
+       zthr_t *ll_delete_thread = spa->spa_livelist_delete_zthr;
+       if (ll_delete_thread != NULL)
+               zthr_resume(ll_delete_thread);
+
+       zthr_t *ll_condense_thread = spa->spa_livelist_condense_zthr;
+       if (ll_condense_thread != NULL)
+               zthr_resume(ll_condense_thread);
 }
 
 static boolean_t
@@ -6438,14 +8074,28 @@ spa_async_request(spa_t *spa, int task)
  * ==========================================================================
  */
 
+
 static int
-bpobj_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
+bpobj_enqueue_cb(void *arg, const blkptr_t *bp, boolean_t bp_freed,
+    dmu_tx_t *tx)
 {
        bpobj_t *bpo = arg;
-       bpobj_enqueue(bpo, bp, tx);
+       bpobj_enqueue(bpo, bp, bp_freed, tx);
        return (0);
 }
 
+int
+bpobj_enqueue_alloc_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
+{
+       return (bpobj_enqueue_cb(arg, bp, B_FALSE, tx));
+}
+
+int
+bpobj_enqueue_free_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
+{
+       return (bpobj_enqueue_cb(arg, bp, B_TRUE, tx));
+}
+
 static int
 spa_free_sync_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 {
@@ -6456,6 +8106,14 @@ spa_free_sync_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
        return (0);
 }
 
+static int
+bpobj_spa_free_sync_cb(void *arg, const blkptr_t *bp, boolean_t bp_freed,
+    dmu_tx_t *tx)
+{
+       ASSERT(!bp_freed);
+       return (spa_free_sync_cb(arg, bp, tx));
+}
+
 /*
  * Note: this simple function is not inlined to make it easier to dtrace the
  * amount of time spent syncing frees.
@@ -6475,9 +8133,24 @@ spa_sync_frees(spa_t *spa, bplist_t *bpl, dmu_tx_t *tx)
 static void
 spa_sync_deferred_frees(spa_t *spa, dmu_tx_t *tx)
 {
+       if (spa_sync_pass(spa) != 1)
+               return;
+
+       /*
+        * Note:
+        * If the log space map feature is active, we stop deferring
+        * frees to the next TXG and therefore running this function
+        * would be considered a no-op as spa_deferred_bpobj should
+        * not have any entries.
+        *
+        * That said we run this function anyway (instead of returning
+        * immediately) for the edge-case scenario where we just
+        * activated the log space map feature in this TXG but we have
+        * deferred frees from the previous TXG.
+        */
        zio_t *zio = zio_root(spa, NULL, NULL, 0);
        VERIFY3U(bpobj_iterate(&spa->spa_deferred_bpobj,
-           spa_free_sync_cb, zio, tx), ==, 0);
+           bpobj_spa_free_sync_cb, zio, tx), ==, 0);
        VERIFY0(zio_wait(zio));
 }
 
@@ -6768,7 +8441,7 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
                case ZPOOL_PROP_READONLY:
                case ZPOOL_PROP_CACHEFILE:
                        /*
-                        * 'readonly' and 'cachefile' are also non-persisitent
+                        * 'readonly' and 'cachefile' are also non-persistent
                         * properties.
                         */
                        break;
@@ -6838,6 +8511,11 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
                        case ZPOOL_PROP_FAILUREMODE:
                                spa->spa_failmode = intval;
                                break;
+                       case ZPOOL_PROP_AUTOTRIM:
+                               spa->spa_autotrim = intval;
+                               spa_async_request(spa,
+                                   SPA_ASYNC_AUTOTRIM_RESTART);
+                               break;
                        case ZPOOL_PROP_AUTOEXPAND:
                                spa->spa_autoexpand = intval;
                                if (tx->tx_txg != TXG_INITIAL)
@@ -6847,9 +8525,6 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
                        case ZPOOL_PROP_MULTIHOST:
                                spa->spa_multihost = intval;
                                break;
-                       case ZPOOL_PROP_DEDUPDITTO:
-                               spa->spa_dedup_ditto = intval;
-                               break;
                        default:
                                break;
                        }
@@ -6870,10 +8545,10 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
 static void
 spa_sync_upgrades(spa_t *spa, dmu_tx_t *tx)
 {
-       dsl_pool_t *dp = spa->spa_dsl_pool;
-
-       ASSERT(spa->spa_sync_pass == 1);
+       if (spa_sync_pass(spa) != 1)
+               return;
 
+       dsl_pool_t *dp = spa->spa_dsl_pool;
        rrw_enter(&dp->dp_config_rwlock, RW_WRITER, FTAG);
 
        if (spa->spa_ubsync.ub_version < SPA_VERSION_ORIGIN &&
@@ -6945,14 +8620,15 @@ vdev_indirect_state_sync_verify(vdev_t *vd)
                ASSERT(vib != NULL);
        }
 
-       if (vdev_obsolete_sm_object(vd) != 0) {
+       uint64_t obsolete_sm_object = 0;
+       ASSERT0(vdev_obsolete_sm_object(vd, &obsolete_sm_object));
+       if (obsolete_sm_object != 0) {
                ASSERT(vd->vdev_obsolete_sm != NULL);
                ASSERT(vd->vdev_removing ||
                    vd->vdev_ops == &vdev_indirect_ops);
                ASSERT(vdev_indirect_mapping_num_entries(vim) > 0);
                ASSERT(vdev_indirect_mapping_bytes_mapped(vim) > 0);
-
-               ASSERT3U(vdev_obsolete_sm_object(vd), ==,
+               ASSERT3U(obsolete_sm_object, ==,
                    space_map_object(vd->vdev_obsolete_sm));
                ASSERT3U(vdev_indirect_mapping_bytes_mapped(vim), >=,
                    space_map_allocated(vd->vdev_obsolete_sm));
@@ -6968,109 +8644,32 @@ vdev_indirect_state_sync_verify(vdev_t *vd)
 }
 
 /*
- * Sync the specified transaction group.  New blocks may be dirtied as
- * part of the process, so we iterate until it converges.
+ * Set the top-level vdev's max queue depth. Evaluate each top-level's
+ * async write queue depth in case it changed. The max queue depth will
+ * not change in the middle of syncing out this txg.
  */
-void
-spa_sync(spa_t *spa, uint64_t txg)
+static void
+spa_sync_adjust_vdev_max_queue_depth(spa_t *spa)
 {
-       dsl_pool_t *dp = spa->spa_dsl_pool;
-       objset_t *mos = spa->spa_meta_objset;
-       bplist_t *free_bpl = &spa->spa_free_bplist[txg & TXG_MASK];
+       ASSERT(spa_writeable(spa));
+
        vdev_t *rvd = spa->spa_root_vdev;
-       vdev_t *vd;
-       dmu_tx_t *tx;
-       int error;
        uint32_t max_queue_depth = zfs_vdev_async_write_max_active *
            zfs_vdev_queue_depth_pct / 100;
+       metaslab_class_t *normal = spa_normal_class(spa);
+       metaslab_class_t *special = spa_special_class(spa);
+       metaslab_class_t *dedup = spa_dedup_class(spa);
 
-       VERIFY(spa_writeable(spa));
-
-       /*
-        * Wait for i/os issued in open context that need to complete
-        * before this txg syncs.
-        */
-       VERIFY0(zio_wait(spa->spa_txg_zio[txg & TXG_MASK]));
-       spa->spa_txg_zio[txg & TXG_MASK] = zio_root(spa, NULL, NULL, 0);
-
-       /*
-        * Lock out configuration changes.
-        */
-       spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
-
-       spa->spa_syncing_txg = txg;
-       spa->spa_sync_pass = 0;
-
-       mutex_enter(&spa->spa_alloc_lock);
-       VERIFY0(avl_numnodes(&spa->spa_alloc_tree));
-       mutex_exit(&spa->spa_alloc_lock);
-
-       /*
-        * If there are any pending vdev state changes, convert them
-        * into config changes that go out with this transaction group.
-        */
-       spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
-       while (list_head(&spa->spa_state_dirty_list) != NULL) {
-               /*
-                * We need the write lock here because, for aux vdevs,
-                * calling vdev_config_dirty() modifies sav_config.
-                * This is ugly and will become unnecessary when we
-                * eliminate the aux vdev wart by integrating all vdevs
-                * into the root vdev tree.
-                */
-               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
-               spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_WRITER);
-               while ((vd = list_head(&spa->spa_state_dirty_list)) != NULL) {
-                       vdev_state_clean(vd);
-                       vdev_config_dirty(vd);
-               }
-               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
-               spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_READER);
-       }
-       spa_config_exit(spa, SCL_STATE, FTAG);
-
-       tx = dmu_tx_create_assigned(dp, txg);
-
-       spa->spa_sync_starttime = gethrtime();
-       taskq_cancel_id(system_delay_taskq, spa->spa_deadman_tqid);
-       spa->spa_deadman_tqid = taskq_dispatch_delay(system_delay_taskq,
-           spa_deadman, spa, TQ_SLEEP, ddi_get_lbolt() +
-           NSEC_TO_TICK(spa->spa_deadman_synctime));
-
-       /*
-        * If we are upgrading to SPA_VERSION_RAIDZ_DEFLATE this txg,
-        * set spa_deflate if we have no raid-z vdevs.
-        */
-       if (spa->spa_ubsync.ub_version < SPA_VERSION_RAIDZ_DEFLATE &&
-           spa->spa_uberblock.ub_version >= SPA_VERSION_RAIDZ_DEFLATE) {
-               int i;
-
-               for (i = 0; i < rvd->vdev_children; i++) {
-                       vd = rvd->vdev_child[i];
-                       if (vd->vdev_deflate_ratio != SPA_MINBLOCKSIZE)
-                               break;
-               }
-               if (i == rvd->vdev_children) {
-                       spa->spa_deflate = TRUE;
-                       VERIFY(0 == zap_add(spa->spa_meta_objset,
-                           DMU_POOL_DIRECTORY_OBJECT, DMU_POOL_DEFLATE,
-                           sizeof (uint64_t), 1, &spa->spa_deflate, tx));
-               }
-       }
-
-       /*
-        * Set the top-level vdev's max queue depth. Evaluate each
-        * top-level's async write queue depth in case it changed.
-        * The max queue depth will not change in the middle of syncing
-        * out this txg.
-        */
-       uint64_t queue_depth_total = 0;
+       uint64_t slots_per_allocator = 0;
        for (int c = 0; c < rvd->vdev_children; c++) {
                vdev_t *tvd = rvd->vdev_child[c];
+
                metaslab_group_t *mg = tvd->vdev_mg;
+               if (mg == NULL || !metaslab_group_initialized(mg))
+                       continue;
 
-               if (mg == NULL || mg->mg_class != spa_normal_class(spa) ||
-                   !metaslab_group_initialized(mg))
+               metaslab_class_t *mc = mg->mg_class;
+               if (mc != normal && mc != special && mc != dedup)
                        continue;
 
                /*
@@ -7078,18 +8677,37 @@ spa_sync(spa_t *spa, uint64_t txg)
                 * allocations look at mg_max_alloc_queue_depth, and async
                 * allocations all happen from spa_sync().
                 */
-               ASSERT0(refcount_count(&mg->mg_alloc_queue_depth));
+               for (int i = 0; i < spa->spa_alloc_count; i++)
+                       ASSERT0(zfs_refcount_count(
+                           &(mg->mg_alloc_queue_depth[i])));
                mg->mg_max_alloc_queue_depth = max_queue_depth;
-               queue_depth_total += mg->mg_max_alloc_queue_depth;
+
+               for (int i = 0; i < spa->spa_alloc_count; i++) {
+                       mg->mg_cur_max_alloc_queue_depth[i] =
+                           zfs_vdev_def_queue_depth;
+               }
+               slots_per_allocator += zfs_vdev_def_queue_depth;
        }
-       metaslab_class_t *mc = spa_normal_class(spa);
-       ASSERT0(refcount_count(&mc->mc_alloc_slots));
-       mc->mc_alloc_max_slots = queue_depth_total;
-       mc->mc_alloc_throttle_enabled = zio_dva_throttle_enabled;
 
-       ASSERT3U(mc->mc_alloc_max_slots, <=,
-           max_queue_depth * rvd->vdev_children);
+       for (int i = 0; i < spa->spa_alloc_count; i++) {
+               ASSERT0(zfs_refcount_count(&normal->mc_alloc_slots[i]));
+               ASSERT0(zfs_refcount_count(&special->mc_alloc_slots[i]));
+               ASSERT0(zfs_refcount_count(&dedup->mc_alloc_slots[i]));
+               normal->mc_alloc_max_slots[i] = slots_per_allocator;
+               special->mc_alloc_max_slots[i] = slots_per_allocator;
+               dedup->mc_alloc_max_slots[i] = slots_per_allocator;
+       }
+       normal->mc_alloc_throttle_enabled = zio_dva_throttle_enabled;
+       special->mc_alloc_throttle_enabled = zio_dva_throttle_enabled;
+       dedup->mc_alloc_throttle_enabled = zio_dva_throttle_enabled;
+}
+
+static void
+spa_sync_condense_indirect(spa_t *spa, dmu_tx_t *tx)
+{
+       ASSERT(spa_writeable(spa));
 
+       vdev_t *rvd = spa->spa_root_vdev;
        for (int c = 0; c < rvd->vdev_children; c++) {
                vdev_t *vd = rvd->vdev_child[c];
                vdev_indirect_state_sync_verify(vd);
@@ -7099,10 +8717,16 @@ spa_sync(spa_t *spa, uint64_t txg)
                        break;
                }
        }
+}
+
+static void
+spa_sync_iterate_to_convergence(spa_t *spa, dmu_tx_t *tx)
+{
+       objset_t *mos = spa->spa_meta_objset;
+       dsl_pool_t *dp = spa->spa_dsl_pool;
+       uint64_t txg = tx->tx_txg;
+       bplist_t *free_bpl = &spa->spa_free_bplist[txg & TXG_MASK];
 
-       /*
-        * Iterate to convergence.
-        */
        do {
                int pass = ++spa->spa_sync_pass;
 
@@ -7114,7 +8738,14 @@ spa_sync(spa_t *spa, uint64_t txg)
                spa_errlog_sync(spa, txg);
                dsl_pool_sync(dp, txg);
 
-               if (pass < zfs_sync_pass_deferred_free) {
+               if (pass < zfs_sync_pass_deferred_free ||
+                   spa_feature_is_active(spa, SPA_FEATURE_LOG_SPACEMAP)) {
+                       /*
+                        * If the log space map feature is active we don't
+                        * care about deferred frees and the deferred bpobj
+                        * as the log space map should effectively have the
+                        * same results (i.e. appending only to one object).
+                        */
                        spa_sync_frees(spa, free_bpl, tx);
                } else {
                        /*
@@ -7122,85 +8753,68 @@ spa_sync(spa_t *spa, uint64_t txg)
                         * we sync the deferred frees later in pass 1.
                         */
                        ASSERT3U(pass, >, 1);
-                       bplist_iterate(free_bpl, bpobj_enqueue_cb,
+                       bplist_iterate(free_bpl, bpobj_enqueue_alloc_cb,
                            &spa->spa_deferred_bpobj, tx);
                }
 
                ddt_sync(spa, txg);
                dsl_scan_sync(dp, tx);
+               svr_sync(spa, tx);
+               spa_sync_upgrades(spa, tx);
 
-               if (spa->spa_vdev_removal != NULL)
-                       svr_sync(spa, tx);
+               spa_flush_metaslabs(spa, tx);
 
+               vdev_t *vd = NULL;
                while ((vd = txg_list_remove(&spa->spa_vdev_txg_list, txg))
                    != NULL)
                        vdev_sync(vd, txg);
 
-               if (pass == 1) {
-                       spa_sync_upgrades(spa, tx);
-                       ASSERT3U(txg, >=,
-                           spa->spa_uberblock.ub_rootbp.blk_birth);
+               /*
+                * Note: We need to check if the MOS is dirty because we could
+                * have marked the MOS dirty without updating the uberblock
+                * (e.g. if we have sync tasks but no dirty user data). We need
+                * to check the uberblock's rootbp because it is updated if we
+                * have synced out dirty data (though in this case the MOS will
+                * most likely also be dirty due to second order effects, we
+                * don't want to rely on that here).
+                */
+               if (pass == 1 &&
+                   spa->spa_uberblock.ub_rootbp.blk_birth < txg &&
+                   !dmu_objset_is_dirty(mos, txg)) {
                        /*
-                        * Note: We need to check if the MOS is dirty
-                        * because we could have marked the MOS dirty
-                        * without updating the uberblock (e.g. if we
-                        * have sync tasks but no dirty user data).  We
-                        * need to check the uberblock's rootbp because
-                        * it is updated if we have synced out dirty
-                        * data (though in this case the MOS will most
-                        * likely also be dirty due to second order
-                        * effects, we don't want to rely on that here).
+                        * Nothing changed on the first pass, therefore this
+                        * TXG is a no-op. Avoid syncing deferred frees, so
+                        * that we can keep this TXG as a no-op.
                         */
-                       if (spa->spa_uberblock.ub_rootbp.blk_birth < txg &&
-                           !dmu_objset_is_dirty(mos, txg)) {
-                               /*
-                                * Nothing changed on the first pass,
-                                * therefore this TXG is a no-op.  Avoid
-                                * syncing deferred frees, so that we
-                                * can keep this TXG as a no-op.
-                                */
-                               ASSERT(txg_list_empty(&dp->dp_dirty_datasets,
-                                   txg));
-                               ASSERT(txg_list_empty(&dp->dp_dirty_dirs, txg));
-                               ASSERT(txg_list_empty(&dp->dp_sync_tasks, txg));
-                               break;
-                       }
-                       spa_sync_deferred_frees(spa, tx);
+                       ASSERT(txg_list_empty(&dp->dp_dirty_datasets, txg));
+                       ASSERT(txg_list_empty(&dp->dp_dirty_dirs, txg));
+                       ASSERT(txg_list_empty(&dp->dp_sync_tasks, txg));
+                       ASSERT(txg_list_empty(&dp->dp_early_sync_tasks, txg));
+                       break;
                }
 
+               spa_sync_deferred_frees(spa, tx);
        } while (dmu_objset_is_dirty(mos, txg));
+}
 
-#ifdef ZFS_DEBUG
-       if (!list_is_empty(&spa->spa_config_dirty_list)) {
-               /*
-                * Make sure that the number of ZAPs for all the vdevs matches
-                * the number of ZAPs in the per-vdev ZAP list. This only gets
-                * called if the config is dirty; otherwise there may be
-                * outstanding AVZ operations that weren't completed in
-                * spa_sync_config_object.
-                */
-               uint64_t all_vdev_zap_entry_count;
-               ASSERT0(zap_count(spa->spa_meta_objset,
-                   spa->spa_all_vdev_zaps, &all_vdev_zap_entry_count));
-               ASSERT3U(vdev_count_verify_zaps(spa->spa_root_vdev), ==,
-                   all_vdev_zap_entry_count);
-       }
-#endif
-
-       if (spa->spa_vdev_removal != NULL) {
-               ASSERT0(spa->spa_vdev_removal->svr_bytes_done[txg & TXG_MASK]);
-       }
+/*
+ * Rewrite the vdev configuration (which includes the uberblock) to
+ * commit the transaction group.
+ *
+ * If there are no dirty vdevs, we sync the uberblock to a few random
+ * top-level vdevs that are known to be visible in the config cache
+ * (see spa_vdev_add() for a complete description). If there *are* dirty
+ * vdevs, sync the uberblock to all vdevs.
+ */
+static void
+spa_sync_rewrite_vdev_config(spa_t *spa, dmu_tx_t *tx)
+{
+       vdev_t *rvd = spa->spa_root_vdev;
+       uint64_t txg = tx->tx_txg;
 
-       /*
-        * Rewrite the vdev configuration (which includes the uberblock)
-        * to commit the transaction group.
-        *
-        * If there are no dirty vdevs, we sync the uberblock to a few
-        * random top-level vdevs that are known to be visible in the
-        * config cache (see spa_vdev_add() for a complete description).
-        * If there *are* dirty vdevs, sync the uberblock to all vdevs.
-        */
        for (;;) {
+               int error = 0;
+
                /*
                 * We hold SCL_STATE to prevent vdev open/close/etc.
                 * while we're attempting to write the vdev labels.
@@ -7208,18 +8822,26 @@ spa_sync(spa_t *spa, uint64_t txg)
                spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
 
                if (list_is_empty(&spa->spa_config_dirty_list)) {
-                       vdev_t *svd[SPA_DVAS_PER_BP];
+                       vdev_t *svd[SPA_SYNC_MIN_VDEVS] = { NULL };
                        int svdcount = 0;
                        int children = rvd->vdev_children;
                        int c0 = spa_get_random(children);
 
                        for (int c = 0; c < children; c++) {
-                               vd = rvd->vdev_child[(c0 + c) % children];
-                               if (vd->vdev_ms_array == 0 || vd->vdev_islog ||
+                               vdev_t *vd =
+                                   rvd->vdev_child[(c0 + c) % children];
+
+                               /* Stop when revisiting the first vdev */
+                               if (c > 0 && svd[0] == vd)
+                                       break;
+
+                               if (vd->vdev_ms_array == 0 ||
+                                   vd->vdev_islog ||
                                    !vdev_is_concrete(vd))
                                        continue;
+
                                svd[svdcount++] = vd;
-                               if (svdcount == SPA_DVAS_PER_BP)
+                               if (svdcount == SPA_SYNC_MIN_VDEVS)
                                        break;
                        }
                        error = vdev_config_sync(svd, svdcount, txg);
@@ -7238,6 +8860,124 @@ spa_sync(spa_t *spa, uint64_t txg)
                zio_suspend(spa, NULL, ZIO_SUSPEND_IOERR);
                zio_resume_wait(spa);
        }
+}
+
+/*
+ * Sync the specified transaction group.  New blocks may be dirtied as
+ * part of the process, so we iterate until it converges.
+ */
+void
+spa_sync(spa_t *spa, uint64_t txg)
+{
+       vdev_t *vd = NULL;
+
+       VERIFY(spa_writeable(spa));
+
+       /*
+        * Wait for i/os issued in open context that need to complete
+        * before this txg syncs.
+        */
+       (void) zio_wait(spa->spa_txg_zio[txg & TXG_MASK]);
+       spa->spa_txg_zio[txg & TXG_MASK] = zio_root(spa, NULL, NULL,
+           ZIO_FLAG_CANFAIL);
+
+       /*
+        * Lock out configuration changes.
+        */
+       spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
+
+       spa->spa_syncing_txg = txg;
+       spa->spa_sync_pass = 0;
+
+       for (int i = 0; i < spa->spa_alloc_count; i++) {
+               mutex_enter(&spa->spa_alloc_locks[i]);
+               VERIFY0(avl_numnodes(&spa->spa_alloc_trees[i]));
+               mutex_exit(&spa->spa_alloc_locks[i]);
+       }
+
+       /*
+        * If there are any pending vdev state changes, convert them
+        * into config changes that go out with this transaction group.
+        */
+       spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
+       while (list_head(&spa->spa_state_dirty_list) != NULL) {
+               /*
+                * We need the write lock here because, for aux vdevs,
+                * calling vdev_config_dirty() modifies sav_config.
+                * This is ugly and will become unnecessary when we
+                * eliminate the aux vdev wart by integrating all vdevs
+                * into the root vdev tree.
+                */
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_WRITER);
+               while ((vd = list_head(&spa->spa_state_dirty_list)) != NULL) {
+                       vdev_state_clean(vd);
+                       vdev_config_dirty(vd);
+               }
+               spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
+               spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_READER);
+       }
+       spa_config_exit(spa, SCL_STATE, FTAG);
+
+       dsl_pool_t *dp = spa->spa_dsl_pool;
+       dmu_tx_t *tx = dmu_tx_create_assigned(dp, txg);
+
+       spa->spa_sync_starttime = gethrtime();
+       taskq_cancel_id(system_delay_taskq, spa->spa_deadman_tqid);
+       spa->spa_deadman_tqid = taskq_dispatch_delay(system_delay_taskq,
+           spa_deadman, spa, TQ_SLEEP, ddi_get_lbolt() +
+           NSEC_TO_TICK(spa->spa_deadman_synctime));
+
+       /*
+        * If we are upgrading to SPA_VERSION_RAIDZ_DEFLATE this txg,
+        * set spa_deflate if we have no raid-z vdevs.
+        */
+       if (spa->spa_ubsync.ub_version < SPA_VERSION_RAIDZ_DEFLATE &&
+           spa->spa_uberblock.ub_version >= SPA_VERSION_RAIDZ_DEFLATE) {
+               vdev_t *rvd = spa->spa_root_vdev;
+
+               int i;
+               for (i = 0; i < rvd->vdev_children; i++) {
+                       vd = rvd->vdev_child[i];
+                       if (vd->vdev_deflate_ratio != SPA_MINBLOCKSIZE)
+                               break;
+               }
+               if (i == rvd->vdev_children) {
+                       spa->spa_deflate = TRUE;
+                       VERIFY0(zap_add(spa->spa_meta_objset,
+                           DMU_POOL_DIRECTORY_OBJECT, DMU_POOL_DEFLATE,
+                           sizeof (uint64_t), 1, &spa->spa_deflate, tx));
+               }
+       }
+
+       spa_sync_adjust_vdev_max_queue_depth(spa);
+
+       spa_sync_condense_indirect(spa, tx);
+
+       spa_sync_iterate_to_convergence(spa, tx);
+
+#ifdef ZFS_DEBUG
+       if (!list_is_empty(&spa->spa_config_dirty_list)) {
+       /*
+        * Make sure that the number of ZAPs for all the vdevs matches
+        * the number of ZAPs in the per-vdev ZAP list. This only gets
+        * called if the config is dirty; otherwise there may be
+        * outstanding AVZ operations that weren't completed in
+        * spa_sync_config_object.
+        */
+               uint64_t all_vdev_zap_entry_count;
+               ASSERT0(zap_count(spa->spa_meta_objset,
+                   spa->spa_all_vdev_zaps, &all_vdev_zap_entry_count));
+               ASSERT3U(vdev_count_verify_zaps(spa->spa_root_vdev), ==,
+                   all_vdev_zap_entry_count);
+       }
+#endif
+
+       if (spa->spa_vdev_removal != NULL) {
+               ASSERT0(spa->spa_vdev_removal->svr_bytes_done[txg & TXG_MASK]);
+       }
+
+       spa_sync_rewrite_vdev_config(spa, tx);
        dmu_tx_commit(tx);
 
        taskq_cancel_id(system_delay_taskq, spa->spa_deadman_tqid);
@@ -7261,16 +9001,24 @@ spa_sync(spa_t *spa, uint64_t txg)
 
        dsl_pool_sync_done(dp, txg);
 
-       mutex_enter(&spa->spa_alloc_lock);
-       VERIFY0(avl_numnodes(&spa->spa_alloc_tree));
-       mutex_exit(&spa->spa_alloc_lock);
+       for (int i = 0; i < spa->spa_alloc_count; i++) {
+               mutex_enter(&spa->spa_alloc_locks[i]);
+               VERIFY0(avl_numnodes(&spa->spa_alloc_trees[i]));
+               mutex_exit(&spa->spa_alloc_locks[i]);
+       }
 
        /*
         * Update usable space statistics.
         */
-       while ((vd = txg_list_remove(&spa->spa_vdev_txg_list, TXG_CLEAN(txg))))
+       while ((vd = txg_list_remove(&spa->spa_vdev_txg_list, TXG_CLEAN(txg)))
+           != NULL)
                vdev_sync_done(vd, txg);
 
+       metaslab_class_evict_old(spa->spa_normal_class, txg);
+       metaslab_class_evict_old(spa->spa_log_class, txg);
+
+       spa_sync_close_syncing_log_sm(spa);
+
        spa_update_dspace(spa);
 
        /*
@@ -7281,6 +9029,9 @@ spa_sync(spa_t *spa, uint64_t txg)
        ASSERT(txg_list_empty(&dp->dp_dirty_dirs, txg));
        ASSERT(txg_list_empty(&spa->spa_vdev_txg_list, txg));
 
+       while (zfs_pause_spa_sync)
+               delay(1);
+
        spa->spa_sync_pass = 0;
 
        /*
@@ -7453,6 +9204,21 @@ spa_has_active_shared_spare(spa_t *spa)
        return (B_FALSE);
 }
 
+uint64_t
+spa_total_metaslabs(spa_t *spa)
+{
+       vdev_t *rvd = spa->spa_root_vdev;
+
+       uint64_t m = 0;
+       for (uint64_t c = 0; c < rvd->vdev_children; c++) {
+               vdev_t *vd = rvd->vdev_child[c];
+               if (!vdev_is_concrete(vd))
+                       continue;
+               m += vd->vdev_ms_count;
+       }
+       return (m);
+}
+
 sysevent_t *
 spa_event_create(spa_t *spa, vdev_t *vd, nvlist_t *hist_nvl, const char *name)
 {
@@ -7493,7 +9259,7 @@ spa_event_notify(spa_t *spa, vdev_t *vd, nvlist_t *hist_nvl, const char *name)
        spa_event_post(spa_event_create(spa, vd, hist_nvl, name));
 }
 
-#if defined(_KERNEL) && defined(HAVE_SPL)
+#if defined(_KERNEL)
 /* state manipulation functions */
 EXPORT_SYMBOL(spa_open);
 EXPORT_SYMBOL(spa_open_rewind);
@@ -7512,7 +9278,7 @@ EXPORT_SYMBOL(spa_inject_delref);
 EXPORT_SYMBOL(spa_scan_stat_init);
 EXPORT_SYMBOL(spa_scan_get_stats);
 
-/* device maniion */
+/* device manipulation */
 EXPORT_SYMBOL(spa_vdev_add);
 EXPORT_SYMBOL(spa_vdev_attach);
 EXPORT_SYMBOL(spa_vdev_detach);
@@ -7550,10 +9316,12 @@ EXPORT_SYMBOL(spa_prop_clear_bootfs);
 EXPORT_SYMBOL(spa_event_notify);
 #endif
 
-#if defined(_KERNEL) && defined(HAVE_SPL)
-module_param(spa_load_verify_maxinflight, int, 0644);
-MODULE_PARM_DESC(spa_load_verify_maxinflight,
-       "Max concurrent traversal I/Os while verifying pool during import -X");
+#if defined(_KERNEL)
+/* BEGIN CSTYLED */
+module_param(spa_load_verify_shift, int, 0644);
+MODULE_PARM_DESC(spa_load_verify_shift, "log2(fraction of arc that can "
+       "be used by inflight I/Os when verifying pool during import");
+/* END CSTYLED */
 
 module_param(spa_load_verify_metadata, int, 0644);
 MODULE_PARM_DESC(spa_load_verify_metadata,
@@ -7563,9 +9331,40 @@ module_param(spa_load_verify_data, int, 0644);
 MODULE_PARM_DESC(spa_load_verify_data,
        "Set to traverse data on pool import");
 
+module_param(spa_load_print_vdev_tree, int, 0644);
+MODULE_PARM_DESC(spa_load_print_vdev_tree,
+       "Print vdev tree to zfs_dbgmsg during pool import");
+
 /* CSTYLED */
 module_param(zio_taskq_batch_pct, uint, 0444);
 MODULE_PARM_DESC(zio_taskq_batch_pct,
        "Percentage of CPUs to run an IO worker thread");
 
+/* BEGIN CSTYLED */
+module_param(zfs_max_missing_tvds, ulong, 0644);
+MODULE_PARM_DESC(zfs_max_missing_tvds,
+       "Allow importing pool with up to this number of missing top-level vdevs"
+       " (in read-only mode)");
+/* END CSTYLED */
+
+module_param(zfs_livelist_condense_zthr_pause, int, 0644);
+MODULE_PARM_DESC(zfs_livelist_condense_zthr_pause,
+       "Set the livelist condense zthr to pause");
+module_param(zfs_livelist_condense_sync_pause, int, 0644);
+MODULE_PARM_DESC(zfs_livelist_condense_sync_pause,
+       "Set the livelist condense synctask to pause");
+
+module_param(zfs_livelist_condense_sync_cancel, int, 0644);
+MODULE_PARM_DESC(zfs_livelist_condense_sync_cancel,
+       "Whether livelist condensing was canceled in the synctask");
+module_param(zfs_livelist_condense_zthr_cancel, int, 0644);
+MODULE_PARM_DESC(zfs_livelist_condense_zthr_cancel,
+       "Whether livelist condensing was canceled in the zthr function");
+
+/* BEGIN CSTYLED */
+module_param(zfs_livelist_condense_new_alloc, int, 0644);
+MODULE_PARM_DESC(zfs_livelist_condense_new_alloc,
+       "Whether extra ALLOC blkptrs were added to a livelist entry while it"
+       " was being condensed");
+/* END CSTYLED */
 #endif