1 commit d8d8fd9192a54c7b8caef8cca9b7a1eb5e5e3298
2 Author: Alex Zhuravlev <alex.zhuravlev@sun.com>
3 AuthorDate: Thu Oct 23 10:02:19 2008 +0000
5 Subject: ext4: support for tunable preallocation window
6 Add support for tunable preallocation window and new tunables
7 for large/small requests.
10 Signed-off-by: Alex Zhuravlev <alex.zhuravlev@sun.com>
11 Reviewed-by: Kalpak Shah <kalpak@clusterfs.com>
12 Reviewed-by: Andreas Dilger <andreas.dilger@sun.com>
16 fs/ext4/mballoc.c | 215 +++++++++++++++++++++++++++++++++++++++++-------------
17 fs/ext4/sysfs.c | 8 +-
18 4 files changed, 180 insertions(+), 53 deletions(-)
22 @@ -1241,6 +1241,8 @@ extern void ext4_set_bits(void *bm, int
23 /* Metadata checksum algorithm codes */
24 #define EXT4_CRC32C_CHKSUM 1
26 +#define EXT4_MAX_PREALLOC_TABLE 64
29 * Structure of the super block
31 @@ -1497,11 +1499,13 @@ struct ext4_sb_info {
34 unsigned long s_stripe;
35 - unsigned int s_mb_stream_request;
36 + unsigned long s_mb_small_req;
37 + unsigned long s_mb_large_req;
38 unsigned int s_mb_max_to_scan;
39 unsigned int s_mb_min_to_scan;
40 unsigned int s_mb_stats;
41 unsigned int s_mb_order2_reqs;
42 + unsigned long *s_mb_prealloc_table;
43 unsigned int s_mb_group_prealloc;
44 unsigned int s_max_dir_size_kb;
45 /* where last allocation was done - for stream allocation */
46 @@ -2645,6 +2649,7 @@ extern int ext4_init_inode_table(struct
47 extern void ext4_end_bitmap_read(struct buffer_head *bh, int uptodate);
50 +extern const struct proc_ops ext4_seq_prealloc_table_fops;
51 extern const struct seq_operations ext4_mb_seq_groups_ops;
52 extern long ext4_mb_stats;
53 extern long ext4_mb_max_to_scan;
56 @@ -2698,6 +2698,9 @@ static int ext4_writepages(struct addres
57 PAGE_SIZE >> inode->i_blkbits);
60 + if (wbc->nr_to_write < sbi->s_mb_small_req)
61 + wbc->nr_to_write = sbi->s_mb_small_req;
63 if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
66 --- a/fs/ext4/mballoc.c
67 +++ b/fs/ext4/mballoc.c
68 @@ -2455,6 +2455,99 @@ const struct seq_operations ext4_mb_seq_
69 .show = ext4_mb_seq_groups_show,
72 +static int ext4_mb_check_and_update_prealloc(struct ext4_sb_info *sbi,
73 + char *str, size_t cnt,
76 + unsigned long value;
77 + unsigned long prev = 0;
86 + while ((cur < end) && (*cur == ' ')) cur++;
87 + value = simple_strtol(cur, &next, 0);
95 + if (value > (sbi->s_blocks_per_group - 1 - 1 - sbi->s_itb_per_group))
98 + /* they should add values in order */
103 + sbi->s_mb_prealloc_table[num] = value;
109 + if (num > EXT4_MAX_PREALLOC_TABLE - 1)
113 + sbi->s_mb_prealloc_table[num] = 0;
118 +static ssize_t ext4_mb_prealloc_table_proc_write(struct file *file,
119 + const char __user *buf,
120 + size_t cnt, loff_t *pos)
122 + struct ext4_sb_info *sbi = EXT4_SB(PDE_DATA(file_inode(file)));
126 + if (cnt >= sizeof(str))
128 + if (copy_from_user(str, buf, cnt))
131 + rc = ext4_mb_check_and_update_prealloc(sbi, str, cnt, 0);
135 + rc = ext4_mb_check_and_update_prealloc(sbi, str, cnt, 1);
136 + return rc ? rc : cnt;
139 +static int mb_prealloc_table_seq_show(struct seq_file *m, void *v)
141 + struct ext4_sb_info *sbi = EXT4_SB(m->private);
144 + for (i = 0; i < EXT4_MAX_PREALLOC_TABLE &&
145 + sbi->s_mb_prealloc_table[i] != 0; i++)
146 + seq_printf(m, "%ld ", sbi->s_mb_prealloc_table[i]);
147 + seq_printf(m, "\n");
152 +static int mb_prealloc_table_seq_open(struct inode *inode, struct file *file)
154 + return single_open(file, mb_prealloc_table_seq_show, PDE_DATA(inode));
157 +const struct proc_ops ext4_seq_prealloc_table_fops = {
158 + .proc_open = mb_prealloc_table_seq_open,
159 + .proc_read = seq_read,
160 + .proc_lseek = seq_lseek,
161 + .proc_release = single_release,
162 + .proc_write = ext4_mb_prealloc_table_proc_write,
165 static struct kmem_cache *get_groupinfo_cache(int blocksize_bits)
167 int cache_index = blocksize_bits - EXT4_MIN_BLOCK_LOG_SIZE;
168 @@ -2685,7 +2778,7 @@ static int ext4_groupinfo_create_slab(si
169 int ext4_mb_init(struct super_block *sb)
171 struct ext4_sb_info *sbi = EXT4_SB(sb);
173 + unsigned i, j, k, l;
174 unsigned offset, offset_incr;
177 @@ -2734,7 +2827,6 @@ int ext4_mb_init(struct super_block *sb)
178 sbi->s_mb_max_to_scan = MB_DEFAULT_MAX_TO_SCAN;
179 sbi->s_mb_min_to_scan = MB_DEFAULT_MIN_TO_SCAN;
180 sbi->s_mb_stats = MB_DEFAULT_STATS;
181 - sbi->s_mb_stream_request = MB_DEFAULT_STREAM_THRESHOLD;
182 sbi->s_mb_order2_reqs = MB_DEFAULT_ORDER2_REQS;
184 * The default group preallocation is 512, which for 4k block
185 @@ -2758,9 +2850,29 @@ int ext4_mb_init(struct super_block *sb)
186 * RAID stripe size so that preallocations don't fragment
189 - if (sbi->s_stripe > 1) {
190 - sbi->s_mb_group_prealloc = roundup(
191 - sbi->s_mb_group_prealloc, sbi->s_stripe);
193 + /* Allocate table once */
194 + sbi->s_mb_prealloc_table = kzalloc(
195 + EXT4_MAX_PREALLOC_TABLE * sizeof(unsigned long), GFP_NOFS);
196 + if (sbi->s_mb_prealloc_table == NULL) {
201 + if (sbi->s_stripe == 0) {
202 + for (k = 0, l = 4; k <= 9; ++k, l *= 2)
203 + sbi->s_mb_prealloc_table[k] = l;
205 + sbi->s_mb_small_req = 256;
206 + sbi->s_mb_large_req = 1024;
207 + sbi->s_mb_group_prealloc = 512;
209 + for (k = 0, l = sbi->s_stripe; k <= 2; ++k, l *= 2)
210 + sbi->s_mb_prealloc_table[k] = l;
212 + sbi->s_mb_small_req = sbi->s_stripe;
213 + sbi->s_mb_large_req = sbi->s_stripe * 8;
214 + sbi->s_mb_group_prealloc = sbi->s_stripe * 4;
217 sbi->s_locality_groups = alloc_percpu(struct ext4_locality_group);
218 @@ -2788,6 +2900,7 @@ out_free_locality_groups:
219 free_percpu(sbi->s_locality_groups);
220 sbi->s_locality_groups = NULL;
222 + kfree(sbi->s_mb_prealloc_table);
223 kfree(sbi->s_mb_offsets);
224 sbi->s_mb_offsets = NULL;
225 kfree(sbi->s_mb_maxs);
226 @@ -3057,7 +3170,6 @@ ext4_mb_mark_diskspace_used(struct ext4_
229 BUG_ON(ac->ac_status != AC_STATUS_FOUND);
230 - BUG_ON(ac->ac_b_ex.fe_len <= 0);
234 @@ -3187,13 +3299,14 @@ ext4_mb_normalize_request(struct ext4_al
235 struct ext4_allocation_request *ar)
237 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
239 + int bsbits, i, wind;
241 - loff_t size, start_off;
243 loff_t orig_size __maybe_unused;
245 struct ext4_inode_info *ei = EXT4_I(ac->ac_inode);
246 struct ext4_prealloc_space *pa;
247 + unsigned long value, last_non_zero;
249 /* do normalize only data requests, metadata requests
250 do not need preallocation */
251 @@ -3222,51 +3335,46 @@ ext4_mb_normalize_request(struct ext4_al
252 size = size << bsbits;
253 if (size < i_size_read(ac->ac_inode))
254 size = i_size_read(ac->ac_inode);
256 + size = (size + ac->ac_sb->s_blocksize - 1) >> bsbits;
259 + value = last_non_zero = 0;
261 - /* max size of free chunks */
263 + /* let's choose preallocation window depending on file size */
264 + for (i = 0; i < EXT4_MAX_PREALLOC_TABLE; i++) {
265 + value = sbi->s_mb_prealloc_table[i];
269 + last_non_zero = value;
271 -#define NRL_CHECK_SIZE(req, size, max, chunk_size) \
272 - (req <= (size) || max <= (chunk_size))
273 + if (size <= value) {
279 - /* first, try to predict filesize */
280 - /* XXX: should this table be tunable? */
282 - if (size <= 16 * 1024) {
284 - } else if (size <= 32 * 1024) {
286 - } else if (size <= 64 * 1024) {
288 - } else if (size <= 128 * 1024) {
290 - } else if (size <= 256 * 1024) {
292 - } else if (size <= 512 * 1024) {
294 - } else if (size <= 1024 * 1024) {
295 - size = 1024 * 1024;
296 - } else if (NRL_CHECK_SIZE(size, 4 * 1024 * 1024, max, 2 * 1024)) {
297 - start_off = ((loff_t)ac->ac_o_ex.fe_logical >>
298 - (21 - bsbits)) << 21;
299 - size = 2 * 1024 * 1024;
300 - } else if (NRL_CHECK_SIZE(size, 8 * 1024 * 1024, max, 4 * 1024)) {
301 - start_off = ((loff_t)ac->ac_o_ex.fe_logical >>
302 - (22 - bsbits)) << 22;
303 - size = 4 * 1024 * 1024;
304 - } else if (NRL_CHECK_SIZE(ac->ac_o_ex.fe_len,
305 - (8<<20)>>bsbits, max, 8 * 1024)) {
306 - start_off = ((loff_t)ac->ac_o_ex.fe_logical >>
307 - (23 - bsbits)) << 23;
308 - size = 8 * 1024 * 1024;
310 + if (last_non_zero != 0) {
311 + __u64 tstart, tend;
312 + /* file is quite large, we now preallocate with
313 + * the biggest configured window with regart to
314 + * logical offset */
315 + wind = last_non_zero;
316 + tstart = ac->ac_o_ex.fe_logical;
317 + do_div(tstart, wind);
318 + start = tstart * wind;
319 + tend = ac->ac_o_ex.fe_logical + ac->ac_o_ex.fe_len - 1;
320 + do_div(tend, wind);
321 + tend = tend * wind + wind;
322 + size = tend - start;
325 - start_off = (loff_t) ac->ac_o_ex.fe_logical << bsbits;
326 - size = (loff_t) EXT4_C2B(EXT4_SB(ac->ac_sb),
327 - ac->ac_o_ex.fe_len) << bsbits;
330 - size = size >> bsbits;
331 - start = start_off >> bsbits;
336 /* don't cover already allocated blocks in selected range */
337 if (ar->pleft && start <= ar->lleft) {
338 @@ -3348,7 +3456,6 @@ ext4_mb_normalize_request(struct ext4_al
339 (unsigned long) ac->ac_o_ex.fe_logical);
342 - BUG_ON(size <= 0 || size > EXT4_BLOCKS_PER_GROUP(ac->ac_sb));
344 /* now prepare goal request */
346 @@ -4341,11 +4448,19 @@ static void ext4_mb_group_or_file(struct
348 /* don't use group allocation for large files */
349 size = max(size, isize);
350 - if (size > sbi->s_mb_stream_request) {
351 + if ((ac->ac_o_ex.fe_len >= sbi->s_mb_small_req) ||
352 + (size >= sbi->s_mb_large_req)) {
353 ac->ac_flags |= EXT4_MB_STREAM_ALLOC;
358 + * request is so large that we don't care about
359 + * streaming - it overweights any possible seek
361 + if (ac->ac_o_ex.fe_len >= sbi->s_mb_large_req)
364 BUG_ON(ac->ac_lg != NULL);
366 * locality group prealloc space are per cpu. The reason for having
367 --- a/fs/ext4/sysfs.c
368 +++ b/fs/ext4/sysfs.c
369 @@ -213,7 +213,8 @@ EXT4_RW_ATTR_SBI_UI(mb_stats, s_mb_stats
370 EXT4_RW_ATTR_SBI_UI(mb_max_to_scan, s_mb_max_to_scan);
371 EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);
372 EXT4_RW_ATTR_SBI_UI(mb_order2_req, s_mb_order2_reqs);
373 -EXT4_RW_ATTR_SBI_UI(mb_stream_req, s_mb_stream_request);
374 +EXT4_RW_ATTR_SBI_UI(mb_small_req, s_mb_small_req);
375 +EXT4_RW_ATTR_SBI_UI(mb_large_req, s_mb_large_req);
376 EXT4_RW_ATTR_SBI_UI(mb_group_prealloc, s_mb_group_prealloc);
377 EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb);
378 EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error);
379 @@ -255,7 +256,8 @@ static struct attribute *ext4_attrs[] =
380 ATTR_LIST(mb_max_to_scan),
381 ATTR_LIST(mb_min_to_scan),
382 ATTR_LIST(mb_order2_req),
383 - ATTR_LIST(mb_stream_req),
384 + ATTR_LIST(mb_small_req),
385 + ATTR_LIST(mb_large_req),
386 ATTR_LIST(mb_group_prealloc),
387 ATTR_LIST(max_writeback_mb_bump),
388 ATTR_LIST(extent_max_zeroout_kb),
389 @@ -510,6 +512,8 @@ int ext4_register_sysfs(struct super_blo
391 proc_create_seq_data("mb_groups", S_IRUGO, sbi->s_proc,
392 &ext4_mb_seq_groups_ops, sb);
393 + proc_create_data("prealloc_table", S_IRUGO, sbi->s_proc,
394 + &ext4_seq_prealloc_table_fops, sb);