From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81C58C4332F for ; Mon, 10 Oct 2022 09:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231735AbiJJJi5 (ORCPT ); Mon, 10 Oct 2022 05:38:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231252AbiJJJiw (ORCPT ); Mon, 10 Oct 2022 05:38:52 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9833669F6A; Mon, 10 Oct 2022 02:38:49 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4D90A21923; Mon, 10 Oct 2022 09:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1665394728; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DJQlEp/uxLKUiv2uPW7N2mWAva5AQ0VOFfU5lqkOtmU=; b=fGYKhiPPovec1q4YKUbYaN4eA/xwV/T0MWSr3587sgrt/AYEEe3u2CC72YxC/LFVfW7api wgMp73rYCoiOKTb2BThz4EIS/tWKmpcnDLdR6pgWmSp3aMHkeRLka3WyzTygtLpILuKq8x FI0DE8tDOS1ct2nwf5gAi+R8k+jijr0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1665394728; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DJQlEp/uxLKUiv2uPW7N2mWAva5AQ0VOFfU5lqkOtmU=; b=gaq27j3Ksqhxd6GhpY0PrOierOu3HSXmeGrNy8QAc16rTh6eB23vE3dp7jVZ78CStNGbJl yZC5EEOQJV/2ycDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 377DD13479; Mon, 10 Oct 2022 09:38:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dGWlDSjoQ2P0EQAAMHmgww (envelope-from ); Mon, 10 Oct 2022 09:38:48 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id B2727A06ED; Mon, 10 Oct 2022 11:38:47 +0200 (CEST) Date: Mon, 10 Oct 2022 11:38:47 +0200 From: Jan Kara To: Ojaswin Mujoo Cc: linux-ext4@vger.kernel.org, Theodore Ts'o , Ritesh Harjani , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Dilger , Jan Kara , rookxu , Ritesh Harjani Subject: Re: [PATCH 8/8] ext4: Remove the logic to trim inode PAs Message-ID: <20221010093847.ahahx6i3ik3ttbc2@quack3> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Fri 07-10-22 02:16:19, Ojaswin Mujoo wrote: > Earlier, inode PAs were stored in a linked list. This caused a need to > periodically trim the list down inorder to avoid growing it to a very > large size, as this would severly affect performance during list > iteration. > > Recent patches changed this list to an rbtree, and since the tree scales > up much better, we no longer need to have the trim functionality, hence > remove it. > > Signed-off-by: Ojaswin Mujoo > Reviewed-by: Ritesh Harjani (IBM) Looks good. Feel free to add: Reviewed-by: Jan Kara Honza > --- > Documentation/admin-guide/ext4.rst | 3 --- > fs/ext4/ext4.h | 1 - > fs/ext4/mballoc.c | 20 -------------------- > fs/ext4/mballoc.h | 5 ----- > fs/ext4/sysfs.c | 2 -- > 5 files changed, 31 deletions(-) > > diff --git a/Documentation/admin-guide/ext4.rst b/Documentation/admin-guide/ext4.rst > index 4c559e08d11e..5740d85439ff 100644 > --- a/Documentation/admin-guide/ext4.rst > +++ b/Documentation/admin-guide/ext4.rst > @@ -489,9 +489,6 @@ Files in /sys/fs/ext4/: > multiple of this tuning parameter if the stripe size is not set in the > ext4 superblock > > - mb_max_inode_prealloc > - The maximum length of per-inode ext4_prealloc_space list. > - > mb_max_to_scan > The maximum number of extents the multiblock allocator will search to > find the best extent. > diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h > index c23be3b45442..1d2ed29278e2 100644 > --- a/fs/ext4/ext4.h > +++ b/fs/ext4/ext4.h > @@ -1612,7 +1612,6 @@ struct ext4_sb_info { > unsigned int s_mb_stats; > unsigned int s_mb_order2_reqs; > unsigned int s_mb_group_prealloc; > - unsigned int s_mb_max_inode_prealloc; > unsigned int s_max_dir_size_kb; > /* where last allocation was done - for stream allocation */ > unsigned long s_mb_last_group; > diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c > index 33896e47059b..9c446d87a61c 100644 > --- a/fs/ext4/mballoc.c > +++ b/fs/ext4/mballoc.c > @@ -3419,7 +3419,6 @@ int ext4_mb_init(struct super_block *sb) > sbi->s_mb_stats = MB_DEFAULT_STATS; > sbi->s_mb_stream_request = MB_DEFAULT_STREAM_THRESHOLD; > sbi->s_mb_order2_reqs = MB_DEFAULT_ORDER2_REQS; > - sbi->s_mb_max_inode_prealloc = MB_DEFAULT_MAX_INODE_PREALLOC; > /* > * The default group preallocation is 512, which for 4k block > * sizes translates to 2 megabytes. However for bigalloc file > @@ -5537,29 +5536,11 @@ static void ext4_mb_add_n_trim(struct ext4_allocation_context *ac) > return ; > } > > -/* > - * if per-inode prealloc list is too long, trim some PA > - */ > -static void ext4_mb_trim_inode_pa(struct inode *inode) > -{ > - struct ext4_inode_info *ei = EXT4_I(inode); > - struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb); > - int count, delta; > - > - count = atomic_read(&ei->i_prealloc_active); > - delta = (sbi->s_mb_max_inode_prealloc >> 2) + 1; > - if (count > sbi->s_mb_max_inode_prealloc + delta) { > - count -= sbi->s_mb_max_inode_prealloc; > - ext4_discard_preallocations(inode, count); > - } > -} > - > /* > * release all resource we used in allocation > */ > static int ext4_mb_release_context(struct ext4_allocation_context *ac) > { > - struct inode *inode = ac->ac_inode; > struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb); > struct ext4_prealloc_space *pa = ac->ac_pa; > if (pa) { > @@ -5595,7 +5576,6 @@ static int ext4_mb_release_context(struct ext4_allocation_context *ac) > if (ac->ac_flags & EXT4_MB_HINT_GROUP_ALLOC) > mutex_unlock(&ac->ac_lg->lg_mutex); > ext4_mb_collect_stats(ac); > - ext4_mb_trim_inode_pa(inode); > return 0; > } > > diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h > index f8e8ee493867..6d85ee8674a6 100644 > --- a/fs/ext4/mballoc.h > +++ b/fs/ext4/mballoc.h > @@ -73,11 +73,6 @@ > */ > #define MB_DEFAULT_GROUP_PREALLOC 512 > > -/* > - * maximum length of inode prealloc list > - */ > -#define MB_DEFAULT_MAX_INODE_PREALLOC 512 > - > /* > * Number of groups to search linearly before performing group scanning > * optimization. > diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c > index d233c24ea342..f0d42cf44c71 100644 > --- a/fs/ext4/sysfs.c > +++ b/fs/ext4/sysfs.c > @@ -214,7 +214,6 @@ 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(mb_max_inode_prealloc, s_mb_max_inode_prealloc); > EXT4_RW_ATTR_SBI_UI(mb_max_linear_groups, s_mb_max_linear_groups); > EXT4_RW_ATTR_SBI_UI(extent_max_zeroout_kb, s_extent_max_zeroout_kb); > EXT4_ATTR(trigger_fs_error, 0200, trigger_test_error); > @@ -264,7 +263,6 @@ static struct attribute *ext4_attrs[] = { > ATTR_LIST(mb_order2_req), > ATTR_LIST(mb_stream_req), > ATTR_LIST(mb_group_prealloc), > - ATTR_LIST(mb_max_inode_prealloc), > ATTR_LIST(mb_max_linear_groups), > ATTR_LIST(max_writeback_mb_bump), > ATTR_LIST(extent_max_zeroout_kb), > -- > 2.31.1 > -- Jan Kara SUSE Labs, CR