]> git.proxmox.com Git - mirror_zfs.git/blobdiff - include/sys/fs/zfs.h
Introduce read/write kstats per dataset
[mirror_zfs.git] / include / sys / fs / zfs.h
index b634635c8df846a33baa3d0f6e7828e72f8c03e0..7daf72895730f03f5332be708bd3f6714a350a7b 100644 (file)
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013, 2017 Joyent, Inc. All rights reserved.
+ * Copyright (c) 2014 Integros [integros.com]
  * Copyright (c) 2017 Datto Inc.
  */
 
@@ -87,7 +88,8 @@ typedef enum dmu_objset_type {
  * the property table in module/zcommon/zfs_prop.c.
  */
 typedef enum {
-       ZFS_PROP_BAD = -1,
+       ZPROP_CONT = -2,
+       ZPROP_INVAL = -1,
        ZFS_PROP_TYPE = 0,
        ZFS_PROP_CREATION,
        ZFS_PROP_USED,
@@ -143,7 +145,7 @@ typedef enum {
        ZFS_PROP_USERREFS,
        ZFS_PROP_LOGBIAS,
        ZFS_PROP_UNIQUE,                /* not exposed to the user */
-       ZFS_PROP_OBJSETID,              /* not exposed to the user */
+       ZFS_PROP_OBJSETID,
        ZFS_PROP_DEDUP,
        ZFS_PROP_MLSLABEL,
        ZFS_PROP_SYNC,
@@ -170,6 +172,15 @@ typedef enum {
        ZFS_PROP_OVERLAY,
        ZFS_PROP_PREV_SNAP,
        ZFS_PROP_RECEIVE_RESUME_TOKEN,
+       ZFS_PROP_ENCRYPTION,
+       ZFS_PROP_KEYLOCATION,
+       ZFS_PROP_KEYFORMAT,
+       ZFS_PROP_PBKDF2_SALT,
+       ZFS_PROP_PBKDF2_ITERS,
+       ZFS_PROP_ENCRYPTION_ROOT,
+       ZFS_PROP_KEY_GUID,
+       ZFS_PROP_KEYSTATUS,
+       ZFS_PROP_REMAPTXG,              /* not exposed to the user */
        ZFS_NUM_PROPS
 } zfs_prop_t;
 
@@ -182,6 +193,10 @@ typedef enum {
        ZFS_PROP_USEROBJQUOTA,
        ZFS_PROP_GROUPOBJUSED,
        ZFS_PROP_GROUPOBJQUOTA,
+       ZFS_PROP_PROJECTUSED,
+       ZFS_PROP_PROJECTQUOTA,
+       ZFS_PROP_PROJECTOBJUSED,
+       ZFS_PROP_PROJECTOBJQUOTA,
        ZFS_NUM_USERQUOTA_PROPS
 } zfs_userquota_prop_t;
 
@@ -194,6 +209,7 @@ extern const char *zfs_userquota_prop_prefixes[ZFS_NUM_USERQUOTA_PROPS];
  * the property table in module/zcommon/zpool_prop.c.
  */
 typedef enum {
+       ZPOOL_PROP_INVAL = -1,
        ZPOOL_PROP_NAME,
        ZPOOL_PROP_SIZE,
        ZPOOL_PROP_CAPACITY,
@@ -222,15 +238,15 @@ typedef enum {
        ZPOOL_PROP_MAXBLOCKSIZE,
        ZPOOL_PROP_TNAME,
        ZPOOL_PROP_MAXDNODESIZE,
+       ZPOOL_PROP_MULTIHOST,
+       ZPOOL_PROP_CHECKPOINT,
+       ZPOOL_PROP_LOAD_GUID,
        ZPOOL_NUM_PROPS
 } zpool_prop_t;
 
 /* Small enough to not hog a whole line of printout in zpool(1M). */
 #define        ZPROP_MAX_COMMENT       32
 
-#define        ZPROP_CONT              -2
-#define        ZPROP_INVAL             -1
-
 #define        ZPROP_VALUE             "value"
 #define        ZPROP_SOURCE            "source"
 
@@ -271,14 +287,22 @@ typedef int (*zprop_func)(int, void *);
  */
 #define        ZPOOL_ROOTFS_PROPS      "root-props-nvl"
 
+/*
+ * Length of 'written@' and 'written#'
+ */
+#define        ZFS_WRITTEN_PROP_PREFIX_LEN     8
+
 /*
  * Dataset property functions shared between libzfs and kernel.
  */
 const char *zfs_prop_default_string(zfs_prop_t);
 uint64_t zfs_prop_default_numeric(zfs_prop_t);
 boolean_t zfs_prop_readonly(zfs_prop_t);
+boolean_t zfs_prop_visible(zfs_prop_t prop);
 boolean_t zfs_prop_inheritable(zfs_prop_t);
 boolean_t zfs_prop_setonce(zfs_prop_t);
+boolean_t zfs_prop_encryption_key_param(zfs_prop_t);
+boolean_t zfs_prop_valid_keylocation(const char *, boolean_t);
 const char *zfs_prop_to_name(zfs_prop_t);
 zfs_prop_t zfs_name_to_prop(const char *);
 boolean_t zfs_prop_user(const char *);
@@ -297,6 +321,7 @@ const char *zpool_prop_to_name(zpool_prop_t);
 const char *zpool_prop_default_string(zpool_prop_t);
 uint64_t zpool_prop_default_numeric(zpool_prop_t);
 boolean_t zpool_prop_readonly(zpool_prop_t);
+boolean_t zpool_prop_setonce(zpool_prop_t);
 boolean_t zpool_prop_feature(const char *);
 boolean_t zpool_prop_unsupported(const char *);
 int zpool_prop_index_to_string(zpool_prop_t, uint64_t, const char **);
@@ -402,6 +427,30 @@ typedef enum {
        ZFS_VOLMODE_NONE = 3
 } zfs_volmode_t;
 
+typedef enum zfs_keystatus {
+       ZFS_KEYSTATUS_NONE = 0,
+       ZFS_KEYSTATUS_UNAVAILABLE,
+       ZFS_KEYSTATUS_AVAILABLE,
+} zfs_keystatus_t;
+
+typedef enum zfs_keyformat {
+       ZFS_KEYFORMAT_NONE = 0,
+       ZFS_KEYFORMAT_RAW,
+       ZFS_KEYFORMAT_HEX,
+       ZFS_KEYFORMAT_PASSPHRASE,
+       ZFS_KEYFORMAT_FORMATS
+} zfs_keyformat_t;
+
+typedef enum zfs_key_location {
+       ZFS_KEYLOCATION_NONE = 0,
+       ZFS_KEYLOCATION_PROMPT,
+       ZFS_KEYLOCATION_URI,
+       ZFS_KEYLOCATION_LOCATIONS
+} zfs_keylocation_t;
+
+#define        DEFAULT_PBKDF2_ITERATIONS 350000
+#define        MIN_PBKDF2_ITERATIONS 100000
+
 /*
  * On-disk version number.
  */
@@ -524,7 +573,7 @@ typedef enum {
 #define        ZPL_VERSION_USERSPACE           ZPL_VERSION_4
 #define        ZPL_VERSION_SA                  ZPL_VERSION_5
 
-/* Rewind request information */
+/* Rewind policy information */
 #define        ZPOOL_NO_REWIND         1  /* No policy - default behavior */
 #define        ZPOOL_NEVER_REWIND      2  /* Do not search for best txg or rewind */
 #define        ZPOOL_TRY_REWIND        4  /* Search for best txg, but do not rewind */
@@ -533,16 +582,18 @@ typedef enum {
 #define        ZPOOL_REWIND_MASK       28 /* All the possible rewind bits */
 #define        ZPOOL_REWIND_POLICIES   31 /* All the possible policy bits */
 
-typedef struct zpool_rewind_policy {
-       uint32_t        zrp_request;    /* rewind behavior requested */
-       uint64_t        zrp_maxmeta;    /* max acceptable meta-data errors */
-       uint64_t        zrp_maxdata;    /* max acceptable data errors */
-       uint64_t        zrp_txg;        /* specific txg to load */
-} zpool_rewind_policy_t;
+typedef struct zpool_load_policy {
+       uint32_t        zlp_rewind;     /* rewind policy requested */
+       uint64_t        zlp_maxmeta;    /* max acceptable meta-data errors */
+       uint64_t        zlp_maxdata;    /* max acceptable data errors */
+       uint64_t        zlp_txg;        /* specific txg to load */
+} zpool_load_policy_t;
 
 /*
  * The following are configuration names used in the nvlist describing a pool's
- * configuration.
+ * configuration.  New on-disk names should be prefixed with "<reverse-DNS>:"
+ * (e.g. "org.open-zfs:") to avoid conflicting names being developed
+ * independently.
  */
 #define        ZPOOL_CONFIG_VERSION            "version"
 #define        ZPOOL_CONFIG_POOL_NAME          "name"
@@ -556,6 +607,9 @@ typedef struct zpool_rewind_policy {
 #define        ZPOOL_CONFIG_CHILDREN           "children"
 #define        ZPOOL_CONFIG_ID                 "id"
 #define        ZPOOL_CONFIG_GUID               "guid"
+#define        ZPOOL_CONFIG_INDIRECT_OBJECT    "com.delphix:indirect_object"
+#define        ZPOOL_CONFIG_INDIRECT_BIRTHS    "com.delphix:indirect_births"
+#define        ZPOOL_CONFIG_PREV_INDIRECT_VDEV "com.delphix:prev_indirect_vdev"
 #define        ZPOOL_CONFIG_PATH               "path"
 #define        ZPOOL_CONFIG_DEVID              "devid"
 #define        ZPOOL_CONFIG_METASLAB_ARRAY     "metaslab_array"
@@ -564,7 +618,10 @@ typedef struct zpool_rewind_policy {
 #define        ZPOOL_CONFIG_ASIZE              "asize"
 #define        ZPOOL_CONFIG_DTL                "DTL"
 #define        ZPOOL_CONFIG_SCAN_STATS         "scan_stats"    /* not stored on disk */
+#define        ZPOOL_CONFIG_REMOVAL_STATS      "removal_stats" /* not stored on disk */
+#define        ZPOOL_CONFIG_CHECKPOINT_STATS   "checkpoint_stats" /* not on disk */
 #define        ZPOOL_CONFIG_VDEV_STATS         "vdev_stats"    /* not stored on disk */
+#define        ZPOOL_CONFIG_INDIRECT_SIZE      "indirect_size" /* not stored on disk */
 
 /* container nvlist of extended stats */
 #define        ZPOOL_CONFIG_VDEV_STATS_EX      "vdev_stats_ex"
@@ -636,6 +693,7 @@ typedef struct zpool_rewind_policy {
 #define        ZPOOL_CONFIG_RESILVER_TXG       "resilver_txg"
 #define        ZPOOL_CONFIG_COMMENT            "comment"
 #define        ZPOOL_CONFIG_SUSPENDED          "suspended"     /* not stored on disk */
+#define        ZPOOL_CONFIG_SUSPENDED_REASON   "suspended_reason"      /* not stored */
 #define        ZPOOL_CONFIG_TIMESTAMP          "timestamp"     /* not stored on disk */
 #define        ZPOOL_CONFIG_BOOTFS             "bootfs"        /* not stored on disk */
 #define        ZPOOL_CONFIG_MISSING_DEVICES    "missing_vdevs" /* not stored on disk */
@@ -650,6 +708,12 @@ typedef struct zpool_rewind_policy {
 #define        ZPOOL_CONFIG_VDEV_TOP_ZAP       "com.delphix:vdev_zap_top"
 #define        ZPOOL_CONFIG_VDEV_LEAF_ZAP      "com.delphix:vdev_zap_leaf"
 #define        ZPOOL_CONFIG_HAS_PER_VDEV_ZAPS  "com.delphix:has_per_vdev_zaps"
+#define        ZPOOL_CONFIG_CACHEFILE          "cachefile"     /* not stored on disk */
+#define        ZPOOL_CONFIG_MMP_STATE          "mmp_state"     /* not stored on disk */
+#define        ZPOOL_CONFIG_MMP_TXG            "mmp_txg"       /* not stored on disk */
+#define        ZPOOL_CONFIG_MMP_HOSTNAME       "mmp_hostname"  /* not stored on disk */
+#define        ZPOOL_CONFIG_MMP_HOSTID         "mmp_hostid"    /* not stored on disk */
+
 /*
  * The persistent vdev state is stored as separate values rather than a single
  * 'vdev_state' entry.  This is because a device can be in multiple states, such
@@ -662,12 +726,12 @@ typedef struct zpool_rewind_policy {
 #define        ZPOOL_CONFIG_FRU                "fru"
 #define        ZPOOL_CONFIG_AUX_STATE          "aux_state"
 
-/* Rewind policy parameters */
-#define        ZPOOL_REWIND_POLICY             "rewind-policy"
-#define        ZPOOL_REWIND_REQUEST            "rewind-request"
-#define        ZPOOL_REWIND_REQUEST_TXG        "rewind-request-txg"
-#define        ZPOOL_REWIND_META_THRESH        "rewind-meta-thresh"
-#define        ZPOOL_REWIND_DATA_THRESH        "rewind-data-thresh"
+/* Pool load policy parameters */
+#define        ZPOOL_LOAD_POLICY               "load-policy"
+#define        ZPOOL_LOAD_REWIND_POLICY        "load-rewind-policy"
+#define        ZPOOL_LOAD_REQUEST_TXG          "load-request-txg"
+#define        ZPOOL_LOAD_META_THRESH          "load-meta-thresh"
+#define        ZPOOL_LOAD_DATA_THRESH          "load-data-thresh"
 
 /* Rewind data discovered */
 #define        ZPOOL_CONFIG_LOAD_TIME          "rewind_txg_ts"
@@ -685,6 +749,15 @@ typedef struct zpool_rewind_policy {
 #define        VDEV_TYPE_SPARE                 "spare"
 #define        VDEV_TYPE_LOG                   "log"
 #define        VDEV_TYPE_L2CACHE               "l2cache"
+#define        VDEV_TYPE_INDIRECT              "indirect"
+
+/* VDEV_TOP_ZAP_* are used in top-level vdev ZAP objects. */
+#define        VDEV_TOP_ZAP_INDIRECT_OBSOLETE_SM \
+       "com.delphix:indirect_obsolete_sm"
+#define        VDEV_TOP_ZAP_OBSOLETE_COUNTS_ARE_PRECISE \
+       "com.delphix:obsolete_counts_are_precise"
+#define        VDEV_TOP_ZAP_POOL_CHECKPOINT_SM \
+       "com.delphix:pool_checkpoint_sm"
 
 /*
  * This is needed in userland to report the minimum necessary device size.
@@ -743,7 +816,9 @@ typedef enum vdev_aux {
        VDEV_AUX_EXTERNAL,      /* external diagnosis or forced fault   */
        VDEV_AUX_SPLIT_POOL,    /* vdev was split off into another pool */
        VDEV_AUX_BAD_ASHIFT,    /* vdev ashift is invalid               */
-       VDEV_AUX_EXTERNAL_PERSIST       /* persistent forced fault      */
+       VDEV_AUX_EXTERNAL_PERSIST,      /* persistent forced fault      */
+       VDEV_AUX_ACTIVE,        /* vdev active on a different host      */
+       VDEV_AUX_CHILDREN_OFFLINE, /* all children are offline          */
 } vdev_aux_t;
 
 /*
@@ -763,6 +838,16 @@ typedef enum pool_state {
        POOL_STATE_POTENTIALLY_ACTIVE   /* Internal libzfs state        */
 } pool_state_t;
 
+/*
+ * mmp state. The following states provide additional detail describing
+ * why a pool couldn't be safely imported.
+ */
+typedef enum mmp_state {
+       MMP_STATE_ACTIVE = 0,           /* In active use                */
+       MMP_STATE_INACTIVE,             /* Inactive and safe to import  */
+       MMP_STATE_NO_HOSTID             /* System hostid is not set     */
+} mmp_state_t;
+
 /*
  * Scan Functions.
  */
@@ -782,6 +867,18 @@ typedef enum pool_scrub_cmd {
        POOL_SCRUB_FLAGS_END
 } pool_scrub_cmd_t;
 
+typedef enum {
+       CS_NONE,
+       CS_CHECKPOINT_EXISTS,
+       CS_CHECKPOINT_DISCARDING,
+       CS_NUM_STATES
+} checkpoint_state_t;
+
+typedef struct pool_checkpoint_stat {
+       uint64_t pcs_state;             /* checkpoint_state_t */
+       uint64_t pcs_start_time;        /* time checkpoint/discard started */
+       uint64_t pcs_space;             /* checkpointed space */
+} pool_checkpoint_stat_t;
 
 /*
  * ZIO types.  Needed to interpret vdev statistics below.
@@ -807,19 +904,35 @@ typedef struct pool_scan_stat {
        uint64_t        pss_start_time; /* scan start time */
        uint64_t        pss_end_time;   /* scan end time */
        uint64_t        pss_to_examine; /* total bytes to scan */
-       uint64_t        pss_examined;   /* total examined bytes */
+       uint64_t        pss_examined;   /* total bytes located by scanner */
        uint64_t        pss_to_process; /* total bytes to process */
        uint64_t        pss_processed;  /* total processed bytes */
        uint64_t        pss_errors;     /* scan errors  */
 
        /* values not stored on disk */
-       uint64_t        pss_pass_exam;  /* examined bytes per scan pass */
+       uint64_t        pss_pass_exam; /* examined bytes per scan pass */
        uint64_t        pss_pass_start; /* start time of a scan pass */
        uint64_t        pss_pass_scrub_pause; /* pause time of a scurb pass */
        /* cumulative time scrub spent paused, needed for rate calculation */
        uint64_t        pss_pass_scrub_spent_paused;
+       uint64_t        pss_pass_issued; /* issued bytes per scan pass */
+       uint64_t        pss_issued;     /* total bytes checked by scanner */
 } pool_scan_stat_t;
 
+typedef struct pool_removal_stat {
+       uint64_t prs_state; /* dsl_scan_state_t */
+       uint64_t prs_removing_vdev;
+       uint64_t prs_start_time;
+       uint64_t prs_end_time;
+       uint64_t prs_to_copy; /* bytes that need to be copied */
+       uint64_t prs_copied; /* bytes copied so far */
+       /*
+        * bytes of memory used for indirect mappings.
+        * This includes all removed vdevs.
+        */
+       uint64_t prs_mapping_memory;
+} pool_removal_stat_t;
+
 typedef enum dsl_scan_state {
        DSS_NONE,
        DSS_SCANNING,
@@ -838,6 +951,7 @@ typedef enum zpool_errata {
        ZPOOL_ERRATA_NONE,
        ZPOOL_ERRATA_ZOL_2094_SCRUB,
        ZPOOL_ERRATA_ZOL_2094_ASYNC_DESTROY,
+       ZPOOL_ERRATA_ZOL_6845_ENCRYPTION,
 } zpool_errata_t;
 
 /*
@@ -862,7 +976,7 @@ typedef struct vdev_stat {
        uint64_t        vs_scan_removing;       /* removing?    */
        uint64_t        vs_scan_processed;      /* scan processed bytes */
        uint64_t        vs_fragmentation;       /* device fragmentation */
-
+       uint64_t        vs_checkpoint_space;    /* checkpoint-consumed space */
 } vdev_stat_t;
 
 /*
@@ -1041,8 +1155,15 @@ typedef enum zfs_ioc {
        ZFS_IOC_BOOKMARK,
        ZFS_IOC_GET_BOOKMARKS,
        ZFS_IOC_DESTROY_BOOKMARKS,
+       ZFS_IOC_CHANNEL_PROGRAM,
        ZFS_IOC_RECV_NEW,
        ZFS_IOC_POOL_SYNC,
+       ZFS_IOC_LOAD_KEY,
+       ZFS_IOC_UNLOAD_KEY,
+       ZFS_IOC_CHANGE_KEY,
+       ZFS_IOC_REMAP,
+       ZFS_IOC_POOL_CHECKPOINT,
+       ZFS_IOC_POOL_DISCARD_CHECKPOINT,
 
        /*
         * Linux - 3/64 numbers reserved.
@@ -1065,6 +1186,22 @@ typedef enum zfs_ioc {
  */
 #define        BLKZNAME                _IOR(0x12, 125, char[ZFS_MAX_DATASET_NAME_LEN])
 
+/*
+ * ZFS-specific error codes used for returning descriptive errors
+ * to the userland through zfs ioctls.
+ *
+ * The enum implicitly includes all the error codes from errno.h.
+ * New code should use and extend this enum for errors that are
+ * not described precisely by generic errno codes.
+ */
+typedef enum {
+       ZFS_ERR_CHECKPOINT_EXISTS = 1024,
+       ZFS_ERR_DISCARDING_CHECKPOINT,
+       ZFS_ERR_NO_CHECKPOINT,
+       ZFS_ERR_DEVRM_IN_PROGRESS,
+       ZFS_ERR_VDEV_TOO_BIG
+} zfs_errno_t;
+
 /*
  * Internal SPA load state.  Used by FMA diagnosis engine.
  */
@@ -1106,6 +1243,13 @@ typedef enum {
 #define        ZPOOL_HIST_OUTPUT_NVL   "out_nvl"
 #define        ZPOOL_HIST_DSNAME       "dsname"
 #define        ZPOOL_HIST_DSID         "dsid"
+#define        ZPOOL_HIST_ERRNO        "errno"
+
+/*
+ * Special nvlist name that will not have its args recorded in the pool's
+ * history log.
+ */
+#define        ZPOOL_HIDDEN_ARGS       "hidden_args"
 
 /*
  * Flags for ZFS_IOC_VDEV_SET_STATE
@@ -1125,6 +1269,28 @@ typedef enum {
 #define        ZFS_IMPORT_MISSING_LOG  0x4
 #define        ZFS_IMPORT_ONLY         0x8
 #define        ZFS_IMPORT_TEMP_NAME    0x10
+#define        ZFS_IMPORT_SKIP_MMP     0x20
+#define        ZFS_IMPORT_LOAD_KEYS    0x40
+#define        ZFS_IMPORT_CHECKPOINT   0x80
+
+/*
+ * Channel program argument/return nvlist keys and defaults.
+ */
+#define        ZCP_ARG_PROGRAM         "program"
+#define        ZCP_ARG_ARGLIST         "arg"
+#define        ZCP_ARG_SYNC            "sync"
+#define        ZCP_ARG_INSTRLIMIT      "instrlimit"
+#define        ZCP_ARG_MEMLIMIT        "memlimit"
+
+#define        ZCP_ARG_CLIARGV         "argv"
+
+#define        ZCP_RET_ERROR           "error"
+#define        ZCP_RET_RETURN          "return"
+
+#define        ZCP_DEFAULT_INSTRLIMIT  (10 * 1000 * 1000)
+#define        ZCP_MAX_INSTRLIMIT      (10 * ZCP_DEFAULT_INSTRLIMIT)
+#define        ZCP_DEFAULT_MEMLIMIT    (10 * 1024 * 1024)
+#define        ZCP_MAX_MEMLIMIT        (10 * ZCP_DEFAULT_MEMLIMIT)
 
 /*
  * Sysevent payload members.  ZFS will generate the following sysevents with the
@@ -1146,11 +1312,45 @@ typedef enum {
  *             ZFS_EV_POOL_GUID        DATA_TYPE_UINT64
  *             ZFS_EV_VDEV_PATH        DATA_TYPE_STRING        (optional)
  *             ZFS_EV_VDEV_GUID        DATA_TYPE_UINT64
+ *
+ *     ESC_ZFS_HISTORY_EVENT
+ *
+ *             ZFS_EV_POOL_NAME        DATA_TYPE_STRING
+ *             ZFS_EV_POOL_GUID        DATA_TYPE_UINT64
+ *             ZFS_EV_HIST_TIME        DATA_TYPE_UINT64        (optional)
+ *             ZFS_EV_HIST_CMD         DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_WHO         DATA_TYPE_UINT64        (optional)
+ *             ZFS_EV_HIST_ZONE        DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_HOST        DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_TXG         DATA_TYPE_UINT64        (optional)
+ *             ZFS_EV_HIST_INT_EVENT   DATA_TYPE_UINT64        (optional)
+ *             ZFS_EV_HIST_INT_STR     DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_INT_NAME    DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_IOCTL       DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_DSNAME      DATA_TYPE_STRING        (optional)
+ *             ZFS_EV_HIST_DSID        DATA_TYPE_UINT64        (optional)
+ *
+ * The ZFS_EV_HIST_* members will correspond to the ZPOOL_HIST_* members in the
+ * history log nvlist.  The keynames will be free of any spaces or other
+ * characters that could be potentially unexpected to consumers of the
+ * sysevents.
  */
 #define        ZFS_EV_POOL_NAME        "pool_name"
 #define        ZFS_EV_POOL_GUID        "pool_guid"
 #define        ZFS_EV_VDEV_PATH        "vdev_path"
 #define        ZFS_EV_VDEV_GUID        "vdev_guid"
+#define        ZFS_EV_HIST_TIME        "history_time"
+#define        ZFS_EV_HIST_CMD         "history_command"
+#define        ZFS_EV_HIST_WHO         "history_who"
+#define        ZFS_EV_HIST_ZONE        "history_zone"
+#define        ZFS_EV_HIST_HOST        "history_hostname"
+#define        ZFS_EV_HIST_TXG         "history_txg"
+#define        ZFS_EV_HIST_INT_EVENT   "history_internal_event"
+#define        ZFS_EV_HIST_INT_STR     "history_internal_str"
+#define        ZFS_EV_HIST_INT_NAME    "history_internal_name"
+#define        ZFS_EV_HIST_IOCTL       "history_ioctl"
+#define        ZFS_EV_HIST_DSNAME      "history_dsname"
+#define        ZFS_EV_HIST_DSID        "history_dsid"
 
 #ifdef __cplusplus
 }