hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/ICAH6I -------------------------------- After we optimized the block group lock, we found another lock contention issue when running will-it-scale/fallocate2 with multiple processes. The fallocate's block allocation and the truncate's block release were fighting over the s_md_lock. The problem is, this lock protects totally different things in those two processes: the list of freed data blocks (s_freed_data_list) when releasing, and where to start looking for new blocks (mb_last_[group|start]) when allocating. Moreover, when allocating data blocks, if the first try (goal allocation) fails and stream allocation is on, it tries a global goal starting from the last group we used (s_mb_last_group). This can make things faster by writing blocks close together on the disk. But when many processes are allocating, they all fight over s_md_lock and might even try to use the same group. This makes it harder to merge extents and can make files more fragmented. If different processes allocate chunks of very different sizes, the free space on the disk can also get fragmented. A small allocation might fit in a partially full group, but a big allocation might have skipped it, leading to the small IO ending up in a more empty group. So, we're changing stream allocation to work per inode. First, it tries the goal, then the last group where that inode successfully allocated a block. This keeps an inode's data closer together. Plus, after moving mb_last_[group|start] to ext4_inode_info, we don't need s_md_lock during block allocation anymore because we already have the write lock on i_data_sem. This gets rid of the contention between allocating and releasing blocks, which gives a huge performance boost to fallocate2. Performance test data follows: CPU: HUAWEI Kunpeng 920 Memory: 480GB Disk: 480GB SSD SATA 3.2 Test: Running will-it-scale/fallocate2 on 64 CPU-bound containers. Observation: Average fallocate operations per container per second. base patched mb_optimize_scan=0 6755 23280 (+244.6%) mb_optimize_scan=1 4302 10430 (+142.4%) Signed-off-by: Baokun Li <libaokun1@huawei.com> --- fs/ext4/ext4.h | 7 ++++--- fs/ext4/mballoc.c | 20 +++++++++----------- fs/ext4/super.c | 2 ++ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 885fe1d9a8e9..a31069001add 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1179,6 +1179,10 @@ struct ext4_inode_info { __u32 i_csum_seed; kprojid_t i_projid; + + /* where last allocation was done - for stream allocation */ + ext4_group_t i_mb_last_group; + ext4_grpblk_t i_mb_last_start; }; /* @@ -1611,9 +1615,6 @@ struct ext4_sb_info { unsigned int s_mb_order2_reqs; unsigned int s_mb_group_prealloc; unsigned int s_max_dir_size_kb; - /* where last allocation was done - for stream allocation */ - unsigned long s_mb_last_group; - unsigned long s_mb_last_start; unsigned int s_mb_prefetch; unsigned int s_mb_prefetch_limit; unsigned int s_mb_best_avail_max_trim_order; diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 7646ac5d3b6f..ec2808247f4f 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -2139,7 +2139,6 @@ static int mb_mark_used(struct ext4_buddy *e4b, struct ext4_free_extent *ex) static void ext4_mb_use_best_found(struct ext4_allocation_context *ac, struct ext4_buddy *e4b) { - struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); int ret; BUG_ON(ac->ac_b_ex.fe_group != e4b->bd_group); @@ -2170,10 +2169,8 @@ static void ext4_mb_use_best_found(struct ext4_allocation_context *ac, get_page(ac->ac_buddy_page); /* store last allocated for subsequent stream allocation */ if (ac->ac_flags & EXT4_MB_STREAM_ALLOC) { - spin_lock(&sbi->s_md_lock); - sbi->s_mb_last_group = ac->ac_f_ex.fe_group; - sbi->s_mb_last_start = ac->ac_f_ex.fe_start; - spin_unlock(&sbi->s_md_lock); + EXT4_I(ac->ac_inode)->i_mb_last_group = ac->ac_f_ex.fe_group; + EXT4_I(ac->ac_inode)->i_mb_last_start = ac->ac_f_ex.fe_start; } /* * As we've just preallocated more space than @@ -2845,13 +2842,14 @@ ext4_mb_regular_allocator(struct ext4_allocation_context *ac) MB_NUM_ORDERS(sb)); } - /* if stream allocation is enabled, use global goal */ + /* if stream allocation is enabled, use last goal */ if (ac->ac_flags & EXT4_MB_STREAM_ALLOC) { - /* TBD: may be hot point */ - spin_lock(&sbi->s_md_lock); - ac->ac_g_ex.fe_group = sbi->s_mb_last_group; - ac->ac_g_ex.fe_start = sbi->s_mb_last_start; - spin_unlock(&sbi->s_md_lock); + struct ext4_inode_info *ei = EXT4_I(ac->ac_inode); + + if (ei->i_mb_last_group || ei->i_mb_last_start) { + ac->ac_g_ex.fe_group = ei->i_mb_last_group; + ac->ac_g_ex.fe_start = ei->i_mb_last_start; + } } /* diff --git a/fs/ext4/super.c b/fs/ext4/super.c index c45dfcf9ac62..f7a301116d59 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1517,6 +1517,8 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) INIT_WORK(&ei->i_iomap_ioend_work, ext4_iomap_end_io); ext4_fc_init_inode(&ei->vfs_inode); mutex_init(&ei->i_fc_lock); + ei->i_mb_last_group = 0; + ei->i_mb_last_start = 0; return &ei->vfs_inode; } -- 2.46.1