ext4: Fix hueristic which avoids group preallocation for closed files
Subsystems (2)
Theodore Ts'o
maintainerPATCH 1/2 ext4: Fix hueristic which avoids group preallocation for closed files
The hueristic was designed to avoid using locality group preallocation when writing the last segment of a closed file. Fix it by move setting size to the maximum of size and isize until after we check whether size == isize.
--- fs/ext4/mballoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/ext4/mballoc.c +1 -1
@@ -4189,7 +4189,6 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac) size = ac->ac_o_ex.fe_logical + ac->ac_o_ex.fe_len; isize = (i_size_read (ac->ac_inode) + ac->ac_sb->s_blocksize -1 ) >> bsbits; - size =max (size, isize); if ((size == isize) && !ext4_fs_is_busy(sbi) &&
@@ -4199,6 +4198,7 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac) }/* don't use group allocation for large files */ + size =max (size, isize);if (size >= sbi->s_mb_stream_request) { ac->ac_flags |=EXT4_MB_STREAM_ALLOC ;return ;
Signature · 1 line
1.6.4.4.2.g31f8e.dirty
Theodore Ts'o
maintainerPATCH 2/2 ext4: Adjust ext4_da_writepages() to write out larger contiguous chunks
Work around problems in the writeback code to force out writebacks in larger chunks than just 4mb, which is just too small. This also works around limitations in the ext4 block allocator, which can't allocate more than 2048 blocks at a time. So we need to defeat the round-robin characteristics of the writeback code and try to write out as many blocks in one inode before allowing the writeback code to move on to another inode. We add a a new per-filesystem tunable, max_contig_writeback_mb, which caps this to a default of 128mb per inode.
--- fs/ext4/ext4.h | 1 + fs/ext4/inode.c | 100 +++++++++++++++++++++++++++++++++++++----- fs/ext4/super.c | 3 + include/trace/events/ext4.h | 14 ++++-- 4 files changed, 102 insertions(+), 16 deletions(-)
fs/ext4/ext4.h +1 -0
@@ -942,6 +942,7 @@ struct ext4_sb_info {unsigned int s_mb_stats;unsigned int s_mb_order2_reqs;unsigned int s_mb_group_prealloc; +unsigned int s_max_contig_writeback_mb;/* where last allocation was done - for stream allocation */ unsigned long s_mb_last_group;unsigned long s_mb_last_start;
fs/ext4/inode.c +88 -12
130 lines not on this page · raw message
fs/ext4/super.c +3 -0
@@ -2197,6 +2197,7 @@ EXT4_RW_ATTR_SBI_UI(mb_min_to_scan, s_mb_min_to_scan);EXT4_RW_ATTR_SBI_UI (mb_order2_req, s_mb_order2_reqs);EXT4_RW_ATTR_SBI_UI (mb_stream_req, s_mb_stream_request);EXT4_RW_ATTR_SBI_UI (mb_group_prealloc, s_mb_group_prealloc); +EXT4_RW_ATTR_SBI_UI (max_contig_writeback, s_max_contig_writeback_mb);static struct attribute *ext4_attrs[] = {ATTR_LIST (delayed_allocation_blocks),
@@ -2210,6 +2211,7 @@ static struct attribute *ext4_attrs[] = {ATTR_LIST (mb_order2_req),ATTR_LIST (mb_stream_req),ATTR_LIST (mb_group_prealloc), +ATTR_LIST (max_contig_writeback), NULL, };
@@ -2679,6 +2681,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) } sbi->s_stripe =ext4_get_stripe_size (sbi); + sbi->s_max_contig_writeback_mb =128 ;/* * set up enough so that it can read an inode
include/trace/events/ext4.h +10 -4
@@ -236,6 +236,7 @@ TRACE_EVENT(ext4_da_writepages, __field( char, for_kupdate ) __field( char, for_reclaim ) __field( char, range_cyclic ) +__field ( pgoff_t, writeback_index ) ), TP_fast_assign(
@@ -249,15 +250,17 @@ TRACE_EVENT(ext4_da_writepages, __entry->for_kupdate = wbc->for_kupdate; __entry->for_reclaim = wbc->for_reclaim; __entry->range_cyclic = wbc->range_cyclic; + __entry->writeback_index = inode->i_mapping->writeback_index; ), -TP_printk ("dev %s ino %lu nr_to_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d range_cyclic %d" , +TP_printk ("dev %s ino %lu nr_to_write %ld pages_skipped %ld range_start %llu range_end %llu nonblocking %d for_kupdate %d for_reclaim %d range_cyclic %d writeback_index %lu" ,jbd2_dev_to_name (__entry->dev), (unsigned long ) __entry->ino, __entry->nr_to_write, __entry->pages_skipped, __entry->range_start, __entry->range_end, __entry->nonblocking, __entry->for_kupdate, __entry->for_reclaim, - __entry->range_cyclic) + __entry->range_cyclic, + (unsigned long ) __entry->writeback_index) ); TRACE_EVENT(ext4_da_write_pages,
@@ -309,6 +312,7 @@ TRACE_EVENT(ext4_da_writepages_result, __field( char, encountered_congestion ) __field( char, more_io ) __field( char, no_nrwrite_index_update ) +__field ( pgoff_t, writeback_index ) ), TP_fast_assign(
@@ -320,14 +324,16 @@ TRACE_EVENT(ext4_da_writepages_result, __entry->encountered_congestion = wbc->encountered_congestion; __entry->more_io = wbc->more_io; __entry->no_nrwrite_index_update = wbc->no_nrwrite_index_update; + __entry->writeback_index = inode->i_mapping->writeback_index; ), -TP_printk ("dev %s ino %lu ret %d pages_written %d pages_skipped %ld congestion %d more_io %d no_nrwrite_index_update %d" , +TP_printk ("dev %s ino %lu ret %d pages_written %d pages_skipped %ld congestion %d more_io %d no_nrwrite_index_update %d writeback_index %lu" ,jbd2_dev_to_name (__entry->dev), (unsigned long ) __entry->ino, __entry->ret, __entry->pages_written, __entry->pages_skipped, __entry->encountered_congestion, __entry->more_io, - __entry->no_nrwrite_index_update) + __entry->no_nrwrite_index_update, + (unsigned long ) __entry->writeback_index) ); TRACE_EVENT(ext4_da_write_begin,
Signature · 1 line
1.6.4.4.2.g31f8e.dirty