Print this page
Optimize creation and removal of temporary "user holds" placed on
snapshots by a zfs send, by ensuring all the required holds and
releases are done in a single dsl_sync_task.
Creation now collates the required holds during a dry run and
then uses a single lzc_hold call via zfs_hold_apply instead of
processing each snapshot in turn.
Defered (on exit) cleanup by the kernel is also now done in
dsl_sync_task by reusing dsl_dataset_user_release.
On a test with 11 volumes in a tree each with 8 snapshots on a
single HDD zpool this reduces the time required to perform a full
send from 20 seconds to under 0.8 seconds.
For reference eliminating the hold entirely reduces this 0.15
seconds.
While I'm here:-
* Remove some unused structures
* Fix nvlist_t leak in zfs_release_one
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h
+++ new/usr/src/uts/common/fs/zfs/sys/dsl_dataset.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 23 * Copyright (c) 2012 by Delphix. All rights reserved.
24 24 * Copyright (c) 2012, Joyent, Inc. All rights reserved.
25 25 */
26 26
27 27 #ifndef _SYS_DSL_DATASET_H
28 28 #define _SYS_DSL_DATASET_H
29 29
30 30 #include <sys/dmu.h>
31 31 #include <sys/spa.h>
32 32 #include <sys/txg.h>
33 33 #include <sys/zio.h>
34 34 #include <sys/bplist.h>
35 35 #include <sys/dsl_synctask.h>
36 36 #include <sys/zfs_context.h>
37 37 #include <sys/dsl_deadlist.h>
38 38 #include <sys/refcount.h>
39 39
40 40 #ifdef __cplusplus
41 41 extern "C" {
42 42 #endif
43 43
44 44 struct dsl_dataset;
45 45 struct dsl_dir;
46 46 struct dsl_pool;
47 47
48 48 #define DS_FLAG_INCONSISTENT (1ULL<<0)
49 49 #define DS_IS_INCONSISTENT(ds) \
50 50 ((ds)->ds_phys->ds_flags & DS_FLAG_INCONSISTENT)
51 51 /*
52 52 * Note: nopromote can not yet be set, but we want support for it in this
53 53 * on-disk version, so that we don't need to upgrade for it later.
54 54 */
55 55 #define DS_FLAG_NOPROMOTE (1ULL<<1)
56 56
57 57 /*
58 58 * DS_FLAG_UNIQUE_ACCURATE is set if ds_unique_bytes has been correctly
59 59 * calculated for head datasets (starting with SPA_VERSION_UNIQUE_ACCURATE,
60 60 * refquota/refreservations).
61 61 */
62 62 #define DS_FLAG_UNIQUE_ACCURATE (1ULL<<2)
63 63
64 64 /*
65 65 * DS_FLAG_DEFER_DESTROY is set after 'zfs destroy -d' has been called
66 66 * on a dataset. This allows the dataset to be destroyed using 'zfs release'.
67 67 */
68 68 #define DS_FLAG_DEFER_DESTROY (1ULL<<3)
69 69 #define DS_IS_DEFER_DESTROY(ds) \
70 70 ((ds)->ds_phys->ds_flags & DS_FLAG_DEFER_DESTROY)
71 71
72 72 /*
73 73 * DS_FLAG_CI_DATASET is set if the dataset contains a file system whose
74 74 * name lookups should be performed case-insensitively.
75 75 */
76 76 #define DS_FLAG_CI_DATASET (1ULL<<16)
77 77
78 78 #define DS_CREATE_FLAG_NODIRTY (1ULL<<24)
79 79
80 80 typedef struct dsl_dataset_phys {
81 81 uint64_t ds_dir_obj; /* DMU_OT_DSL_DIR */
82 82 uint64_t ds_prev_snap_obj; /* DMU_OT_DSL_DATASET */
83 83 uint64_t ds_prev_snap_txg;
84 84 uint64_t ds_next_snap_obj; /* DMU_OT_DSL_DATASET */
85 85 uint64_t ds_snapnames_zapobj; /* DMU_OT_DSL_DS_SNAP_MAP 0 for snaps */
86 86 uint64_t ds_num_children; /* clone/snap children; ==0 for head */
87 87 uint64_t ds_creation_time; /* seconds since 1970 */
88 88 uint64_t ds_creation_txg;
89 89 uint64_t ds_deadlist_obj; /* DMU_OT_DEADLIST */
90 90 /*
91 91 * ds_referenced_bytes, ds_compressed_bytes, and ds_uncompressed_bytes
92 92 * include all blocks referenced by this dataset, including those
93 93 * shared with any other datasets.
94 94 */
95 95 uint64_t ds_referenced_bytes;
96 96 uint64_t ds_compressed_bytes;
97 97 uint64_t ds_uncompressed_bytes;
98 98 uint64_t ds_unique_bytes; /* only relevant to snapshots */
99 99 /*
100 100 * The ds_fsid_guid is a 56-bit ID that can change to avoid
101 101 * collisions. The ds_guid is a 64-bit ID that will never
102 102 * change, so there is a small probability that it will collide.
103 103 */
104 104 uint64_t ds_fsid_guid;
105 105 uint64_t ds_guid;
106 106 uint64_t ds_flags; /* DS_FLAG_* */
107 107 blkptr_t ds_bp;
108 108 uint64_t ds_next_clones_obj; /* DMU_OT_DSL_CLONES */
109 109 uint64_t ds_props_obj; /* DMU_OT_DSL_PROPS for snaps */
110 110 uint64_t ds_userrefs_obj; /* DMU_OT_USERREFS */
111 111 uint64_t ds_pad[5]; /* pad out to 320 bytes for good measure */
112 112 } dsl_dataset_phys_t;
113 113
114 114 typedef struct dsl_dataset {
115 115 /* Immutable: */
116 116 struct dsl_dir *ds_dir;
117 117 dsl_dataset_phys_t *ds_phys;
118 118 dmu_buf_t *ds_dbuf;
119 119 uint64_t ds_object;
120 120 uint64_t ds_fsid_guid;
121 121
122 122 /* only used in syncing context, only valid for non-snapshots: */
123 123 struct dsl_dataset *ds_prev;
124 124
125 125 /* has internal locking: */
126 126 dsl_deadlist_t ds_deadlist;
127 127 bplist_t ds_pending_deadlist;
128 128
129 129 /* protected by lock on pool's dp_dirty_datasets list */
130 130 txg_node_t ds_dirty_link;
131 131 list_node_t ds_synced_link;
132 132
133 133 /*
134 134 * ds_phys->ds_<accounting> is also protected by ds_lock.
135 135 * Protected by ds_lock:
136 136 */
137 137 kmutex_t ds_lock;
138 138 objset_t *ds_objset;
139 139 uint64_t ds_userrefs;
140 140 void *ds_owner;
141 141
142 142 /*
143 143 * Long holds prevent the ds from being destroyed; they allow the
144 144 * ds to remain held even after dropping the dp_config_rwlock.
145 145 * Owning counts as a long hold. See the comments above
146 146 * dsl_pool_hold() for details.
147 147 */
148 148 refcount_t ds_longholds;
149 149
150 150 /* no locking; only for making guesses */
151 151 uint64_t ds_trysnap_txg;
152 152
153 153 /* for objset_open() */
154 154 kmutex_t ds_opening_lock;
155 155
156 156 uint64_t ds_reserved; /* cached refreservation */
157 157 uint64_t ds_quota; /* cached refquota */
158 158
159 159 kmutex_t ds_sendstream_lock;
160 160 list_t ds_sendstreams;
161 161
162 162 /* Protected by ds_lock; keep at end of struct for better locality */
163 163 char ds_snapname[MAXNAMELEN];
164 164 } dsl_dataset_t;
165 165
166 166 /*
167 167 * The max length of a temporary tag prefix is the number of hex digits
168 168 * required to express UINT64_MAX plus one for the hyphen.
169 169 */
170 170 #define MAX_TAG_PREFIX_LEN 17
171 171
172 172 #define dsl_dataset_is_snapshot(ds) \
173 173 ((ds)->ds_phys->ds_num_children != 0)
174 174
175 175 #define DS_UNIQUE_IS_ACCURATE(ds) \
176 176 (((ds)->ds_phys->ds_flags & DS_FLAG_UNIQUE_ACCURATE) != 0)
177 177
178 178 int dsl_dataset_hold(struct dsl_pool *dp, const char *name, void *tag,
179 179 dsl_dataset_t **dsp);
|
↓ open down ↓ |
179 lines elided |
↑ open up ↑ |
180 180 int dsl_dataset_hold_obj(struct dsl_pool *dp, uint64_t dsobj, void *tag,
181 181 dsl_dataset_t **);
182 182 void dsl_dataset_rele(dsl_dataset_t *ds, void *tag);
183 183 int dsl_dataset_own(struct dsl_pool *dp, const char *name,
184 184 void *tag, dsl_dataset_t **dsp);
185 185 int dsl_dataset_own_obj(struct dsl_pool *dp, uint64_t dsobj,
186 186 void *tag, dsl_dataset_t **dsp);
187 187 void dsl_dataset_disown(dsl_dataset_t *ds, void *tag);
188 188 void dsl_dataset_name(dsl_dataset_t *ds, char *name);
189 189 boolean_t dsl_dataset_tryown(dsl_dataset_t *ds, void *tag);
190 -void dsl_register_onexit_hold_cleanup(dsl_dataset_t *ds, const char *htag,
191 - minor_t minor);
190 +void dsl_register_onexit_hold_cleanup(nvlist_t *holds, minor_t minor);
192 191 uint64_t dsl_dataset_create_sync(dsl_dir_t *pds, const char *lastname,
193 192 dsl_dataset_t *origin, uint64_t flags, cred_t *, dmu_tx_t *);
194 193 uint64_t dsl_dataset_create_sync_dd(dsl_dir_t *dd, dsl_dataset_t *origin,
195 194 uint64_t flags, dmu_tx_t *tx);
196 195 int dsl_dataset_snapshot(nvlist_t *snaps, nvlist_t *props, nvlist_t *errors);
197 196 int dsl_dataset_promote(const char *name, char *conflsnap);
198 197 int dsl_dataset_clone_swap(dsl_dataset_t *clone, dsl_dataset_t *origin_head,
199 198 boolean_t force);
200 199 int dsl_dataset_rename_snapshot(const char *fsname,
201 200 const char *oldsnapname, const char *newsnapname, boolean_t recursive);
202 201 int dsl_dataset_snapshot_tmp(const char *fsname, const char *snapname,
203 202 minor_t cleanup_minor, const char *htag);
204 203
205 204 blkptr_t *dsl_dataset_get_blkptr(dsl_dataset_t *ds);
206 205 void dsl_dataset_set_blkptr(dsl_dataset_t *ds, blkptr_t *bp, dmu_tx_t *tx);
207 206
208 207 spa_t *dsl_dataset_get_spa(dsl_dataset_t *ds);
209 208
210 209 boolean_t dsl_dataset_modified_since_lastsnap(dsl_dataset_t *ds);
211 210
212 211 void dsl_dataset_sync(dsl_dataset_t *os, zio_t *zio, dmu_tx_t *tx);
213 212
214 213 void dsl_dataset_block_born(dsl_dataset_t *ds, const blkptr_t *bp,
215 214 dmu_tx_t *tx);
216 215 int dsl_dataset_block_kill(dsl_dataset_t *ds, const blkptr_t *bp,
217 216 dmu_tx_t *tx, boolean_t async);
218 217 boolean_t dsl_dataset_block_freeable(dsl_dataset_t *ds, const blkptr_t *bp,
219 218 uint64_t blk_birth);
220 219 uint64_t dsl_dataset_prev_snap_txg(dsl_dataset_t *ds);
221 220
222 221 void dsl_dataset_dirty(dsl_dataset_t *ds, dmu_tx_t *tx);
223 222 void dsl_dataset_stats(dsl_dataset_t *os, nvlist_t *nv);
224 223 void dsl_dataset_fast_stat(dsl_dataset_t *ds, dmu_objset_stats_t *stat);
225 224 void dsl_dataset_space(dsl_dataset_t *ds,
226 225 uint64_t *refdbytesp, uint64_t *availbytesp,
227 226 uint64_t *usedobjsp, uint64_t *availobjsp);
228 227 uint64_t dsl_dataset_fsid_guid(dsl_dataset_t *ds);
229 228 int dsl_dataset_space_written(dsl_dataset_t *oldsnap, dsl_dataset_t *new,
230 229 uint64_t *usedp, uint64_t *compp, uint64_t *uncompp);
231 230 int dsl_dataset_space_wouldfree(dsl_dataset_t *firstsnap, dsl_dataset_t *last,
232 231 uint64_t *usedp, uint64_t *compp, uint64_t *uncompp);
233 232 boolean_t dsl_dataset_is_dirty(dsl_dataset_t *ds);
234 233
235 234 int dsl_dsobj_to_dsname(char *pname, uint64_t obj, char *buf);
236 235
237 236 int dsl_dataset_check_quota(dsl_dataset_t *ds, boolean_t check_quota,
238 237 uint64_t asize, uint64_t inflight, uint64_t *used,
239 238 uint64_t *ref_rsrv);
240 239 int dsl_dataset_set_refquota(const char *dsname, zprop_source_t source,
241 240 uint64_t quota);
242 241 int dsl_dataset_set_refreservation(const char *dsname, zprop_source_t source,
243 242 uint64_t reservation);
244 243
245 244 boolean_t dsl_dataset_is_before(dsl_dataset_t *later, dsl_dataset_t *earlier);
246 245 void dsl_dataset_long_hold(dsl_dataset_t *ds, void *tag);
247 246 void dsl_dataset_long_rele(dsl_dataset_t *ds, void *tag);
248 247 boolean_t dsl_dataset_long_held(dsl_dataset_t *ds);
249 248
250 249 int dsl_dataset_clone_swap_check_impl(dsl_dataset_t *clone,
251 250 dsl_dataset_t *origin_head, boolean_t force);
252 251 void dsl_dataset_clone_swap_sync_impl(dsl_dataset_t *clone,
253 252 dsl_dataset_t *origin_head, dmu_tx_t *tx);
254 253 int dsl_dataset_snapshot_check_impl(dsl_dataset_t *ds, const char *snapname,
255 254 dmu_tx_t *tx);
256 255 void dsl_dataset_snapshot_sync_impl(dsl_dataset_t *ds, const char *snapname,
257 256 dmu_tx_t *tx);
258 257
259 258 void dsl_dataset_remove_from_next_clones(dsl_dataset_t *ds, uint64_t obj,
260 259 dmu_tx_t *tx);
261 260 void dsl_dataset_recalc_head_uniq(dsl_dataset_t *ds);
262 261 int dsl_dataset_get_snapname(dsl_dataset_t *ds);
263 262 int dsl_dataset_snap_lookup(dsl_dataset_t *ds, const char *name,
264 263 uint64_t *value);
265 264 int dsl_dataset_snap_remove(dsl_dataset_t *ds, const char *name, dmu_tx_t *tx);
266 265 void dsl_dataset_set_refreservation_sync_impl(dsl_dataset_t *ds,
267 266 zprop_source_t source, uint64_t value, dmu_tx_t *tx);
268 267 int dsl_dataset_rollback(const char *fsname);
269 268
270 269 #ifdef ZFS_DEBUG
271 270 #define dprintf_ds(ds, fmt, ...) do { \
272 271 if (zfs_flags & ZFS_DEBUG_DPRINTF) { \
273 272 char *__ds_name = kmem_alloc(MAXNAMELEN, KM_SLEEP); \
274 273 dsl_dataset_name(ds, __ds_name); \
275 274 dprintf("ds=%s " fmt, __ds_name, __VA_ARGS__); \
276 275 kmem_free(__ds_name, MAXNAMELEN); \
277 276 } \
278 277 _NOTE(CONSTCOND) } while (0)
279 278 #else
280 279 #define dprintf_ds(dd, fmt, ...)
281 280 #endif
282 281
283 282 #ifdef __cplusplus
284 283 }
285 284 #endif
286 285
287 286 #endif /* _SYS_DSL_DATASET_H */
|
↓ open down ↓ |
86 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX