From 98ab38d1096079d82247350f526f0d7268956fb5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 30 Sep 2013 11:45:58 -0700 Subject: [PATCH] Revert "Add new kstat for monitoring time in dmu_tx_assign" This reverts commit 92334b14ec378b1693573b52c09816bbade9cf3e. Signed-off-by: Brian Behlendorf --- include/sys/dsl_pool.h | 5 ---- module/zfs/dmu_tx.c | 8 ------ module/zfs/dsl_pool.c | 59 ------------------------------------------ 3 files changed, 72 deletions(-) diff --git a/include/sys/dsl_pool.h b/include/sys/dsl_pool.h index 51b588e6a..807d76b11 100644 --- a/include/sys/dsl_pool.h +++ b/include/sys/dsl_pool.h @@ -90,7 +90,6 @@ typedef struct dsl_pool { uint64_t dp_root_dir_obj; struct taskq *dp_iput_taskq; kstat_t *dp_txg_kstat; - kstat_t *dp_tx_assign_kstat; /* No lock needed - sync context only */ blkptr_t dp_meta_rootbp; @@ -113,8 +112,6 @@ typedef struct dsl_pool { uint64_t dp_mos_uncompressed_delta; uint64_t dp_txg_history_size; list_t dp_txg_history; - uint64_t dp_tx_assign_size; - kstat_named_t *dp_tx_assign_buckets; /* Has its own locking */ @@ -171,8 +168,6 @@ int dsl_pool_open_special_dir(dsl_pool_t *dp, const char *name, dsl_dir_t **); int dsl_pool_hold(const char *name, void *tag, dsl_pool_t **dp); void dsl_pool_rele(dsl_pool_t *dp, void *tag); -void dsl_pool_tx_assign_add_usecs(dsl_pool_t *dp, uint64_t usecs); - txg_history_t *dsl_pool_txg_history_add(dsl_pool_t *dp, uint64_t txg); txg_history_t *dsl_pool_txg_history_get(dsl_pool_t *dp, uint64_t txg); void dsl_pool_txg_history_put(txg_history_t *th); diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c index 3e46a02f8..17982a04e 100644 --- a/module/zfs/dmu_tx.c +++ b/module/zfs/dmu_tx.c @@ -1077,15 +1077,12 @@ dmu_tx_unassign(dmu_tx_t *tx) int dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how) { - hrtime_t before, after; int err; ASSERT(tx->tx_txg == 0); ASSERT(txg_how == TXG_WAIT || txg_how == TXG_NOWAIT); ASSERT(!dsl_pool_sync_context(tx->tx_pool)); - before = gethrtime(); - /* If we might wait, we must not hold the config lock. */ ASSERT(txg_how != TXG_WAIT || !dsl_pool_config_held(tx->tx_pool)); @@ -1100,11 +1097,6 @@ dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how) txg_rele_to_quiesce(&tx->tx_txgh); - after = gethrtime(); - - dsl_pool_tx_assign_add_usecs(tx->tx_pool, - (after - before) / NSEC_PER_USEC); - return (0); } diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c index da4a9df85..f81d84354 100644 --- a/module/zfs/dsl_pool.c +++ b/module/zfs/dsl_pool.c @@ -59,63 +59,6 @@ kmutex_t zfs_write_limit_lock; static pgcnt_t old_physmem = 0; -static void -dsl_pool_tx_assign_init(dsl_pool_t *dp, unsigned int ndata) -{ - kstat_named_t *ks; - char name[KSTAT_STRLEN]; - int i, data_size = ndata * sizeof(kstat_named_t); - - (void) snprintf(name, KSTAT_STRLEN, "dmu_tx_assign-%s", - spa_name(dp->dp_spa)); - - dp->dp_tx_assign_size = ndata; - - if (data_size) - dp->dp_tx_assign_buckets = kmem_alloc(data_size, KM_SLEEP); - else - dp->dp_tx_assign_buckets = NULL; - - for (i = 0; i < dp->dp_tx_assign_size; i++) { - ks = &dp->dp_tx_assign_buckets[i]; - ks->data_type = KSTAT_DATA_UINT64; - ks->value.ui64 = 0; - (void) snprintf(ks->name, KSTAT_STRLEN, "%u us", 1 << i); - } - - dp->dp_tx_assign_kstat = kstat_create("zfs", 0, name, "misc", - KSTAT_TYPE_NAMED, 0, KSTAT_FLAG_VIRTUAL); - - if (dp->dp_tx_assign_kstat) { - dp->dp_tx_assign_kstat->ks_data = dp->dp_tx_assign_buckets; - dp->dp_tx_assign_kstat->ks_ndata = dp->dp_tx_assign_size; - dp->dp_tx_assign_kstat->ks_data_size = data_size; - kstat_install(dp->dp_tx_assign_kstat); - } -} - -static void -dsl_pool_tx_assign_destroy(dsl_pool_t *dp) -{ - if (dp->dp_tx_assign_buckets) - kmem_free(dp->dp_tx_assign_buckets, - dp->dp_tx_assign_size * sizeof(kstat_named_t)); - - if (dp->dp_tx_assign_kstat) - kstat_delete(dp->dp_tx_assign_kstat); -} - -void -dsl_pool_tx_assign_add_usecs(dsl_pool_t *dp, uint64_t usecs) -{ - uint64_t idx = 0; - - while (((1 << idx) < usecs) && (idx < dp->dp_tx_assign_size - 1)) - idx++; - - atomic_inc_64(&dp->dp_tx_assign_buckets[idx].value.ui64); -} - static int dsl_pool_txg_history_update(kstat_t *ksp, int rw) { @@ -296,7 +239,6 @@ dsl_pool_open_impl(spa_t *spa, uint64_t txg) 1, 4, 0); dsl_pool_txg_history_init(dp, txg); - dsl_pool_tx_assign_init(dp, 32); return (dp); } @@ -438,7 +380,6 @@ dsl_pool_close(dsl_pool_t *dp) arc_flush(dp->dp_spa); txg_fini(dp); dsl_scan_fini(dp); - dsl_pool_tx_assign_destroy(dp); dsl_pool_txg_history_destroy(dp); rrw_destroy(&dp->dp_config_rwlock); mutex_destroy(&dp->dp_lock);