diff options
| author | Tom Caputi <[email protected]> | 2018-04-10 14:15:05 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-04-10 11:15:05 -0700 |
| commit | edc1e713c294d116702b034c59eed7b9a03fbc64 (patch) | |
| tree | 95423150271705e3015359791785f12221d896ff /include/sys | |
| parent | 10f88c5cd523eec8431941abf00017fc8fb67fd3 (diff) | |
Fix race in dnode_check_slots_free()
Currently, dnode_check_slots_free() works by checking dn->dn_type
in the dnode to determine if the dnode is reclaimable. However,
there is a small window of time between dnode_free_sync() in the
first call to dsl_dataset_sync() and when the useraccounting code
is run when the type is set DMU_OT_NONE, but the dnode is not yet
evictable, leading to crashes. This patch adds the ability for
dnodes to track which txg they were last dirtied in and adds a
check for this before performing the reclaim.
This patch also corrects several instances when dn_dirty_link was
treated as a list_node_t when it is technically a multilist_node_t.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7147
Closes #7388
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/dmu_impl.h | 1 | ||||
| -rw-r--r-- | include/sys/dnode.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/sys/dmu_impl.h b/include/sys/dmu_impl.h index 65e417e3f..03a63077f 100644 --- a/include/sys/dmu_impl.h +++ b/include/sys/dmu_impl.h @@ -161,6 +161,7 @@ extern "C" { * dn_allocated_txg * dn_free_txg * dn_assigned_txg + * dn_dirty_txg * dd_assigned_tx * dn_notxholds * dn_dirtyctx diff --git a/include/sys/dnode.h b/include/sys/dnode.h index 1cb7cae09..2f70d5446 100644 --- a/include/sys/dnode.h +++ b/include/sys/dnode.h @@ -329,6 +329,7 @@ struct dnode { uint64_t dn_allocated_txg; uint64_t dn_free_txg; uint64_t dn_assigned_txg; + uint64_t dn_dirty_txg; /* txg dnode was last dirtied */ kcondvar_t dn_notxholds; enum dnode_dirtycontext dn_dirtyctx; uint8_t *dn_dirtyctx_firstset; /* dbg: contents meaningless */ @@ -432,6 +433,9 @@ void dnode_evict_dbufs(dnode_t *dn); void dnode_evict_bonus(dnode_t *dn); void dnode_free_interior_slots(dnode_t *dn); +#define DNODE_IS_DIRTY(_dn) \ + ((_dn)->dn_dirty_txg >= spa_syncing_txg((_dn)->dn_objset->os_spa)) + #define DNODE_IS_CACHEABLE(_dn) \ ((_dn)->dn_objset->os_primary_cache == ZFS_CACHE_ALL || \ (DMU_OT_IS_METADATA((_dn)->dn_type) && \ |