Print this page
4045 zfs write throttle & i/o scheduler performance work
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/fs/zfs/sys/dsl_pool.h
+++ new/usr/src/uts/common/fs/zfs/sys/dsl_pool.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 *
|
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
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 - * Copyright (c) 2012 by Delphix. All rights reserved.
23 + * Copyright (c) 2013 by Delphix. All rights reserved.
24 24 */
25 25
26 26 #ifndef _SYS_DSL_POOL_H
27 27 #define _SYS_DSL_POOL_H
28 28
29 29 #include <sys/spa.h>
30 30 #include <sys/txg.h>
31 31 #include <sys/txg_impl.h>
32 32 #include <sys/zfs_context.h>
33 33 #include <sys/zio.h>
34 34 #include <sys/dnode.h>
35 35 #include <sys/ddt.h>
36 36 #include <sys/arc.h>
37 37 #include <sys/bpobj.h>
38 38 #include <sys/bptree.h>
39 39 #include <sys/rrwlock.h>
40 40
41 41 #ifdef __cplusplus
|
↓ open down ↓ |
8 lines elided |
↑ open up ↑ |
42 42 extern "C" {
43 43 #endif
44 44
45 45 struct objset;
46 46 struct dsl_dir;
47 47 struct dsl_dataset;
48 48 struct dsl_pool;
49 49 struct dmu_tx;
50 50 struct dsl_scan;
51 51
52 +extern uint64_t zfs_dirty_data_max;
53 +extern uint64_t zfs_dirty_data_max_max;
54 +extern uint64_t zfs_dirty_data_sync;
55 +extern int zfs_dirty_data_max_percent;
56 +extern int zfs_delay_min_dirty_percent;
57 +extern uint64_t zfs_delay_scale;
58 +
52 59 /* These macros are for indexing into the zfs_all_blkstats_t. */
53 60 #define DMU_OT_DEFERRED DMU_OT_NONE
54 61 #define DMU_OT_OTHER DMU_OT_NUMTYPES /* place holder for DMU_OT() types */
55 62 #define DMU_OT_TOTAL (DMU_OT_NUMTYPES + 1)
56 63
57 64 typedef struct zfs_blkstat {
58 65 uint64_t zb_count;
59 66 uint64_t zb_asize;
60 67 uint64_t zb_lsize;
61 68 uint64_t zb_psize;
62 69 uint64_t zb_gangs;
63 70 uint64_t zb_ditto_2_of_2_samevdev;
64 71 uint64_t zb_ditto_2_of_3_samevdev;
65 72 uint64_t zb_ditto_3_of_3_samevdev;
66 73 } zfs_blkstat_t;
67 74
68 75 typedef struct zfs_all_blkstats {
69 76 zfs_blkstat_t zab_type[DN_MAX_LEVELS + 1][DMU_OT_TOTAL + 1];
70 77 } zfs_all_blkstats_t;
71 78
72 79
73 80 typedef struct dsl_pool {
74 81 /* Immutable */
75 82 spa_t *dp_spa;
|
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
76 83 struct objset *dp_meta_objset;
77 84 struct dsl_dir *dp_root_dir;
78 85 struct dsl_dir *dp_mos_dir;
79 86 struct dsl_dir *dp_free_dir;
80 87 struct dsl_dataset *dp_origin_snap;
81 88 uint64_t dp_root_dir_obj;
82 89 struct taskq *dp_vnrele_taskq;
83 90
84 91 /* No lock needed - sync context only */
85 92 blkptr_t dp_meta_rootbp;
86 - hrtime_t dp_read_overhead;
87 - uint64_t dp_throughput; /* bytes per millisec */
88 - uint64_t dp_write_limit;
89 93 uint64_t dp_tmp_userrefs_obj;
90 94 bpobj_t dp_free_bpobj;
91 95 uint64_t dp_bptree_obj;
92 96 uint64_t dp_empty_bpobj;
93 97
94 98 struct dsl_scan *dp_scan;
95 99
96 100 /* Uses dp_lock */
97 101 kmutex_t dp_lock;
98 - uint64_t dp_space_towrite[TXG_SIZE];
99 - uint64_t dp_tempreserved[TXG_SIZE];
102 + kcondvar_t dp_spaceavail_cv;
103 + uint64_t dp_dirty_pertxg[TXG_SIZE];
104 + uint64_t dp_dirty_total;
100 105 uint64_t dp_mos_used_delta;
101 106 uint64_t dp_mos_compressed_delta;
102 107 uint64_t dp_mos_uncompressed_delta;
103 108
109 + /*
110 + * Time of most recently scheduled (furthest in the future)
111 + * wakeup for delayed transactions.
112 + */
113 + hrtime_t dp_last_wakeup;
114 +
104 115 /* Has its own locking */
105 116 tx_state_t dp_tx;
106 117 txg_list_t dp_dirty_datasets;
107 118 txg_list_t dp_dirty_zilogs;
108 119 txg_list_t dp_dirty_dirs;
109 120 txg_list_t dp_sync_tasks;
110 121
111 122 /*
112 123 * Protects administrative changes (properties, namespace)
113 124 *
114 125 * It is only held for write in syncing context. Therefore
115 126 * syncing context does not need to ever have it for read, since
116 127 * nobody else could possibly have it for write.
117 128 */
118 129 rrwlock_t dp_config_rwlock;
119 130
120 131 zfs_all_blkstats_t *dp_blkstats;
121 132 } dsl_pool_t;
|
↓ open down ↓ |
8 lines elided |
↑ open up ↑ |
122 133
123 134 int dsl_pool_init(spa_t *spa, uint64_t txg, dsl_pool_t **dpp);
124 135 int dsl_pool_open(dsl_pool_t *dp);
125 136 void dsl_pool_close(dsl_pool_t *dp);
126 137 dsl_pool_t *dsl_pool_create(spa_t *spa, nvlist_t *zplprops, uint64_t txg);
127 138 void dsl_pool_sync(dsl_pool_t *dp, uint64_t txg);
128 139 void dsl_pool_sync_done(dsl_pool_t *dp, uint64_t txg);
129 140 int dsl_pool_sync_context(dsl_pool_t *dp);
130 141 uint64_t dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree);
131 142 uint64_t dsl_pool_adjustedfree(dsl_pool_t *dp, boolean_t netfree);
132 -int dsl_pool_tempreserve_space(dsl_pool_t *dp, uint64_t space, dmu_tx_t *tx);
133 -void dsl_pool_tempreserve_clear(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
134 -void dsl_pool_memory_pressure(dsl_pool_t *dp);
135 -void dsl_pool_willuse_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
143 +void dsl_pool_dirty_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
144 +void dsl_pool_undirty_space(dsl_pool_t *dp, int64_t space, uint64_t txg);
136 145 void dsl_free(dsl_pool_t *dp, uint64_t txg, const blkptr_t *bpp);
137 146 void dsl_free_sync(zio_t *pio, dsl_pool_t *dp, uint64_t txg,
138 147 const blkptr_t *bpp);
139 148 void dsl_pool_create_origin(dsl_pool_t *dp, dmu_tx_t *tx);
140 149 void dsl_pool_upgrade_clones(dsl_pool_t *dp, dmu_tx_t *tx);
141 150 void dsl_pool_upgrade_dir_clones(dsl_pool_t *dp, dmu_tx_t *tx);
142 151 void dsl_pool_mos_diduse_space(dsl_pool_t *dp,
143 152 int64_t used, int64_t comp, int64_t uncomp);
144 153 void dsl_pool_config_enter(dsl_pool_t *dp, void *tag);
145 154 void dsl_pool_config_exit(dsl_pool_t *dp, void *tag);
146 155 boolean_t dsl_pool_config_held(dsl_pool_t *dp);
156 +boolean_t dsl_pool_need_dirty_delay(dsl_pool_t *dp);
147 157
148 158 taskq_t *dsl_pool_vnrele_taskq(dsl_pool_t *dp);
149 159
150 160 int dsl_pool_user_hold(dsl_pool_t *dp, uint64_t dsobj,
151 161 const char *tag, uint64_t now, dmu_tx_t *tx);
152 162 int dsl_pool_user_release(dsl_pool_t *dp, uint64_t dsobj,
153 163 const char *tag, dmu_tx_t *tx);
154 164 void dsl_pool_clean_tmp_userrefs(dsl_pool_t *dp);
155 165 int dsl_pool_open_special_dir(dsl_pool_t *dp, const char *name, dsl_dir_t **);
156 166 int dsl_pool_hold(const char *name, void *tag, dsl_pool_t **dp);
157 167 void dsl_pool_rele(dsl_pool_t *dp, void *tag);
158 168
159 169 #ifdef __cplusplus
160 170 }
161 171 #endif
162 172
163 173 #endif /* _SYS_DSL_POOL_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX