OpenZFS 8063 - verify that we do not attempt to access inactive txg

Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
A standard practice in ZFS is to keep track of "per-txg" state. Any of
the 3 active TXG's (open, quiescing, syncing) can have different values
for this state. We should assert that we do not attempt to modify other
(inactive) TXG's.

Porting Notes:
- ASSERTV added to txg_sync_waiting() for unused variable.

OpenZFS-issue: https://www.illumos.org/issues/8063
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/01acb46
Closes #6109

diff --git a/include/sys/txg.h b/include/sys/txg.h
index 44f81beca420bbc7f66cfbb136787d3246440ed0..f52197781889ceaedc9e6aff14cd8cf29d9769dc 100644 (file)
--- a/include/sys/txg.h
+++ b/include/sys/txg.h
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_TXG_H
@@ -60,6 +60,7 @@ typedef struct txg_node {
 typedef struct txg_list {
        kmutex_t        tl_lock;
        size_t          tl_offset;
+       spa_t           *tl_spa;
        txg_node_t      *tl_head[TXG_SIZE];
 } txg_list_t;
 
@@ -103,6 +104,8 @@ extern boolean_t txg_stalled(struct dsl_pool *dp);
 /* returns TRUE if someone is waiting for the next txg to sync */
 extern boolean_t txg_sync_waiting(struct dsl_pool *dp);
 
+extern void txg_verify(spa_t *spa, uint64_t txg);
+
 /*
  * Wait for pending commit callbacks of already-synced transactions to finish
  * processing.
@@ -115,7 +118,7 @@ extern void txg_wait_callbacks(struct dsl_pool *dp);
 
 #define        TXG_CLEAN(txg)  ((txg) - 1)
 
-extern void txg_list_create(txg_list_t *tl, size_t offset);
+extern void txg_list_create(txg_list_t *tl, spa_t *spa, size_t offset);
 extern void txg_list_destroy(txg_list_t *tl);
 extern boolean_t txg_list_empty(txg_list_t *tl, uint64_t txg);
 extern boolean_t txg_all_lists_empty(txg_list_t *tl);

diff --git a/include/sys/zil.h b/include/sys/zil.h
index ed0810aa1a9efdaa232735acdba86bf7f68e1491..62572f894a179fc6d38a57ea26060df74ad21267 100644 (file)
--- a/include/sys/zil.h
+++ b/include/sys/zil.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -94,6 +94,15 @@ typedef struct zil_chain {
 
 #define        ZIL_MIN_BLKSZ   4096ULL
 
+/*
+ * ziltest is by and large an ugly hack, but very useful in
+ * checking replay without tedious work.
+ * When running ziltest we want to keep all itx's and so maintain
+ * a single list in the zl_itxg[] that uses a high txg: ZILTEST_TXG
+ * We subtract TXG_CONCURRENT_STATES to allow for common code.
+ */
+#define        ZILTEST_TXG (UINT64_MAX - TXG_CONCURRENT_STATES)
+
 /*
  * The words of a log block checksum.
  */

diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c
index 0f7a38c0ce31db1419d8b92c6d329673b118fef3..a7914207f430efd34afbb5db5e78add1088d3492 100644 (file)
--- a/module/zfs/dmu_tx.c
+++ b/module/zfs/dmu_tx.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -87,7 +87,7 @@ dmu_tx_create_assigned(struct dsl_pool *dp, uint64_t txg)
 {
        dmu_tx_t *tx = dmu_tx_create_dd(NULL);
 
-       ASSERT3U(txg, <=, dp->dp_tx.tx_open_txg);
+       txg_verify(dp->dp_spa, txg);
        tx->tx_pool = dp;
        tx->tx_txg = txg;
        tx->tx_anyobj = TRUE;

diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
index c98938f3cdffeed58222965ad1b206fd4d585fd0..97eb0cced7074b9610988738939c367754f74415 100644 (file)
--- a/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@ -161,13 +161,13 @@ dsl_pool_open_impl(spa_t *spa, uint64_t txg)
        rrw_init(&dp->dp_config_rwlock, B_TRUE);
        txg_init(dp, txg);
 
-       txg_list_create(&dp->dp_dirty_datasets,
+       txg_list_create(&dp->dp_dirty_datasets, spa,
            offsetof(dsl_dataset_t, ds_dirty_link));
-       txg_list_create(&dp->dp_dirty_zilogs,
+       txg_list_create(&dp->dp_dirty_zilogs, spa,
            offsetof(zilog_t, zl_dirty_link));
-       txg_list_create(&dp->dp_dirty_dirs,
+       txg_list_create(&dp->dp_dirty_dirs, spa,
            offsetof(dsl_dir_t, dd_dirty_link));
-       txg_list_create(&dp->dp_sync_tasks,
+       txg_list_create(&dp->dp_sync_tasks, spa,
            offsetof(dsl_sync_task_t, dst_node));
 
        dp->dp_sync_taskq = taskq_create("dp_sync_taskq",

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index 638ec59efd646cdc2545bea5734e554dc2ce60ca..70756ce49ce493af779dbce6b05b4e73bdf97d31 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. 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) 2014 Spectra Logic Corporation, All rights reserved.
@@ -1136,7 +1136,7 @@ spa_activate(spa_t *spa, int mode)
        list_create(&spa->spa_state_dirty_list, sizeof (vdev_t),
            offsetof(vdev_t, vdev_state_dirty_node));
 
-       txg_list_create(&spa->spa_vdev_txg_list,
+       txg_list_create(&spa->spa_vdev_txg_list, spa,
            offsetof(struct vdev, vdev_txg_node));
 
        avl_create(&spa->spa_errlist_scrub,

diff --git a/module/zfs/txg.c b/module/zfs/txg.c
index 043547e97af3929aff08d02f6b82585e127643d2..65bd7f93acdf316fa462ac26bd47ff212fad06c4 100644 (file)
--- a/module/zfs/txg.c
+++ b/module/zfs/txg.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 Martin Matuska
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -31,6 +31,7 @@
 #include <sys/dmu_tx.h>
 #include <sys/dsl_pool.h>
 #include <sys/dsl_scan.h>
+#include <sys/zil.h>
 #include <sys/callb.h>
 #include <sys/trace_txg.h>
 
@@ -722,17 +723,33 @@ txg_sync_waiting(dsl_pool_t *dp)
            tx->tx_quiesced_txg != 0);
 }
 
+/*
+ * Verify that this txg is active (open, quiescing, syncing).  Non-active
+ * txg's should not be manipulated.
+ */
+void
+txg_verify(spa_t *spa, uint64_t txg)
+{
+       ASSERTV(dsl_pool_t *dp = spa_get_dsl(spa));
+       if (txg <= TXG_INITIAL || txg == ZILTEST_TXG)
+               return;
+       ASSERT3U(txg, <=, dp->dp_tx.tx_open_txg);
+       ASSERT3U(txg, >=, dp->dp_tx.tx_synced_txg);
+       ASSERT3U(txg, >=, dp->dp_tx.tx_open_txg - TXG_CONCURRENT_STATES);
+}
+
 /*
  * Per-txg object lists.
  */
 void
-txg_list_create(txg_list_t *tl, size_t offset)
+txg_list_create(txg_list_t *tl, spa_t *spa, size_t offset)
 {
        int t;
 
        mutex_init(&tl->tl_lock, NULL, MUTEX_DEFAULT, NULL);
 
        tl->tl_offset = offset;
+       tl->tl_spa = spa;
 
        for (t = 0; t < TXG_SIZE; t++)
                tl->tl_head[t] = NULL;
@@ -752,6 +769,7 @@ txg_list_destroy(txg_list_t *tl)
 boolean_t
 txg_list_empty(txg_list_t *tl, uint64_t txg)
 {
+       txg_verify(tl->tl_spa, txg);
        return (tl->tl_head[txg & TXG_MASK] == NULL);
 }
 
@@ -786,6 +804,7 @@ txg_list_add(txg_list_t *tl, void *p, uint64_t txg)
        txg_node_t *tn = (txg_node_t *)((char *)p + tl->tl_offset);
        boolean_t add;
 
+       txg_verify(tl->tl_spa, txg);
        mutex_enter(&tl->tl_lock);
        add = (tn->tn_member[t] == 0);
        if (add) {
@@ -810,6 +829,7 @@ txg_list_add_tail(txg_list_t *tl, void *p, uint64_t txg)
        txg_node_t *tn = (txg_node_t *)((char *)p + tl->tl_offset);
        boolean_t add;
 
+       txg_verify(tl->tl_spa, txg);
        mutex_enter(&tl->tl_lock);
        add = (tn->tn_member[t] == 0);
        if (add) {
@@ -837,6 +857,7 @@ txg_list_remove(txg_list_t *tl, uint64_t txg)
        txg_node_t *tn;
        void *p = NULL;
 
+       txg_verify(tl->tl_spa, txg);
        mutex_enter(&tl->tl_lock);
        if ((tn = tl->tl_head[t]) != NULL) {
                p = (char *)tn - tl->tl_offset;
@@ -858,6 +879,7 @@ txg_list_remove_this(txg_list_t *tl, void *p, uint64_t txg)
        int t = txg & TXG_MASK;
        txg_node_t *tn, **tp;
 
+       txg_verify(tl->tl_spa, txg);
        mutex_enter(&tl->tl_lock);
 
        for (tp = &tl->tl_head[t]; (tn = *tp) != NULL; tp = &tn->tn_next[t]) {
@@ -881,6 +903,7 @@ txg_list_member(txg_list_t *tl, void *p, uint64_t txg)
        int t = txg & TXG_MASK;
        txg_node_t *tn = (txg_node_t *)((char *)p + tl->tl_offset);
 
+       txg_verify(tl->tl_spa, txg);
        return (tn->tn_member[t] != 0);
 }
 
@@ -893,6 +916,7 @@ txg_list_head(txg_list_t *tl, uint64_t txg)
        int t = txg & TXG_MASK;
        txg_node_t *tn = tl->tl_head[t];
 
+       txg_verify(tl->tl_spa, txg);
        return (tn == NULL ? NULL : (char *)tn - tl->tl_offset);
 }
 
@@ -902,6 +926,7 @@ txg_list_next(txg_list_t *tl, void *p, uint64_t txg)
        int t = txg & TXG_MASK;
        txg_node_t *tn = (txg_node_t *)((char *)p + tl->tl_offset);
 
+       txg_verify(tl->tl_spa, txg);
        tn = tn->tn_next[t];
 
        return (tn == NULL ? NULL : (char *)tn - tl->tl_offset);

diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c
index b979509c57849e625b3facb5b269824c05495f33..a71e678bbea9e61777807b2db4c342fce53cd96e 100644 (file)
--- a/module/zfs/vdev.c
+++ b/module/zfs/vdev.c
@@ -370,9 +370,9 @@ vdev_alloc_common(spa_t *spa, uint_t id, uint64_t guid, vdev_ops_t *ops)
                vd->vdev_dtl[t] = range_tree_create(NULL, NULL,
                    &vd->vdev_dtl_lock);
        }
-       txg_list_create(&vd->vdev_ms_list,
+       txg_list_create(&vd->vdev_ms_list, spa,
            offsetof(struct metaslab, ms_txg_node));
-       txg_list_create(&vd->vdev_dtl_list,
+       txg_list_create(&vd->vdev_dtl_list, spa,
            offsetof(struct vdev, vdev_dtl_node));
        vd->vdev_stat.vs_timestamp = gethrtime();
        vdev_queue_init(vd);

diff --git a/module/zfs/zil.c b/module/zfs/zil.c
index e745ac253056fb73da0d3b29f85819123128f48f..12a034d5ba89123a38232ee881de09197b36a315 100644 (file)
--- a/module/zfs/zil.c
+++ b/module/zfs/zil.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2016 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  */
 
@@ -109,16 +109,6 @@ static void zil_async_to_sync(zilog_t *zilog, uint64_t foid);
 #define        LWB_EMPTY(lwb) ((BP_GET_LSIZE(&lwb->lwb_blk) - \
     sizeof (zil_chain_t)) == (lwb->lwb_sz - lwb->lwb_nused))
 
-
-/*
- * ziltest is by and large an ugly hack, but very useful in
- * checking replay without tedious work.
- * When running ziltest we want to keep all itx's and so maintain
- * a single list in the zl_itxg[] that uses a high txg: ZILTEST_TXG
- * We subtract TXG_CONCURRENT_STATES to allow for common code.
- */
-#define        ZILTEST_TXG (UINT64_MAX - TXG_CONCURRENT_STATES)
-
 static int
 zil_bp_compare(const void *x1, const void *x2)
 {